bunny 1.7.0 → 2.17.0

data/spec/higher_level_api/integration/queue_delete_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Queue, "#delete" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -22,7 +22,7 @@ describe Bunny::Queue, "#delete" do
       # no exception as of RabbitMQ 3.2. MK.
       q.delete
 
-      ch.queues.size.should == 0
+      expect(ch.queues.size).to eq 0
     end
   end
 

data/spec/higher_level_api/integration/queue_purge_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Queue do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -15,15 +15,15 @@ describe Bunny::Queue do
   it "can be purged" do
     ch = connection.create_channel
 
-    q  = ch.queue("", :exclusive => true)
+    q  = ch.queue("", exclusive: true)
     x  = ch.default_exchange
 
-    x.publish("xyzzy", :routing_key => q.name)
+    x.publish("xyzzy", routing_key: q.name)
     sleep(0.5)
 
-    q.message_count.should == 1
+    expect(q.message_count).to eq 1
     q.purge
-    q.message_count.should == 0
+    expect(q.message_count).to eq 0
 
     ch.close
   end

data/spec/higher_level_api/integration/queue_unbind_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Queue, "bound to an exchange" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -15,16 +15,16 @@ describe Bunny::Queue, "bound to an exchange" do
   it "can be unbound from an exchange it was bound to" do
     ch = connection.create_channel
     x  = ch.fanout("amq.fanout")
-    q  = ch.queue("", :exclusive => true).bind(x)
+    q  = ch.queue("", exclusive: true).bind(x)
 
     x.publish("")
     sleep 0.3
-    q.message_count.should == 1
+    expect(q.message_count).to eq 1
 
     q.unbind(x)
 
     x.publish("")
-    q.message_count.should == 1
+    expect(q.message_count).to eq 1
   end
 end
 
@@ -32,7 +32,7 @@ end
 
 describe Bunny::Queue, "NOT bound to an exchange" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -45,7 +45,7 @@ describe Bunny::Queue, "NOT bound to an exchange" do
   it "is idempotent (succeeds)" do
     ch = connection.create_channel
     x  = ch.fanout("amq.fanout")
-    q  = ch.queue("", :exclusive => true)
+    q  = ch.queue("", exclusive: true)
 
     # No exception as of RabbitMQ 3.2. MK.
     q.unbind(x)

data/spec/higher_level_api/integration/read_only_consumer_spec.rb

@@ -2,13 +2,13 @@ require "spec_helper"
 
 describe Bunny::Queue, "#subscribe" do
   let(:publisher_connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
 
   let(:consumer_connection) do
-    c = Bunny.new(:user => "bunny_reader", :password => "reader_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_reader", password: "reader_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -28,7 +28,7 @@ describe Bunny::Queue, "#subscribe" do
       ch = publisher_connection.create_channel
       # declare the queue because the read-only user won't be able to issue
       # queue.declare
-      q  = ch.queue(queue_name, :auto_delete => true, :durable => false)
+      q  = ch.queue(queue_name, auto_delete: true, durable: false)
 
       t = Thread.new do
         # give the main thread a bit of time to declare the queue
@@ -36,8 +36,8 @@ describe Bunny::Queue, "#subscribe" do
         ch = consumer_connection.create_channel
         # this connection is read only, use passive declare to only get
         # a reference to the queue
-        q  = ch.queue(queue_name, :auto_delete => true, :durable => false, :passive => true)
-        q.subscribe(:exclusive => false) do |delivery_info, properties, payload|
+        q  = ch.queue(queue_name, auto_delete: true, durable: false, passive: true)
+        q.subscribe(exclusive: false) do |delivery_info, properties, payload|
           delivered_keys << delivery_info.routing_key
           delivered_data << payload
         end
@@ -46,13 +46,13 @@ describe Bunny::Queue, "#subscribe" do
       sleep 0.5
 
       x  = ch.default_exchange
-      x.publish("hello", :routing_key => queue_name)
+      x.publish("hello", routing_key: queue_name)
 
       sleep 0.7
-      delivered_keys.should include(queue_name)
-      delivered_data.should include("hello")
+      expect(delivered_keys).to include(queue_name)
+      expect(delivered_data).to include("hello")
 
-      ch.queue(queue_name, :auto_delete => true, :durable => false).message_count.should == 0
+      expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
       ch.close
     end

data/spec/higher_level_api/integration/sender_selected_distribution_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "Sender-selected distribution" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -14,22 +14,22 @@ describe "Sender-selected distribution" do
   it "lets publishers specify additional routing keys using CC and BCC headers" do
     ch   = connection.create_channel
     x    = ch.direct("bunny.tests.ssd.exchange")
-    q1   = ch.queue("", :exclusive => true).bind(x, :routing_key => "one")
-    q2   = ch.queue("", :exclusive => true).bind(x, :routing_key => "two")
-    q3   = ch.queue("", :exclusive => true).bind(x, :routing_key => "three")
-    q4   = ch.queue("", :exclusive => true).bind(x, :routing_key => "four")
+    q1   = ch.queue("", exclusive: true).bind(x, routing_key: "one")
+    q2   = ch.queue("", exclusive: true).bind(x, routing_key: "two")
+    q3   = ch.queue("", exclusive: true).bind(x, routing_key: "three")
+    q4   = ch.queue("", exclusive: true).bind(x, routing_key: "four")
 
     n    = 10
     n.times do |i|
-      x.publish("Message #{i}", :routing_key => "one", :headers => {"CC" => ["two", "three"]})
+      x.publish("Message #{i}", routing_key: "one", headers: {"CC" => ["two", "three"]})
     end
 
     sleep 0.5
 
-    q1.message_count.should == n
-    q2.message_count.should == n
-    q3.message_count.should == n
-    q4.message_count.should be_zero
+    expect(q1.message_count).to eq n
+    expect(q2.message_count).to eq n
+    expect(q3.message_count).to eq n
+    expect(q4.message_count).to be_zero
 
     x.delete
   end

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -1,156 +1,262 @@
 # -*- coding: utf-8 -*-
 require "spec_helper"
 
-unless ENV["CI"]
-  shared_examples_for "successful TLS connection" do
-    it "succeeds" do
-      connection.should be_tls
-      ch = connection.create_channel
-
-      q  = ch.queue("", :exclusive => true)
-      x  = ch.default_exchange
-
-      x.publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name)
-
-      sleep 0.5
-      q.message_count.should == 4
-
-      i = 0
-      q.subscribe do |delivery_info, _, payload|
-        i += 1
-      end
-      sleep 1.0
-      i.should == 4
-      q.message_count.should == 0
-
-      ch.close
+require "socket"
+
+CERTIFICATE_DIR = ENV.fetch("BUNNY_CERTIFICATE_DIR", "./spec/tls")
+puts "Will use certificates from #{CERTIFICATE_DIR}"
+
+shared_examples_for "successful TLS connection" do
+  it "succeeds", skip: ENV["CI"] do
+    expect(subject).to be_tls
+    ch = subject.create_channel
+    ch.confirm_select
+
+    q  = ch.queue("", exclusive: true)
+    x  = ch.default_exchange
+
+    x.publish("xyzzy", routing_key: q.name).
+      publish("xyzzy", routing_key: q.name).
+      publish("xyzzy", routing_key: q.name).
+      publish("xyzzy", routing_key: q.name)
+
+    x.wait_for_confirms
+    expect(q.message_count).to eq 4
+
+    i = 0
+    q.subscribe do |delivery_info, _, payload|
+      i += 1
     end
+    sleep 1.0
+    expect(i).to eq 4
+    expect(q.message_count).to eq 0
+
+    ch.close
   end
+end
 
+def local_hostname
+  ENV.fetch("BUNNY_RABBITMQ_HOSTNAME", "localhost")
+end
 
-  describe "TLS connection to RabbitMQ with client certificates" do
-    let(:connection) do
-      c = Bunny.new(:user     => "bunny_gem",
-        :password => "bunny_password",
-        :vhost    => "bunny_testbed",
-        :tls                   => true,
-        :tls_cert              => "spec/tls/client_cert.pem",
-        :tls_key               => "spec/tls/client_key.pem",
-        :tls_ca_certificates   => ["./spec/tls/cacert.pem"],
-        :verify_peer           => false)
-      c.start
-      c
-    end
+def no_tls12_supported?
+  not tls12_supported?
+end
 
-    after :each do
-      connection.close
-    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
 
-    include_examples "successful TLS connection"
+context "initialized with tls: true", skip: ENV["CI"] do
+  let(:subject) do
+    Bunny.new(
+      hostname:  local_hostname(),
+      user:     "bunny_gem",
+      password: "bunny_password",
+      vhost:    "bunny_testbed",
+      tls: true,
+      verify_peer: verify_peer,
+      tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
+      tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"])
   end
 
+  context "peer verification is off" do
+    let(:verify_peer) { false }
 
-  describe "TLS connection to RabbitMQ without client certificates" do
-    let(:connection) do
-      c = Bunny.new(:user     => "bunny_gem",
-        :password => "bunny_password",
-        :vhost    => "bunny_testbed",
-        :tls                   => true,
-        :tls_ca_certificates   => ["./spec/tls/cacert.pem"],
-        :verify_peer           => false)
-      c.start
-      c
+    it "uses TLS port" do
+      expect(subject.port).to eq AMQ::Protocol::TLS_PORT
     end
 
-    after :each do
-      connection.close
+    it "sends the SNI details" do
+      # https://github.com/ruby-amqp/bunny/issues/440
+      subject.start
+      expect(subject.transport.socket.hostname).to_not be_empty
     end
 
-    include_examples "successful TLS connection"
+    after :each do
+      subject.close
+    end
   end
 
+  context "peer verification is on" do
+    let(:verify_peer) { true }
 
-  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_key               => "spec/tls/client_key.pem",
-        :tls_ca_certificates   => ["./spec/tls/cacert.pem"],
-        :verify_peer           => false)
-      c.start
-      c
+    it "uses TLS port" do
+      expect(subject.port).to eq AMQ::Protocol::TLS_PORT
     end
+  end
+end
 
-    after :each do
-      connection.close
-    end
+describe "TLS connection to RabbitMQ with client certificates", 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: "#{CERTIFICATE_DIR}/client_certificate.pem",
+      tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
+  end
 
-    include_examples "successful TLS connection"
+  after :each do
+    subject.close
   end
 
+  include_examples "successful TLS connection"
+end
 
-  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"],
-        :verify_peer           => false)
-      c.start
-      c
-    end
 
-    after :each do
-      connection.close
-    end
+describe "TLS connection to RabbitMQ without client certificates", 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_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
+  end
 
-    include_examples "successful TLS connection"
+  after :each do
+    subject.close
+  end
+
+  include_examples "successful TLS connection"
+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_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
+      tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
+  end
+
+  after :each do
+    subject.close
   end
 
+  include_examples "successful TLS connection"
 
-  describe "TLS connection to RabbitMQ with client certificates provided inline" do
-    let(:connection) do
-      c = Bunny.new(:user    => "bunny_gem",
-        :password            => "bunny_password",
-        :vhost               => "bunny_testbed",
-        :tls                 => true,
-        :tls_cert            => File.read("./spec/tls/client_cert.pem"),
-        :tls_key             => File.read("./spec/tls/client_key.pem"),
-        :tls_ca_certificates => ["./spec/tls/cacert.pem"],
-        :verify_peer         => false)
-      c.start
-      c
+  context "when URI contains query parameters" do
+    subject(:session) do
+      Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed?heartbeat=10&connection_timeout=100&channel_max=1000&verify=false&cacertfile=#{CERTIFICATE_DIR}/ca_certificate.pem&certfile=#{CERTIFICATE_DIR}/client_certificate.pem&keyfile=#{CERTIFICATE_DIR}/client_key.pem")
     end
 
-    after :each do
-      connection.close
+    it "parses extra connection parameters" do
+      session.start
+
+      expect(session.uses_tls?).to eq(true)
+      expect(session.transport.verify_peer).to eq(false)
+      expect(session.transport.tls_ca_certificates).to eq(["#{CERTIFICATE_DIR}/ca_certificate.pem"])
+      expect(session.transport.tls_certificate_path).to eq("#{CERTIFICATE_DIR}/client_certificate.pem")
+      expect(session.transport.tls_key_path).to eq("#{CERTIFICATE_DIR}/client_key.pem")
     end
+  end
+end
 
-    include_examples "successful TLS connection"
+
+describe "TLS connection to RabbitMQ with a connection string and w/o client certificate and key", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: verify_peer)
+    c.start
+    c
   end
 
-  describe "TLS connection to RabbitMQ with tls_version TLSv1 specified" do
-    let(:connection) do
-      c = Bunny.new(:user    => "bunny_gem",
-        :password            => "bunny_password",
-        :vhost               => "bunny_testbed",
-        :tls                 => true,
-        :tls_protocol        => :TLSv1,
-        :tls_ca_certificates => ["./spec/tls/cacert.pem"],
-        :verify_peer         => false)
-      c.start
-      c
-    end
+  after :each do
+    subject.close
+  end
 
-    after :each do
-      connection.close
+  context "peer verification is off" do
+    let(:verify_peer) { false }
+
+    include_examples "successful TLS connection"
+
+    it "sends the SNI details" do
+      # https://github.com/ruby-amqp/bunny/issues/440
+      expect(subject.transport.socket.hostname).to_not be_empty
     end
+  end
+
+  context "peer verification is on" do
+    let(:verify_peer) { true }
 
     include_examples "successful TLS connection"
 
-    it "connects using TLSv1" do
-      connection.transport.socket.ssl_version.should == "TLSv1"
+    it "sends the SNI details" do
+      # https://github.com/ruby-amqp/bunny/issues/440
+      expect(subject.transport.socket.hostname).to_not be_empty
     end
   end
 end
+
+
+describe "TLS connection to RabbitMQ with client certificates provided inline", 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"),
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
+  end
+
+  after :each do
+    subject.close
+  end
+
+  include_examples "successful TLS connection"
+end
+
+describe "TLS connection to RabbitMQ with tls_version TLSv1.2 specified", 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_protocol: :TLSv1_2,
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
+  end
+
+  after :each do
+    subject.close
+  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