logstash-input-http 3.3.3-java → 3.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c840c2c8013ab47e1d3fc43a6665b1b262f108c3b3650e9b9fd98bcfd23ae38
-  data.tar.gz: fc3afeae7a6d0d46ff366088ff5ef11baac377107d6c409f75fe3742bd8c96d9
+  metadata.gz: 4b87a5c0d794b79c2fbc32f0019893258464c106d651b97ea461491d3abe82a3
+  data.tar.gz: d8a60c43c88913797b62e14d6724ab1ad263a65bccc02d2e60ff8e166c6950e9
 SHA512:
-  metadata.gz: cb380aa9cb337af0b5007c027bf0e1f73c73fac2a2c4342ca3a23b49da462e6f55f19c7101da8919ef53922b9149f4217738a5c63f8bb18e54fa0f41d2a174bb
-  data.tar.gz: 93af6e86b906ea58ae25c97449143bcf71f145cbcd82cb3ee42f5376c1f98ec272ecd7e0414934cd579f43f817f17674bf6227268389df26e5a53e67cdb12153
+  metadata.gz: 4489b8a66bd3a3a5f35c7d95f9f7c20a450b84aefe5416418983a3ec05ef41a278c78eaa48f40389d7262191a47c0fb9e2c43047af3f1817c9ca2c5871a783f0
+  data.tar.gz: 3c3c75d19312c553b31ed1144c59184c39ed5a6f5a96b3674c55c9b851c050206de08fa2900b1546d0fa416aff41a974efe8f035df4d08119b4f094dcf4cfd5b

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 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
+   authentication receives a request that does not include authentication, it now appropriately
+   includes an `WWW-Authenticate` header in its `401 Unauthorized` response, allowing the browser
+   to collect credentials before retrying the request.
+
+## 3.3.5
+ - Updated jackson databind and Netty dependencies. Additionally, this release removes the dependency on `tcnative` +
+   `boringssl`, using JVM supplied ciphers instead. This may result in fewer ciphers being available if the JCE
+   unlimited strength jurisdiction policy is not installed. (This policy is installed by default on versions of the
+   JDK from u161 onwards)[#126](https://github.com/logstash-plugins/logstash-input-http/pull/126)
+
+## 3.3.4
+ - Refactor: scope (and avoid unused) java imports [#124](https://github.com/logstash-plugins/logstash-input-http/pull/124)
+
 ## 3.3.3
  - Revert updates to netty and tcnative since CBC ciphers are still used in many contexts
  - More about the reasoning can be found [here](https://github.com/elastic/logstash/issues/11499#issuecomment-580333510)

data/LICENSE

@@ -1,13 +1,202 @@
-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.
-You may obtain a copy of the License at
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2020 Elastic and contributors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

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.3
+3.4.0

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 | 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`: 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-input-http_jars.rb

@@ -1,7 +1,6 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('io.netty', 'netty-all', '4.1.30.Final')
-require_jar('io.netty', 'netty-tcnative-boringssl-static', '2.0.12.Final')
+require_jar('io.netty', 'netty-all', '4.1.49.Final')
 require_jar('org.apache.logging.log4j', 'log4j-api', '2.11.1')
-require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '3.3.3')
+require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '3.4.0')

data/lib/logstash/inputs/http.rb

@@ -3,12 +3,11 @@ require "logstash/inputs/base"
 require "logstash/namespace"
 require "stud/interval"
 require "logstash-input-http_jars"
-
-java_import "io.netty.handler.codec.http.HttpUtil"
+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
-# input and Logstash will convert it into an event for subsequent processing. Users 
+# input and Logstash will convert it into an event for subsequent processing. Users
 # can pass plain text, JSON, or any formatted data and use a corresponding codec with this
 # input. For Content-Type `application/json` the `json` codec is used, but for all other
 # data formats, `plain` codec is used.
@@ -16,7 +15,7 @@ java_import "io.netty.handler.codec.http.HttpUtil"
 # This input can also be used to receive webhook requests to integrate with other services
 # and applications. By taking advantage of the vast plugin ecosystem available in Logstash
 # you can trigger actionable events right from your application.
-# 
+#
 # ==== Security
 # This plugin supports standard HTTP basic authentication headers to identify the requester.
 # You can pass in an username, password combination while sending data to this input
@@ -27,8 +26,11 @@ java_import "io.netty.handler.codec.http.HttpUtil"
 # 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"
+
   config_name "http"
 
   # Codec used to decode the incoming data.
@@ -93,7 +95,7 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
   config :tls_max_version, :validate => :number, :default => TLS.max.version
 
   # The list of ciphers suite to use, listed by priorities.
-  config :cipher_suites, :validate => :array, :default => org.logstash.plugins.inputs.http.util.SslSimpleBuilder::DEFAULT_CIPHERS
+  config :cipher_suites, :validate => :array, :default => org.logstash.plugins.inputs.http.util.SslSimpleBuilder.getDefaultCiphers
 
   # Apply specific codecs for specific content types.
   # The default codec will be applied only after this list is checked
@@ -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/inputs/http/message_handler.rb

@@ -1,12 +1,5 @@
 # encoding: utf-8
 require "logstash-input-http_jars"
-java_import org.logstash.plugins.inputs.http.MessageHandler
-java_import "io.netty.handler.codec.http.DefaultFullHttpResponse"
-java_import "io.netty.handler.codec.http.HttpHeaderNames"
-java_import "io.netty.handler.codec.http.HttpVersion"
-java_import "io.netty.handler.codec.http.HttpResponseStatus"
-java_import "io.netty.buffer.Unpooled"
-java_import "io.netty.util.CharsetUtil"
 
 module LogStash module Inputs class Http
   class MessageHandler
@@ -29,6 +22,10 @@ module LogStash module Inputs class Http
       end
     end
 
+    def requires_token
+      !!@auth_token
+    end
+
     def onNewMessage(remote_address, headers, body)
       @input.decode_body(headers, remote_address, body, @default_codec, @additional_codecs)
     end

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

@@ -1,10 +1,12 @@
 require "logstash/devutils/rspec/spec_helper"
+require "logstash/devutils/rspec/shared_examples"
 require "logstash/inputs/http"
 require "json"
 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"
 
@@ -33,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
@@ -84,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
@@ -278,6 +208,11 @@ describe LogStash::Inputs::Http do
         it "should respond with 401" do
           expect(response.code).to eq(401)
         end
+        it 'should include a WWW-Authenticate: Basic header' do
+          expect(response['WWW-Authenticate']).to_not be_nil
+
+          expect(response['WWW-Authenticate']).to start_with('Basic realm=')
+        end
         it "should not generate an event" do
           expect(logstash_queue).to be_empty
         end
@@ -294,6 +229,9 @@ describe LogStash::Inputs::Http do
         it "should respond with 401" do
           expect(response.code).to eq(401)
         end
+        it 'should not include a WWW-Authenticate header' do
+          expect(response['WWW-Authenticate']).to be_nil
+        end
         it "should not generate an event" do
           expect(logstash_queue).to be_empty
         end
@@ -359,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
@@ -377,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
@@ -410,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
@@ -432,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.3
+  version: 3.4.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2021-06-08 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,10 +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.30.Final/netty-all-4.1.30.Final.jar
-- vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final/netty-tcnative-boringssl-static-2.0.12.Final.jar
+- vendor/jar-dependencies/io/netty/netty-all/4.1.49.Final/netty-all-4.1.49.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.3/logstash-input-http-3.3.3.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/3.4.0/logstash-input-http-3.4.0.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)