bunny 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fec40c94f09ec1a59ff65e902db263a81659bf06
-  data.tar.gz: ecabd798af455fb73487bf088f2f34953d3e6a72
+  metadata.gz: 53c74a39ad4bc726f41f1c2db1f6ad7e7ebdefb8
+  data.tar.gz: 4ede7c5896c820ab5895963f1da741dda42e9fe7
 SHA512:
-  metadata.gz: c4a1714e037cf752a4785f0890c373e8cd26b12f4cdeba8f4587d6667fa0d5ae51423540747be59bface7dee44899f3720521ddc832c2a3cb8334d563d8f7b30
-  data.tar.gz: fb7074e6da4484b740d6e4a057d4a6f7ed0f9d4845a77d3e386cdde9f6dadc931087609adac51139e1cfbac9aee99d86afa95ada0a532b43e71e837547958fa1
+  metadata.gz: 14e4fbe2d2aca163498882cb49ee7d6ec90756a7c0c6e419b5c73e3afc31673451e4b75a4f47f1c49e5525dd91b5b792d074fa7edef18aa18957a542896bb02c
+  data.tar.gz: d750d4af8cf6fd512a60422865b4e8df3e0dcd6c6f72eb95ed671bd73ba053e3fca8dea7d853517502de59f0f43e0b3e7531f13f7a23d622050e98aaea2b552f

data/lib/bunny/transport.rb

@@ -21,10 +21,8 @@ module Bunny
 
     # Default TCP connection timeout
     DEFAULT_CONNECTION_TIMEOUT = 5.0
-    # Default TLS protocol version to use.
-    # Currently SSLv3, same as in RabbitMQ Java client
-    DEFAULT_TLS_PROTOCOL       = "SSLv3"
-
+    DEFAULT_READ_TIMEOUT  = 5.0
+    DEFAULT_WRITE_TIMEOUT = 5.0
 
     attr_reader :session, :host, :port, :socket, :connect_timeout, :read_write_timeout, :disconnect_timeout
     attr_reader :tls_context
@@ -315,7 +313,7 @@ module Bunny
       @tls_ca_certificates   = opts.fetch(:tls_ca_certificates, default_tls_certificates)
       @verify_peer           = opts[:verify_ssl] || opts[:verify_peer]
 
-      @tls_context = initialize_tls_context(OpenSSL::SSL::SSLContext.new)
+      @tls_context = initialize_tls_context(OpenSSL::SSL::SSLContext.new, opts)
     end
 
     def wrap_in_tls_socket(socket)
@@ -349,7 +347,7 @@ module Bunny
       end
     end
 
-    def initialize_tls_context(ctx)
+    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.cert_store = if @tls_certificate_store
@@ -368,17 +366,15 @@ module Bunny
         @logger.warn "Using TLS but no client private key is provided!"
       end
 
-      # setting TLS/SSL version only works correctly when done
-      # vis set_params. MK.
-      ctx.set_params(:ssl_version => @opts.fetch(:tls_protocol, DEFAULT_TLS_PROTOCOL))
-     
       verify_mode = if @verify_peer
         OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
       else
         OpenSSL::SSL::VERIFY_NONE
       end
+      ctx.verify_mode = verify_mode
 
-      ctx.set_params(:verify_mode => verify_mode)
+      ssl_version = opts[:tls_protocol] || opts[:ssl_version]
+      ctx.ssl_version = ssl_version if ssl_version
 
       ctx
     end

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -124,4 +124,51 @@ unless ENV["CI"]
 
     include_examples "successful TLS connection"
   end
+
+
+  describe "TLS connection to RabbitMQ with ssl_version SSLv3 specified" do
+    let(:connection) do
+      c = Bunny.new(:user     => "bunny_gem",
+        :password => "bunny_password",
+        :vhost    => "bunny_testbed",
+        :tls                   => true,
+        :ssl_version           => :SSLv3,
+        :tls_ca_certificates   => ["./spec/tls/cacert.pem"])
+      c.start
+      c
+    end
+
+    after :each do
+      connection.close
+    end
+
+    include_examples "successful TLS connection"
+
+    it "connects using SSLv3" do
+      connection.transport.socket.ssl_version.should == "SSLv3"
+    end
+  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"])
+      c.start
+      c
+    end
+
+    after :each do
+      connection.close
+    end
+
+    include_examples "successful TLS connection"
+
+    it "connects using TLSv1" do
+      connection.transport.socket.ssl_version.should == "TLSv1"
+    end
+  end
 end

data/spec/stress/channel_open_stress_spec.rb

@@ -1,15 +1,21 @@
 require "spec_helper"
 
 describe "Rapidly opening and closing lots of channels" do
-  connection = Bunny.new(:automatic_recovery => false).tap do |c|
-    c.start
+  before :all do
+    @connection = Bunny.new(:automatic_recovery => false).tap do |c|
+      c.start
+    end
+  end
+
+  after :all do
+    @connection.close
   end
 
   context "in a single-threaded scenario" do
     let(:n) { 500 }
 
     it "works correctly" do
-      xs = Array.new(n) { connection.create_channel }
+      xs = Array.new(n) { @connection.create_channel }
       puts "Opened #{n} channels"
 
       xs.size.should == n
@@ -35,12 +41,12 @@ describe "Rapidly opening and closing lots of channels" do
 
         n.times do
           t = Thread.new do
-            ch1 = connection.create_channel
+            ch1 = @connection.create_channel
             q   = ch1.queue("", :exclusive => true)
             q.delete
             ch1.close
 
-            ch2 = connection.create_channel
+            ch2 = @connection.create_channel
             ch2.close
           end
           t.abort_on_exception = true
@@ -62,7 +68,7 @@ describe "Rapidly opening and closing lots of channels" do
         n.times do
           t = Thread.new do
             3.times do
-              ch = connection.create_channel
+              ch = @connection.create_channel
               x  = ch.topic('bunny.stress.topics.t2', :durable => false)
               ch.close
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol