bunny 3.3.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2354707d0c6f725a8992baaff54c129113312407166c6c7275b6aef9c6d10b
-  data.tar.gz: 5e0bfc1d60c0ccd0c0718fea83b537a4be5cca88c1c17795a7340d5fa39df168
+  metadata.gz: 0c409adf026a09b52061cdbca1d1ea72e6312f11085712f3ba586111fc62fd91
+  data.tar.gz: c90db5d9e534fb527899221f0a13fb91e13ef18cc178f064f077a7984da692d5
 SHA512:
-  metadata.gz: 85cda03336b6f4130335f39d5641054e8be776e2cb6a14291075954fa5364c62f631044c0a5364fd9473634e9680ed5a46331c1e8ec588470ea9281d0b5943bc
-  data.tar.gz: 58f094229752eb2718345c078cb6ed2baa7f5642b59f37e211dd8f963e8543960ec0423fb3a7c4b0e7cb3c1a4daf6be1a747d14eb5b3a625b4abd8873d33b9fd
+  metadata.gz: 9fadf7743831aef18668dc5394c3a888b89f39f2afeb71c73f99a0553722ed365ed26fa571cd1a0d0ed27240c5b35b2c0fa4b330b9b2acfe25339bebf5e49fca
+  data.tar.gz: 465c8430c93d6895c510f4fc8d66493f0c2a17493ce1685175305f8ed6a704017e85098972c074c8bca67fb12611c01e9820d33da21120b3cbdfa37a226a17d9

data/ChangeLog.md

@@ -1,3 +1,62 @@
+## Changes between Bunny 3.5.0 and 3.6.0
+
+No changes yet.
+
+
+## Changes between Bunny 3.4.0 and 3.5.0 (Oct 25, 2026)
+
+### `no_declare: true` Is Respected by Topology Recovery
+
+Queues and exchanges instantiated with `no_declare: true` are no longer redeclared during recovery.
+
+GitHub issue: [#751](https://github.com/ruby-amqp/bunny/issues/751)
+
+### `basic.cancel-ok` for Server-Initiated Consumer Cancellations
+
+For RabbitMQ versions that declare a corresponding capability, Bunny now responds to a
+server-sent `basic.cancel` with a `basic.cancel-ok`.
+
+See [rabbitmq/rabbitmq-server#17734](https://github.com/rabbitmq/rabbitmq-server/issues/17734) and [rabbitmq/rabbitmq-java-client#2113](https://github.com/rabbitmq/rabbitmq-java-client/issues/2113) for context.
+
+### `Bunny::Session#server_has_capability?`
+
+New `Bunny::Session#server_has_capability?` takes a capability name as a symbol.
+
+### `Bunny::DeliveryInfo#to_s` and `#inspect` Use Channel and Consumer Identifiers
+
+`Bunny::DeliveryInfo#to_s` and `#inspect` now include the channel number and consumer tag
+but avoid printing the actual data structures.
+
+See [ruby-amqp/kicks#48](https://github.com/ruby-amqp/kicks/pull/48) for background.
+
+
+## Changes between Bunny 3.3.0 and 3.4.0 (Sep 18, 2026)
+
+### Ruby 3.2 or Later Is Now Required
+
+`required_ruby_version` was raised from `3.0` to `3.2`.
+
+
+### Client Certificate Chains
+
+If `tls_cert` points at a certificate bundle (chain), the entire chain will now be sent.
+
+Previously only the first (leaf) certificate was sent, unintentionally.
+
+Contributed by @eglitobias.
+
+GitHub issues: [#749](https://github.com/ruby-amqp/bunny/issues/749), [#750](https://github.com/ruby-amqp/bunny/pull/750)
+
+
+### TLS Handshake Now Respects `connect_timeout`
+
+A peer that accepted the TCP connection but never completed the TLS handshake
+could block `Bunny::Session#start` indefinitely. The handshake now gives up after
+`connect_timeout` and the connection fails over to the next endpoint.
+
+This requires the `openssl` gem `3.3.0` or later.
+
+
 ## Changes between Bunny 3.2.0 and 3.3.0 (Aug 29, 2026)
 
 ### Passive Declarations No Longer Affect Topology Recovery

data/lib/bunny/channel.rb

@@ -523,7 +523,6 @@ module Bunny
 
       q = find_queue(name) || Bunny::Queue.new(self, name, opts)
 
-      record_queue(q) unless opts[:passive]
       register_queue(q)
     end
 
@@ -652,7 +651,6 @@ module Bunny
       )
       q = find_queue(name) || Bunny::Queue.new(self, name, final_opts)
 
-      record_queue(q)
       register_queue(q)
     end
 
@@ -2130,6 +2128,13 @@ module Bunny
         pending_server_named_queue_declaration?
     end
 
+    # @private
+    def send_basic_cancel_ok(consumer_tag)
+      tag = consumer_tag.to_s
+      payload = [AMQ::Protocol::Basic::CancelOk.index, tag.bytesize, tag].pack("NCa*")
+      @connection.send_frame(AMQ::Protocol::MethodFrame.new(payload, @id))
+    end
+
     # @private
     def handle_method(method)
       @logger.debug { "Channel#handle_frame on channel #{@id}: #{method.inspect}" }
@@ -2171,6 +2176,8 @@ module Bunny
       when AMQ::Protocol::Basic::ConsumeOk then
         @continuations.push(method)
       when AMQ::Protocol::Basic::Cancel then
+        send_basic_cancel_ok(method.consumer_tag) if @connection.server_has_capability?(:accept_consumer_cancel_ok)
+
         if consumer = @consumers[method.consumer_tag]
           @work_pool.submit do
             begin

data/lib/bunny/delivery_info.rb

@@ -64,12 +64,12 @@ module Bunny
 
     # @private
     def to_s
-      to_hash.to_s
+      printable_hash.to_s
     end
 
     # @private
     def inspect
-      to_hash.inspect
+      printable_hash.inspect
     end
 
     # @return [String] Consumer tag this delivery is for
@@ -97,5 +97,11 @@ module Bunny
     def routing_key
       @basic_deliver.routing_key
     end
+
+    private
+
+    def printable_hash
+      to_hash.merge(consumer: @consumer&.consumer_tag, channel: @channel&.number)
+    end
   end
 end

data/lib/bunny/exchange.rb

@@ -108,9 +108,6 @@ module Bunny
 
       # for basic.return dispatch and such
       @channel.register_exchange(self)
-      # for topology recovery. A passive declaration does not own the exchange,
-      # so it must not overwrite what was recorded for it earlier
-      @channel.record_exchange(self) unless @options[:passive]
     end
 
     # @return [Boolean] true if this exchange was declared as durable (will survive broker restart).

data/lib/bunny/queue.rb

@@ -91,9 +91,6 @@ module Bunny
 
       # for basic.deliver dispatch and such
       @channel.register_queue(self)
-      # for topology recovery. A passive declaration does not own the queue,
-      # so it must not overwrite what was recorded for it earlier
-      @channel.record_queue(self) unless @options[:passive]
     end
 
     # @return [Boolean] true if this queue was declared as durable (will survive broker restart).

data/lib/bunny/session.rb

@@ -1593,6 +1593,12 @@ module Bunny
       to_s
     end
 
+    # @param [Symbol] capability a server capability name
+    # @return [Boolean] true if the server advertises the capability as supported
+    def server_has_capability?(capability)
+      (@server_capabilities || {})[capability.to_s] == true
+    end
+
     protected
 
     # @private

data/lib/bunny/transport.rb

@@ -108,7 +108,12 @@ module Bunny
     def connect
       if uses_tls?
         begin
-          @socket.connect
+          tls_handshake
+        rescue ClientTimeout => e
+          @logger.error { "TLS connection failed: #{e.message}" }
+          close
+          @status = :not_connected
+          raise Bunny::TCPConnectionFailed.new(e, self.hostname, self.port)
         rescue OpenSSL::SSL::SSLError => e
           @logger.error { "TLS connection failed: #{e.message}" }
           raise e
@@ -335,6 +340,17 @@ module Bunny
       @socket
     end
 
+    # Needs the openssl gem >= 3.3, which added SSLSocket#timeout= and made #connect honour it
+    def tls_handshake
+      previous_timeout = @socket.timeout
+      @socket.timeout = @connect_timeout if @connect_timeout
+      @socket.connect
+    rescue IO::TimeoutError
+      raise ClientTimeout, "TLS handshake timed out after #{@connect_timeout} seconds"
+    ensure
+      @socket.timeout = previous_timeout
+    end
+
     def maybe_initialize_socket
       initialize_socket if !@socket || closed?
     end
@@ -481,7 +497,12 @@ module Bunny
     end
 
     def initialize_tls_context(ctx, opts = {})
-      ctx.cert       = OpenSSL::X509::Certificate.new(@tls_certificate) if @tls_certificate
+      if @tls_certificate
+        leaf, *chain = OpenSSL::X509::Certificate.load(@tls_certificate)
+
+        ctx.cert = leaf
+        ctx.extra_chain_cert = chain unless chain.empty?
+      end
       ctx.key        = OpenSSL::PKey.read(@tls_key) if @tls_key
       ctx.cert_store = if @tls_certificate_store
                          @tls_certificate_store

data/lib/bunny/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -47,6 +47,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: sorted_set
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +143,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ
 test_files: []