march_hare 2.7.0-java → 2.8.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a417da5f5c33e7afac262924967c49e0910c6a8
-  data.tar.gz: 8bfcf751a299b57a60bf6bcd87260626ebc3d983
+  metadata.gz: 10b9d00ad30cfe685795276ba8bd53d6cc5af312
+  data.tar.gz: acc9c65925a91800f6a68a1732e15d52eda372ac
 SHA512:
-  metadata.gz: f3af5dfa114500351fbaeece4d3d34cec7d73e5b6465880870d46cdef3ac9e25a0166a2fb6c884ae7ca9d9b3ece0871c9d3f98b85f5070f01b9c3aa7ca39bd71
-  data.tar.gz: ab7451d9f4621f5da10264af369558b94968a5772af9af282b0a5d0ce27123011822a00823d297ee419d3603ad4aa14da83c09ec1c4a4ce50127093e09f0a95e
+  metadata.gz: 7ae3150965e1d9081ea8ff628fbb4ce23848c88a0fd5c1e28b992d6db54f8eea920e8d7775db8689afc886c3e4a48a0632765d7ce891db327f4731ecfe2b3070
+  data.tar.gz: 4572abefa55fec760696be30d3bad7707da9120b3e91e7c4ba7816bdf94f40823da08319f03523315f144f56dbaf8075915a2db224bb36a1c61a383c6f8cd73a

data/lib/march_hare/channel.rb

@@ -151,6 +151,11 @@ module MarchHare
     alias id channel_number
     alias number channel_number
 
+    # @return [Boolean] true if the channel is open
+    def open?
+      @delegate.open?
+    end
+
     # Closes the channel.
     #
     # Closed channels can no longer be used. Closed channel id is

data/lib/march_hare/consumers/base.rb

@@ -100,7 +100,7 @@ module MarchHare
     end
 
     def deliver(headers, message)
-      if @callback_arity == 2
+      if @callback_arity == 2 or @callback_arity < 0
         @callback.call(headers, message)
       else
         @callback.call(message)

data/lib/march_hare/session.rb

@@ -7,6 +7,11 @@ module MarchHare
   java_import com.rabbitmq.client.ConnectionFactory
   java_import com.rabbitmq.client.Connection
   java_import com.rabbitmq.client.BlockedListener
+  java_import com.rabbitmq.client.NullTrustManager
+
+  java_import javax.net.ssl.SSLContext
+  java_import javax.net.ssl.KeyManagerFactory
+  java_import java.security.KeyStore
 
   # Connection to a RabbitMQ node.
   #
@@ -64,6 +69,32 @@ module MarchHare
       when String then
         if options[:trust_manager]
           cf.use_ssl_protocol(tls, options[:trust_manager])
+        elsif (key_cert = tls_key_certificate_path_from(options)) && (key_cert_password = tls_key_certificate_password_from(options))
+          sslContext = SSLContext.get_instance(tls)
+          certificate_password = key_cert_password.to_java.to_char_array
+          begin
+            input_stream = File.new(key_cert).to_inputstream
+            key_store = KeyStore.get_instance('PKCS12')
+            key_store.load(input_stream, certificate_password)
+
+            key_manager_factory = KeyManagerFactory.get_instance("SunX509")
+            key_manager_factory.init(key_store, certificate_password)
+
+            key_managers =  key_manager_factory.get_key_managers
+
+            sslContext.init(key_managers, [NullTrustManager.new].to_java('javax.net.ssl.TrustManager'), nil)
+
+            cf.use_ssl_protocol(sslContext)
+          # catch all exceptions from java
+          rescue Java::JavaLang::Exception => e
+            message = e.message
+            message << "\n"
+            message << e.backtrace.join("\n")
+
+            raise SSLContextException.new(message)
+          ensure
+            input_stream.close if input_stream
+          end  
         else
           cf.use_ssl_protocol(tls)
         end
@@ -73,6 +104,11 @@ module MarchHare
       new(cf, options)
     end
 
+
+    class SSLContextException < StandardError
+    end
+
+
     # @return [Array<MarchHare::Channel>] Channels opened on this connection
     attr_reader :channels
 
@@ -444,6 +480,16 @@ module MarchHare
       end
     end
 
+    # @private
+    def tls_key_certificate_path_from(opts)
+      opts[:tls_key_cert] || opts[:ssl_key_cert] || opts[:tls_key_cert_path] || opts[:ssl_key_cert_path] || opts[:tls_key_certificate_path] || opts[:ssl_key_certificate_path]
+    end
+    
+    # @private
+    def tls_key_certificate_password_from(opts)
+      opts[:cert_password] || opts[:certificate_password]
+    end  
+
     # Ruby blocks-based BlockedListener that handles
     # connection.blocked and connection.unblocked.
     # @private

data/lib/march_hare/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module MarchHare
-  VERSION = "2.7.0"
+  VERSION = "2.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
@@ -60,4 +60,3 @@ signing_key:
 specification_version: 4
 summary: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 test_files: []
-has_rdoc: