logstash-mixin-http_client 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f2cad331c64dce7e457f0de8672443dd8d82adc
-  data.tar.gz: e59d7aae81af6bf2eec2f19131fefa502b8636b5
+  metadata.gz: 997861fb27c7f41617d640e9526db40c9750fc27
+  data.tar.gz: becffe860628916c9829ac650fff941067a35009
 SHA512:
-  metadata.gz: eac146c522b541b1a6dc01d1d1118b8d1467e0d147bb83db9adf93ae15c23a363149ac42e76cd14ff3915c46f9cdd034df783e9e627998e30c904e051ff01987
-  data.tar.gz: 133ca719c78d2cf33b8f02a6d009036ceead3e3f106c1ca95f71a9587ebde7b621f6aed84a5d7c52b5a1a04b8342b29f77c4323469c7235fa7a21ffad5c24e4d
+  metadata.gz: 51baa92d069a19d4885fd97755da05aa3e2b409536ce4d8d68fb32e33777d1dd9d7e4729e6bb41f1c458e6615d098162fb8c4fc82dfb68c98abf9932cefd045f
+  data.tar.gz: 2415d592ecaa660f4fbc1f0e5f0706881377ad52909f58f66d1b8c9efe7ebf24b03ef6a641ce11d7b964f078ab8c83db3bc8d79fa3646fc3d3d1af134b6b97e6

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.0.3
+  - Raise configuration error when user supplies a trust/keystore without a password
+
 ## 4.0.2
   - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
 
@@ -19,7 +22,7 @@
  * Default `automatic_retries` to 1 to fix connections to hosts with broken keepalive
  * Add `non_idempotent_retries` option
 # 2.0.0
- * Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+ * Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
  * Dependency on logstash-core update to 2.0
 # 1.0.2

data/lib/logstash/plugin_mixins/http_client.rb

@@ -127,24 +127,24 @@ module LogStash::PluginMixins::HttpClient
     if @truststore
       c[:ssl].merge!(
         :truststore => @truststore,
-        :truststore_type => @truststore_type
+        :truststore_type => @truststore_type,
+        :truststore_password => @truststore_password.value
       )
-
-      # JKS files have optional passwords if programatically created
-      if (@truststore_password)
-        c[:ssl].merge!(truststore_password: @truststore_password.value)
+      
+      if c[:ssl][:truststore_password].nil?
+        raise LogStash::ConfigurationError, "Truststore declared without a password! This is not valid, please set the 'truststore_password' option"
       end
     end
 
     if @keystore
       c[:ssl].merge!(
         :keystore => @keystore,
-        :keystore_type => @keystore_type
+        :keystore_type => @keystore_type,
+        :keystore_password => @keystore_password.value
       )
 
-      # JKS files have optional passwords if programatically created
-      if keystore_password
-        c[:ssl].merge!(keystore_password: @keystore_password.value)
+      if c[:ssl][:keystore_password].nil?
+        raise LogStash::ConfigurationError, "Keystore declared without a password! This is not valid, please set the 'keystore_password' option"
       end
     end
 

data/logstash-mixin-http_client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-mixin-http_client'
-  s.version         = '4.0.2'
+  s.version         = '4.0.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "AWS mixins to provide a unified interface for Amazon Webservice"
   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"

data/spec/plugin_mixin/http_client_spec.rb

@@ -85,21 +85,33 @@ describe LogStash::PluginMixins::HttpClient do
     end
   end
 
-  describe "with a custom keystore" do
-    let(:file) { Stud::Temporary.file }
-    let(:path) { file.path }
-    let(:password) { "foo" }
-    after { File.unlink(path)}
+  ["keystore", "truststore"].each do |store|
+    describe "with a custom #{store}" do
+      let(:file) { Stud::Temporary.file }
+      let(:path) { file.path }
+      let(:password) { "foo" }
+      after { File.unlink(path)}
 
-    let(:conf) {
-      basic_config.merge(
-        "keystore" => path,
-        "keystore_password" => "foo",
-        "keystore_type" => "jks"
-      )
-    }
+      let(:conf) {
+        basic_config.merge(
+          store => path,
+          "#{store}_password" => password,
+          "#{store}_type" => "jks"
+        )
+      }
+
+      include_examples("setting ca bundles", store.to_sym, :jks)
 
-    include_examples("setting ca bundles", :keystore, :jks)
+      context "with no password set" do
+        let(:password) { nil }
+        
+        it "should raise an error" do
+          expect do
+            Dummy.new(conf).client_config
+          end.to raise_error(LogStash::ConfigurationError)
+        end
+      end
+    end
   end
 
   describe "with a client cert" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-http_client
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.3
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: AWS mixins to provide a unified interface for Amazon Webservice