bunny 2.17.0 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f3ba4a5565a42eace00f8789c1be953871d9dc57d42028a94a9dd70a586271e
-  data.tar.gz: c7d2fdf832b466a27c7ae884e6195729d31a6bf1cb6accde9818c2f72b46cdc6
+  metadata.gz: d6de535f1d386dbf46fd89a733c1c44915280af55c3cc3cc56467abe0ead9c24
+  data.tar.gz: 6048aea84078fb8995718ed774d9a3956dc91645b24c09382cd54283b444aabe
 SHA512:
-  metadata.gz: 26a352492ca652429975e45ec36fad12ebfd3c94e66babb879afb0f09dcec0158affc820f8a29fd07a25d8db6ac9312fd31ebc5b1a3d4c315ecfeeb880a5a8f2
-  data.tar.gz: 393fa99fb87c7784eccd0f5019fe3668b39064e15935d85f4134c85aa6b138849d0026addb814f49d00f606b9157b78878863c875d2ad6480b17b3053dcb98fb
+  metadata.gz: b3575710f81dabf6c116c92c4ac1807a29f0c0bcd1bd5fb35ae1fd9dd468df193efac49d0ad5e77ef04ecc53e97b9b4e13e70f4207972ba0c2335c28afcd6c9b
+  data.tar.gz: 8b90dd4da7dab28b529e78cf1282656ca1904432b1017ee5574545c1972315f975d175c718481372604b61796e9ae56b293a342dcba800fa0929e4b80cd7a3c4

data/README.md

@@ -47,7 +47,7 @@ Specific examples:
 
 Modern Bunny versions support
 
- * CRuby 2.3 through 2.7 (inclusive)
+ * CRuby 2.5 through 3.0 (inclusive)
 
 Bunny works sufficiently well on JRuby but there are known
 JRuby bugs in versions prior to JRuby 9000 that cause high CPU burn. JRuby users should
@@ -70,10 +70,8 @@ a stable public API.
 Change logs per release series:
 
  * [master](https://github.com/ruby-amqp/bunny/blob/master/ChangeLog.md)
- * [2.16.x](https://github.com/ruby-amqp/bunny/blob/2.16.x-stable/ChangeLog.md)
- * [2.15.x](https://github.com/ruby-amqp/bunny/blob/2.15.x-stable/ChangeLog.md)
- * [2.14.x](https://github.com/ruby-amqp/bunny/blob/2.14.x-stable/ChangeLog.md)
- * [2.13.x](https://github.com/ruby-amqp/bunny/blob/2.13.x-stable/ChangeLog.md)
+ * [2.18.x](https://github.com/ruby-amqp/bunny/blob/2.18.x-stable/ChangeLog.md)
+ * [2.17.x](https://github.com/ruby-amqp/bunny/blob/2.17.x-stable/ChangeLog.md)
 
 
 
@@ -96,7 +94,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 2.16.1"
+gem "bunny", ">= 2.18.0"
 ```
 
 
@@ -116,20 +114,31 @@ conn.start
 
 # open a channel
 ch = conn.create_channel
+ch.confirm_select
 
 # declare a queue
 q  = ch.queue("test1")
+q.subscribe(manual_ack: true) do |delivery_info, metadata, payload|
+  puts "This is the message: #{payload}"
+  # acknowledge the delivery so that RabbitMQ can mark it for deletion
+  ch.ack(delivery_info.delivery_tag)
+end
 
 # publish a message to the default exchange which then gets routed to this queue
 q.publish("Hello, everybody!")
 
-# fetch a message from the queue
-delivery_info, metadata, payload = q.pop
+# await confirmations from RabbitMQ, see
+# https://www.rabbitmq.com/publishers.html#data-safety for details
+ch.wait_for_confirms
 
-puts "This is the message: #{payload}"
+# give the above consumer some time consume the delivery and print out the message
+sleep 1
 
+puts "Done"
+
+ch.close
 # close the connection
-conn.stop
+conn.close
 ```
 
 
@@ -141,7 +150,7 @@ For a 15 minute tutorial using more practical examples, see [Getting Started wit
 
 ### Guides
 
-Other documentation guides are available at [rubybunny.info](http://rubybunny.info):
+Bunny documentation guides are available at [rubybunny.info](http://rubybunny.info):
 
  * [Queues and Consumers](http://rubybunny.info/articles/queues.html)
  * [Exchanges and Publishers](http://rubybunny.info/articles/exchanges.html)
@@ -153,6 +162,16 @@ Other documentation guides are available at [rubybunny.info](http://rubybunny.in
  * [Using RabbitMQ Extensions with Bunny](http://rubybunny.info/articles/extensions.html)
  * [Durability and Related Matters](http://rubybunny.info/articles/durability.html)
 
+Some highly relevant RabbitMQ documentation guides:
+
+ * [Connections](https://www.rabbitmq.com/connections.html)
+ * [Channels](https://www.rabbitmq.com/channels.html)
+ * [Queues](https://www.rabbitmq.com/queues.html)
+ * [Publishers](https://www.rabbitmq.com/publishers.html)
+ * [Consumers](https://www.rabbitmq.com/consumers.html)
+ * Data safety: publisher and consumer [Confirmations](https://www.rabbitmq.com/confirms.html)
+ * [Production Checklist](https://www.rabbitmq.com/production-checklist.html)
+
 ### API Reference
 
 [Bunny API Reference](http://reference.rubybunny.info/).

data/lib/bunny/channel.rb

@@ -1789,7 +1789,7 @@ module Bunny
     # @private
     def handle_ack_or_nack(delivery_tag_before_offset, multiple, nack)
       delivery_tag          = delivery_tag_before_offset + @delivery_tag_offset
-      confirmed_range_start = multiple ? @delivery_tag_offset + 1 : delivery_tag
+      confirmed_range_start = multiple ? @delivery_tag_offset + @unconfirmed_set.min : delivery_tag
       confirmed_range_end   = delivery_tag
       confirmed_range       = (confirmed_range_start..confirmed_range_end)
 

data/lib/bunny/session.rb

@@ -124,6 +124,8 @@ module Bunny
     # @option connection_string_or_opts [Boolean] :automatically_recover (true) Should automatically recover from network failures?
     # @option connection_string_or_opts [Integer] :recovery_attempts (nil) Max number of recovery attempts, nil means forever
     # @option connection_string_or_opts [Integer] :reset_recovery_attempts_after_reconnection (true) Should recovery attempt counter be reset after successful reconnection? When set to false, the attempt counter will last through the entire lifetime of the connection object.
+    # @option connection_string_or_opts [Proc] :recovery_attempt_started (nil) Will be called before every connection recovery attempt
+    # @option connection_string_or_opts [Proc] :recovery_completed (nil) Will be called after successful connection recovery
     # @option connection_string_or_opts [Boolean] :recover_from_connection_close (true) Should this connection recover after receiving a server-sent connection.close (e.g. connection was force closed)?
     # @option connection_string_or_opts [Object] :session_error_handler (Thread.current) Object which responds to #raise that will act as a session error handler. Defaults to Thread.current, which will raise asynchronous exceptions in the thread that created the session.
     #
@@ -172,7 +174,7 @@ module Bunny
       @automatically_recover = if opts[:automatically_recover].nil? && opts[:automatic_recovery].nil?
                                  true
                                else
-                                 opts[:automatically_recover] || opts[:automatic_recovery]
+                                 opts[:automatically_recover] | opts[:automatic_recovery]
                                end
       @recovering_from_network_failure = false
       @max_recovery_attempts = opts[:recovery_attempts]
@@ -218,7 +220,9 @@ module Bunny
       @address_index_mutex = @mutex_impl.new
 
       @channels            = Hash.new
-      @recovery_completed  = opts[:recovery_completed]
+
+      @recovery_attempt_started = opts[:recovery_attempt_started]
+      @recovery_completed       = opts[:recovery_completed]
 
       @session_error_handler = opts.fetch(:session_error_handler, Thread.current)
 
@@ -533,6 +537,18 @@ module Bunny
       end
     end
 
+    # Defines a callable (e.g. a block) that will be called
+    # before every connection recovery attempt.
+    def before_recovery_attempt_starts(&block)
+      @recovery_attempt_started = block
+    end
+
+    # Defines a callable (e.g. a block) that will be called
+    # after successful connection recovery.
+    def after_recovery_completed(&block)
+      @recovery_completed = block
+    end
+
 
     #
     # Implementation
@@ -750,6 +766,7 @@ module Bunny
     def recover_from_network_failure
       sleep @network_recovery_interval
       @logger.debug "Will attempt connection recovery..."
+      notify_of_recovery_attempt_start
 
       self.initialize_transport
 
@@ -823,8 +840,9 @@ module Bunny
       end
     end
 
-    def after_recovery_completed(&block)
-      @recovery_completed = block
+    # @private
+    def notify_of_recovery_attempt_start
+      @recovery_attempt_started.call if @recovery_attempt_started
     end
 
     # @private

data/lib/bunny/transport.rb

@@ -453,9 +453,9 @@ module Bunny
       end
     end
 
-    def initialize_tls_context(ctx, opts={})
+    def initialize_tls_context(ctx, opts = {})
       ctx.cert       = OpenSSL::X509::Certificate.new(@tls_certificate) if @tls_certificate
-      ctx.key        = OpenSSL::PKey::RSA.new(@tls_key) if @tls_key
+      ctx.key        = OpenSSL::PKey.read(@tls_key) if @tls_key
       ctx.cert_store = if @tls_certificate_store
                          @tls_certificate_store
                        else
@@ -463,8 +463,9 @@ module Bunny
                          @tls_ca_certificates = tls_ca_certificates_paths_from(opts)
                          initialize_tls_certificate_store(@tls_ca_certificates)
                        end
+      should_silence_warnings = opts.fetch(:tls_silence_warnings, false)
 
-      if !@tls_certificate
+      if !@tls_certificate && !should_silence_warnings
         @logger.warn <<-MSG
 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
@@ -482,14 +483,14 @@ certificate, connection will be rejected. Learn more at https://www.rabbitmq.com
       @logger.debug { "Will use peer verification mode #{verify_mode}" }
       ctx.verify_mode = verify_mode
 
-      if !@verify_peer
+      if !@verify_peer && !should_silence_warnings
         @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. Learn more at https://www.rabbitmq.com/ssl.html
         MSG
       end
 
-      ssl_version = opts[:tls_protocol] || opts[:ssl_version]
+      ssl_version = opts[:tls_protocol] || opts[:ssl_version] || :TLSv1_2
       ctx.ssl_version = ssl_version if ssl_version
 
       ctx
@@ -501,7 +502,7 @@ but prone to man-in-the-middle attacks. Please set verify_peer: true in producti
       certs.each do |cert|
         # if it starts with / or C:/ then it's a file path that may or may not
         # exist (e.g. a default OpenSSL path). MK.
-        if File.readable?(cert) || cert =~ /^([a-z]:?)?\//i
+        if File.readable?(cert) || cert =~ /\A([a-z]:?)?\//i
           cert_files.push(cert)
         else
           cert_inlines.push(cert)

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -62,8 +62,10 @@ describe Bunny::Queue, "#subscribe" do
           x.publish("hello", routing_key: queue_name)
         end
 
-        sleep 1.0
-        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
+        sleep 1.5
+        100.times do |i|
+          expect(delivery_tags).to include(i + 1)
+        end
 
         expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
@@ -95,7 +97,9 @@ describe Bunny::Queue, "#subscribe" do
         end
 
         sleep 1.5
-        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
+        100.times do |i|
+          expect(delivery_tags).to include(i + 1)
+        end
 
         expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
@@ -305,8 +309,10 @@ describe Bunny::Queue, "#subscribe" do
           x.publish("hello", routing_key: queue_name)
         end
 
-        sleep 1.0
-        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
+        sleep 1.5
+        100.times do |i|
+          expect(delivery_tags).to include(i + 1)
+        end
 
         expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
@@ -338,7 +344,9 @@ describe Bunny::Queue, "#subscribe" do
         end
 
         sleep 1.5
-        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
+        100.times do |i|
+          expect(delivery_tags).to include(i + 1)
+        end
 
         expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -39,20 +39,6 @@ def local_hostname
   ENV.fetch("BUNNY_RABBITMQ_HOSTNAME", "localhost")
 end
 
-def no_tls12_supported?
-  not tls12_supported?
-end
-
-def tls12_supported?
-  begin
-    ctx = OpenSSL::SSL::SSLContext.new
-    ctx.min_version = ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
-    true
-  rescue
-    false
-  end
-end
-
 context "initialized with tls: true", skip: ENV["CI"] do
   let(:subject) do
     Bunny.new(
@@ -102,6 +88,7 @@ describe "TLS connection to RabbitMQ with client certificates", skip: ENV["CI"]
       password: "bunny_password",
       vhost: "bunny_testbed",
       tls: true,
+      tls_protocol: :TLSv1_2,
       tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
       tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
       tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
@@ -126,6 +113,7 @@ describe "TLS connection to RabbitMQ without client certificates", skip: ENV["CI
       password: "bunny_password",
       vhost: "bunny_testbed",
       tls: true,
+      tls_protocol: :TLSv1_2,
       tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
       verify_peer: false)
     c.start
@@ -143,6 +131,7 @@ end
 describe "TLS connection to RabbitMQ with a connection string", skip: ENV["CI"] do
   let(:subject) do
     c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
+      tls_protocol: :TLSv1_2,
       tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
       tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
       tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
@@ -179,6 +168,7 @@ describe "TLS connection to RabbitMQ with a connection string and w/o client cer
   let(:subject) do
     c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
       tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      tls_protocol: :TLSv1_2,
       verify_peer: verify_peer)
     c.start
     c
@@ -211,19 +201,13 @@ describe "TLS connection to RabbitMQ with a connection string and w/o client cer
   end
 end
 
-
-describe "TLS connection to RabbitMQ with client certificates provided inline", skip: ENV["CI"] do
+describe "TLS connection to RabbitMQ w/o client certificate", skip: ENV["CI"] do
   let(:subject) do
-    c = Bunny.new(
-      hostname: local_hostname(),
-      username: "bunny_gem",
-      password: "bunny_password",
-      vhost: "bunny_testbed",
-      tls: true,
-      tls_cert: File.read("#{CERTIFICATE_DIR}/client_certificate.pem"),
-      tls_key: File.read("#{CERTIFICATE_DIR}/client_key.pem"),
+    c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
       tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-      verify_peer: false)
+      tls_protocol: :TLSv1_2,
+      verify_peer: false,
+      tls_silence_warnings: should_silence_warnings)
     c.start
     c
   end
@@ -232,10 +216,21 @@ describe "TLS connection to RabbitMQ with client certificates provided inline",
     subject.close
   end
 
-  include_examples "successful TLS connection"
+  context "TLS-related warnings are enabled" do
+    let(:should_silence_warnings) { false }
+
+    include_examples "successful TLS connection"
+  end
+
+  context "TLS-related warnings are silenced" do
+    let(:should_silence_warnings) { true }
+
+    include_examples "successful TLS connection"
+  end
 end
 
-describe "TLS connection to RabbitMQ with tls_version TLSv1.2 specified", skip: ENV["CI"] do
+
+describe "TLS connection to RabbitMQ with client certificates provided inline", skip: ENV["CI"] do
   let(:subject) do
     c = Bunny.new(
       hostname: local_hostname(),
@@ -243,8 +238,10 @@ describe "TLS connection to RabbitMQ with tls_version TLSv1.2 specified", skip:
       password: "bunny_password",
       vhost: "bunny_testbed",
       tls: true,
-      tls_protocol: :TLSv1_2,
+      tls_cert: File.read("#{CERTIFICATE_DIR}/client_certificate.pem"),
+      tls_key: File.read("#{CERTIFICATE_DIR}/client_key.pem"),
       tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      tls_protocol: :TLSv1_2,
       verify_peer: false)
     c.start
     c
@@ -255,8 +252,4 @@ describe "TLS connection to RabbitMQ with tls_version TLSv1.2 specified", skip:
   end
 
   include_examples "successful TLS connection"
-
-  it "connects using TLSv1.2", skip: no_tls12_supported? do
-    expect(subject.transport.socket.ssl_version).to eq "TLSv1.2"
-  end
 end

data/spec/issues/issue609_spec.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Bunny::Session, 'TLS certificate store' do
+  subject { described_class.new tls: true, tls_ca_certificates: [certificate], logger: logger }
+
+  let(:logger) { Logger.new(io).tap { |l| l.level = :debug } }
+  let(:io) { StringIO.new }
+
+  context 'when a Windows path given' do
+    let(:certificate) { 'C:/some/path/cacert.pem' }
+
+    # skipping actual work with file by Windows path as this spec runs in Linux
+    before do
+      allow(File).to receive(:readable?).with(certificate).and_return(true)
+      allow_any_instance_of(OpenSSL::X509::Store).to receive(:add_file)
+    end
+
+    it 'uses the certificate by path' do
+      subject
+
+      expect(log_content).to include('Using CA certificates at C:/some/path/cacert.pem')
+    end
+  end
+
+  context 'when a POSIX path given' do
+    let(:certificate) { './spec/tls/ca_certificate.pem' }
+
+    it 'uses the certificate by path' do
+      subject
+
+      expect(log_content).to include('Using CA certificates at ./spec/tls/ca_certificate.pem')
+    end
+  end
+
+  context 'when an inline certificate given' do
+    let(:certificate) do
+      <<~CERT
+        -----BEGIN CERTIFICATE-----
+        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
+        eYEXqywYlmGZite4N3qb3qQnyGw=
+        -----END CERTIFICATE-----
+      CERT
+    end
+
+    it 'uses the inline certificate' do
+      subject
+
+      expect(log_content).to include('Using 1 inline CA certificates')
+    end
+  end
+
+  def log_content
+    io.tap(&:rewind).read
+  end
+end

data/spec/lower_level_api/integration/basic_cancel_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel, "#basic_cancel" do
   before(:all) do
-    @connection = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    @connection = Bunny.new(:user => "bunny_gem", password: "bunny_password", :vhost => "bunny_testbed")
     @connection.start
   end
 

data/spec/lower_level_api/integration/basic_consume_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel, "#basic_consume" do
   before(:all) do
-    @connection = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    @connection = Bunny.new(:user => "bunny_gem", password: "bunny_password", :vhost => "bunny_testbed")
     @connection.start
   end
 
@@ -12,7 +12,7 @@ describe Bunny::Channel, "#basic_consume" do
 
   it "returns basic.consume-ok when it is received" do
     ch = @connection.create_channel
-    q  = ch.queue("", :exclusive => true)
+    q  = ch.queue("", exclusive: true)
 
     consume_ok = ch.basic_consume(q)
     expect(consume_ok).to be_instance_of AMQ::Protocol::Basic::ConsumeOk
@@ -23,7 +23,7 @@ describe Bunny::Channel, "#basic_consume" do
 
   it "carries server-generated consumer tag with basic.consume-ok" do
     ch = @connection.create_channel
-    q  = ch.queue("", :exclusive => true)
+    q  = ch.queue("", exclusive: true)
 
     consume_ok = ch.basic_consume(q, "")
     expect(consume_ok.consumer_tag).to match /amq\.ctag.*/
@@ -51,13 +51,13 @@ describe Bunny::Channel, "#basic_consume" do
 
       ch = @connection.create_channel
       x  = ch.default_exchange
-      x.publish("hello", :routing_key => queue_name)
+      x.publish("hello", routing_key: queue_name)
 
       sleep 0.7
       expect(delivered_keys).to include queue_name
       expect(delivered_data).to include "hello"
 
-      expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
+      expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
       ch.close
     end
@@ -72,7 +72,7 @@ describe Bunny::Channel, "#basic_consume" do
 
       t = Thread.new do
         ch = @connection.create_channel
-        q = ch.queue(queue_name, :auto_delete => true, :durable => false)
+        q = ch.queue(queue_name, auto_delete: true, durable: false)
         ch.basic_consume(q, "", false, false) do |delivery_info, properties, payload|
           delivered_keys << delivery_info.routing_key
           delivered_data << payload
@@ -85,13 +85,13 @@ describe Bunny::Channel, "#basic_consume" do
 
       ch = @connection.create_channel
       x  = ch.default_exchange
-      x.publish("hello", :routing_key => queue_name)
+      x.publish("hello", routing_key: queue_name)
 
       sleep 0.7
       expect(delivered_keys).to include queue_name
       expect(delivered_data).to include "hello"
 
-      expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
+      expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
       ch.close
     end