logstash-mixin-rabbitmq_connection 5.0.0-java → 6.2.0-java

data/spec/fixtures/testca/index.txt

@@ -1,2 +1,4 @@
 V	170510165759Z		01	unknown	/CN=localhost/O=server
 V	170510170001Z		02	unknown	/CN=localhost/O=client
+V	450505233839Z		05	unknown	/CN=localhost, O=client
+V	450505234253Z		06	unknown	/CN=localhost, O=server

data/spec/fixtures/testca/index.txt.old

@@ -1 +1,3 @@
 V	170510165759Z		01	unknown	/CN=localhost/O=server
+V	170510170001Z		02	unknown	/CN=localhost/O=client
+V	450505233839Z		05	unknown	/CN=localhost, O=client

data/spec/fixtures/testca/openssl.cnf

@@ -10,7 +10,7 @@ private_key = $dir/private/cakey.pem
 serial = $dir/serial
 
 default_crl_days = 7
-default_days = 365
+default_days = 10000
 default_md = sha256
 
 policy = testca_policy

data/spec/fixtures/testca/serial

@@ -1 +1 @@
-03
+07

data/spec/fixtures/testca/serial.old

@@ -1 +1 @@
-02
+06

data/spec/plugin_mixins/rabbitmq_connection_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require "logstash/devutils/rspec/spec_helper"
-require "logstash/pipeline"
 require "logstash/plugin_mixins/rabbitmq_connection"
 require "stud/temporary"
 
@@ -14,12 +13,12 @@ end
 
 describe LogStash::PluginMixins::RabbitMQConnection do
   let(:klass) { TestPlugin }
+  let(:default_port) { 5672 }
   let(:host) { "localhost" }
-  let(:port) { 5672 }
+  let(:port) { default_port }
   let(:rabbitmq_settings) {
     {
-      "host" => host,
-      "port" => port,
+      "host" => host
     }
   }
   let(:instance) {
@@ -27,6 +26,24 @@ describe LogStash::PluginMixins::RabbitMQConnection do
   }
   let(:hare_info) { instance.instance_variable_get(:@hare_info) }
 
+
+
+  shared_examples_for 'it sets the addresses correctly' do
+    let(:file) { Stud::Temporary.file }
+    let(:path) { file.path }
+
+    it "should set addresses to the expected value" do
+      host.each_with_index do |_, index|
+        puts(expected_values[index])
+        expect(instance.rabbitmq_settings[:addresses][index]).to eql(expected_values[index])
+      end
+    end
+
+    it "should insert the correct number of address entries" do
+      expect(instance.rabbitmq_settings[:addresses].length).to eql(host.count)
+    end
+  end
+
   describe "rabbitmq_settings" do
     let(:file) { Stud::Temporary.file }
     let(:path) { file.path }
@@ -59,31 +76,83 @@ describe LogStash::PluginMixins::RabbitMQConnection do
       expect(instance.rabbitmq_settings[:tls_certificate_password]).to eql(rabbitmq_settings["ssl_certificate_password"])
     end
 
-    it "should set hosts to the expected value " do
-      expect(instance.rabbitmq_settings[:hosts][0]).to eql(host)
+    context 'with host names' do
+      let (:host) {%w(localhost rmq.elastic.co rmq.local)}
+      let (:expected_values) {%w(localhost:5672 rmq.elastic.co:5672 rmq.local:5672)}
+
+      it_behaves_like 'it sets the addresses correctly'
     end
 
-    it "should only insert a single host entry" do
-      expect(instance.rabbitmq_settings[:hosts].length).to eql(1)
+    context 'with host names including ports' do
+      let (:host) {%w(localhost:123 rmq.elastic.co:234 rmq.local:345)}
+      let (:expected_values) {%w(localhost:123 rmq.elastic.co:234 rmq.local:345)}
+
+      it_behaves_like 'it sets the addresses correctly'
     end
-  end
 
-  describe "rabbitmq_settings multiple hosts" do
-    let(:file) { Stud::Temporary.file }
-    let(:path) { file.path }
-    after { File.unlink(path)}
+    context 'with ipv4 ip addresses' do
+      let (:host) {%w(127.0.0.1 192.168.1.1 192.168.1.2)}
+      let (:expected_values) {%w(127.0.0.1:5672 192.168.1.1:5672 192.168.1.2:5672)}
 
-    let(:rabbitmq_settings) { super.merge({"host" => ["host01", "host02", "host03"]}) }
+      it_behaves_like 'it sets the addresses correctly'
+    end
 
-    it "should set hosts to the expected value" do
-      expect(instance.rabbitmq_settings[:hosts][0]).to eql("host01")
-      expect(instance.rabbitmq_settings[:hosts][1]).to eql("host02")
-      expect(instance.rabbitmq_settings[:hosts][2]).to eql("host03")
+    context 'with ipv4 ip addresses including ports' do
+      let (:host) {%w(127.0.0.1:123 192.168.1.1:234 192.168.1.2:345)}
+      let (:expected_values) {host}
+
+      it_behaves_like 'it sets the addresses correctly'
     end
 
-    it "should insert 3 host entries" do
-      expect(instance.rabbitmq_settings[:hosts].length).to eql(3)
+    context 'with ipv6 addresses' do
+      let (:host) {%w(::1 fe80::1c86:a2e:4bec:4a9f%en0 2406:da00:ff00::36e1:f792 [::1] [fe80::1c86:a2e:4bec:4a9f%en0] [2406:da00:ff00::36e1:f792])}
+      let (:expected_values) {%w([::1]:5672 [fe80::1c86:a2e:4bec:4a9f%en0]:5672 [2406:da00:ff00::36e1:f792]:5672 [::1]:5672 [fe80::1c86:a2e:4bec:4a9f%en0]:5672 [2406:da00:ff00::36e1:f792]:5672)}
+      it_behaves_like 'it sets the addresses correctly'
     end
+
+    context 'with ipv6 addresses including ports' do
+      let (:host) {%w([::1]:456 [fe80::1c86:a2e:4bec:4a9f%en0]:457 [2406:da00:ff00::36e1:f792]:458)}
+      let (:expected_values) {%w([::1]:456 [fe80::1c86:a2e:4bec:4a9f%en0]:457 [2406:da00:ff00::36e1:f792]:458)}
+      it_behaves_like 'it sets the addresses correctly'
+    end
+
+    context 'with a custom port' do
+      let(:port) { 123 }
+      let(:rabbitmq_settings) { super.merge({"port" => port})}
+
+      context 'with hostnames' do
+        let (:host) {%w(localhost rmq.elastic.co rmq.local)}
+        let (:expected_values) {%w(localhost:123 rmq.elastic.co:123 rmq.local:123)}
+
+        it_behaves_like 'it sets the addresses correctly'
+      end
+
+
+      context 'with ipv4 ip addresses' do
+        let (:host) {%w(127.0.0.1 192.168.1.1 192.168.1.2)}
+        let (:expected_values) {%w(127.0.0.1:123 192.168.1.1:123 192.168.1.2:123)}
+
+        it_behaves_like 'it sets the addresses correctly'
+      end
+
+      context 'with ipv6 addresses' do
+        let (:host) {%w(::1 fe80::1c86:a2e:4bec:4a9f%en0 2406:da00:ff00::36e1:f792 [::1] [fe80::1c86:a2e:4bec:4a9f%en0] [2406:da00:ff00::36e1:f792])}
+        let (:expected_values) {%w([::1]:123 [fe80::1c86:a2e:4bec:4a9f%en0]:123 [2406:da00:ff00::36e1:f792]:123 [::1]:123 [fe80::1c86:a2e:4bec:4a9f%en0]:123 [2406:da00:ff00::36e1:f792]:123)}
+        it_behaves_like 'it sets the addresses correctly'
+      end
+    end
+  end
+
+  describe "ssl enabled, but no verification" do
+    let(:rabbitmq_settings) { super.merge({"connection_timeout" => 123,
+                                           "heartbeat" => 456,
+                                           "ssl" => true}) }
+
+    it "should not have any certificates set" do
+      expect(instance.rabbitmq_settings[:tls_certificate_password]).to be nil
+      expect(instance.rabbitmq_settings[:tls_certificate_path]).to be nil
+    end
+
   end
 
   context "when connected" do

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-rabbitmq_connection
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.2.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
   name: march_hare
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -80,28 +80,35 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '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
+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
 email: info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ci/docker-compose.yml"
+- ".ci/run.sh"
 - ".github/CONTRIBUTING.md"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".travis.yml"
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - lib/logstash/plugin_mixins/rabbitmq_connection.rb
 - logstash-mixin-rabbitmq_connection.gemspec
+- spec/fixtures/README.md
 - spec/fixtures/client/cert.pem
 - spec/fixtures/client/key.pem
 - spec/fixtures/client/keycert.p12
 - spec/fixtures/client/req.pem
-- spec/fixtures/password_for_files
+- spec/fixtures/client_untrusted/cert.pem
+- spec/fixtures/client_untrusted/key.pem
+- spec/fixtures/client_untrusted/keycert.p12
 - spec/fixtures/server/cert.pem
 - spec/fixtures/server/key.pem
 - spec/fixtures/server/key_password
@@ -112,6 +119,8 @@ files:
 - spec/fixtures/testca/cacert.pem
 - spec/fixtures/testca/certs/01.pem
 - spec/fixtures/testca/certs/02.pem
+- spec/fixtures/testca/certs/05.pem
+- spec/fixtures/testca/certs/06.pem
 - spec/fixtures/testca/index.txt
 - spec/fixtures/testca/index.txt.attr
 - spec/fixtures/testca/index.txt.attr.old
@@ -133,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -141,16 +150,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Common functionality for RabbitMQ plugins
 test_files:
+- spec/fixtures/README.md
 - spec/fixtures/client/cert.pem
 - spec/fixtures/client/key.pem
 - spec/fixtures/client/keycert.p12
 - spec/fixtures/client/req.pem
-- spec/fixtures/password_for_files
+- spec/fixtures/client_untrusted/cert.pem
+- spec/fixtures/client_untrusted/key.pem
+- spec/fixtures/client_untrusted/keycert.p12
 - spec/fixtures/server/cert.pem
 - spec/fixtures/server/key.pem
 - spec/fixtures/server/key_password
@@ -161,6 +173,8 @@ test_files:
 - spec/fixtures/testca/cacert.pem
 - spec/fixtures/testca/certs/01.pem
 - spec/fixtures/testca/certs/02.pem
+- spec/fixtures/testca/certs/05.pem
+- spec/fixtures/testca/certs/06.pem
 - spec/fixtures/testca/index.txt
 - spec/fixtures/testca/index.txt.attr
 - spec/fixtures/testca/index.txt.attr.old

data/CHANGELOG

@@ -1,44 +0,0 @@
-* 5.0.0
-- Mark deprecated options `debug`, `tls_certificate_path` and `tls_certificate_password` as obsolete
-
-* 4.3.0
-- Bump march hare to 3.0.0
-* 4.2.2
-- Bump march hare to 2.22.0 to properly convert LongString to String
-* 4.2.1
-- Bump march_hare version to 2.20.0 to fix reconnection issues
-* 4.2.0
-- Include URL of server when logging errors
-- Add warning log when connection is severed
-* 4.1.3
-- Bump march_hare version to 2.19.0 to fix reconnection failures with
-  proxies. See
-  https://github.com/logstash-plugins/logstash-input-rabbitmq/issues/76 for
-  more info
-* 4.1.2
-  - Retry the connection attempt if there is an IO Exception.
-* 4.1.1
-  - Remove internal Logstash deps that were not necessary
-* 4.1.0
-  - Fix SSL option to be boolean once again
-  - Add separate ssl_version parameter
-  - Mark verify_ssl parameter as obsolete since it never worked
-  - Better checks for SSL argument consistency
-* 2.4.0
-  - Add SSL/TLS Support
-  - Add support for "x-consistent-hash" and "x-modulus-hash" exchanges
-* 2.3.1
-  - use logstash-core-plugin-api as dependency instead of logstash-core directly
-* 2.3.0
-  - Bump march_mare version to 2.15.0 to fix perms issue internal to march hare gem (.jar not installed with o+r perms)
-* 2.2.0
-  - Rollback the changes in 2.1.0 . prefetch_count only belongs in the input plugin
-* 2.1.0
-  - Add prefetch_count config option
-* 2.0.3
-  - Add heartbeat setting
-  - Add connect_timeout setting
-* 2.0.0
-  - Make LS2 compatible
-* 1.0.1
-  - Initial Release

data/spec/fixtures/password_for_files

@@ -1 +0,0 @@
-MySecretPassword