logstash-mixin-http_client 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e247306e83334a1697891f830e558a73b1e1b12
-  data.tar.gz: 5580b16dbaf08d67bcd050b23e77160f022a4b5a
+  metadata.gz: c7eb2faa6caaf2aeb2a930c0f3f19863dad8245b
+  data.tar.gz: df9699cc474589379d399287bd9bb646143593f1
 SHA512:
-  metadata.gz: 1f79c0d9d81e096e6941a4a570cf1b453b351a0b6987d22a61454c4eea9b358c5ba97a5c84af90b14b088a401cb77717842fd2c1cbbe65047a1fb1054e191bd4
-  data.tar.gz: 538e5d633bbb42e6348bb28cbebbbdfb96a9080d7264be5257340666ffd0181799bf95f431ce5ef3aa6a14430bc54fdef6734727799bfe1a3b8ee16c751b02fc
+  metadata.gz: c60419907ae6c653d36f144d9643ba9f1a49b4734fb9b5d743d8d26424be71ff71b0882851ce5333f234fe9ce70b0b847a1e80f26a4dfa36c63221452c4ae0e6
+  data.tar.gz: eda4337386b678066d65a3201c103f279bd4d3a8838763caa486e970f6ee70af5147d13b762a1518dec13a939fa07af4053a7ee73b36b4f6c638eb6014354047

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.0
+ - 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
   * Add 'verify_cert' config option
 # 1.0.1

data/lib/logstash/plugin_mixins/http_client.rb

@@ -46,14 +46,29 @@ module LogStash::PluginMixins::HttpClient
     # If you need to use a custom X.509 CA (.pem certs) specify the path to that here
     config :cacert, :validate => :path
 
-    # If you need to use a custom keystore (`.jks`) specify that here
-    config :truststore, :validate => :path
+    # If you'd like to use a client certificate (note, most people don't want this) set the path to the x509 cert here
+    config :client_cert, :validate => :path
+    # If you're using a client certificate specify the path to the encryption key here
+    config :client_key, :validate => :path
+
+    # If you need to use a custom keystore (`.jks`) specify that here. This does not work with .pem keys!
+    config :keystore, :validate => :path
 
     # Specify the keystore password here.
     # Note, most .jks files created with keytool require a password!
-    config :truststore_password, :validate => :password
+    config :keystore_password, :validate => :password
 
     # Specify the keystore type here. One of `JKS` or `PKCS12`. Default is `JKS`
+    config :keystore_type, :validate => :string, :default => "JKS"
+
+    # If you need to use a custom truststore (`.jks`) specify that here. This does not work with .pem certs!
+    config :truststore, :validate => :path
+
+    # Specify the truststore password here.
+    # Note, most .jks files created with keytool require a password!
+    config :truststore_password, :validate => :password
+
+    # Specify the truststore type here. One of `JKS` or `PKCS12`. Default is `JKS`
     config :truststore_type, :validate => :string, :default => "JKS"
 
     # Enable cookie support. With this enabled the client will persist cookies
@@ -66,11 +81,6 @@ module LogStash::PluginMixins::HttpClient
     # 2. Proxy host in form: `{host => "proxy.org", port => 80, scheme => 'http', user => 'username@host', password => 'password'}`
     # 3. Proxy host in form: `{url =>  'http://proxy.org:1234', user => 'username@host', password => 'password'}`
     config :proxy
-
-    # If you'd like to use a client certificate (note, most people don't want this) set the path to the x509 cert here
-    config :client_cert, :validate => :path
-    # If you're using a client certificate specify the path to the encryption key here
-    config :client_key, :validate => :path
   end
 
   public
@@ -99,7 +109,8 @@ module LogStash::PluginMixins::HttpClient
     if @cacert
       c[:ssl][:ca_file] = @cacert
     end
-    if (@truststore)
+
+    if @truststore
       c[:ssl].merge!(
         :truststore => @truststore,
         :truststore_type => @truststore_type
@@ -110,6 +121,19 @@ module LogStash::PluginMixins::HttpClient
         c[:ssl].merge!(truststore_password: @truststore_password.value)
       end
     end
+
+    if @keystore
+      c[:ssl].merge!(
+        :keystore => @keystore,
+        :keystore_type => @keystore_type
+      )
+
+      # JKS files have optional passwords if programatically created
+      if keystore_password
+        c[:ssl].merge!(keystore_password: @keystore_password.value)
+      end
+    end
+
     if @client_cert && @client_key
       c[:ssl][:client_cert] = @client_cert
       c[:ssl][:client_key] = @client_key

data/logstash-mixin-http_client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-mixin-http_client'
-  s.version         = '2.0.0'
+  s.version         = '2.0.2'
   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/plugin install gemname. This gem is not a stand-alone program"
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0.snapshot", "< 3.0.0"
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'manticore', '>= 0.4.1'
 

data/spec/plugin_mixin/http_client_spec.rb

@@ -29,11 +29,24 @@ describe LogStash::PluginMixins::HttpClient do
     expect(impl.send(:client)).to eql(impl.client)
   end
 
-  shared_examples "setting ca bundles" do |key|
+  shared_examples "setting ca bundles" do |key, type|
     subject { Dummy.new(conf).send(:client_config) }
 
     it "should correctly set the path" do
-      expect(subject[:ssl][key]).to eql(path)
+      expect(subject[:ssl][key]).to eql(path), "Expected to find path for #{key}"
+    end
+
+    if type == :jks
+      let(:store_password) { conf["#{key}_password"].value}
+      let(:store_type) { conf["#{key}_type"]}
+
+      it "should set the bundle password" do
+        expect(subject[:ssl]["#{key}_password".to_sym]).to eql(store_password)
+      end
+
+      it "should set the bundle type" do
+        expect(subject[:ssl]["#{key}_type".to_sym]).to eql(store_type)
+      end
     end
   end
 
@@ -49,12 +62,35 @@ describe LogStash::PluginMixins::HttpClient do
     end
 
     context "with JKS" do
-      let(:conf) { basic_config.merge("truststore" => path) }
-
-      include_examples("setting ca bundles", :truststore)
+      let(:conf) {
+        basic_config.merge(
+          "truststore" => path,
+          "truststore_password" => "foobar",
+          "truststore_type" => "jks"
+        )
+      }
+
+      include_examples("setting ca bundles", :truststore, :jks)
     end
   end
 
+  describe "with a custom keystore" 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"
+      )
+    }
+
+    include_examples("setting ca bundles", :keystore, :jks)
+  end
+
   describe "with a client cert" do
     let(:file) { Stud::Temporary.file }
     let(:path) { file.path }

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-http_client
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0.snapshot
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0.snapshot
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: