logstash-input-http 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba514b03f267447315b843c65a676c710300a3ee
-  data.tar.gz: f15c517f4ec64213b6c7e3ef95f89a5b6bf88843
+  metadata.gz: 3648e185031d3c683d8358957f0748f35ad1e819
+  data.tar.gz: d8297d164e01f1dfa0c96c14babba645f1770e97
 SHA512:
-  metadata.gz: dfc240fde16f8fbac393bda7104bce9f4ef0338d3101fbd72829937fdd35522772e17d0a340757f225234a40662507ec7123886d24c5269918fc9df064f71eef
-  data.tar.gz: c1456684b3692f82e5a68f409efd2bb731c1483a048dab507c4d4ae5f2d0911efade13101d5a45a4fa9e2680a79d473c27695df532c95e318389997888b4fc64
+  metadata.gz: f26f64902532cb0b434ebed7bf2bec635031a88700535d6db9b029d23effa3d05ed28275aa23d5d8a1dbf24e3d28ba31573c496762aef404cffdb66485bbfb32
+  data.tar.gz: 78990664e22c39ff4b1ba875cb4cbe3c6b4329e2e6cca451630572d6b13b374d153431b62e9fdb8975e640283036b191ec5286e8dcba304965ee5cebca671f69

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.1.1
+ - Support for custom response headers 
+
 ## 2.1.0
  - Support compressed and gziped requests (thanks dwapstra)
 

data/lib/logstash/inputs/http.rb

@@ -73,12 +73,13 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
   # and no codec for the request's content-type is found
   config :additional_codecs, :validate => :hash, :default => { "application/json" => "json" }
 
+  # specify a custom set of response headers
+  config :response_headers, :validate => :hash, :default => { 'Content-Type' => 'text/plain' }
+
   # useless headers puma adds to the requests
   # mostly due to rack compliance
   REJECTED_HEADERS = ["puma.socket", "rack.hijack?", "rack.hijack", "rack.url_scheme", "rack.after_reply", "rack.version", "rack.errors", "rack.multithread", "rack.multiprocess", "rack.run_once", "SCRIPT_NAME", "QUERY_STRING", "SERVER_PROTOCOL", "SERVER_SOFTWARE", "GATEWAY_INTERFACE"]
 
-  RESPONSE_HEADERS = {'Content-Type' => 'text/plain'}
-
   public
   def register
     require "logstash/util/http_compressed_requests"
@@ -122,10 +123,10 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
           decorate(event)
           queue << event
         end
-        ['200', RESPONSE_HEADERS, ['ok']]
+        ['200', @response_headers, ['ok']]
       rescue => e
         @logger.error("unable to process event #{req.inspect}. exception => #{e.inspect}")
-        ['500', RESPONSE_HEADERS, ['internal error']]
+        ['500', @response_headers, ['internal error']]
       end
     end
 

data/logstash-input-http.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-http'
-  s.version         = '2.1.0'
+  s.version         = '2.1.1'
   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

@@ -82,10 +82,10 @@ describe LogStash::Inputs::Http 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; 
+        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)
@@ -147,6 +147,20 @@ describe LogStash::Inputs::Http do
     end
   end
 
+  context "when using custom headers" do
+    let(:custom_headers) { { 'access-control-allow-origin' => '*' } }
+    subject { LogStash::Inputs::Http.new("port" => port, "response_headers" => custom_headers) }
+
+    describe "the response" do
+      it "should include the custom headers" do
+        subject.register
+        Thread.new { subject.run(queue) }
+        response = agent.post!("http://localhost:#{port}/meh", :body => "hello")
+        expect(response.headers.to_hash).to include(custom_headers)
+      end
+    end
+  end
+
   context "with :ssl => false" do
     subject { LogStash::Inputs::Http.new("port" => port, "ssl" => false) }
     it "should not raise exception" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-http
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Logstash Input plugin that receives HTTP requests