bunny 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e10debc2fea6cb3ed014eeebdef45e41e7dad3b4
-  data.tar.gz: 12d0bb9c3a0878b4831c2fe448fe09a0a0207c6d
+  metadata.gz: d0ff7b5af604687e3c750723a694563dbb26531b
+  data.tar.gz: 46b8f5c4414063ffa1732b76b60d62aa38f16e5d
 SHA512:
-  metadata.gz: ac653c25bc8bd4b8da57e68e0f077f2466eb374da3427f24a9ce62d87cd980246d1785728cf55969d90806bee886390f4ec625732a65903722704d8faa0308f3
-  data.tar.gz: b7d5b2b007e2f1a13240f44df4bcb302155f4d4333950d73ec38e492f3526e971fc2094963489c68af0f13664c906c00eb793dc195ded4d3f829ba7e4d0bd550
+  metadata.gz: e30fd008a99b0c0747c7b561d9026c04364a6eadb18f1eed34691aa49d3b504a251f210c58bd9251b3fc18ad8d10001b8a954c7c73d43ae068dd27f8ff03470a
+  data.tar.gz: 2147b893b63274e8c1d9f6a9e01f3bd02a84446d26d533912f2525a3b1bb51c1409c100cd973bb6e9c88676266924c9f08f5c9e241bf7f1d8d278963eca31720

data/ChangeLog.md

@@ -1,3 +1,22 @@
+## Changes between Bunny 2.3.0 and 2.3.1 (Apr 4th, 2016)
+
+### Support (Quoted) IPv6 Addresses in Address Lists
+
+GitHub issue: [#383](https://github.com/ruby-amqp/bunny/issues/383).
+
+Contributed by Jeremy Heiler.
+
+### Transport#read_fully Doesn't Try to Recover
+
+Since transport is replaced by a recovering connection
+anyway, and this produces confusing errors up the stack.
+
+GitHub issue: [#359](https://github.com/ruby-amqp/bunny/issues/359)
+
+Contributed by Donal McBreen.
+
+
+
 ## Changes between Bunny 2.2.0 and 2.3.0 (Feb 26th, 2016)
 
 ### Thread#abort_on_exception Setting for Consumer Work Pool Threads

data/lib/bunny/channel.rb

@@ -1415,7 +1415,6 @@ module Bunny
       Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do
         @last_confirm_select_ok = wait_on_continuations
       end
-      @confirm_mode = true
       raise_if_continuation_resulted_in_a_channel_error!
       @last_confirm_select_ok
     end

data/lib/bunny/get_response.rb

@@ -20,7 +20,7 @@ module Bunny
     attr_reader :channel
 
     # @private
-    def initialize(get_ok, consumer, channel)
+    def initialize(get_ok, channel)
       @get_ok = get_ok
       @hash          = {
         :delivery_tag => @get_ok.delivery_tag,

data/lib/bunny/queue.rb

@@ -250,7 +250,7 @@ module Bunny
 
       if block
         if properties
-          di = GetResponse.new(get_response, properties, @channel)
+          di = GetResponse.new(get_response, @channel)
           mp = MessageProperties.new(properties)
 
           block.call(di, mp, content)
@@ -259,7 +259,7 @@ module Bunny
         end
       else
         if properties
-          di = GetResponse.new(get_response, properties, @channel)
+          di = GetResponse.new(get_response, @channel)
           mp = MessageProperties.new(properties)
           [di, mp, content]
         else

data/lib/bunny/reader_loop.rb

@@ -33,7 +33,7 @@ module Bunny
         begin
           break if @mutex.synchronize { @stopping || @stopped || @network_is_down }
           run_once
-        rescue AMQ::Protocol::EmptyResponseError, IOError, SystemCallError => e
+        rescue AMQ::Protocol::EmptyResponseError, IOError, SystemCallError, Timeout::Error => e
           break if terminate? || @session.closing? || @session.closed?
 
           log_exception(e)

data/lib/bunny/session.rb

@@ -138,18 +138,23 @@ module Bunny
       @default_hosts_shuffle_strategy = Proc.new { |hosts| hosts.shuffle }
 
       @opts            = opts
+      log_file         = opts[:log_file] || opts[:logfile] || STDOUT
+      log_level        = opts[:log_level] || ENV["BUNNY_LOG_LEVEL"] || Logger::WARN
+      # we might need to log a warning about ill-formatted IPv6 address but
+      # progname includes hostname, so init like this first
+      @logger          = opts.fetch(:logger, init_default_logger_without_progname(log_file, log_level))
+
       @addresses       = self.addresses_from(opts)
       @address_index   = 0
 
+      # re-init, see above
+      @logger          = opts.fetch(:logger, init_default_logger(log_file, log_level))
+
       @user            = self.username_from(opts)
       @pass            = self.password_from(opts)
       @vhost           = self.vhost_from(opts)
       @threaded        = opts.fetch(:threaded, true)
 
-      log_file         = opts[:log_file] || opts[:logfile] || STDOUT
-      log_level        = opts[:log_level] || ENV["BUNNY_LOG_LEVEL"] || Logger::WARN
-      @logger          = opts.fetch(:logger, init_default_logger(log_file, log_level))
-
       validate_connection_options(opts)
 
       # should automatic recovery from network failures be used?
@@ -774,11 +779,6 @@ module Bunny
       shuffle_strategy.call addresses
     end
 
-    # @private
-    def host_with_port?(address)
-      address.include? ':'
-    end
-
     # @private
     def port_from(options)
       fallback = if options[:tls] || options[:ssl]
@@ -790,14 +790,61 @@ module Bunny
       options.fetch(:port, fallback)
     end
 
+    # @private
+    def host_with_port?(address)
+      # we need to handle cases such as [2001:db8:85a3:8d3:1319:8a2e:370:7348]:5671
+      last_colon                  = address.rindex(":")
+      last_closing_square_bracket = address.rindex("]")
+
+      if last_closing_square_bracket.nil?
+        address.include?(":")
+      else
+        last_closing_square_bracket < last_colon
+      end
+    end
+
     # @private
     def host_from_address(address)
-      address.split(":")[0]
+      # we need to handle cases such as [2001:db8:85a3:8d3:1319:8a2e:370:7348]:5671
+      last_colon                  = address.rindex(":")
+      last_closing_square_bracket = address.rindex("]")
+
+      if last_closing_square_bracket.nil?
+        parts = address.split(":")
+        # this looks like an unquoted IPv6 address, so emit a warning
+        if parts.size > 2
+          @logger.warn "Address #{address} looks like an unquoted IPv6 address. Make sure you quote IPv6 addresses like so: [2001:db8:85a3:8d3:1319:8a2e:370:7348]"
+        end
+        return parts[0]
+      end
+
+      if last_closing_square_bracket < last_colon
+        # there is a port
+        address[0, last_colon]
+      elsif last_closing_square_bracket > last_colon
+        address
+      end
     end
 
     # @private
     def port_from_address(address)
-      address.split(":")[1].to_i
+      # we need to handle cases such as [2001:db8:85a3:8d3:1319:8a2e:370:7348]:5671
+      last_colon                  = address.rindex(":")
+      last_closing_square_bracket = address.rindex("]")
+
+      if last_closing_square_bracket.nil?
+        parts = address.split(":")
+        # this looks like an unquoted IPv6 address, so emit a warning
+        if parts.size > 2
+          @logger.warn "Address #{address} looks like an unquoted IPv6 address. Make sure you quote IPv6 addresses like so: [2001:db8:85a3:8d3:1319:8a2e:370:7348]"
+        end
+        return parts[1].to_i
+      end
+
+      if last_closing_square_bracket < last_colon
+        # there is a port
+        address[(last_colon + 1)..-1].to_i
+      end
     end
 
     # @private
@@ -1220,6 +1267,15 @@ module Bunny
                         end
     end
 
+    # @private
+    def init_default_logger_without_progname(logfile, level)
+      @default_logger = begin
+                          lgr = ::Logger.new(logfile)
+                          lgr.level    = normalize_log_level(level)
+                          lgr
+                        end
+    end
+
     # @private
     def normalize_log_level(level)
       case level

data/lib/bunny/transport.rb

@@ -218,7 +218,7 @@ module Bunny
         @status = :not_connected
 
         if @session.automatically_recover?
-          @session.handle_network_failure(e)
+          raise
         else
           @session_thread.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
         end

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/connection_spec.rb

@@ -192,6 +192,83 @@ describe Bunny::Session do
       end
     end
 
+    context "initialized with :addresses => [...] with quoted IPv6 hostnames" do
+      after :each do
+        subject.close if subject.open?
+      end
+
+      let(:host)      { "[2001:db8:85a3:8d3:1319:8a2e:370:7348]" }
+      let(:port)      { 5673 }
+      let(:address)   { "#{host}:#{port}" }
+      let(:addresses) { [address] }
+      let(:subject)   { described_class.new(:addresses => addresses) }
+
+      it "uses correct hostname" do
+        expect(subject.host).to eq host
+        expect(subject.hostname).to eq host
+      end
+
+      it "uses port 5673" do
+        expect(subject.port).to eq port
+      end
+
+      it "uses username = guest" do
+        expect(subject.username).to eq username
+        expect(subject.user).to eq username
+      end
+    end
+
+    context "initialized with :addresses => [...] with quoted IPv6 hostnames without ports" do
+      after :each do
+        subject.close if subject.open?
+      end
+
+      let(:host)      { "[2001:db8:85a3:8d3:1319:8a2e:370:7348]" }
+      let(:address)   { host }
+      let(:addresses) { [address] }
+      let(:subject)   { described_class.new(:addresses => addresses) }
+
+      it "uses correct hostname" do
+        expect(subject.host).to eq host
+        expect(subject.hostname).to eq host
+      end
+
+      it "uses port 5672" do
+        expect(subject.port).to eq 5672
+      end
+
+      it "uses username = guest" do
+        expect(subject.username).to eq username
+        expect(subject.user).to eq username
+      end
+    end
+
+    context "initialized with :addresses => [...] with an quoted IPv6 hostnames" do
+      after :each do
+        subject.close if subject.open?
+      end
+
+      let(:host)      { "2001:db8:85a3:8d3:1319:8a2e:370:7348" }
+      let(:port)      { 5673 }
+      let(:address)   { "#{host}:#{port}" }
+      let(:addresses) { [address] }
+      let(:subject)   { described_class.new(:addresses => addresses) }
+
+      it "fails to correctly parse the host (and emits a warning)" do
+        expect(subject.host).to eq "2001"
+        expect(subject.hostname).to eq "2001"
+      end
+
+      it "fails to correctly parse the port (and emits a warning)" do
+        expect(subject.port).to eq 0
+      end
+
+      it "uses username = guest" do
+        expect(subject.username).to eq username
+        expect(subject.user).to eq username
+      end
+    end
+
     context "initialized with conflicting hosts and addresses" do
       let(:host)      { "192.168.1.10" }
       let(:port)      { 5673 }
@@ -259,9 +336,9 @@ describe Bunny::Session do
           :password => "bunny_password",
           :vhost    => "bunny_testbed",
           :tls                   => true,
-          :tls_cert              => "spec/tls/client_cert.pem",
+          :tls_cert              => "spec/tls/client_certificate.pem",
           :tls_key               => "spec/tls/client_key.pem",
-          :tls_ca_certificates   => ["./spec/tls/cacert.pem"])
+          :tls_ca_certificates   => ["./spec/tls/ca_certificate.pem"])
       end
 
       it "uses TLS port" do

data/spec/higher_level_api/integration/connection_stop_spec.rb

@@ -52,7 +52,7 @@ describe Bunny::Session do
 
   describe "that recovers from connection.close" do
     it "can be closed" do
-      c  = Bunny.new(:automatically_recover => false, :recover_from_connection_close => true, :network_recovery_interval => 0.2)
+      c  = Bunny.new(:automatically_recover => true, :recover_from_connection_close => true, :network_recovery_interval => 0.2)
       c.start
       ch = c.create_channel
 

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -37,9 +37,9 @@ unless ENV["CI"]
         :password => "bunny_password",
         :vhost    => "bunny_testbed",
         :tls                   => true,
-        :tls_cert              => "spec/tls/client_cert.pem",
+        :tls_cert              => "spec/tls/client_certificate.pem",
         :tls_key               => "spec/tls/client_key.pem",
-        :tls_ca_certificates   => ["./spec/tls/cacert.pem"],
+        :tls_ca_certificates   => ["./spec/tls/ca_certificate.pem"],
         :verify_peer           => false)
       c.start
       c
@@ -59,7 +59,7 @@ unless ENV["CI"]
         :password => "bunny_password",
         :vhost    => "bunny_testbed",
         :tls                   => true,
-        :tls_ca_certificates   => ["./spec/tls/cacert.pem"],
+        :tls_ca_certificates   => ["./spec/tls/ca_certificate.pem"],
         :verify_peer           => false)
       c.start
       c
@@ -76,9 +76,9 @@ unless ENV["CI"]
   describe "TLS connection to RabbitMQ with a connection string" do
     let(:connection) do
       c = Bunny.new("amqps://bunny_gem:bunny_password@127.0.0.1/bunny_testbed",
-        :tls_cert              => "spec/tls/client_cert.pem",
+        :tls_cert              => "spec/tls/client_certificate.pem",
         :tls_key               => "spec/tls/client_key.pem",
-        :tls_ca_certificates   => ["./spec/tls/cacert.pem"],
+        :tls_ca_certificates   => ["./spec/tls/ca_certificate.pem"],
         :verify_peer           => false)
       c.start
       c
@@ -95,7 +95,7 @@ unless ENV["CI"]
   describe "TLS connection to RabbitMQ with a connection string and w/o client certificate and key" do
     let(:connection) do
       c = Bunny.new("amqps://bunny_gem:bunny_password@127.0.0.1/bunny_testbed",
-        :tls_ca_certificates   => ["./spec/tls/cacert.pem"],
+        :tls_ca_certificates   => ["./spec/tls/ca_certificate.pem"],
         :verify_peer           => false)
       c.start
       c
@@ -115,9 +115,9 @@ unless ENV["CI"]
         :password            => "bunny_password",
         :vhost               => "bunny_testbed",
         :tls                 => true,
-        :tls_cert            => File.read("./spec/tls/client_cert.pem"),
+        :tls_cert            => File.read("./spec/tls/client_certificate.pem"),
         :tls_key             => File.read("./spec/tls/client_key.pem"),
-        :tls_ca_certificates => ["./spec/tls/cacert.pem"],
+        :tls_ca_certificates => ["./spec/tls/ca_certificate.pem"],
         :verify_peer         => false)
       c.start
       c
@@ -137,7 +137,7 @@ unless ENV["CI"]
         :vhost               => "bunny_testbed",
         :tls                 => true,
         :tls_protocol        => :TLSv1,
-        :tls_ca_certificates => ["./spec/tls/cacert.pem"],
+        :tls_ca_certificates => ["./spec/tls/ca_certificate.pem"],
         :verify_peer         => false)
       c.start
       c

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol