logstash-output-http 5.6.1 → 5.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e48e61a55be36ec256a7a4449f2aaf555f56253f3bb15d67e250e03cd39bf9
-  data.tar.gz: b61f7df593739a7ba2d892c62e29952c514d9274a5219c321bd6c96b09d33adb
+  metadata.gz: 4ee250c7e18f8f86d45a9976fdad992c6b329d862c153c1ee786032bb1fca022
+  data.tar.gz: 346c7c1027d694bb03288a271a72bdde0f8f1d37a162dd2b2f6b6e8073e45f37
 SHA512:
-  metadata.gz: a331795a25242f9f82c11746e6a3ecb619c18917dc91b77fb1f6ef8060a5ceb91d5effbfd171eeaac67ed8e7c12ad93ca3230ed279828ff8396dad71bd935882
-  data.tar.gz: 0fb511bb512aecf1caf602c44ed755c4be7c0c5a4781c651623dcaba5fc633f253611a7dd7bd25be2d1a66d52730ceb3e7e56ac031dfa8b093896f3e0bae63fc
+  metadata.gz: 889fc141a67c6eddc1dc35f87da3fde5fcc56c5f294662a370bcc401a8a7848937ad5e1c912d1234ae68f1de3779bab2648e8588249c6f3e6ef6087dbf5c0a34
+  data.tar.gz: d6ef06b950a4763025625ca3dc9e8c09bd086f50a42d0bce35f0de64ab445cac4a3e54980343374a69ab615fdc1940a7df4b57e9077c3ddcc956213e11476bdb

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 5.7.1
+  - Added new development `rackup` dependency to fix tests 
+
+## 5.7.0
+  - Added new `ssl_enabled` setting for enabling/disabling the SSL configurations [#144](https://github.com/logstash-plugins/logstash-output-http/pull/144)
+
 ## 5.6.1
   - Added body logging for non 2xx responses [#142](https://github.com/logstash-plugins/logstash-output-http/pull/142)
 

data/docs/index.asciidoc

@@ -103,6 +103,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-ssl_certificate>> |<<path,path>>|No
 | <<plugins-{type}s-{plugin}-ssl_certificate_authorities>> |list of <<path,path>>|No
 | <<plugins-{type}s-{plugin}-ssl_cipher_suites>> |list of <<string,string>>|No
+| <<plugins-{type}s-{plugin}-ssl_enabled>> |<<boolean,boolean>>|No
 | <<plugins-{type}s-{plugin}-ssl_keystore_password>> |<<password,password>>|No
 | <<plugins-{type}s-{plugin}-ssl_keystore_path>> |<<path,path>>|No
 | <<plugins-{type}s-{plugin}-ssl_keystore_type>> |<<string,string>>|No
@@ -420,6 +421,15 @@ The .cer or .pem CA files to validate the server's certificate.
 The list of cipher suites to use, listed by priorities.
 Supported cipher suites vary depending on the Java and protocol versions.
 
+[id="plugins-{type}s-{plugin}-ssl_enabled"]
+===== `ssl_enabled`
+
+  * Value type is <<boolean,boolean>>
+  * Default value is `true`
+
+Enable SSL/TLS secured communication. It must be `true` for other `ssl_` options
+to take effect.
+
 [id="plugins-{type}s-{plugin}-ssl_key"]
 ===== `ssl_key`
 

data/logstash-output-http.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-http'
-  s.version         = '5.6.1'
+  s.version         = '5.7.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Sends events to a generic HTTP or HTTPS endpoint"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -20,9 +20,12 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
-  s.add_runtime_dependency "logstash-mixin-http_client", ">= 7.3.0", "< 8.0.0"
+  s.add_runtime_dependency "logstash-mixin-http_client", ">= 7.4.0", "< 8.0.0"
 
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'sinatra'
   s.add_development_dependency 'webrick'
+
+  # Pin to avoid using new Fiber-based implementation that breaks tests here
+  s.add_development_dependency 'rackup', "< 2.1.0"
 end

data/spec/outputs/http_spec.rb

@@ -255,7 +255,7 @@ describe LogStash::Outputs::Http do
       end
 
       let(:last_request) { TestApp.last_request }
-      let(:body) { last_request.body.read }
+      let(:body) {  read_last_request_body(last_request) }
       let(:content_type) { last_request.env["CONTENT_TYPE"] }
 
       it "should receive the request" do
@@ -304,7 +304,7 @@ describe LogStash::Outputs::Http do
       let(:config) {
         base_config.merge({"url" => url, "http_method" => "post", "pool_max" => 1})
       }
-      let(:expected_body) { LogStash::Json.dump(event) }
+      let(:expected_body) { event.to_json }
       let(:expected_content_type) { "application/json" }
 
       include_examples("a received event")
@@ -458,7 +458,7 @@ RSpec.describe LogStash::Outputs::Http do # different block as we're starting we
   after  { subject.close }
 
   let(:last_request) { TestApp.last_request }
-  let(:last_request_body) { last_request.body.read }
+  let(:last_request_body) { read_last_request_body(last_request) }
 
   let(:event) { LogStash::Event.new("message" => "hello!") }
 
@@ -530,3 +530,10 @@ RSpec.describe LogStash::Outputs::Http do # different block as we're starting we
   end if tls_version_enabled_by_default?('TLSv1.3') && JOpenSSL::VERSION > '0.12' # due WEBrick uses OpenSSL
 
 end
+
+# Pre-emptively rewind the retrieval of `last_request.body` - for form based endpoints, the body
+# is placed in params, and body is empty, requiring a `rewind` for the body to be available for comparison
+def read_last_request_body(last_request)
+  last_request.body.rewind
+  last_request.body.read
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-http
 version: !ruby/object:Gem::Version
-  version: 5.6.1
+  version: 5.7.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -20,8 +20,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
   name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -35,18 +35,18 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.3.0
+        version: 7.4.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 8.0.0
   name: logstash-mixin-http_client
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.3.0
+        version: 7.4.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 8.0.0
@@ -57,8 +57,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -71,8 +71,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: sinatra
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -85,13 +85,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: webrick
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  name: rackup
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 description: This gem is a Logstash plugin required to be installed on top of the
   Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
   gem is not a stand-alone program
@@ -133,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Sends events to a generic HTTP or HTTPS endpoint