bunny 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad9161e606b40789a56997ff7b9b3d81f61c3d28
-  data.tar.gz: 22ecc57943938dcefc1fa6d798470d985b61f3ba
+  metadata.gz: b9c9bf09dd970ef5209cce72c05a7d73f82f4750
+  data.tar.gz: d658fe0aea0c6f3461b2f4d1c54db3b7d8c0f9a6
 SHA512:
-  metadata.gz: 88fe8294f3572a9f6f9c7badaf0e92428c0320ba1b9c6d4b2d10c12cb947ce606baa77ab090d73b272e4826ef16122fb0c2d8ef1fb69d5c71c46bf421f8f5e75
-  data.tar.gz: 6d9c2b5e8acb8012a719787c2e410972e981bea80902905f409ba433a74af866217b3ccc61e17ba33f4d47b3deb9f21d604c514cc20888a468c23fbc26d5b614
+  metadata.gz: 220ac2fd8093683bfdb6b6c614b8198a47a996295804bd677d3aebfa6001eb1e5dfd7ad63b359e98050fb285f680c0ba5867b9a7f88d2437487db81cc25e84c1
+  data.tar.gz: a59a8fce37f7807548223b15041d349f5ec8522342427277cebb2de729a0927fde4fb660e5b4ea869b3abd395610e5bc9d3844e126f4d8d7476ce260f0cbae1a

data/ChangeLog.md

@@ -1,3 +1,13 @@
+## Changes between Bunny 0.10.3 and 0.10.4
+
+### Default Paths for TLS/SSL CA's on All OS'es
+
+Bunny now uses OpenSSL to detect default TLS/SSL CA's paths, extending
+this feature to OS'es other than Linux.
+
+Contributed by Jingwen Owen Ou.
+
+
 ## Changes between Bunny 0.10.2 and 0.10.3
 
 ### Default Paths for TLS/SSL CA's on Linux

data/lib/bunny/transport.rb

@@ -41,11 +41,14 @@ module Bunny
       @tls_certificate       = opts[:tls_certificate] || opts[:ssl_cert_string]
       @tls_key               = opts[:tls_key]         || opts[:ssl_key_string]
       @tls_certificate_store = opts[:tls_certificate_store]
+
+      default_ca_file = ENV[OpenSSL::X509::DEFAULT_CERT_FILE_ENV] || OpenSSL::X509::DEFAULT_CERT_FILE
+      default_ca_path = ENV[OpenSSL::X509::DEFAULT_CERT_DIR_ENV] || OpenSSL::X509::DEFAULT_CERT_DIR
       @tls_ca_certificates   = opts.fetch(:tls_ca_certificates, [
-        '/etc/ssl/certs/ca-certificates.crt', # Ubuntu/Debian
-        '/etc/ssl/certs/ca-bundle.crt', # Amazon Linux
-        '/etc/ssl/ca-bundle.pem', # OpenSUSE
-        '/etc/pki/tls/certs/ca-bundle.crt' # Fedora/RHEL
+        default_ca_file,
+        File.join(default_ca_path, 'ca-certificates.crt'), # Ubuntu/Debian
+        File.join(default_ca_path, 'ca-bundle.crt'), # Amazon Linux & Fedora/RHEL
+        File.join(default_ca_path, 'ca-bundle.pem') # OpenSUSE
       ])
       @verify_peer           = opts[:verify_ssl] || opts[:verify_peer]
 
@@ -345,6 +348,7 @@ module Bunny
 
     def initialize_tls_certificate_store(certs)
       certs = certs.select { |path| File.readable? path }
+      @logger.debug "Using CA certificates at #{certs.join(', ')}"
       if certs.empty?
         @logger.error "No CA certificates found, add one with :tls_ca_certificates"
       end

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -86,4 +86,46 @@ unless ENV["CI"]
       ch.close
     end
   end
+
+
+  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"])
+      c.start
+      c
+    end
+
+    after :each do
+      connection.close
+    end
+
+    it "provides the same API as a regular connection" 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
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Chris Duncan