mongo 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 091537e3e22eeeced33e7b6f0f325176421c0815
-  data.tar.gz: 1e20931d726c885a783019e6bd3302633f8871e3
+  metadata.gz: df545157946c4036f58eb215212390c7ee6468c2
+  data.tar.gz: feef5fae4e44d03d423ab47d79f6b164f90d0a36
 SHA512:
-  metadata.gz: 15eff6d3df999006130abf1d31e90723004abbb621bfa1d3c8df011fb21809191b9b68aed94c124255cf9977a5d74fe784e2083b17130fa14f61c10e9bbb28f0
-  data.tar.gz: 9b59120fcd633bfad9a612f7bb9ad641259348683f0598bfa0a41e73b6d05d65c4363e888debac942141b2eec6ba991a712c7bd23a7e4909c56124c8c0ff7b4d
+  metadata.gz: 765b04848c2b7d821bc1dd1c9e23c56e95b1bdad9bdff7a332bcd2d96a3dff1bbe6c0227b751b07a459688107e0511d5ff0394fd09a266297b3c487f2a4b6bf3
+  data.tar.gz: c45d06e8676ca91af22d72435e1fdea026dab940fb9e9b6f038b7ed5b0e5c6025e8b29a7aa5bb0cf5251ea1e59c90edcf95a8a5c60c69ac4e836736f6b57b402

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

@@ -290,7 +290,7 @@ module Mongo
         #
         # @since 2.0.0
         def h(string)
-          DIGEST.digest(string)
+          digest.digest(string)
         end
 
         # HI algorithm implementation.
@@ -305,7 +305,7 @@ module Mongo
             data,
             Base64.strict_decode64(salt),
             iterations,
-            DIGEST.size
+            digest.size
           )
         end
 
@@ -317,7 +317,7 @@ module Mongo
         #
         # @since 2.0.0
         def hmac(data, key)
-          OpenSSL::HMAC.digest(DIGEST, data, key)
+          OpenSSL::HMAC.digest(digest, data, key)
         end
 
         # Get the iterations from the server response.
@@ -451,6 +451,12 @@ module Mongo
           raise Unauthorized.new(user) unless reply.documents[0][Operation::Result::OK] == 1
           @reply = reply
         end
+
+        private
+
+        def digest
+          @digest ||= OpenSSL::Digest::SHA1.new.freeze
+        end
       end
     end
   end

data/lib/mongo/error.rb

@@ -99,5 +99,6 @@ require 'mongo/error/socket_error'
 require 'mongo/error/socket_timeout_error'
 require 'mongo/error/unchangeable_collection_option'
 require 'mongo/error/unexpected_chunk_length'
+require 'mongo/error/unexpected_response'
 require 'mongo/error/missing_file_chunk'
 require 'mongo/error/unsupported_features'

data/lib/mongo/error/unexpected_response.rb

@@ -0,0 +1,38 @@
+# Copyright (C) 2014-2015 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class Error
+
+    # Raised if the response read from the socket does not match the latest query.
+    #
+    # @since 2.2.6
+    class UnexpectedResponse < Error
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::UnexpectedResponse.new(expected_response_to, response_to)
+      #
+      # @param [ Integer ] expected_response_to The last request id sent.
+      # @param [ Integer ] response_to The actual response_to of the reply.
+      #
+      # @since 2.2.6
+      def initialize(expected_response_to, response_to)
+        super("Unexpected response. Got response for request ID #{response_to} " +
+              "but expected response for request ID #{expected_response_to}")
+      end
+    end
+  end
+end

data/lib/mongo/operation/commands/map_reduce/result.rb

@@ -82,7 +82,7 @@ module Mongo
           # @example Get the execution time.
           #   result.time
           #
-          # @return [ Integer ] The executiong time in milliseconds.
+          # @return [ Integer ] The executing time in milliseconds.
           #
           # @since 2.0.0
           def time

data/lib/mongo/operation/commands/user_query.rb

@@ -44,7 +44,7 @@ module Mongo
         # @since 2.1.0
         def execute(context)
           if context.features.users_info_enabled?
-            UsersInfo.new(spec).execute(context)
+            UsersInfo.new(spec).execute(context).validate!
           else
             context.with_connection do |connection|
               Result.new(connection.dispatch([ message(context) ])).validate!

data/lib/mongo/operation/commands/users_info/result.rb

@@ -31,6 +31,12 @@ module Mongo
           def documents
             reply.documents.first[USERS]
           end
+
+          private
+
+          def first_document
+            @first_document ||= reply.documents[0]
+          end
         end
       end
     end

data/lib/mongo/protocol/message.rb

@@ -109,8 +109,8 @@ module Mongo
       # @param [ IO ] io Stream containing a message
       #
       # @return [ Message ] Instance of a Message class
-      def self.deserialize(io, max_message_size = MAX_MESSAGE_SIZE)
-        length = deserialize_header(BSON::ByteBuffer.new(io.read(16))).first
+      def self.deserialize(io, max_message_size = MAX_MESSAGE_SIZE, expected_response_to = nil)
+        length, request_id, response_to, op_code = deserialize_header(BSON::ByteBuffer.new(io.read(16)))
 
         # Protection from potential DOS man-in-the-middle attacks. See
         # DRIVERS-276.
@@ -118,8 +118,15 @@ module Mongo
           raise Error::MaxMessageSize.new(max_message_size)
         end
 
+        # Protection against returning the response to a previous request. See
+        # RUBY-1117
+        if expected_response_to && response_to != expected_response_to
+          raise Error::UnexpectedResponse.new(expected_response_to, response_to)
+        end
+
         buffer = BSON::ByteBuffer.new(io.read(length - 16))
         message = allocate
+
         fields.each do |field|
           if field[:multi]
             deserialize_array(message, buffer, field)
@@ -228,7 +235,7 @@ module Mongo
       # @param io [IO] Stream containing the header.
       # @return [Array<Fixnum>] Deserialized header.
       def self.deserialize_header(io)
-        @length, @request_id, @response_to, @op_code = Header.deserialize(io)
+        Header.deserialize(io)
       end
 
       # A method for declaring a message field

data/lib/mongo/retryable.rb

@@ -67,6 +67,29 @@ module Mongo
       end
     end
 
+    # Execute a read operation with a single retry.
+    #
+    # @api private
+    #
+    # @example Execute the read.
+    #   read_with_one_retry do
+    #     ...
+    #   end
+    #
+    # @note This only retries read operations on socket errors.
+    #
+    # @param [ Proc ] block The block to execute.
+    #
+    # @return [ Result ] The result of the operation.
+    #
+    # @since 2.2.6
+    def read_with_one_retry(&block)
+      block.call
+    rescue Error::SocketError,
+           Error::SocketTimeoutError
+      block.call
+    end
+
     # Execute a write operation with a retry.
     #
     # @api private

data/lib/mongo/server/connectable.rb

@@ -88,10 +88,11 @@ module Mongo
         ensure_same_process!
         connect!
         begin
-          yield socket
-        rescue Exception => e
-          disconnect!
-          raise e
+          result = yield socket
+          success = true
+          result
+        ensure
+          success or disconnect!
         end
       end
 
@@ -102,9 +103,9 @@ module Mongo
         end
       end
 
-      def read
+      def read(request_id = nil)
         ensure_connected do |socket|
-          Protocol::Reply.deserialize(socket, max_message_size)
+          Protocol::Reply.deserialize(socket, max_message_size, request_id)
         end
       end
     end

data/lib/mongo/server/connection.rb

@@ -21,6 +21,7 @@ module Mongo
     class Connection
       include Connectable
       include Monitoring::Publishable
+      include Retryable
       extend Forwardable
 
       # The ping command.
@@ -62,6 +63,9 @@ module Mongo
           authenticate!
         end
         true
+      rescue Mongo::Auth::Unauthorized => e
+        disconnect!
+        raise e
       end
 
       # Disconnect the connection.
@@ -155,17 +159,29 @@ module Mongo
 
       def deliver(messages)
         write(messages)
-        messages.last.replyable? ? read : nil
+        messages.last.replyable? ? read(messages.last.request_id) : nil
       end
 
       def authenticate!
         if options[:user]
-          default_mechanism = @server.features.scram_sha_1_enabled? ? :scram : :mongodb_cr
           user = Auth::User.new(Options::Redacted.new(:auth_mech => default_mechanism).merge(options))
           Auth.get(user).login(self)
         end
       end
 
+      def default_mechanism
+        if socket && socket.connectable?
+          socket.write(Monitor::Connection::ISMASTER_BYTES)
+          ismaster = Protocol::Reply.deserialize(socket, max_message_size).documents[0]
+          min_wire_version = ismaster[Description::MIN_WIRE_VERSION] || Description::LEGACY_WIRE_VERSION
+          max_wire_version = ismaster[Description::MAX_WIRE_VERSION] || Description::LEGACY_WIRE_VERSION
+          features = Description::Features.new(min_wire_version..max_wire_version)
+          (features.scram_sha_1_enabled? || @server.features.scram_sha_1_enabled?) ? :scram : :mongodb_cr
+        else
+          @server.features.scram_sha_1_enabled? ? :scram : :mongodb_cr
+        end
+      end
+
       def write(messages, buffer = BSON::ByteBuffer.new)
         start_size = 0
         messages.each do |message|

data/lib/mongo/server/connection_pool.rb

@@ -103,12 +103,10 @@ module Mongo
       #
       # @since 2.0.0
       def with_connection
-        begin
-          connection = checkout
-          yield(connection)
-        ensure
-          checkin(connection) if connection
-        end
+        connection = checkout
+        yield(connection)
+      ensure
+        checkin(connection) if connection
       end
 
       private

data/lib/mongo/server/monitor/connection.rb

@@ -20,6 +20,7 @@ module Mongo
       #
       # @since 2.0.0
       class Connection
+        include Retryable
         include Connectable
 
         # The command used for determining server status.
@@ -52,8 +53,10 @@ module Mongo
         # @since 2.2.0
         def ismaster
           ensure_connected do |socket|
-            socket.write(ISMASTER_BYTES)
-            Protocol::Reply.deserialize(socket).documents[0]
+            read_with_one_retry do
+              socket.write(ISMASTER_BYTES)
+              Protocol::Reply.deserialize(socket).documents[0]
+            end
           end
         end
 
@@ -69,7 +72,7 @@ module Mongo
         #
         # @since 2.0.0
         def connect!
-          unless socket
+          unless socket && socket.connectable?
             @socket = address.socket(timeout, ssl_options)
             socket.connect!
           end

data/lib/mongo/uri.rb

@@ -158,9 +158,9 @@ module Mongo
     # @since 2.0.0
     READ_MODE_MAP = {
       'primary'            => :primary,
-      'primaryPreferred'   => :primary_preferred,
+      'primarypreferred'   => :primary_preferred,
       'secondary'          => :secondary,
-      'secondaryPreferred' => :secondary_preferred,
+      'secondarypreferred' => :secondary_preferred,
       'nearest'            => :nearest
     }.freeze
 
@@ -387,13 +387,12 @@ module Mongo
     uri_option 'connect', :connect
 
     # Auth Options
-    uri_option 'authsource', :source, :group => :auth, :type => :auth_source
+    uri_option 'authsource', :auth_source, :type => :auth_source
     uri_option 'authmechanism', :auth_mech, :type => :auth_mech
-    uri_option 'authmechanismproperties', :auth_mech_properties, :group => :auth,
-                 :type => :auth_mech_props
+    uri_option 'authmechanismproperties', :auth_mech_properties, :type => :auth_mech_props
 
     # Casts option values that do not have a specifically provided
-    # transofrmation to the appropriate type.
+    # transformation to the appropriate type.
     #
     # @param value [String] The value to be cast.
     #
@@ -500,7 +499,7 @@ module Mongo
     #
     # @return [Symbol] The transformed authentication mechanism.
     def auth_mech(value)
-      AUTH_MECH_MAP[value]
+      AUTH_MECH_MAP[value.upcase]
     end
 
     # Read preference mode transformation.
@@ -509,7 +508,7 @@ module Mongo
     #
     # @return [Symbol] The read mode symbol.
     def read_mode(value)
-      READ_MODE_MAP[value]
+      READ_MODE_MAP[value.downcase]
     end
 
     # Read preference tags transformation.

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.2.5'.freeze
+  VERSION = '2.2.6'.freeze
 end

data/mongo.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.bindir            = 'bin'
 
   s.add_dependency 'bson', '~> 4.0'
+  s.add_dependency 'pry'
 end

data/spec/mongo/address_spec.rb

@@ -209,11 +209,11 @@ describe Mongo::Address do
     context 'when providing a DNS entry that resolves to both IPv6 and IPv4' do
 
       let(:address) do
-        described_class.new(DEFAULT_ADDRESS)
+        default_address
       end
 
       let(:host) do
-        DEFAULT_ADDRESS.split(':').first
+        address.host
       end
 
       before do

data/spec/mongo/auth/cr_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mongo::Auth::CR do
 
   let(:address) do
-    Mongo::Address.new(DEFAULT_ADDRESS)
+    default_address
   end
 
   let(:monitoring) do

data/spec/mongo/auth/ldap_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mongo::Auth::LDAP do
 
   let(:address) do
-    Mongo::Address.new(DEFAULT_ADDRESS)
+    default_address
   end
 
   let(:monitoring) do

data/spec/mongo/auth/scram_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mongo::Auth::SCRAM do
 
   let(:address) do
-    Mongo::Address.new(DEFAULT_ADDRESS)
+    default_address
   end
 
   let(:monitoring) do

data/spec/mongo/auth/user/view_spec.rb

@@ -139,5 +139,17 @@ describe Mongo::Auth::User::View do
       end
     end
 
+    context 'when a user is not authorized' do
+
+      let(:view) do
+        described_class.new(unauthorized_client.database)
+      end
+
+      it 'raises an OperationFailure' do
+        expect{
+          view.info('emily')
+        }.to raise_exception(Mongo::Error::OperationFailure)
+      end
+    end
   end
 end