logstash-input-http 3.3.6-java → 3.4.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c16f35c7b0da36b5d3a34ae730e2e9386754b4f770d91ab95c426ea51d6088b6
-  data.tar.gz: b7e6c19a7405151badb060b4342ff5d01d419e70031c0887afba277e0749352e
+  metadata.gz: 617f443ab23cb2aa875de1b20cd2476d9696f76f08a2ecfc3820538e5696679c
+  data.tar.gz: 338b0608a20ee0d4c647b5ae3db3bec4d032c5486f3436dc93f361e96c652e0c
 SHA512:
-  metadata.gz: f1b3f4486a8877a4aa4af9bb2f03cee3bd69cf8d66fb5bfb709781a9e9b31376e8118ad8457fcd6bdfc7375e170860e83d16121696b123e923dfe3c25f88980e
-  data.tar.gz: 6e62fb8e3b112b60bcea52db6fb6c09a548c51e2563110bfa80703e5afa4c55a1ae31db921cfdc3dfeb87c9b9f29c3a522d93ab30bbd62b784ef8214a91572af
+  metadata.gz: ed34be2f84eeac7372e40f68996dce79667a7a2e776a758ca2d8e7b2b95b0c71298290aa222c537101d3784e82fd9063ce5b7a6647c1164c0e311c47124a13c2
+  data.tar.gz: 0c84e4d9793a07a7f500a9345fac0ee1ec969e4e0b5758a316f485c6584dd84001913806d30de2aa005cdec7262ef05bcb616407e5b46d6b6967842a1203323a

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 3.4.2
+ - Docs: added `v8` as an acceptible value for `ecs_compatibility`
+
+## 3.4.1
+ - Changed jar dependencies to reflect newer versions [#140](https://github.com/logstash-plugins/logstash-input-http/pull/140)
+
+## 3.4.0
+ - Add ECS support, mapping Http header to ECS compatible fields [#137](https://github.com/logstash-plugins/logstash-input-http/pull/137)
+
+## 3.3.7
+ - Feat: improved error handling/logging/unwraping [#133](https://github.com/logstash-plugins/logstash-input-http/pull/133)
+ 
 ## 3.3.6
  - Fixes a regression introduced in 3.1.0's migration to the Netty back-end that broke some users'
    browser-based workflows. When an instance of this plugin that is configured to require Basic

data/README.md

@@ -1,6 +1,6 @@
 # Logstash Plugin
 
-[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-http.svg)](https://travis-ci.org/logstash-plugins/logstash-input-http)
+[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-input-http.svg)](https://travis-ci.com/logstash-plugins/logstash-input-http)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 

data/VERSION

@@ -1 +1 @@
-3.3.6
+3.4.2

data/docs/index.asciidoc

@@ -32,6 +32,28 @@ This input can also be used to receive webhook requests to integrate with other
 and applications. By taking advantage of the vast plugin ecosystem available in Logstash
 you can trigger actionable events right from your application.
 
+[id="plugins-{type}s-{plugin}-ecs_metadata"]
+==== Event Metadata and the Elastic Common Schema (ECS)
+In addition to decoding the events, this input will add HTTP headers containing connection information to each event.
+When ECS compatibility is disabled, the headers are stored in the `headers` field, which has the potential to create confusion and schema conflicts downstream.
+When ECS is enabled, we can ensure a pipeline maintains access to this metadata throughout the event's lifecycle without polluting the top-level namespace.
+
+Here’s how ECS compatibility mode affects output.
+[cols="<l,<l,e,<e"]
+|=======================================================================
+| ECS `disabled` | ECS `v1`,`v8` | Availability | Description
+
+| [host] | [host][ip] | Always | Host IP address
+| [headers] | [@metadata][input][http][request][headers] | Always | Complete HTTP headers
+| [headers][http_version] | [http][version] | Always | HTTP version
+| [headers][http_user_agent] | [user_agent][original] | Always | client user agent
+| [headers][http_host] | [url][domain] and [url][port] | Always | host domain and port
+| [headers][request_method] | [http][method] | Always | HTTP method
+| [headers][request_path] | [url][path] | Always | Query path
+| [headers][content_length] | [http][request][body][bytes] | Always | Request content length
+| [headers][content_type] | [http][request][mime_type] | Always | Request mime type
+|=======================================================================
+
 ==== Blocking Behavior
 
 The HTTP protocol doesn't deal well with long running requests. This plugin will either return 
@@ -70,6 +92,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 |Setting |Input type|Required
 | <<plugins-{type}s-{plugin}-additional_codecs>> |<<hash,hash>>|No
 | <<plugins-{type}s-{plugin}-cipher_suites>> |<<array,array>>|No
+| <<plugins-{type}s-{plugin}-ecs_compatibility>> | <<string,string>>|No
 | <<plugins-{type}s-{plugin}-host>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-keystore>> |<<path,path>>|No
 | <<plugins-{type}s-{plugin}-keystore_password>> |<<password,password>>|No
@@ -115,6 +138,72 @@ and no codec for the request's content-type is found
 
 The list of ciphers suite to use, listed by priorities.
 
+[id="plugins-{type}s-{plugin}-ecs_compatibility"]
+===== `ecs_compatibility`
+
+* Value type is <<string,string>>
+* Supported values are:
+** `disabled`: unstructured connection metadata added at root level
+** `v1`,`v8`: headers added under `[@metadata][http][header]`. Some are copied to structured ECS fields `http`, `url`, `user_agent` and `host`
+
+Controls this plugin's compatibility with the
+{ecs-ref}[Elastic Common Schema (ECS)].
+See <<plugins-{type}s-{plugin}-ecs_metadata>> for detailed information.
+
+Example output:
+
+**Sample output: ECS disabled**
+[source,text]
+-----
+{
+    "@version" => "1",
+    "headers" => {
+           "request_path" => "/twitter/tweet/1",
+            "http_accept" => "*/*",
+           "http_version" => "HTTP/1.1",
+         "request_method" => "PUT",
+              "http_host" => "localhost:8080",
+        "http_user_agent" => "curl/7.64.1",
+         "content_length" => "5",
+           "content_type" => "application/x-www-form-urlencoded"
+    },
+    "@timestamp" => 2021-05-28T19:27:28.609Z,
+    "host" => "127.0.0.1",
+    "message" => "hello"
+}
+-----
+
+**Sample output: ECS enabled**
+[source,text]
+-----
+{
+    "@version" => "1",
+    "user_agent" => {
+        "original" => "curl/7.64.1"
+    },
+    "http" => {
+        "method" => "PUT",
+        "request" => {
+            "mime_type" => "application/x-www-form-urlencoded",
+            "body" => {
+                "bytes" => "5"
+            }
+        },
+        "version" => "HTTP/1.1"
+    },
+    "url" => {
+          "port" => "8080",
+        "domain" => "snmp1",
+          "path" => "/twitter/tweet/1"
+    },
+    "@timestamp" => 2021-05-28T23:32:38.222Z,
+    "host" => {
+        "ip" => "127.0.0.1"
+    },
+    "message" => "hello",
+}
+-----
+
 [id="plugins-{type}s-{plugin}-host"]
 ===== `host` 
 
@@ -209,7 +298,8 @@ specify a custom set of response headers
 ===== `remote_host_target_field` 
 
   * Value type is <<string,string>>
-  * Default value is `"host"`
+  * Default value is `"host"` when ECS is disabled
+  * Default value is `[host][ip]` when ECS is enabled
 
 specify a target field for the client host of the http request
 
@@ -217,7 +307,8 @@ specify a target field for the client host of the http request
 ===== `request_headers_target_field` 
 
   * Value type is <<string,string>>
-  * Default value is `"headers"`
+  * Default value is `"headers"` when ECS is disabled
+  * Default value is `[@metadata][http][header]` when ECS is enabled
 
 specify target field for the client host of the http request
 

data/lib/logstash/inputs/http.rb

@@ -3,6 +3,7 @@ require "logstash/inputs/base"
 require "logstash/namespace"
 require "stud/interval"
 require "logstash-input-http_jars"
+require "logstash/plugin_mixins/ecs_compatibility_support"
 
 # Using this input you can receive single or multiline events over http(s).
 # Applications can send a HTTP POST request with a body to the endpoint started by this
@@ -25,6 +26,7 @@ require "logstash-input-http_jars"
 # format]
 #
 class LogStash::Inputs::Http < LogStash::Inputs::Base
+  include LogStash::PluginMixins::ECSCompatibilitySupport(:disabled, :v1, :v8 => :v1)
   require "logstash/inputs/http/tls"
 
   java_import "io.netty.handler.codec.http.HttpUtil"
@@ -104,10 +106,10 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
   config :response_headers, :validate => :hash, :default => { 'Content-Type' => 'text/plain' }
 
   # target field for the client host of the http request
-  config :remote_host_target_field, :validate => :string, :default => "host"
+  config :remote_host_target_field, :validate => :string
 
   # target field for the client host of the http request
-  config :request_headers_target_field, :validate => :string, :default => "headers"
+  config :request_headers_target_field, :validate => :string
 
   config :threads, :validate => :number, :required => false, :default => ::LogStash::Config::CpuCoreStrategy.maximum
 
@@ -130,7 +132,7 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
 
     validate_ssl_settings!
 
-    if @user && @password then
+    if @user && @password
       token = Base64.strict_encode64("#{@user}:#{@password.value}")
       @auth_token = "Basic #{token}"
     end
@@ -144,6 +146,9 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
     require "logstash/inputs/http/message_handler"
     message_handler = MessageHandler.new(self, @codec, @codecs, @auth_token)
     @http_server = create_http_server(message_handler)
+
+    @remote_host_target_field ||= ecs_select[disabled: "host", v1: "[host][ip]"]
+    @request_headers_target_field ||= ecs_select[disabled: "headers", v1: "[@metadata][input][http][request][headers]"]
   end # def register
 
   def run(queue)
@@ -177,12 +182,50 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
   end
 
   def push_decoded_event(headers, remote_address, event)
+    add_ecs_fields(headers, event)
     event.set(@request_headers_target_field, headers)
     event.set(@remote_host_target_field, remote_address)
     decorate(event)
     @queue << event
   end
 
+  def add_ecs_fields(headers, event)
+    return if ecs_compatibility == :disabled
+
+    http_version = headers.get("http_version")
+    event.set("[http][version]", http_version) if http_version
+
+    http_user_agent = headers.get("http_user_agent")
+    event.set("[user_agent][original]", http_user_agent) if http_user_agent
+
+    http_host = headers.get("http_host")
+    domain, port = self.class.get_domain_port(http_host)
+    event.set("[url][domain]", domain) if domain
+    event.set("[url][port]", port) if port
+
+    request_method = headers.get("request_method")
+    event.set("[http][method]", request_method) if request_method
+
+    request_path = headers.get("request_path")
+    event.set("[url][path]", request_path) if request_path
+
+    content_length = headers.get("content_length")
+    event.set("[http][request][body][bytes]", content_length) if content_length
+
+    content_type = headers.get("content_type")
+    event.set("[http][request][mime_type]", content_type) if content_type
+  end
+
+  # match the domain and port in either IPV4, "127.0.0.1:8080", or IPV6, "[2001:db8::8a2e:370:7334]:8080", style
+  # return [domain, port]
+  def self.get_domain_port(http_host)
+    if /^(([^:]+)|\[(.*)\])\:([\d]+)$/ =~ http_host
+      ["#{$2 || $3}", $4.to_i]
+    else
+      [http_host, nil]
+    end
+  end
+
   def validate_ssl_settings!
     if !@ssl
       @logger.warn("SSL Certificate will not be used") if @ssl_certificate
@@ -217,16 +260,16 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
   def build_ssl_params
     return nil unless @ssl
 
-    ssl_builder = nil
-
     if @keystore && @keystore_password
       ssl_builder = org.logstash.plugins.inputs.http.util.JksSslBuilder.new(@keystore, @keystore_password.value)
     else
       begin
-        ssl_builder = org.logstash.plugins.inputs.http.util.SslSimpleBuilder.new(@ssl_certificate, @ssl_key, @ssl_key_passphrase.nil? ? nil : @ssl_key_passphrase.value)
-        .setCipherSuites(normalized_ciphers)
+        ssl_builder = org.logstash.plugins.inputs.http.util.SslSimpleBuilder
+                          .new(@ssl_certificate, @ssl_key, @ssl_key_passphrase.nil? ? nil : @ssl_key_passphrase.value)
+                          .setCipherSuites(normalized_ciphers)
       rescue java.lang.IllegalArgumentException => e
-        raise LogStash::ConfigurationError.new(e)
+        @logger.error("SSL configuration invalid", error_details(e))
+        raise LogStash::ConfigurationError, e
       end
 
       if client_authentication?
@@ -234,13 +277,7 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
       end
     end
 
-    ssl_context = ssl_builder.build()
-    ssl_handler_provider = org.logstash.plugins.inputs.http.util.SslHandlerProvider.new(ssl_context)
-    ssl_handler_provider.setVerifyMode(@ssl_verify_mode_final.upcase)
-    ssl_handler_provider.setProtocols(convert_protocols)
-    ssl_handler_provider.setHandshakeTimeoutMilliseconds(@ssl_handshake_timeout)
-
-    ssl_handler_provider
+    new_ssl_handshake_provider(ssl_builder)
   end
 
   def ssl_key_configured?
@@ -259,6 +296,8 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
     @ssl_verify_mode_final == "force_peer" || @ssl_verify_mode_final == "peer"
   end
 
+  private
+
   def normalized_ciphers
     @cipher_suites.map(&:upcase)
   end
@@ -267,4 +306,31 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
     TLS.get_supported(@tls_min_version..@tls_max_version).map(&:name)
   end
 
+  def new_ssl_handshake_provider(ssl_builder)
+    begin
+      ssl_handler_provider = org.logstash.plugins.inputs.http.util.SslHandlerProvider.new(ssl_builder.build())
+      ssl_handler_provider.setVerifyMode(@ssl_verify_mode_final.upcase)
+      ssl_handler_provider.setProtocols(convert_protocols)
+      ssl_handler_provider.setHandshakeTimeoutMilliseconds(@ssl_handshake_timeout)
+      ssl_handler_provider
+    rescue java.lang.IllegalArgumentException => e
+      @logger.error("SSL configuration invalid", error_details(e))
+      raise LogStash::ConfigurationError, e
+    rescue java.lang.Exception => e
+      @logger.error("SSL configuration failed", error_details(e, true))
+      raise e
+    end
+  end
+
+  def error_details(e, trace = false)
+    error_details = { :exception => e.class, :message => e.message }
+    error_details[:backtrace] = e.backtrace if trace || @logger.debug?
+    cause = e.cause
+    if cause && e != cause
+      error_details[:cause] = { :exception => cause.class, :message => cause.message }
+      error_details[:cause][:backtrace] = cause.backtrace if trace || @logger.debug?
+    end
+    error_details
+  end
+
 end # class LogStash::Inputs::Http

data/lib/logstash-input-http_jars.rb

@@ -1,6 +1,6 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('io.netty', 'netty-all', '4.1.49.Final')
+require_jar('io.netty', 'netty-all', '4.1.65.Final')
 require_jar('org.apache.logging.log4j', 'log4j-api', '2.11.1')
-require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '3.3.6')
+require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '3.4.2')

data/logstash-input-http.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'jar-dependencies', '~> 0.3', '>= 0.3.4'
+  s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~>1.2'
 
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'logstash-codec-json'

data/spec/inputs/http_spec.rb

@@ -6,6 +6,7 @@ require "manticore"
 require "stud/temporary"
 require "zlib"
 require "stringio"
+require 'logstash/plugin_mixins/ecs_compatibility_support/spec_helper'
 
 java_import "io.netty.handler.ssl.util.SelfSignedCertificate"
 
@@ -34,20 +35,7 @@ describe LogStash::Inputs::Http do
     subject { LogStash::Inputs::Http.new("port" => port) }
 
     before :each do
-      subject.register
-      t = Thread.new { subject.run(logstash_queue) }
-      ok = false
-      until ok
-        begin
-          client.post("http://127.0.0.1:#{port}", :body => '{}').call
-        rescue => e
-          # retry
-        else
-          ok = true
-        end
-        sleep 0.01
-      end
-      logstash_queue.pop if logstash_queue.size == 1 # pop test event
+      setup_server_client
     end
 
     describe "handling overflowing requests with a 429" do
@@ -85,65 +73,6 @@ describe LogStash::Inputs::Http do
       end
     end
 
-    describe "remote host" do
-      subject { LogStash::Inputs::Http.new(config.merge("port" => port)) }
-      context "by default" do
-        let(:config) { {} }
-        it "is written to the \"host\" field" do
-          client.post("http://localhost:#{port}/meh.json",
-                      :headers => { "content-type" => "text/plain" },
-                      :body => "hello").call
-          event = logstash_queue.pop
-          expect(event.get("host")).to eq("127.0.0.1")
-        end
-      end
-
-      context "when using remote_host_target_field" do
-        let(:config) { { "remote_host_target_field" => "remote_host" } }
-        it "is written to the value of \"remote_host_target_field\" property" do
-          client.post("http://localhost:#{port}/meh.json",
-                      :headers => { "content-type" => "text/plain" },
-                      :body => "hello").call
-          event = logstash_queue.pop
-          expect(event.get("remote_host")).to eq("127.0.0.1")
-        end
-      end
-    end
-
-    describe "request headers" do
-      subject { LogStash::Inputs::Http.new(config.merge("port" => port)) }
-      context "by default" do
-        let(:config) { {} }
-        it "are written to the \"headers\" field" do
-          client.post("http://localhost:#{port}/meh.json",
-                      :headers => { "content-type" => "text/plain" },
-                      :body => "hello").call
-          event = logstash_queue.pop
-          expect(event.get("headers")).to be_a(Hash)
-          expect(event.get("headers")).to include("request_method" => "POST")
-        end
-      end
-      context "when using request_headers_target_field" do
-        let(:config) { { "request_headers_target_field" => "request_headers" } }
-        it "are written to the field set in \"request_headers_target_field\"" do
-          client.post("http://localhost:#{port}/meh.json",
-                      :headers => { "content-type" => "text/plain" },
-                      :body => "hello").call
-          event = logstash_queue.pop
-          expect(event.get("request_headers")).to be_a(Hash)
-          expect(event.get("request_headers")).to include("request_method" => "POST")
-        end
-      end
-    end
-
-    it "should include remote host in \"host\" property" do
-      client.post("http://127.0.0.1:#{port}/meh.json",
-                  :headers => { "content-type" => "text/plain" },
-                  :body => "hello").call
-      event = logstash_queue.pop
-      expect(event.get("host")).to eq("127.0.0.1")
-    end
-
     context "with default codec" do
       subject { LogStash::Inputs::Http.new("port" => port) }
       context "when receiving a text/plain request" do
@@ -368,6 +297,143 @@ describe LogStash::Inputs::Http do
     end
   end
 
+  describe "ECS support", :ecs_compatibility_support, :aggregate_failures do
+    ecs_compatibility_matrix(:disabled, :v1) do |ecs_select|
+      let(:host_field) { ecs_select[disabled: "[host]", v1: "[host][ip]"] }
+      let(:header_field) { ecs_select[disabled: "headers", v1: "[@metadata][input][http][request][headers]"] }
+      let(:http_version_field) { ecs_select[disabled: "[headers][http_version]", v1: "[http][version]"] }
+      let(:user_agent_field) { ecs_select[disabled: "[headers][http_user_agent]", v1: "[user_agent][original]"] }
+      let(:http_host_field) { "[headers][http_host]" }
+      let(:domain_field) { "[url][domain]" }
+      let(:port_field) { "[url][port]" }
+      let(:request_method_field) { ecs_select[disabled: "[headers][request_method]", v1: "[http][method]"] }
+      let(:request_path_field) { ecs_select[disabled: "[headers][request_path]", v1: "[url][path]"] }
+      let(:content_length_field) { ecs_select[disabled: "[headers][content_length]", v1: "[http][request][body][bytes]"] }
+      let(:content_type_field) { ecs_select[disabled: "[headers][content_type]", v1: "[http][request][mime_type]"] }
+
+      before :each do
+        allow_any_instance_of(described_class).to receive(:ecs_compatibility).and_return(ecs_compatibility)
+        setup_server_client
+      end
+
+      describe "remote host" do
+        subject { LogStash::Inputs::Http.new(config.merge("port" => port)) }
+        context "by default" do
+          let(:config) { {} }
+          it "is written to the \"host\" field" do
+            client.post("http://localhost:#{port}/meh.json",
+                        :headers => { "content-type" => "text/plain" },
+                        :body => "hello").call
+            event = logstash_queue.pop
+            expect(event.get(host_field)).to eq("127.0.0.1")
+          end
+        end
+
+        context "when using remote_host_target_field" do
+          let(:config) { { "remote_host_target_field" => "remote_host" } }
+          it "is written to the value of \"remote_host_target_field\" property" do
+            client.post("http://localhost:#{port}/meh.json",
+                        :headers => { "content-type" => "text/plain" },
+                        :body => "hello").call
+            event = logstash_queue.pop
+            expect(event.get("remote_host")).to eq("127.0.0.1")
+          end
+        end
+      end
+
+      describe "request headers" do
+        subject { LogStash::Inputs::Http.new(config.merge("port" => port)) }
+        context "by default" do
+          let(:config) { {} }
+          it "are written to the \"headers\" field" do
+            client.post("http://localhost:#{port}/meh.json",
+                        :headers => { "content-type" => "text/plain" },
+                        :body => "hello").call
+            event = logstash_queue.pop
+            expect(event.get(header_field)).to be_a(Hash)
+            expect(event.get(request_method_field)).to eq("POST")
+            expect(event.get(request_path_field)).to eq("/meh.json")
+            expect(event.get(http_version_field)).to eq("HTTP/1.1")
+            expect(event.get(user_agent_field)).to include("Manticore")
+            if ecs_compatibility == :disabled
+              expect(event.get(http_host_field)).to eq("localhost:#{port}")
+            else
+              expect(event.get(domain_field)).to eq("localhost")
+              expect(event.get(port_field)).to eq(port)
+            end
+
+            expect(event.get(content_length_field)).to eq("5")
+            expect(event.get(content_type_field)).to eq("text/plain")
+          end
+        end
+        context "when using request_headers_target_field" do
+          let(:config) { { "request_headers_target_field" => "request_headers" } }
+          it "are written to the field set in \"request_headers_target_field\"" do
+            client.post("http://localhost:#{port}/meh.json",
+                        :headers => { "content-type" => "text/plain" },
+                        :body => "hello").call
+            event = logstash_queue.pop
+            expect(event.get("request_headers")).to be_a(Hash)
+            expect(event.get("request_headers")).to include("request_method" => "POST")
+            expect(event.get("request_headers")).to include("request_path" => "/meh.json")
+            expect(event.get("request_headers")).to include("http_version" => "HTTP/1.1")
+            expect(event.get("request_headers")["http_user_agent"]).to include("Manticore")
+            expect(event.get("request_headers")).to include("http_host" => "localhost:#{port}")
+            expect(event.get("request_headers")).to include("content_length" => "5")
+            expect(event.get("request_headers")).to include("content_type" => "text/plain")
+          end
+        end
+      end
+    end
+  end
+
+  # wait until server is ready
+  def setup_server_client
+    subject.register
+    t = Thread.new { subject.run(logstash_queue) }
+    ok = false
+    until ok
+      begin
+        client.post("http://127.0.0.1:#{port}", :body => '{}').call
+      rescue => e
+        # retry
+      else
+        ok = true
+      end
+      sleep 0.01
+    end
+    logstash_queue.pop if logstash_queue.size == 1 # pop test event
+  end
+
+  describe "parse domain host" do
+    let(:localhost) { "localhost" }
+    let(:ipv6) { "2001:db8::8a2e:370:7334" }
+
+    it "should parse in IPV4 format with port" do
+      domain, port = LogStash::Inputs::Http.get_domain_port("#{localhost}:8080")
+      expect(domain).to eq(localhost)
+      expect(port).to eq(8080)
+    end
+
+    it "should parse in IPV4 format without port" do
+      domain, port = LogStash::Inputs::Http.get_domain_port(localhost)
+      expect(domain).to eq(localhost)
+      expect(port).to be_nil
+    end
+
+    it "should parse in IPV6 format with port" do
+      domain, port = LogStash::Inputs::Http.get_domain_port("[#{ipv6}]:8080")
+      expect(domain).to eq(ipv6)
+      expect(port).to eq(8080)
+    end
+
+    it "should parse in IPV6 format without port" do
+      domain, port = LogStash::Inputs::Http.get_domain_port("#{ipv6}")
+      expect(domain).to eq(ipv6)
+      expect(port).to be_nil
+    end
+  end
+
   context "with :ssl => false" do
     subject { LogStash::Inputs::Http.new("port" => port, "ssl" => false) }
     it "should not raise exception" do
@@ -386,21 +452,21 @@ describe LogStash::Inputs::Http do
       let(:ssl_certificate) { ssc.certificate }
       let(:ssl_key) { ssc.private_key }
 
+      let(:config) do
+        { "port" => port, "ssl" => true, "ssl_certificate" => ssl_certificate.path, "ssl_key" => ssl_key.path }
+      end
+
       after(:each) { ssc.delete }
 
-      subject { LogStash::Inputs::Http.new("port" => port, "ssl" => true,
-                                           "ssl_certificate" => ssl_certificate.path,
-                                           "ssl_key" => ssl_key.path) }
+      subject { LogStash::Inputs::Http.new(config) }
+
       it "should not raise exception" do
         expect { subject.register }.to_not raise_exception
       end
 
       context "with ssl_verify_mode = none" do
-        subject { LogStash::Inputs::Http.new("port" => port, "ssl" => true,
-                                             "ssl_certificate" => ssl_certificate.path,
-                                             "ssl_key" => ssl_key.path,
-                                             "ssl_verify_mode" => "none"
-                                            ) }
+        subject { LogStash::Inputs::Http.new(config.merge("ssl_verify_mode" => "none")) }
+
         it "should not raise exception" do
           expect { subject.register }.to_not raise_exception
         end
@@ -419,11 +485,8 @@ describe LogStash::Inputs::Http do
         end
       end
       context "with verify_mode = none" do
-        subject { LogStash::Inputs::Http.new("port" => port, "ssl" => true,
-                                             "ssl_certificate" => ssl_certificate.path,
-                                             "ssl_key" => ssl_key.path,
-                                             "verify_mode" => "none"
-                                            ) }
+        subject { LogStash::Inputs::Http.new(config.merge("verify_mode" => "none")) }
+
         it "should not raise exception" do
           expect { subject.register }.to_not raise_exception
         end
@@ -441,6 +504,67 @@ describe LogStash::Inputs::Http do
           end
         end
       end
+
+      context "with invalid cipher_suites" do
+        let(:config) { super().merge("cipher_suites" => "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA38") }
+
+        it "should raise a configuration error" do
+          expect( subject.logger ).to receive(:error) do |msg, opts|
+            expect( msg ).to match /.*?configuration invalid/
+            expect( opts[:message] ).to match /TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA38.*? not available/
+          end
+          expect { subject.register }.to raise_error(LogStash::ConfigurationError)
+        end
+      end
+
+      context "with invalid ssl certificate" do
+        before do
+          cert = File.readlines path = config["ssl_certificate"]
+          i = cert.index { |line| line.index('END CERTIFICATE') }
+          cert[i - 1] = ''
+          File.write path, cert.join("\n")
+        end
+
+        it "should raise a configuration error" do
+          expect( subject.logger ).to receive(:error) do |msg, opts|
+            expect( msg ).to match /SSL configuration invalid/
+            expect( opts[:message] ).to match /File does not contain valid certificate/i
+          end
+          expect { subject.register }.to raise_error(LogStash::ConfigurationError)
+        end
+      end
+
+      context "with invalid ssl key config" do
+        let(:config) { super().merge("ssl_key_passphrase" => "1234567890") }
+
+        it "should raise a configuration error" do
+          expect( subject.logger ).to receive(:error) do |msg, opts|
+            expect( msg ).to match /SSL configuration invalid/
+            expect( opts[:message] ).to match /File does not contain valid private key/i
+          end
+          expect { subject.register }.to raise_error(LogStash::ConfigurationError)
+        end
+      end
+
+      context "with invalid ssl certificate_authorities" do
+        let(:config) do
+          super().merge("ssl_verify_mode" => "peer",
+                      "ssl_certificate_authorities" => [ ssc.certificate.path, ssc.private_key.path ])
+        end
+
+        it "should raise a cert error" do
+          expect( subject.logger ).to receive(:error) do |msg, opts|
+            expect( msg ).to match(/SSL configuration failed/), lambda { "unexpected: logger.error #{msg.inspect}, #{opts.inspect}" }
+            expect( opts[:message] ).to match /signed fields invalid/
+          end
+          begin
+            subject.register
+          rescue Java::JavaSecurityCert::CertificateParsingException
+            :pass
+          end
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-http
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.4.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +64,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.4
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  name: logstash-mixin-ecs_compatibility_support
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -144,9 +158,9 @@ files:
 - lib/tasks/build.rake
 - logstash-input-http.gemspec
 - spec/inputs/http_spec.rb
-- vendor/jar-dependencies/io/netty/netty-all/4.1.49.Final/netty-all-4.1.49.Final.jar
+- vendor/jar-dependencies/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final.jar
 - vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.11.1/log4j-api-2.11.1.jar
-- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/3.3.6/logstash-input-http-3.3.6.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/3.4.2/logstash-input-http-3.4.2.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -169,8 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Receives events over HTTP or HTTPS