logstash-input-http 4.1.12-java → 4.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db97525ba9c34e146ee41512fc5488a5178c4cc5bf10d7e6c68b4371c44f9683
-  data.tar.gz: 841c57eee945b10cf1cb86a7c63aceda9fbfb2a0f0fc2771e961dcb16d59d142
+  metadata.gz: 539abcb4c339a32fffb7f9cacbd89d9d89699c2ba2fb095662c5b38f13a2d0e2
+  data.tar.gz: 88d0055774cdd24adac50a40ae6882847833774c4be98909ae1949291f221b26
 SHA512:
-  metadata.gz: '0599f2a38364301caab70ab1656d0e12e007e674097cc352cd64ef7737319ba55c32355b12cb019f698d68bb21fe11f9b2e3cc7a97294a6e000d68260f320acb'
-  data.tar.gz: 7966940eb34d949f61b591d1f136ca42003465aa30efafb9e60b7cf8563df9d707dbbe887822dad15bd2317f8bafdacfa329dbbbbd76da2fae14b0133dded867
+  metadata.gz: 04af87e8700a675a2c461dab2b876e61c16733ce1a670fe09a283ca8f4d5930e90bc874f68bb7d2f8610675498a15f51804a719fc7912db6bd9af77d98c9dafa
+  data.tar.gz: 02cb65c66466c985b7efa061f8bd50993cc4267a63f351b6702e24a9b72ef6cc8585aa7cf01e8da09247dd3db5b0ce07d7a4b0d247b56ff76bfb16c888db7f98

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.2.0
+  - Implements a functionality to log HTTP traffic, disabled by default. To unable switch on debug logs. [#237](https://github.com/logstash-plugins/logstash-input-http/pull/237)
+
+## 4.1.13
+  - Fix to use the `Content-type` declared charset to decode the request body [#230](https://github.com/logstash-plugins/logstash-input-http/pull/230)
+
 ## 4.1.12
   - Update Netty dependency to 4.1.136.Final [#228](https://github.com/logstash-plugins/logstash-input-http/pull/228)
 

data/README.md

@@ -1,6 +1,6 @@
 # Logstash Plugin
 
-[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-input-http.svg)](https://travis-ci.com/logstash-plugins/logstash-input-http)
+[![Unit Tests](https://github.com/logstash-plugins/logstash-input-http/actions/workflows/unit-tests.yml/badge.svg?branch=main)](https://github.com/logstash-plugins/logstash-input-http/actions/workflows/unit-tests.yml)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 

data/VERSION

@@ -1 +1 @@
-4.1.12
+4.2.0

data/docs/index.asciidoc

@@ -27,6 +27,14 @@ 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.
+If the `Content-type` header also defines a charset like in:
+
+[source,text]
+-----
+curl -X POST -H 'Content-Type: application/json; charset=ISO-8859-1'
+-----
+
+then that charset is used to decode the request body. Else UTF-8 is applied.
 
 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
@@ -82,6 +90,33 @@ Values in `additional_codecs` are prioritized over those specified in the
 `codec` option. That is, the default `codec` is applied only if no codec
 for the request's content-type is found in the `additional_codecs` setting.
 
+[id="plugins-{type}s-{plugin}-wire-logging"]
+==== Enable wire logging
+This plugin could log all requests and responses passing through the socket after TLS decoding.
+This functionality helps troubleshoot issues in the processing pipeline that standard 
+external traffic captures, such as `tcpdump`, cannot resolve.
+By default it's disabled, to dump received and sent payloads post-TLS decoding, enable debug logging 
+for `org.logstash.plugins.inputs.http.util.WireLogger`.
+Note: Payloads exceeding 4 KB are automatically truncated to prevent excessive log file growth.
+If you want to set a different limit, then in {ls} `config/jvm.options` configure a value for the system property `logstash.httpinput.wire.dump.size`.
+
+[source,text]
+-----
+-Dlogstash.httpinput.wire.dump.size=512
+-----
+If you want to remove any limit, at the risk of polluting {ls} logs, set it to `0`.
+Admitted values are only integers greater or equals to 0.
+
+To enable it start {ls} in debug mode or configure the `config/log4j2.properties` to include:
+
+[source,text]
+-----
+logger.httpwire.name = org.logstash.plugins.inputs.http.util.WireLogger
+logger.httpwire.level = DEBUG
+-----
+
+WARNING: when this log is enabled the payload is dumped, so if contains secretes those are exposed in {ls} logs.
+
 [id="plugins-{type}s-{plugin}-options"]
 ==== Http Input Configuration Options
 

data/lib/logstash/inputs/http.rb

@@ -176,6 +176,8 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
 
     validate_ssl_settings!
 
+    validate_dump_size_system_property!
+    
     if @user && @password
       token = Base64.strict_encode64("#{@user}:#{@password.value}")
       @auth_token = "Basic #{token}"
@@ -276,6 +278,12 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
       [http_host, nil]
     end
   end
+  
+  def validate_dump_size_system_property!
+    java_import org.logstash.plugins.inputs.http.util.WireLogger
+    WireLogger.validate_dump_size_property
+  end
+  private :validate_dump_size_system_property!
 
   def validate_ssl_settings!
     ssl_config_name = original_params.include?('ssl') ? 'ssl' : 'ssl_enabled'

data/lib/logstash-input-http_jars.rb

@@ -9,4 +9,4 @@ require_jar('io.netty', 'netty-transport', '4.1.136.Final')
 require_jar('io.netty', 'netty-buffer', '4.1.136.Final')
 require_jar('io.netty', 'netty-resolver', '4.1.136.Final')
 require_jar('io.netty', 'netty-common', '4.1.136.Final')
-require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '4.1.12')
+require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '4.2.0')

data/spec/inputs/http_spec.rb

@@ -11,6 +11,17 @@ require 'inputs/helpers'
 
 java_import "io.netty.handler.ssl.util.SelfSignedCertificate"
 
+shared_examples "decodes message with charset" do |charset|
+  let(:headers) { { "content-type" => "application/json; charset=#{charset}" } }
+  let(:body) { '{"msg":"A Coruña"}'.encode(charset) }
+
+  it "should decode the message accordingly" do
+    client.post("http://127.0.0.1:#{port}/meh.json", :headers => headers, :body => body).call
+    event = logstash_queue.pop
+    expect(event.get("msg")).to eq("A Coruña")
+  end
+end
+
 describe LogStash::Inputs::Http do
 
   before do
@@ -58,50 +69,42 @@ describe LogStash::Inputs::Http do
     end
 
     describe "handling overflowing requests with a 429" do
-      let(:logstash_queue_size) { rand(10) + 1 }
-      let(:max_pending_requests) { rand(5) + 1 }
-      let(:threads) { rand(4) + 1 }
+      let(:logstash_queue_size) { 1 }
+      let(:max_pending_requests) { 1 }
+      let(:threads) { 1 }
       let(:logstash_queue) { SizedQueue.new(logstash_queue_size) }
       let(:client_options) { {
-        "request_timeout" => 0.1,
-        "connect_timeout" => 3,
-        "socket_timeout" => 0.1
+        request_timeout: 5,
+        connect_timeout: 3,
+        socket_timeout: 0.5
       } }
 
       let(:config) { { "port" => port, "threads" => threads, "max_pending_requests" => max_pending_requests } }
 
       context "when sending more requests than queue slots" do
         it "rejects additional incoming requests with HTTP 429" do
-          # these will queue and return 200
-          logstash_queue_size.times.each do |i|
+          # fill the pipeline queue so the next push blocks the server worker
+          logstash_queue_size.times do
             response = client.post("http://127.0.0.1:#{port}", :body => '{}').call
             expect(response.code).to eq(200)
           end
 
-          # these will block
-          blocked_calls = (threads + max_pending_requests).times.map do
-            Thread.new do
-              begin
-                {:result => client.post("http://127.0.0.1:#{port}", :body => '{}').call}
-              rescue Manticore::SocketException, Manticore::SocketTimeout => e
-                {:exception => e}
-              end
+          # a blocked request holds its slot even after the client times out, so sending
+          # sequentially fills every worker and backlog slot before the next 429
+          blocked = 0
+          response = nil
+          deadline = Time.now + 30
+          until response && response.code == 429
+            raise "server never returned 429 (blocked=#{blocked})" if Time.now > deadline
+            begin
+              response = client.post("http://127.0.0.1:#{port}", :body => '{}').call
+            rescue Manticore::SocketTimeout
+              blocked += 1
             end
           end
 
-          sleep 1 # let those requests go, but not so long that our block-detector starts emitting 429's
-
-          # by now we should be rejecting with 429 since the backlog is full
-          response = client.post("http://127.0.0.1:#{port}", :body => '{}').call
           expect(response.code).to eq(429)
-
-          # ensure that our blocked connections did block
-          aggregate_failures do
-            blocked_calls.map(&:value).each do |blocked|
-              expect(blocked[:result]).to be_nil
-              expect(blocked[:exception]).to be_a_kind_of Manticore::SocketTimeout
-            end
-          end
+          expect(blocked).to eq(threads + max_pending_requests)
         end
       end
     end
@@ -112,9 +115,9 @@ describe LogStash::Inputs::Http do
       let(:threads) { rand(4) + 1 }
       let(:logstash_queue) { SizedQueue.new(logstash_queue_size) }
       let(:client_options) { {
-        "request_timeout" => 0.1,
-        "connect_timeout" => 3,
-        "socket_timeout" => 0.1
+        request_timeout: 5,
+        connect_timeout: 3,
+        socket_timeout: 1
       } }
 
       let(:config) { { "port" => port, "threads" => threads, "max_pending_requests" => max_pending_requests } }
@@ -223,6 +226,16 @@ describe LogStash::Inputs::Http do
           expect(event.get("message_body")).to eq("Hello")
         end
       end
+      
+      context "when receiving a request with content-type specifying charset" do
+        context "ISO-8859-1" do
+          it_behaves_like "decodes message with charset", "ISO-8859-1"
+        end
+
+        context "UTF-8" do
+          it_behaves_like "decodes message with charset", "utf-8"
+        end
+      end
     end
 
     context "with json codec" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-http
 version: !ruby/object:Gem::Version
-  version: 4.1.12
+  version: 4.2.0
 platform: java
 authors:
 - Elastic
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
@@ -176,7 +176,7 @@ files:
 - vendor/jar-dependencies/io/netty/netty-resolver/4.1.136.Final/netty-resolver-4.1.136.Final.jar
 - vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.136.Final/netty-transport-native-unix-common-4.1.136.Final.jar
 - vendor/jar-dependencies/io/netty/netty-transport/4.1.136.Final/netty-transport-4.1.136.Final.jar
-- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/4.1.12/logstash-input-http-4.1.12.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/4.2.0/logstash-input-http-4.2.0.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Receives events over HTTP or HTTPS
 test_files: