march_hare 2.8.0-java → 2.9.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10b9d00ad30cfe685795276ba8bd53d6cc5af312
-  data.tar.gz: acc9c65925a91800f6a68a1732e15d52eda372ac
+  metadata.gz: b56968635df7028f84b2f18fef851cd0351e43e6
+  data.tar.gz: 3a582e08e4ea7eb61974083b24d8b901d986883e
 SHA512:
-  metadata.gz: 7ae3150965e1d9081ea8ff628fbb4ce23848c88a0fd5c1e28b992d6db54f8eea920e8d7775db8689afc886c3e4a48a0632765d7ce891db327f4731ecfe2b3070
-  data.tar.gz: 4572abefa55fec760696be30d3bad7707da9120b3e91e7c4ba7816bdf94f40823da08319f03523315f144f56dbaf8075915a2db224bb36a1c61a383c6f8cd73a
+  metadata.gz: e39d246d86194431e946266af68edbb78e9f7d3db7b28b722bfec92e4f1b0bebf898cea92c5772020a66820e5f68837e3db886067e86a5992a5236af18116c77
+  data.tar.gz: 5be0b472967ff510a4dbec511cba883fac48fd49911e58b6d5e6e7e50ce08a41e751411507f047dcec45593f74013b07dddb57d1fc802af19ee803ad4da18b68

data/lib/march_hare/session.rb

@@ -2,6 +2,7 @@
 require "march_hare/shutdown_listener"
 require "set"
 require "march_hare/thread_pools"
+require "java"
 
 module MarchHare
   java_import com.rabbitmq.client.ConnectionFactory
@@ -41,20 +42,26 @@ module MarchHare
     # @option options [String] :password ("guest") Password
     # @option options [String] :vhost ("/") Virtual host to use
     # @option options [Integer] :requested_heartbeat (580) Heartbeat timeout used. 0 means no heartbeat.
-    # @option options [Boolean] :tls (false) Set to true to use TLS/SSL connection. This will switch port to 5671 by default.
+    # @option options [Boolean, String] :tls (false) Set to true to use TLS/SSL connection or TLS version name as a string, e.g. "TLSv1.1".
+    #                                   This will switch port to 5671 by default.
+    # @option options [String] :tls_certificate_path Path to a PKCS12 certificate.
     # @option options [java.util.concurrent.ThreadFactory] :thread_factory Thread factory RabbitMQ Java client will use (useful in restricted PaaS platforms such as GAE)
     #
     # @see http://rubymarchhare.info/articles/connecting.html Connecting to RabbitMQ guide
-    def self.connect(options={})
+    def self.connect(options = {})
       cf = ConnectionFactory.new
 
-      cf.uri                = options[:uri]          if options[:uri]
-      cf.host               = hostname_from(options) if include_host?(options)
-      cf.port               = options[:port].to_i    if options[:port]
-      cf.virtual_host       = vhost_from(options)    if include_vhost?(options)
-      cf.connection_timeout = timeout_from(options)  if include_timeout?(options)
-      cf.username           = username_from(options) if include_username?(options)
-      cf.password           = password_from(options) if include_password?(options)
+      if options[:uri]
+        cf.uri          = options[:uri]          if options[:uri]
+      else
+        cf.host         = hostname_from(options) if include_host?(options)
+        cf.port         = options[:port].to_i    if options[:port]
+        cf.virtual_host = vhost_from(options)    if include_vhost?(options)
+        cf.username     = username_from(options) if include_username?(options)
+        cf.password     = password_from(options) if include_password?(options)
+      end
+
+      cf.connection_timeout  = timeout_from(options)  if include_timeout?(options)
 
       cf.requested_heartbeat = heartbeat_from(options)
       cf.connection_timeout  = connection_timeout_from(options) if include_connection_timeout?(options)
@@ -67,44 +74,41 @@ module MarchHare
       when true then
         cf.use_ssl_protocol
       when String then
+        # TODO: logging
+        $stdout.puts "Using TLS/SSL version #{tls}"
         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
+        elsif (cert_path = tls_certificate_path_from(options)) && (password = tls_certificate_password_from(options))
+          ctx = SSLContext.get_instance(tls)
+          pwd = 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)
+            is = File.new(cert_path).to_inputstream
+            ks = KeyStore.get_instance('PKCS12')
+            ks.load(is, pwd)
 
-            key_managers =  key_manager_factory.get_key_managers
+            kmf = KeyManagerFactory.get_instance("SunX509")
+            kmf.init(ks, pwd)
 
-            sslContext.init(key_managers, [NullTrustManager.new].to_java('javax.net.ssl.TrustManager'), nil)
+            ctx.init(kmf.get_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
+            cf.use_ssl_protocol(ctx)
+          rescue Java::JavaLang::Throwable => e
             message = e.message
             message << "\n"
             message << e.backtrace.join("\n")
 
             raise SSLContextException.new(message)
           ensure
-            input_stream.close if input_stream
-          end  
+            is.close if is
+          end
         else
           cf.use_ssl_protocol(tls)
         end
       end
 
-
       new(cf, options)
     end
 
-
     class SSLContextException < StandardError
     end
 
@@ -116,6 +120,8 @@ module MarchHare
     # @private
     def initialize(connection_factory, opts = {})
       @cf               = connection_factory
+      @uri              = opts[:uri]
+      @uses_uri         = !(@uri.nil?)
       # executors cannot be restarted after shutdown,
       # so we really need a factory here. MK.
       @executor_factory = opts[:executor_factory] || build_executor_factory_from(opts)
@@ -124,7 +130,11 @@ module MarchHare
       @default_host_selection_strategy = lambda { |hosts| hosts.sample }
       @host_selection_strategy         = opts[:host_selection_strategy] || @default_host_selection_strategy
 
-      @connection       = self.new_connection_impl(@hosts, @host_selection_strategy)
+      @connection       = if @uses_uri
+                            self.new_uri_connection_impl(opts[:uri])
+                          else
+                            self.new_connection_impl(@hosts, @host_selection_strategy)
+                          end
       @channels         = JavaConcurrent::ConcurrentHashMap.new
 
       # should automatic recovery from network failures be used?
@@ -240,7 +250,11 @@ module MarchHare
 
       new_connection = converting_rjc_exceptions_to_ruby do
         reconnecting_on_network_failures(ms) do
-          self.new_connection_impl(@hosts, @host_selection_strategy)
+          if @uses_uri
+            self.new_uri_connection_impl(options[:uri])
+          else
+            self.new_connection_impl(@hosts, @host_selection_strategy)
+          end
         end
       end
       @thread_pool = ThreadPools.dynamically_growing
@@ -299,6 +313,35 @@ module MarchHare
       # the call to #start. MK.
     end
 
+    def username
+      @cf.username
+    end
+    alias user username
+
+    def vhost
+      @cf.virtual_host
+    end
+
+    def hostname
+      @cf.host
+    end
+    alias host hostname
+
+    def port
+      @cf.port
+    end
+
+    def tls?
+      if @uses_uri
+        u = java.net.URI.new(@uri.to_java_string)
+
+        u.scheme == "amqps"
+      else
+        self.port == ConnectionFactory.DEFAULT_AMQP_OVER_SSL_PORT
+      end
+    end
+    alias ssl? tls?
+
     def method_missing(selector, *args)
       @connection.__send__(selector, *args)
     end
@@ -450,7 +493,7 @@ module MarchHare
 
     # @private
     def new_connection_impl(hosts, host_selector)
-      if hosts && !hosts.empty?
+      if hosts && !hosts.empty? && !@uses_uri
         @cf.host = host_selector.call(hosts)
       end
 
@@ -464,6 +507,19 @@ module MarchHare
       end
     end
 
+    # @private
+    def new_uri_connection_impl(uri)
+      @cf.uri = uri
+      converting_rjc_exceptions_to_ruby do
+        if @executor_factory
+          @executor = @executor_factory.call
+          @cf.new_connection(@executor)
+        else
+          @cf.new_connection
+        end
+      end
+    end
+
     # @private
     def maybe_shut_down_executor
       @executor.shutdown if @executor
@@ -480,15 +536,23 @@ module MarchHare
       end
     end
 
+    def self.tls_certificate_path_from(opts)
+      opts[:tls_cert] || opts[:ssl_cert] || opts[:tls_cert_path] || opts[:ssl_cert_path] || opts[:tls_certificate_path] || opts[:ssl_certificate_path]
+    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]
+    def tls_certificate_path_from(opts)
+      self.class.tls_certificate_path_from(opts)
     end
-    
+
+    def self.tls_certificate_password_from(opts)
+      opts[:tls_certificate_password] || opts[:ssl_certificate_password] || opts[:cert_password] || opts[:certificate_password]
+    end
+
     # @private
-    def tls_key_certificate_password_from(opts)
-      opts[:cert_password] || opts[:certificate_password]
-    end  
+    def tls_certificate_password_from(opts)
+      self.class.tls_certificate_password_from(opts)
+    end
 
     # Ruby blocks-based BlockedListener that handles
     # connection.blocked and connection.unblocked.

data/lib/march_hare/version.rb

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

metadata

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