bunny 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2354707d0c6f725a8992baaff54c129113312407166c6c7275b6aef9c6d10b
-  data.tar.gz: 5e0bfc1d60c0ccd0c0718fea83b537a4be5cca88c1c17795a7340d5fa39df168
+  metadata.gz: ca20b85fa97e5dfdf990bf45cbf000331d413a9aff294c121a788d7883a053bd
+  data.tar.gz: 69f78dded2ac65e651ba70baab933119b9cd80663a1bc0d5dae52767d01dae5c
 SHA512:
-  metadata.gz: 85cda03336b6f4130335f39d5641054e8be776e2cb6a14291075954fa5364c62f631044c0a5364fd9473634e9680ed5a46331c1e8ec588470ea9281d0b5943bc
-  data.tar.gz: 58f094229752eb2718345c078cb6ed2baa7f5642b59f37e211dd8f963e8543960ec0423fb3a7c4b0e7cb3c1a4daf6be1a747d14eb5b3a625b4abd8873d33b9fd
+  metadata.gz: 2b6bb72790ce461357e9934be10ae6a1b1d07744d835bed51c1add5502bbf4710ff9cc16e87e4b685b0fe31a9a8bd932dc00c6d9795cfc3f03ca6b03df6b0e40
+  data.tar.gz: 53978c476c2e712a4e624765fcd66ce5d4dd8cc99eeb364a244f26990d303ea3600d394db130db949040f0a76c59fc76657f6c2a714bb26bc45f84229c1cc5bb

data/ChangeLog.md

@@ -1,3 +1,32 @@
+## 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`.
+
+Ruby `3.0` and `3.1` have reached end of life and are no longer tested against.
+
+
+### 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/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.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.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,7 +143,7 @@ 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:
   - - ">="