mongo 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe6bb7e6b47adaa8d2552af028e6c77510659ec
-  data.tar.gz: fcf01b4299f65ab1b0604f7c6ad5be3f470774cf
+  metadata.gz: 7b0437cd0c5d8bb2f5500c239a8814d634c80499
+  data.tar.gz: bed04278506ef47a820421a872f5850ab8f01a7d
 SHA512:
-  metadata.gz: 84f370d047ea3d27dd06940145be29bc2d6655b1b9676be732010a1d13d17f1fb5f86be35ba47e6a7b2c122dd2fadf02f0d4e37334f0f2446fa66da09d91e68e
-  data.tar.gz: 84902c053cf3394d8b821e4b6e4ada9906010f4221015e86a14ae1897d9c1be7c772c0848a19aabcc7446b1032e6e23f54475f96418dda607bead0143dc1e9fd
+  metadata.gz: 9d790a1e9b2f1e97c2b354e22daf0ec5d6552c438f5d59c3d84e98ab57c42fec8f4cc4d81699569efde84840d3b41e5f9417c0aa536f0d51af1f39ce3c8368fa
+  data.tar.gz: d9417be0c394836c30d60a0bf4a1199003b56866a39f3630aea96e9647a3ef27040c9d1df9a7acc6c068718da4bee16bdb982c6feb3fae13ef7218280059e9e3

data/lib/mongo/address.rb

@@ -25,13 +25,22 @@ module Mongo
   class Address
     extend Forwardable
 
-    # Delegate the ip, host, and port methods to the resolver.
+    # Mapping from socket family to resolver class.
     #
     # @since 2.0.0
-    def_delegators :@resolver, :host, :port, :socket, :seed, :to_s
+    FAMILY_MAP = { ::Socket::PF_UNIX => Unix,
+                   ::Socket::AF_INET6 => IPv6,
+                   ::Socket::AF_INET => IPv4
+                 }
 
-    # @return [ Integer ] port The port to the connect to.
-    attr_reader :resolver
+    # @return [ String ] seed The seed address.
+    attr_reader :seed
+
+    # @return [ String ] host The original host name.
+    attr_reader :host
+
+    # @return [ Integer ] port The port.
+    attr_reader :port
 
     # Check equality of the address to another.
     #
@@ -88,12 +97,8 @@ module Mongo
     #
     # @since 2.0.0
     def initialize(seed, options = {})
-      address = seed.downcase
-      case address
-        when Unix::MATCH then @resolver = Unix.new(address)
-        when IPv6::MATCH then @resolver = IPv6.new(address)
-        else @resolver = IPv4.new(address)
-      end
+      @seed = seed
+      @host, @port = parse_host_port
     end
 
     # Get a pretty printed address inspection.
@@ -105,7 +110,61 @@ module Mongo
     #
     # @since 2.0.0
     def inspect
-      "#<Mongo::Address:0x#{object_id} address=#{resolver.to_s}>"
+      "#<Mongo::Address:0x#{object_id} address=#{to_s}>"
+    end
+
+    # Get a socket for the provided address, given the options.
+    #
+    # @example Get a socket.
+    #   address.socket(5, :ssl => true)
+    #
+    # @param [ Float ] timeout The socket timeout.
+    # @param [ Hash ] ssl_options SSL options.
+    #
+    # @return [ Pool::Socket::SSL, Pool::Socket::TCP, Pool::Socket::Unix ] The socket.
+    #
+    # @since 2.0.0
+    def socket(timeout, ssl_options = {})
+      @resolver ||= initialize_resolver!(timeout, ssl_options)
+      @resolver.socket(timeout, ssl_options)
+    end
+
+    # Get the address as a string.
+    #
+    # @example Get the address as a string.
+    #   address.to_s
+    #
+    # @return [ String ] The nice string.
+    #
+    # @since 2.0.0
+    def to_s
+      port ? "#{host}:#{port}" : host
+    end
+
+    private
+
+    def initialize_resolver!(timeout, ssl_options)
+      family = (host == 'localhost') ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
+      error = nil
+      ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM).detect do |info|
+        begin
+          return FAMILY_MAP[info[4]].new(host, port).tap do |res|
+            res.socket(timeout, ssl_options).connect!
+          end
+        rescue IOError, SystemCallError => e
+          error = e
+        end
+      end
+      raise error
+    end
+
+    def parse_host_port
+      address = seed.downcase
+      case address
+        when Unix::MATCH then Unix.parse(address)
+        when IPv6::MATCH then IPv6.parse(address)
+        else IPv4.parse(address)
+      end
     end
   end
 end

data/lib/mongo/address/ipv4.rb

@@ -27,27 +27,40 @@ module Mongo
       # @return [ Integer ] port The port.
       attr_reader :port
 
-      # @return [ String ] seed The seed address.
-      attr_reader :seed
-
       # The regular expression to use to match an IPv4 ip address.
       #
       # @since 2.0.0
       MATCH = Regexp.new('/\./').freeze
 
+      # Parse an IPv4 address into its host and port.
+      #
+      # @example Parse the address.
+      #   IPv4.parse("127.0.0.1:28011")
+      #
+      # @param [ String ] address The address to parse.
+      #
+      # @return [ Array<String, Integer> ] The host and port pair.
+      #
+      # @since 2.0.0
+      def self.parse(address)
+        parts = address.split(':')
+        host = parts[0]
+        port = (parts[1] || 27017).to_i
+        [ host, port ]
+      end
+
       # Initialize the IPv4 resolver.
       #
       # @example Initialize the resolver.
-      #   IPv4.new("127.0.0.1:28011")
+      #   IPv4.new("127.0.0.1", 27017, "127.0.0.1:28011")
       #
-      # @param [ String ] address The address to resolve.
+      # @param [ String ] host The host.
+      # @param [ Integer ] port The port.
       #
       # @since 2.0.0
-      def initialize(address)
-        parts = address.split(':')
-        @host = parts[0]
-        @port = (parts[1] || 27017).to_i
-        @seed = address
+      def initialize(host, port)
+        @host = host
+        @port = port
       end
 
       # Get a socket for the provided address type, given the options.
@@ -68,18 +81,6 @@ module Mongo
           Socket::TCP.new(host, port, timeout, Socket::PF_INET)
         end
       end
-
-      # Get the address as a string.
-      #
-      # @example Get the address as a string.
-      #   ipv4.to_s
-      #
-      # @return [ String ] The nice string.
-      #
-      # @since 2.0.0
-      def to_s
-        "#{host}:#{port}"
-      end
     end
   end
 end

data/lib/mongo/address/ipv6.rb

@@ -27,27 +27,40 @@ module Mongo
       # @return [ Integer ] port The port.
       attr_reader :port
 
-      # @return [ String ] seed The seed address.
-      attr_reader :seed
-
       # The regular expression to use to match an IPv6 ip address.
       #
       # @since 2.0.0
       MATCH = Regexp.new('::').freeze
 
+      # Parse an IPv6 address into its host and port.
+      #
+      # @example Parse the address.
+      #   IPv4.parse("[::1]:28011")
+      #
+      # @param [ String ] address The address to parse.
+      #
+      # @return [ Array<String, Integer> ] The host and port pair.
+      #
+      # @since 2.0.0
+      def self.parse(address)
+        parts = address.match(/\[(.+)\]:?(.+)?/)
+        host = parts[1]
+        port = (parts[2] || 27017).to_i
+        [ host, port ]
+      end
+
       # Initialize the IPv6 resolver.
       #
       # @example Initialize the resolver.
-      #   IPv6.new("[::1]:28011")
+      #   IPv6.new("::1", 28011, "[::1]:28011")
       #
-      # @param [ String ] address The address to resolve.
+      # @param [ String ] host The host.
+      # @param [ Integer ] port The port.
       #
       # @since 2.0.0
-      def initialize(address)
-        parts = address.match(/\[(.+)\]:?(.+)?/)
-        @host = parts[1]
-        @port = (parts[2] || 27017).to_i
-        @seed = address
+      def initialize(host, port)
+        @host = host
+        @port = port
       end
 
       # Get a socket for the provided address type, given the options.
@@ -68,18 +81,6 @@ module Mongo
           Socket::TCP.new(host, port, timeout, Socket::PF_INET6)
         end
       end
-
-      # Get the address as a string.
-      #
-      # @example Get the address as a string.
-      #   ipv4.to_s
-      #
-      # @return [ String ] The nice string.
-      #
-      # @since 2.0.0
-      def to_s
-        "#{host}:#{port}"
-      end
     end
   end
 end

data/lib/mongo/address/unix.rb

@@ -26,25 +26,35 @@ module Mongo
       # @return [ nil ] port Will always be nil.
       attr_reader :port
 
-      # @return [ String ] seed The seed address.
-      attr_reader :seed
-
       # The regular expression to use to match a socket path.
       #
       # @since 2.0.0
       MATCH = Regexp.new('\.sock').freeze
 
+      # Parse a socket path.
+      #
+      # @example Parse the address.
+      #   Unix.parse("/path/to/socket.sock")
+      #
+      # @param [ String ] address The address to parse.
+      #
+      # @return [ Array<String> ] A list with the host (socket path).
+      #
+      # @since 2.0.0
+      def self.parse(address)
+        [ address ]
+      end
+
       # Initialize the socket resolver.
       #
       # @example Initialize the resolver.
-      #   Sock.new("/path/to/socket.sock")
+      #   Unix.new("/path/to/socket.sock", "/path/to/socket.sock")
       #
-      # @param [ String ] address The socket path.
+      # @param [ String ] host The host.
       #
       # @since 2.0.0
-      def initialize(address)
-        @host = address
-        @seed = address
+      def initialize(host)
+        @host = host
       end
 
       # Get a socket for the provided address type, given the options.
@@ -61,16 +71,6 @@ module Mongo
       def socket(timeout, ssl_options = {})
         Socket::Unix.new(host, timeout, Socket::AF_UNIX)
       end
-
-      # Get the address as a string.
-      #
-      # @example Get the address as a string.
-      #   ipv4.to_s
-      #
-      # @return [ String ] The nice string.
-      #
-      # @since 2.0.0
-      alias :to_s :host
     end
   end
 end

data/lib/mongo/auth.rb

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/auth/executable'
 require 'mongo/auth/cr'
 require 'mongo/auth/ldap'
 require 'mongo/auth/scram'

data/lib/mongo/auth/cr.rb

@@ -21,7 +21,26 @@ module Mongo
     #
     # @since 2.0.0
     class CR
-      include Executable
+
+      # The authentication mechinism string.
+      #
+      # @since 2.0.0
+      MECHANISM = 'MONGODB-CR'.freeze
+
+      # @return [ Mongo::Auth::User ] The user to authenticate.
+      attr_reader :user
+
+      # Instantiate a new authenticator.
+      #
+      # @example Create the authenticator.
+      #   Mongo::Auth::CR.new(user)
+      #
+      # @param [ Mongo::Auth::User ] user The user to authenticate.
+      #
+      # @since 2.0.0
+      def initialize(user)
+        @user = user
+      end
 
       # Log the user in on the given connection.
       #
@@ -34,7 +53,7 @@ module Mongo
       #
       # @since 2.0.0
       def login(connection)
-        conversation = Conversation.new(user, auth_database(connection))
+        conversation = Conversation.new(user)
         reply = connection.dispatch([ conversation.start ])
         reply = connection.dispatch([ conversation.continue(reply) ])
         conversation.finalize(reply)

data/lib/mongo/auth/cr/conversation.rb

@@ -56,7 +56,7 @@ module Mongo
         def continue(reply)
           validate!(reply)
           Protocol::Query.new(
-            database,
+            user.auth_source,
             Database::COMMAND,
             LOGIN.merge(user: user.name, nonce: nonce, key: user.auth_key(nonce)),
             limit: -1
@@ -89,7 +89,11 @@ module Mongo
         #
         # @since 2.0.0
         def start
-          Protocol::Query.new(database, Database::COMMAND, Auth::GET_NONCE, limit: -1)
+          Protocol::Query.new(
+            user.auth_source,
+            Database::COMMAND,
+            Auth::GET_NONCE,
+            limit: -1)
         end
 
         # Create the new conversation.
@@ -101,9 +105,8 @@ module Mongo
         # @param [ String ] database The database to authenticate against.
         #
         # @since 2.0.0
-        def initialize(user, database)
+        def initialize(user)
           @user = user
-          @database = database
         end
 
         private

data/lib/mongo/auth/ldap.rb

@@ -21,13 +21,26 @@ module Mongo
     #
     # @since 2.0.0
     class LDAP
-      include Executable
 
       # The authentication mechinism string.
       #
       # @since 2.0.0
       MECHANISM = 'PLAIN'.freeze
 
+      # @return [ Mongo::Auth::User ] The user to authenticate.
+      attr_reader :user
+
+      # Instantiate a new authenticator.
+      #
+      # @example Create the authenticator.
+      #   Mongo::Auth::LDAP.new(user)
+      #
+      # @param [ Mongo::Auth::User ] user The user to authenticate.
+      #
+      # @since 2.0.0
+      def initialize(user)
+        @user = user
+      end
       # Log the user in on the given connection.
       #
       # @example Log the user in.

data/lib/mongo/auth/scram.rb

@@ -21,13 +21,27 @@ module Mongo
     #
     # @since 2.0.0
     class SCRAM
-      include Executable
 
       # The authentication mechinism string.
       #
       # @since 2.0.0
       MECHANISM = 'SCRAM-SHA-1'.freeze
 
+      # @return [ Mongo::Auth::User ] The user to authenticate.
+      attr_reader :user
+
+      # Instantiate a new authenticator.
+      #
+      # @example Create the authenticator.
+      #   Mongo::Auth::SCRAM.new(user)
+      #
+      # @param [ Mongo::Auth::User ] user The user to authenticate.
+      #
+      # @since 2.0.0
+      def initialize(user)
+        @user = user
+      end
+
       # Log the user in on the given connection.
       #
       # @example Log the user in.