logstash-input-http 3.2.1-java → 3.2.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb71407dd95cdf4ed3a00e3a3052eb9ca98228aab5c4b0d5d850fab30f398612
-  data.tar.gz: 606cb730cbef12485216a22c367fe7e07c0f1f12b4e7e3d2227cb6ef32012a9e
+  metadata.gz: 4ff21efab29549806ebbdb005b2cd9f6d91a69a2aa1558e2ceb48e78d867e426
+  data.tar.gz: 37bbbf9e61f85a24b79030a3d5f8d5b90083fa6f916aa6bd1bde1b47db7561f6
 SHA512:
-  metadata.gz: 77dda823940c35650a14743778fda13e12abbfad0b718d386b410598dc187ee7aa6f0b08a665d95dfc507237c9d0f5ef878ec92394cf4a91e87544860da83da1
-  data.tar.gz: add1951942163b0908a6b0288f0945bc3a412e2eff9bd0819ef988b972031a9211304a4c58475ef04ee062f93cc649a7afcfe0fe352b82eb28792bffd5fdb2d1
+  metadata.gz: b9d443f81399d5bfc1481f1d9db071a469c9d8ed1e565469d3dd91a4e3c4806d4ceb62a8bce70ea886324641b832e7ba59cbe3125f224a0536c143c99af5582c
+  data.tar.gz: ba1d68ce3df79043e6af91c34fc84f9311e35b6781aac188c2f9640bdd068bfd4fadebea81864849f33ad64eae07f56ea1af7a5697d60af40d55500ddcdf89ab

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.2.2
+  - Fix some edge cases of the verify\_mode+ssl\_verify\_mode options
+
 ## 3.2.1
   - Fix expensive SslContext creation per connection #93
 

data/VERSION

@@ -1 +1 @@
-3.2.1
+3.2.2

data/lib/logstash-input-http_jars.rb

@@ -4,4 +4,4 @@ require 'jar_dependencies'
 require_jar('io.netty', 'netty-all', '4.1.18.Final')
 require_jar('io.netty', 'netty-tcnative-boringssl-static', '2.0.7.Final')
 require_jar('org.apache.logging.log4j', 'log4j-api', '2.6.2')
-require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '3.2.1')
+require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '3.2.2')

data/lib/logstash/inputs/http.rb

@@ -191,10 +191,14 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
       raise LogStash::ConfigurationError, "Certificate or JKS must be configured"
     end
 
-    if @ssl && original_params.key?("verify_mode")
-      if original_params.key?("ssl_verify_mode")
+    if @ssl && (original_params.key?("verify_mode") && original_params.key?("ssl_verify_mode"))
         raise LogStash::ConfigurationError, "Both 'ssl_verify_mode' and 'verify_mode' were set. Use only 'ssl_verify_mode'."
-      end
+    elsif original_params.key?("verify_mode")
+      @ssl_verify_mode_final = @verify_mode
+    elsif original_params.key?("ssl_verify_mode")
+      @ssl_verify_mode_final = @ssl_verify_mode
+    else
+      @ssl_verify_mode_final = @ssl_verify_mode
     end
 
     if @ssl && require_certificate_authorities? && !client_authentication?
@@ -213,11 +217,9 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
     return nil unless @ssl
 
     ssl_builder = nil
-    verify_mode_string = nil
 
     if @keystore && @keystore_password
       ssl_builder = org.logstash.plugins.inputs.http.util.JksSslBuilder.new(@keystore, @keystore_password.value)
-      verify_mode_string = @verify_mode.upcase if original_params.key?("verify_mode")
     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)
@@ -227,14 +229,13 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
       end
 
       if client_authentication?
-        verify_mode_string = @ssl_verify_mode.upcase
         ssl_builder.setCertificateAuthorities(@ssl_certificate_authorities)
       end
     end
 
     ssl_context = ssl_builder.build()
     ssl_handler_provider = org.logstash.plugins.inputs.http.util.SslHandlerProvider.new(ssl_context)
-    ssl_handler_provider.setVerifyMode(verify_mode_string)
+    ssl_handler_provider.setVerifyMode(@ssl_verify_mode_final.upcase)
     ssl_handler_provider.setProtocols(convert_protocols)
     ssl_handler_provider.setHandshakeTimeoutMilliseconds(@ssl_handshake_timeout)
 
@@ -254,7 +255,7 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
   end
 
   def require_certificate_authorities?
-    @ssl_verify_mode == "force_peer" || @ssl_verify_mode == "peer"
+    @ssl_verify_mode_final == "force_peer" || @ssl_verify_mode_final == "peer"
   end
 
   def normalized_ciphers

data/spec/inputs/http_spec.rb

@@ -6,6 +6,8 @@ require "stud/temporary"
 require "zlib"
 require "stringio"
 
+java_import "io.netty.handler.ssl.util.SelfSignedCertificate"
+
 describe LogStash::Inputs::Http do
 
   before do
@@ -355,15 +357,65 @@ describe LogStash::Inputs::Http do
       end
     end
     context "with :ssl_certificate" do
-      let(:ssl_certificate) { Stud::Temporary.file }
-      let(:ssl_key) { Stud::Temporary.file }
+      let(:ssc) { SelfSignedCertificate.new }
+      let(:ssl_certificate) { ssc.certificate }
+      let(:ssl_key) { ssc.private_key }
+
+      after(:each) { ssc.delete }
+
       subject { LogStash::Inputs::Http.new("port" => port, "ssl" => true,
                                            "ssl_certificate" => ssl_certificate.path,
                                            "ssl_key" => ssl_key.path) }
       it "should not raise exception" do
-        expect(subject).to receive(:build_ssl_params)
         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"
+                                            ) }
+        it "should not raise exception" do
+          expect { subject.register }.to_not raise_exception
+        end
+      end
+      ["peer", "force_peer"].each do |verify_mode|
+        context "with ssl_verify_mode = #{verify_mode}" do
+          subject { LogStash::Inputs::Http.new("port" => port, "ssl" => true,
+                                               "ssl_certificate" => ssl_certificate.path,
+                                               "ssl_certificate_authorities" => ssl_certificate.path,
+                                               "ssl_key" => ssl_key.path,
+                                               "ssl_verify_mode" => verify_mode
+                                              ) }
+          it "should not raise exception" do
+            expect { subject.register }.to_not raise_exception
+          end
+        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"
+                                            ) }
+        it "should not raise exception" do
+          expect { subject.register }.to_not raise_exception
+        end
+      end
+      ["peer", "force_peer"].each do |verify_mode|
+        context "with verify_mode = #{verify_mode}" do
+          subject { LogStash::Inputs::Http.new("port" => port, "ssl" => true,
+                                               "ssl_certificate" => ssl_certificate.path,
+                                               "ssl_certificate_authorities" => ssl_certificate.path,
+                                               "ssl_key" => ssl_key.path,
+                                               "verify_mode" => verify_mode
+                                              ) }
+          it "should not raise exception" do
+            expect { subject.register }.to_not raise_exception
+          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.2.1
+  version: 3.2.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ files:
 - vendor/jar-dependencies/io/netty/netty-all/4.1.18.Final/netty-all-4.1.18.Final.jar
 - vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.7.Final/netty-tcnative-boringssl-static-2.0.7.Final.jar
 - vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar
-- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/3.2.1/logstash-input-http-3.2.1.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/3.2.2/logstash-input-http-3.2.2.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)