logstash-input-http 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1975dd1f7608f77b01121212cb01df2a95c23eef97b40613ea1b5161bebe8772
-  data.tar.gz: 2de2626b158b0ee92fded043dfb6f32c11c0fdab2c515972157ef48e6e10a5cb
+  metadata.gz: 42ceeaf8d8b30792be582944f25f31f2a49fe9fb63907aaaf01d46ee6b94b684
+  data.tar.gz: d989b314584736c51690656468c4ef0bbcba755cf803b5df3bf337b3650702a3
 SHA512:
-  metadata.gz: b1088e09605455d87a480afdeaf1b41aa1bae213b5cdb3ee91def0180589251b45748a6c3980eb895d24511c1371f71ac0546a5ce0b72849dd5f9fbe89f285cc
-  data.tar.gz: db68457ace06371dcaa312a9a2fa2ad3d96a7cfd1fe047a7e0c8cfed3a0a43c36521a73bf3d15fc39cdf947faf1b1f2f7ad590ea6c546cbb44df5b5bea3b7f8f
+  metadata.gz: 67b672d9f6dd5d7d0a9eb877cd7d7a0203c70f2e8abcbd57f6c51d977edfe454d06f47cce6189196f3a6b9d45cf90dd4725a3cd4396a7d071ddcb77b00cb0f1d
+  data.tar.gz: fa6975d644e0089746c9fe5507138c665969ffa4a8c45d7e5dd01f860b9e55a1274505bcb9dd00ac5b363ada9051fc01a6ecf37e417a3efbed936b4136dbb01a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.9
+  - Make sure default codec is also cloned for thread safety. https://github.com/logstash-plugins/logstash-input-http/pull/80
+  - Always flush codec after each request and codec decoding. https://github.com/logstash-plugins/logstash-input-http/pull/81
+
 ## 3.0.8
   - In the event that all webserver threads are busy this plugin will now return a 429, busy, error.
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/logstash/inputs/http.rb

@@ -92,7 +92,6 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
   # 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"]
 
-  public
   def register
     require "logstash/util/http_compressed_requests"
     @server = ::HTTPInputWebServer.new(nil) # we'll set the rack handler later
@@ -122,7 +121,9 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
     @server.min_threads = 0
     # The actual number of threads is one higher to let us reject additional requests
     @server.max_threads = @threads + 1
-    @codecs = Hash.new
+
+    # set the default codec in the @codecs hash so that it is also cloned in the write_slots
+    @codecs = { :default => @codec }
 
     @additional_codecs.each do |content_type, codec|
       @codecs[content_type] = LogStash::Plugin.lookup("codec", codec).new
@@ -151,13 +152,13 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
           next [429, {}, BUSY_RESPONSE]
         end
         begin
-          codec = local_codecs.fetch(req["content_type"], @codec)
-          codec.decode(body.read) do |event|
-            event.set("host", remote_host)
-            event.set("headers", req)
-            decorate(event)
-            queue << event
-          end
+          codec = local_codecs[req["content_type"]] || local_codecs[:default]
+
+          codec.decode(body.read) { |event| push_decorated_event(queue, event, remote_host, req) }
+
+          # since payloads are self-contained and we don't handle multipart we should flush
+          # the codec after each request.
+          codec.flush { |event| push_decorated_event(queue, event, remote_host, req) }
         ensure
           @write_slots.put(local_codecs)
         end
@@ -186,7 +187,16 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
     @server.run.join
   end
 
+  def stop
+    return unless @server
+    @server.stop(true)
+    @server.binder.close if @server.binder
+  rescue IOError
+    # do nothing
+  end
+
   private
+
   def lowercase_keys(hash)
     new_hash = {}
     hash.each_pair do |k,v|
@@ -195,13 +205,11 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
     new_hash
   end
 
-  public
-  def stop
-    return unless @server
-    @server.stop(true)
-    @server.binder.close if @server.binder
-  rescue IOError
-    # do nothing
+  def push_decorated_event(queue, event, host, headers)
+    event.set("host", host)
+    event.set("headers", headers)
+    decorate(event)
+    queue << event
   end
 
 end # class LogStash::Inputs::Http

data/logstash-input-http.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-http'
-  s.version         = '3.0.8'
+  s.version         = '3.0.9'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Receives events over HTTP or HTTPS"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -26,5 +26,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'logstash-codec-json'
+  s.add_development_dependency 'logstash-codec-line'
   s.add_development_dependency 'ftw'
 end

data/spec/inputs/http_spec.rb

@@ -136,6 +136,7 @@ describe LogStash::Inputs::Http do
         end
       end
     end
+
     context "with json codec" do
       subject { LogStash::Inputs::Http.new("port" => port, "codec" => "json") }
       it "should parse the json body" do
@@ -145,6 +146,20 @@ describe LogStash::Inputs::Http do
       end
     end
 
+    context "with json_lines codec without final delimiter" do
+      subject { LogStash::Inputs::Http.new("port" => port, "codec" => "line") }
+      let(:line1) { "foo" }
+      let(:line2) { "bar" }
+      it "should parse all json_lines in body including last one" do
+        agent.post!("http://localhost:#{port}/meh.json", :body => "#{line1}\n#{line2}")
+        expect(queue.size).to eq(2)
+        event = queue.pop
+        expect(event.get("message")).to eq("foo")
+        event = queue.pop
+        expect(event.get("message")).to eq("bar")
+      end
+    end
+
     context "when using a custom codec mapping" do
       subject { LogStash::Inputs::Http.new("port" => port,
                                            "additional_codecs" => { "application/json" => "plain" }) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-http
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-09 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: logstash-codec-line
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: