logstash-input-http 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7501ef476876913a230b76302468cacc1ffe8dce
-  data.tar.gz: 84e2a47f556eead137f26baa98e90008141a3869
+  metadata.gz: ba514b03f267447315b843c65a676c710300a3ee
+  data.tar.gz: f15c517f4ec64213b6c7e3ef95f89a5b6bf88843
 SHA512:
-  metadata.gz: c6a1febb7c2895f79a7008278a9589fef2ed92e0f7bcd61c9d22b168d630754824e59c94de62b22c940246967ceb7960f4e57301f589e60b44796835544da4dc
-  data.tar.gz: 6b52e97baccc26fa8b7cee6c560e2291feb1b6f58648c0cdb6e6c0083dfc5b1f01da972bff966cf0ceef4b625eabfa9faefac93759d9ae371eb5b953960391c7
+  metadata.gz: dfc240fde16f8fbac393bda7104bce9f4ef0338d3101fbd72829937fdd35522772e17d0a340757f225234a40662507ec7123886d24c5269918fc9df064f71eef
+  data.tar.gz: c1456684b3692f82e5a68f409efd2bb731c1483a048dab507c4d4ae5f2d0911efade13101d5a45a4fa9e2680a79d473c27695df532c95e318389997888b4fc64

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.1.0
+ - Support compressed and gziped requests (thanks dwapstra)
+
 ## 2.0.0
  - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895

data/README.md

@@ -1,5 +1,8 @@
 # Logstash Plugin
 
+[![Build
+Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-http-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-http-unit/)
+
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.

data/lib/logstash/inputs/http.rb

@@ -81,6 +81,7 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
 
   public
   def register
+    require "logstash/util/http_compressed_requests"
     @server = ::Puma::Server.new(nil) # we'll set the rack handler later
     if @user && @password then
       token = Base64.strict_encode64("#{@user}:#{@password.value}")
@@ -134,6 +135,7 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
 
     @server.app = Rack::Builder.new do
       use(Rack::Auth::Basic, &auth) if auth
+      use CompressedRequests
       run(p)
     end
     @server.run.join

data/lib/logstash/util/http_compressed_requests.rb

@@ -0,0 +1,39 @@
+class CompressedRequests
+  def initialize(app)
+    @app = app
+  end
+
+  def method_handled?(env)
+    !!(env['REQUEST_METHOD'] =~ /(POST|PUT)/)
+  end
+
+  def encoding_handled?(env)
+    ['gzip', 'deflate'].include? env['HTTP_CONTENT_ENCODING']
+  end
+
+  def call(env)
+    if method_handled?(env) && encoding_handled?(env)
+      begin
+        extracted = decode(env['rack.input'], env['HTTP_CONTENT_ENCODING'])
+      rescue Zlib::Error
+        return [400, {'Content-Type' => 'text/plain'}, ["Failed to decompress body"]]
+      end
+
+      env.delete('HTTP_CONTENT_ENCODING')
+      env['CONTENT_LENGTH'] = extracted.bytesize
+      env['rack.input'] = StringIO.new(extracted)
+    end
+
+    @app.call(env)
+  end
+
+  def decode(input, content_encoding)
+    case content_encoding
+      when 'gzip' then
+        Zlib::GzipReader.new(input).read
+      when 'deflate' then
+        Zlib::Inflate.inflate(input.read)
+    end
+  end
+
+end

data/logstash-input-http.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-http'
-  s.version         = '2.0.2'
+  s.version         = '2.1.0'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Logstash Input plugin that receives HTTP requests"
   s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

data/spec/inputs/http_spec.rb

@@ -3,6 +3,8 @@ require "logstash/inputs/http"
 require "json"
 require "ftw"
 require "stud/temporary"
+require "zlib"
+require "stringio"
 
 describe LogStash::Inputs::Http do
 
@@ -50,6 +52,62 @@ describe LogStash::Inputs::Http do
         expect(event["message"]).to eq("hello")
       end
     end
+    context "when receiving a deflate compressed text/plain request" do
+      it "should process the request normally" do
+        subject.register
+        Thread.new { subject.run(queue) }
+        agent.post!("http://localhost:#{port}/meh.json",
+                    :headers => { "content-type" => "text/plain", "content-encoding" => "deflate" },
+                    :body => Zlib::Deflate.deflate("hello"))
+        event = queue.pop
+        expect(event["message"]).to eq("hello")
+      end
+    end
+    context "when receiving a deflate text/plain request that cannot be decompressed" do
+      let!(:response) do
+        subject.register
+        Thread.new { subject.run(queue) }
+        agent.post!("http://localhost:#{port}/meh.json",
+                    :headers => { "content-type" => "text/plain", "content-encoding" => "deflate" },
+                    :body => "hello")
+      end
+      it "should respond with 400" do
+        expect(response.status).to eq(400)
+      end
+      it "should respond with a decompression error" do
+        expect(response.read_body).to eq("Failed to decompress body")
+      end
+    end
+    context "when receiving a gzip compressed text/plain request" do
+      it "should process the request normally" do
+        subject.register
+        Thread.new { subject.run(queue) }
+	z = StringIO.new ""
+	w = Zlib::GzipWriter.new z; 
+	w.write("hello"); 
+	w.finish; 
+        agent.post!("http://localhost:#{port}/meh.json",
+                    :headers => { "content-type" => "text/plain", "content-encoding" => "gzip" },
+                    :body => z.string)
+        event = queue.pop
+        expect(event["message"]).to eq("hello")
+      end
+    end
+    context "when receiving a gzip text/plain request that cannot be decompressed" do
+      let!(:response) do
+          subject.register
+          Thread.new { subject.run(queue) }
+          agent.post!("http://localhost:#{port}/meh.json",
+                    :headers => { "content-type" => "text/plain", "content-encoding" => "gzip" },
+                    :body => "hello")
+      end
+      it "should respond with 400" do
+        expect(response.status).to eq(400)
+      end
+      it "should respond with a decompression error" do
+        expect(response.read_body).to eq("Failed to decompress body")
+      end
+    end
     context "when receiving an application/json request" do
       it "should parse the json body" do
         subject.register

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-http
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - NOTICE.TXT
 - README.md
 - lib/logstash/inputs/http.rb
+- lib/logstash/util/http_compressed_requests.rb
 - logstash-input-http.gemspec
 - spec/inputs/http_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html