bunny 2.13.0 → 2.14.1

data/lib/bunny/test_kit.rb

@@ -1,9 +1,23 @@
 # -*- coding: utf-8 -*-
+
+require "timeout"
+
 module Bunny
   # Unit, integration and stress testing toolkit
   class TestKit
     class << self
 
+      def poll_while(timeout = 60, &probe)
+        Timeout.timeout(timeout) {
+          sleep 0.1 while probe.call
+        }
+      end
+      def poll_until(timeout = 60, &probe)
+        Timeout.timeout(timeout) {
+          sleep 0.1 until probe.call
+        }
+      end
+
       # @return [Integer] Random integer in the range of [a, b]
       # @api private
       def random_in_range(a, b)

data/lib/bunny/transport.rb

@@ -82,10 +82,29 @@ module Bunny
 
 
     def connect
-      if uses_ssl?
-        @socket.connect
-        if uses_tls? && @verify_peer
-          @socket.post_connection_check(host)
+      if uses_tls?
+        begin
+          @socket.connect
+        rescue OpenSSL::SSL::SSLError => e
+          @logger.error { "TLS connection failed: #{e.message}" }
+          raise e
+        end
+
+        log_peer_certificate_info(Logger::DEBUG, @socket.peer_cert)
+        log_peer_certificate_chain_info(Logger::DEBUG, @socket.peer_cert_chain)
+
+        begin
+          @socket.post_connection_check(host) if @verify_peer
+        rescue OpenSSL::SSL::SSLError => e
+          @logger.error do
+            msg = "Peer verification of target server failed: #{e.message}. "
+            msg += "Target hostname: #{hostname}, see peer certificate chain details below."
+            msg
+          end
+          log_peer_certificate_info(Logger::ERROR, @socket.peer_cert)
+          log_peer_certificate_chain_info(Logger::ERROR, @socket.peer_cert_chain)
+
+          raise e
         end
 
         @status = :connected
@@ -337,6 +356,29 @@ module Bunny
       end
     end
 
+    def peer_certificate_info(peer_cert, prefix = "Peer's leaf certificate")
+      exts = peer_cert.extensions.map { |x| x.value }
+      # Subject Alternative Names
+      sans = exts.select { |s| s =~ /^DNS/ }.map { |s| s.gsub(/^DNS:/, "") }
+
+      msg = "#{prefix} subject: #{peer_cert.subject}, "
+      msg += "subject alternative names: #{sans.join(', ')}, "
+      msg += "issuer: #{peer_cert.issuer}, "
+      msg += "not valid after: #{peer_cert.not_after}, "
+      msg += "X.509 usage extensions: #{exts.join(', ')}"
+
+      msg
+    end
+
+    def log_peer_certificate_info(severity, peer_cert, prefix = "Peer's leaf certificate")
+      @logger.add(severity, peer_certificate_info(peer_cert, prefix))
+    end
+
+    def log_peer_certificate_chain_info(severity, chain)
+      chain.each do |cert|
+        self.log_peer_certificate_info(severity, cert, "Peer's certificate chain entry")
+      end
+    end
 
     def inline_client_certificate_from(opts)
       opts[:tls_certificate] || opts[:ssl_cert_string] || opts[:tls_cert]
@@ -424,8 +466,8 @@ module Bunny
 
       if !@tls_certificate
         @logger.warn <<-MSG
-Using TLS but no client certificate is provided! If RabbitMQ is configured to verify peer
-certificate, connection upgrade will fail!
+Using TLS but no client certificate is provided. If RabbitMQ is configured to require & verify peer
+certificate, connection will be rejected. Learn more at https://www.rabbitmq.com/ssl.html
         MSG
       end
       if @tls_certificate && !@tls_key
@@ -437,12 +479,13 @@ certificate, connection upgrade will fail!
       else
         OpenSSL::SSL::VERIFY_NONE
       end
+      @logger.debug { "Will use peer verification mode #{verify_mode}" }
       ctx.verify_mode = verify_mode
 
       if !@verify_peer
         @logger.warn <<-MSG
 Using TLS but peer hostname verification is disabled. This is convenient for local development
-but prone to man-in-the-middle attacks. Please set verify_peer: true in production!
+but prone to man-in-the-middle attacks. Please set verify_peer: true in production. Learn more at https://www.rabbitmq.com/ssl.html
         MSG
       end
 

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "2.13.0"
+  VERSION = "2.14.1"
 end

data/spec/config/rabbitmq.conf

@@ -0,0 +1,13 @@
+listeners.tcp.1 = 0.0.0.0:5672
+
+listeners.ssl.default = 5671
+
+# mounted by docker-compose
+ssl_options.cacertfile = /spec/tls/ca_certificate.pem
+ssl_options.certfile   = /spec/tls/server_certificate.pem
+ssl_options.keyfile    = /spec/tls/server_key.pem
+
+ssl_options.verify               = verify_none
+ssl_options.fail_if_no_peer_cert = false
+
+loopback_users = none

data/spec/higher_level_api/integration/channel_close_spec.rb

@@ -46,10 +46,10 @@ describe Bunny::Channel do
       s  = "bunny-temp-q-#{rand}"
 
       expect(ch).to be_open
-      ch.queue_declare(s, durable: false, exclusive: true)
+      ch.queue_declare(s, durable: false)
 
       expect do
-        ch.queue_declare(s, durable: true, exclusive: false)
+        ch.queue_declare(s, durable: true)
       end.to raise_error(Bunny::PreconditionFailed)
 
       # channel.close is sent and handled concurrently with the test
@@ -57,6 +57,10 @@ describe Bunny::Channel do
       expect(ch).to be_closed
 
       expect { ch.close }.to raise_error(Bunny::ChannelAlreadyClosed)
+
+      cleanup_ch = connection.create_channel
+      cleanup_ch.queue_delete(s)
+      cleanup_ch.close
     end
   end
 end

data/spec/higher_level_api/integration/connection_recovery_spec.rb

@@ -1,6 +1,8 @@
 require "spec_helper"
 require "rabbitmq/http/client"
 
+require "bunny/concurrent/condition"
+
 describe "Connection recovery" do
   let(:http_client) { RabbitMQ::HTTP::Client.new("http://127.0.0.1:15672") }
   let(:logger) { Logger.new($stderr).tap {|logger| logger.level = ENV["BUNNY_LOG_LEVEL"] || Logger::WARN } }
@@ -40,6 +42,21 @@ describe "Connection recovery" do
     end
   end
 
+  it "provides a recovery completion callback" do
+    with_open do |c|
+      latch = Bunny::Concurrent::Condition.new
+      c.after_recovery_completed do
+        latch.notify
+      end
+
+      ch = c.create_channel
+      sleep 1.0
+      close_all_connections!
+      poll_until { c.open? && ch.open? }
+      poll_until { latch.none_threads_waiting? }
+    end
+  end
+
   it "recovers channels (with multiple hosts)" do
     with_open_multi_host do |c|
       ch1 = c.create_channel
@@ -270,7 +287,6 @@ describe "Connection recovery" do
       destination = ch.fanout("destination.exchange.recovery.example", auto_delete: true)
 
       source2      = ch2.fanout("source.exchange.recovery.example", no_declare: true)
-      destination2 = ch2.fanout("destination.exchange.recovery.example", no_declare: true)
 
       destination.bind(source)
 
@@ -413,15 +429,11 @@ describe "Connection recovery" do
   end
 
   def poll_while(&probe)
-    Timeout.timeout(20) {
-      sleep 0.1 while probe.call
-    }
+    Bunny::TestKit.poll_while(&probe)
   end
 
   def poll_until(&probe)
-    Timeout.timeout(20) {
-      sleep 0.1 until probe.call
-    }
+    Bunny::TestKit.poll_until(&probe)
   end
 
   def with_open(c = Bunny.new(network_recovery_interval: recovery_interval,
@@ -430,7 +442,7 @@ describe "Connection recovery" do
     c.start
     block.call(c)
   ensure
-    c.close
+    c.close(false) rescue nil
   end
 
   def with_open_multi_host(&block)

data/spec/higher_level_api/integration/queue_declare_spec.rb

@@ -107,18 +107,71 @@ describe Bunny::Queue do
   end
 
 
-
-  context "when queue is declared with a different set of attributes" do
+  context "when queue is declared with a mismatching auto-delete property value" do
     it "raises an exception" do
       ch   = connection.create_channel
 
       q = ch.queue("bunny.tests.queues.auto-delete", auto_delete: true, durable: false)
       expect {
         # force re-declaration
-        ch.queue_declare("bunny.tests.queues.auto-delete", auto_delete: false, durable: true)
+        ch.queue_declare(q.name, auto_delete: false, durable: false)
       }.to raise_error(Bunny::PreconditionFailed)
 
       expect(ch).to be_closed
+
+      cleanup_ch = connection.create_channel
+      cleanup_ch.queue_delete(q.name)
+    end
+  end
+
+  context "when queue is declared with a mismatching durable property value" do
+    it "raises an exception" do
+      ch   = connection.create_channel
+
+      q = ch.queue("bunny.tests.queues.durable", durable: true)
+      expect {
+        # force re-declaration
+        ch.queue_declare(q.name, durable: false)
+      }.to raise_error(Bunny::PreconditionFailed)
+
+      expect(ch).to be_closed
+
+      cleanup_ch = connection.create_channel
+      cleanup_ch.queue_delete(q.name)
+    end
+  end
+
+  context "when queue is declared with a mismatching exclusive property value" do
+    it "raises an exception" do
+      ch   = connection.create_channel
+
+      q = ch.queue("bunny.tests.queues.exclusive.#{rand}", exclusive: true)
+      # when there's an exclusivity property mismatch, a different error
+      # (405 RESOURCE_LOCKED) is used. This is a leaked queue exclusivity/ownership
+      # implementation detail that's now basically a feature. MK.
+      expect {
+        # force re-declaration
+        ch.queue_declare(q.name, exclusive: false)
+      }.to raise_error(Bunny::ResourceLocked)
+
+      expect(ch).to be_closed
+    end
+  end
+
+  context "when queue is declared with a set of mismatching values" do
+    it "raises an exception" do
+      ch   = connection.create_channel
+
+      q = ch.queue("bunny.tests.queues.proprty-equivalence", auto_delete: true, durable: false)
+      expect {
+        # force re-declaration
+        ch.queue_declare(q.name, auto_delete: false, durable: true)
+      }.to raise_error(Bunny::PreconditionFailed)
+
+      expect(ch).to be_closed
+
+      cleanup_ch = connection.create_channel
+      cleanup_ch.queue_delete(q.name)
     end
   end
 

data/spec/higher_level_api/integration/toxiproxy_spec.rb

@@ -5,7 +5,6 @@ if ::Toxiproxy.running?
   describe Bunny::Channel, "#basic_publish" do
     include RabbitMQ::Toxiproxy
 
-
     after :each do
       @connection.close if @connection.open?
     end
@@ -53,7 +52,8 @@ if ::Toxiproxy.running?
         setup_toxiproxy
         @connection = Bunny.new(user: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed",
           host: "localhost:11111", heartbeat_timeout: 1, automatically_recover: true, network_recovery_interval: 1,
-          recovery_attempts: 3, reset_recovery_attempts_after_reconnection: true)
+          recovery_attempts: 2, reset_recovery_attempts_after_reconnection: true,
+          disconnect_timeout: 1)
         @connection.start
       end
 
@@ -61,11 +61,12 @@ if ::Toxiproxy.running?
         expect(@connection.open?).to be(true)
 
         rabbitmq_toxiproxy.down do
-          sleep 6
+          sleep 5
         end
-        # give the connection oen last chance to recover
+        # give the connection one last chance to recover
         sleep 3
 
+        expect(@connection.open?).to be(false)
         expect(@connection.closed?).to be(true)
       end
     end # context

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'bundler'
 Bundler.require(:default, :test)
 
 require "bunny"
+require "bunny/test_kit"
 
 puts "Using Ruby #{RUBY_VERSION}, amq-protocol #{AMQ::Protocol::VERSION}"
 

data/spec/stress/merry_go_round_spec.rb

@@ -0,0 +1,105 @@
+require "spec_helper"
+
+describe "A batch of messages proxied by multiple intermediate consumers" do
+  let(:c1) do
+    c = Bunny.new(username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      heartbeat_timeout: 6)
+    c.start
+    c
+  end
+
+  let(:c2) do
+    c = Bunny.new(username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      heartbeat_timeout: 6)
+    c.start
+    c
+  end
+
+  let(:c3) do
+    c = Bunny.new(username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      heartbeat_timeout: 6)
+    c.start
+    c
+  end
+
+  let(:c4) do
+    c = Bunny.new(username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      heartbeat_timeout: 6)
+    c.start
+    c
+  end
+
+  let(:c5) do
+    c = Bunny.new(username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      heartbeat_timeout: 6)
+    c.start
+    c
+  end
+
+  after :each do
+    [c1, c2, c3, c4, c5].each do |c|
+      c.close if c.open?
+    end
+  end
+
+  [1000, 5_000, 10_000, 20_000, 30_000, 50_000].each do |n|
+    # message flow is as follows:
+    #
+    # x => q4 => q3 => q2 => q1 => xs (results)
+    it "successfully reaches its final destination (batch size: #{n})" do
+      xs  = []
+
+      ch1 = c1.create_channel
+      q1  = ch1.queue("", exclusive: true)
+      q1.subscribe(manual_ack: true) do |delivery_info, _, payload|
+        xs << payload
+        ch1.ack(delivery_info.delivery_tag)
+      end
+
+      ch2 = c2.create_channel
+      q2  = ch2.queue("", exclusive: true)
+      q2.subscribe do |_, _, payload|
+        q1.publish(payload)
+      end
+
+      ch3 = c3.create_channel(nil, 2)
+      q3  = ch3.queue("", exclusive: true)
+      q3.subscribe(manual_ack: true) do |delivery_info, _, payload|
+        q2.publish(payload)
+        ch3.ack(delivery_info.delivery_tag)
+      end
+
+      ch4 = c4.create_channel(nil, 4)
+      q4  = ch4.queue("", exclusive: true)
+      q4.subscribe do |_, _, payload|
+        q3.publish(payload)
+      end
+
+      ch5 = c5.create_channel(nil, 8)
+      x   = ch5.default_exchange
+
+      n.times do |i|
+        x.publish("msg #{i}", routing_key: q4.name)
+      end
+
+      Bunny::TestKit.poll_until(90) do
+        xs.size >= n
+      end
+
+      expect(xs.size).to eq n
+      expect(xs.last).to eq "msg #{n - 1}"
+
+      [q1, q2, q3, q4].each { |q| q.delete }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -34,10 +34,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-description: Easy to use, feature complete Ruby client for RabbitMQ 3.3 and later
-  versions.
+description: Easy to use, feature complete Ruby client for RabbitMQ
 email:
-- michael.s.klishin@gmail.com
+- mklishin@pivotal.io
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -65,11 +64,13 @@ files:
 - benchmarks/queue_declare_bind_and_delete.rb
 - benchmarks/synchronized_sorted_set.rb
 - benchmarks/write_vs_write_nonblock.rb
-- bin/ci/before_build
 - bunny.gemspec
 - docker-compose.yml
 - docker/Dockerfile
+- docker/apt/preferences.d/erlang
+- docker/apt/sources.list.d/bintray.rabbitmq.list
 - docker/docker-entrypoint.sh
+- docker/rabbitmq.conf
 - examples/connection/authentication_failure.rb
 - examples/connection/automatic_recovery_with_basic_get.rb
 - examples/connection/automatic_recovery_with_client_named_queues.rb
@@ -143,7 +144,7 @@ files:
 - profiling/basic_publish/with_4K_messages.rb
 - repl
 - spec/config/enabled_plugins
-- spec/config/rabbitmq.config
+- spec/config/rabbitmq.conf
 - spec/higher_level_api/integration/basic_ack_spec.rb
 - spec/higher_level_api/integration/basic_cancel_spec.rb
 - spec/higher_level_api/integration/basic_consume_spec.rb
@@ -167,7 +168,6 @@ files:
 - spec/higher_level_api/integration/exchange_unbind_spec.rb
 - spec/higher_level_api/integration/exclusive_queue_spec.rb
 - spec/higher_level_api/integration/heartbeat_spec.rb
-- spec/higher_level_api/integration/merry_go_round_spec.rb
 - spec/higher_level_api/integration/message_properties_access_spec.rb
 - spec/higher_level_api/integration/predeclared_exchanges_spec.rb
 - spec/higher_level_api/integration/publisher_confirms_spec.rb
@@ -203,7 +203,7 @@ files:
 - spec/stress/concurrent_consumers_stress_spec.rb
 - spec/stress/concurrent_publishers_stress_spec.rb
 - spec/stress/connection_open_close_spec.rb
-- spec/stress/long_running_consumer_spec.rb
+- spec/stress/merry_go_round_spec.rb
 - spec/tls/ca_certificate.pem
 - spec/tls/ca_key.pem
 - spec/tls/client_certificate.pem
@@ -240,14 +240,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
-summary: Popular easy to use Ruby client for RabbitMQ
+summary: Easy to use Ruby client for RabbitMQ
 test_files:
 - spec/config/enabled_plugins
-- spec/config/rabbitmq.config
+- spec/config/rabbitmq.conf
 - spec/higher_level_api/integration/basic_ack_spec.rb
 - spec/higher_level_api/integration/basic_cancel_spec.rb
 - spec/higher_level_api/integration/basic_consume_spec.rb
@@ -271,7 +270,6 @@ test_files:
 - spec/higher_level_api/integration/exchange_unbind_spec.rb
 - spec/higher_level_api/integration/exclusive_queue_spec.rb
 - spec/higher_level_api/integration/heartbeat_spec.rb
-- spec/higher_level_api/integration/merry_go_round_spec.rb
 - spec/higher_level_api/integration/message_properties_access_spec.rb
 - spec/higher_level_api/integration/predeclared_exchanges_spec.rb
 - spec/higher_level_api/integration/publisher_confirms_spec.rb
@@ -307,7 +305,7 @@ test_files:
 - spec/stress/concurrent_consumers_stress_spec.rb
 - spec/stress/concurrent_publishers_stress_spec.rb
 - spec/stress/connection_open_close_spec.rb
-- spec/stress/long_running_consumer_spec.rb
+- spec/stress/merry_go_round_spec.rb
 - spec/tls/ca_certificate.pem
 - spec/tls/ca_key.pem
 - spec/tls/client_certificate.pem