mongo 2.4.1 → 2.4.2

data/spec/mongo/socket/ssl_spec.rb

@@ -2,8 +2,13 @@ require 'spec_helper'
 
 describe Mongo::Socket::SSL, if: running_ssl? do
 
+  let(:family) do
+    resolver = default_address.instance_variable_get(:@resolver)
+    Mongo::Address::FAMILY_MAP.key(resolver.class)
+  end
+
   let(:socket) do
-    described_class.new(*default_address.to_s.split(":"), default_address.host, 5, Socket::PF_INET, options)
+    described_class.new(*default_address.to_s.split(":"), default_address.host, 5, family, options)
   end
 
   let(:options) do
@@ -95,7 +100,7 @@ describe Mongo::Socket::SSL, if: running_ssl? do
       end
     end
 
-    context 'when certificate and an encrypted key are provided as strings' do
+    context 'when certificate and an encrypted key are provided as strings', if: testing_ssl_locally? do
 
       let(:options) do
         {
@@ -271,21 +276,49 @@ describe Mongo::Socket::SSL, if: running_ssl? do
       end
     end
 
-    context 'when a key is passed, but it is not of the right type' do
-      let(:options) do
-        key = "This is a string not a key"
-        {
-          :ssl => true,
-          :ssl_key_object => key,
-          :ssl_cert => CLIENT_CERT_PEM,
-          :ssl_verify => false
-        }
+    context 'when ruby version is < 2.4.1', if: RUBY_VERSION < '2.4.1' do
+
+      context 'when a key is passed, but it is not of the right type' do
+
+        let(:options) do
+          key = "This is a string not a key"
+          {
+              :ssl => true,
+              :ssl_key_object => key,
+              :ssl_cert => CLIENT_CERT_PEM,
+              :ssl_verify => false
+          }
+        end
+
+        it 'raises a TypeError' do
+          expect{
+            socket.connect!
+          }.to raise_exception(TypeError)
+        end
       end
+    end
 
-      it 'raises a TypeError' do
-        expect{
-          socket.connect!
-        }.to raise_exception(TypeError)
+    # Note that as of MRI 2.4, Creating a socket with the wrong key type raises
+    # a NoMethodError because #private? is attempted to be called on the key.
+    context 'when ruby version is >= 2.4.1', if: RUBY_VERSION >= '2.4.1' do
+
+      context 'when a key is passed, but it is not of the right type' do
+
+        let(:options) do
+          key = "This is a string not a key"
+          {
+              :ssl => true,
+              :ssl_key_object => key,
+              :ssl_cert => CLIENT_CERT_PEM,
+              :ssl_verify => false
+          }
+        end
+
+        it 'raises a NoMethodError' do
+          expect{
+            socket.connect!
+          }.to raise_exception(NoMethodError)
+        end
       end
     end
 
@@ -293,14 +326,14 @@ describe Mongo::Socket::SSL, if: running_ssl? do
 
       let(:options) do
         super().merge(
-          :ssl_key => CRL_PEM
+          :ssl_key => COMMAND_MONITORING_TESTS.first
         )
       end
 
       it 'raises an exception' do
         expect {
           socket.connect!
-        }.to raise_exception(ArgumentError)
+        }.to raise_exception
       end
     end
 
@@ -324,7 +357,7 @@ describe Mongo::Socket::SSL, if: running_ssl? do
         end
       end
 
-      context 'as a string containg the PEM-encoded certificate' do
+      context 'as a string containing the PEM-encoded certificate' do
 
         let (:options) do
           super().merge(

data/spec/spec_helper.rb

@@ -11,20 +11,28 @@ COMMAND_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/support/command_monitoring/
 CONNECTION_STRING_TESTS = Dir.glob("#{CURRENT_PATH}/support/connection_string_tests/*.yml")
 GRIDFS_TESTS = Dir.glob("#{CURRENT_PATH}/support/gridfs_tests/*.yml")
 
-SSL_CERTS_DIR = "#{CURRENT_PATH}/support/certificates"
-CLIENT_PEM = "#{SSL_CERTS_DIR}/client.pem"
-CLIENT_PASSWORD_PEM = "#{SSL_CERTS_DIR}/password_protected.pem"
-CA_PEM = "#{SSL_CERTS_DIR}/ca.pem"
-CRL_PEM = "#{SSL_CERTS_DIR}/crl.pem"
-CLIENT_KEY_PEM = "#{SSL_CERTS_DIR}/client_key.pem"
-CLIENT_CERT_PEM = "#{SSL_CERTS_DIR}/client_cert.pem"
-CLIENT_KEY_ENCRYPTED_PEM = "#{SSL_CERTS_DIR}/client_key_encrypted.pem"
-CLIENT_KEY_PASSPHRASE = "passphrase"
+if ENV['DRIVERS_TOOLS']
+  CLIENT_CERT_PEM = ENV['DRIVER_TOOLS_CLIENT_CERT_PEM']
+  CLIENT_KEY_PEM = ENV['DRIVER_TOOLS_CLIENT_KEY_PEM']
+  CA_PEM = ENV['DRIVER_TOOLS_CA_PEM']
+  CLIENT_KEY_ENCRYPTED_PEM = ENV['DRIVER_TOOLS_CLIENT_KEY_ENCRYPTED_PEM']
+else
+  SSL_CERTS_DIR = "#{CURRENT_PATH}/support/certificates"
+  CLIENT_PEM = "#{SSL_CERTS_DIR}/client.pem"
+  CLIENT_PASSWORD_PEM = "#{SSL_CERTS_DIR}/password_protected.pem"
+  CA_PEM = "#{SSL_CERTS_DIR}/ca.pem"
+  CRL_PEM = "#{SSL_CERTS_DIR}/crl.pem"
+  CLIENT_KEY_PEM = "#{SSL_CERTS_DIR}/client_key.pem"
+  CLIENT_CERT_PEM = "#{SSL_CERTS_DIR}/client_cert.pem"
+  CLIENT_KEY_ENCRYPTED_PEM = "#{SSL_CERTS_DIR}/client_key_encrypted.pem"
+  CLIENT_KEY_PASSPHRASE = "passphrase"
+end
 
 require 'mongo'
 
 Mongo::Logger.logger = Logger.new($stdout)
 Mongo::Logger.logger.level = Logger::INFO
+Encoding.default_external = Encoding::UTF_8
 
 require 'support/travis'
 require 'support/matchers'
@@ -45,7 +53,6 @@ RSpec.configure do |config|
   config.include(Authorization)
 
   config.before(:suite) do
-
     begin
       # Create the root user administrator as the first user to be added to the
       # database. This user will need to be authenticated in order to add any
@@ -191,13 +198,16 @@ end
 #
 # @since 2.2.0
 def auth_enabled?
-  $mongo_client ||= initialize_scanned_client!
-  begin
-    $mongo_client.use(:admin).command(getCmdLineOpts: 1).first["argv"].include?("--auth")
-  rescue
-    return true
+  if auth = ENV['AUTH']
+    auth == 'auth'
+  else
+    $mongo_client ||= initialize_scanned_client!
+    begin
+      $mongo_client.use(:admin).command(getCmdLineOpts: 1).first["argv"].include?("--auth")
+    rescue => e
+      e.message =~ /(not authorized)|(unauthorized)/
+    end
   end
-  false
 end
 
 # Initializes a basic scanned client to do an ismaster check.

data/spec/support/authorization.rb

@@ -22,28 +22,45 @@ TEST_DB = 'ruby-driver'.freeze
 # @since 2.0.0
 TEST_COLL = 'test'.freeze
 
-# The seed addresses to be used when creating a client.
-#
-# @since 2.0.0
-ADDRESSES = ENV['MONGODB_ADDRESSES'] ? ENV['MONGODB_ADDRESSES'].split(',').freeze :
-              [ '127.0.0.1:27017' ].freeze
+# For Evergreen
+if ENV['MONGODB_URI']
+  MONGODB_URI = Mongo::URI.new(ENV['MONGODB_URI'])
+  URI_OPTIONS = Mongo::Options::Mapper.transform_keys_to_symbols(MONGODB_URI.uri_options)
+  if URI_OPTIONS[:replica_set]
+    ADDRESSES = MONGODB_URI.servers
+    CONNECT = { connect: :replica_set, replica_set: URI_OPTIONS[:replica_set] }
+  elsif ENV['TOPOLOGY'] == 'sharded_cluster'
+    ADDRESSES = [ MONGODB_URI.servers.first ] # See SERVER-16836 for why we can only use one host:port
+    CONNECT = { connect: :sharded }
+  else
+    ADDRESSES = MONGODB_URI.servers
+    CONNECT = { connect: :direct }
+  end
+else # For Jenkins
+  ADDRESSES = ENV['MONGODB_ADDRESSES'] ? ENV['MONGODB_ADDRESSES'].split(',').freeze : [ '127.0.0.1:27017' ].freeze
+  if ENV['RS_ENABLED']
+    CONNECT = { connect: :replica_set, replica_set: ENV['RS_NAME'] }
+  elsif ENV['SHARDED_ENABLED']
+    CONNECT = { connect: :sharded }
+  else
+    CONNECT = { connect: :direct }
+  end
+end
 
-# The topology type.
+# The write concern to use in the tests.
 #
 # @since 2.0.0
-CONNECT = ENV['RS_ENABLED'] == 'true' ? { connect: :replica_set, replica_set: ENV['RS_NAME'] } :
-          ENV['SHARDED_ENABLED'] == 'true' ? { connect: :sharded } :
-          { connect: :direct }
+WRITE_CONCERN = CONNECT[:connect] == :replica_set ? { w: 2 } : { w: 1 }
 
-# The write concern to use in the tests.
+# An invalid write concern.
 #
-# @since 2.0.0
-WRITE_CONCERN = CONNECT[:connect] == :replica_set ? { w: ADDRESSES.size } : { w: 1 }
+# @since 2.4.2
+INVALID_WRITE_CONCERN = { w: 4 }
 
 # Whether to use SSL.
 #
 # @since 2.0.3
-SSL = ENV['SSL_ENABLED'] == 'true'
+SSL = (ENV['SSL'] == 'ssl') || (ENV['SSL_ENABLED'] == 'true')
 
 # SSL options.
 #
@@ -73,12 +90,17 @@ TEST_OPTIONS = BASE_OPTIONS.merge(CONNECT).merge(SSL_OPTIONS)
 # The root user name.
 #
 # @since 2.0.0
-ROOT_USER_NAME = ENV['ROOT_USER_NAME'] || 'root-user'
+ROOT_USER_NAME = (defined?(MONGODB_URI) && MONGODB_URI.credentials[:user]) || 'root-user'
 
 # The root user password.
 #
 # @since 2.0.0
-ROOT_USER_PWD = ENV['ROOT_USER_PWD'] || 'password'
+ROOT_USER_PWD = (defined?(MONGODB_URI) && MONGODB_URI.credentials[:password]) || 'password'
+
+# The root user auth source.
+#
+# @since 2.4.2
+ROOT_USER_AUTH_SOURCE = (defined?(URI_OPTIONS) && URI_OPTIONS[:auth_source]) || Mongo::Database::ADMIN
 
 # Gets the root system administrator user.
 #
@@ -161,7 +183,7 @@ ADMIN_AUTHORIZED_TEST_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
   user: ROOT_USER.name,
   password: ROOT_USER.password,
   database: TEST_DB,
-  auth_source: Mongo::Database::ADMIN,
+  auth_source: ROOT_USER_AUTH_SOURCE,
   monitoring: false
 )
 

data/spec/support/connection_string.rb

@@ -14,7 +14,7 @@
 
 RSpec::Matchers.define :have_hosts do |test|
 
-  match do |client|
+  match do |cl|
 
     def find_server(client, host)
       client.cluster.instance_variable_get(:@servers).detect do |s|
@@ -40,7 +40,7 @@ RSpec::Matchers.define :have_hosts do |test|
     end
 
     test.hosts.all? do |host|
-      server = find_server(client, host)
+      server = find_server(cl, host)
       match_host?(server, host) &&
           match_port?(server, host) if server #&&
           #match_address_family?(server, host) if server
@@ -49,7 +49,7 @@ RSpec::Matchers.define :have_hosts do |test|
     failure_message do |client|
       "With URI: #{test.uri_string}\n" +
           "Expected that test hosts: #{test.hosts} would match " +
-          "client hosts: #{client.cluster.instance_variable_get(:@servers)}"
+          "client hosts: #{cl.cluster.instance_variable_get(:@servers)}"
     end
   end
 end

data/spec/support/crud.rb

@@ -83,14 +83,7 @@ module Mongo
       #
       # @since 2.4.0
       def server_version_satisfied?(client)
-        case @min_server_version
-          when '2.6'
-            client.cluster.servers.first.features.write_command_enabled?
-          when '3.4'
-            client.cluster.servers.first.features.collation_enabled?
-          else
-            true
-        end
+        lower_bound_satisfied?(client) && upper_bound_satisfied?(client)
       end
 
       # Get a list of CRUDTests for each test definition.
@@ -106,6 +99,32 @@ module Mongo
           Mongo::CRUD::CRUDTest.new(@data, test)
         end
       end
+
+      private
+
+      def upper_bound_satisfied?(client)
+        if @max_server_version
+          if @max_server_version < '2.6'
+            !client.cluster.next_primary.features.write_command_enabled?
+          end
+        else
+          true
+        end
+      end
+
+      def lower_bound_satisfied?(client)
+        if @min_server_version
+          if @min_server_version >= '3.4'
+            client.cluster.next_primary.features.collation_enabled?
+          elsif @min_server_version >= '2.6'
+            client.cluster.next_primary.features.write_command_enabled?
+          else
+            true
+          end
+        else
+          true
+        end
+      end
     end
 
     # Represents a single CRUD test.
@@ -227,14 +246,23 @@ module Mongo
           when nil
             actual.nil?
           when Hash
-            actual.each do |k, v|
-              expected[k] == v
+            actual.all? do |k, v|
+              expected[k] == v || handle_upserted_id(k, expected[k], v)
             end
           when Integer
             expected == actual
         end
       end
 
+      def handle_upserted_id(field, expected_id, actual_id)
+        return true if expected_id.nil?
+        if field == 'upsertedId'
+          if expected_id.is_a?(Integer)
+            actual_id.is_a?(BSON::ObjectId) || actual_id.nil?
+          end
+        end
+      end
+
       def actual_collection_data
         if @outcome['collection']
           collection_name = @outcome['collection']['name'] || @collection.name

data/spec/support/crud/write.rb

@@ -117,9 +117,12 @@ module Mongo
         end
 
         def update_return_doc(result)
-          return_doc = { 'upsertedId' => result.upserted_id } if upsert
-          (return_doc || {}).merge!({ 'matchedCount' => result.matched_count,
-                                      'modifiedCount' => result.modified_count })
+          return_doc = {}
+          return_doc['upsertedId'] = result.upserted_id if upsert
+          return_doc['upsertedCount'] = result.upserted_count
+          return_doc['matchedCount'] = result.matched_count
+          return_doc['modifiedCount'] = result.modified_count if result.modified_count
+          return_doc
         end
 
         def replace_one(collection)

data/spec/support/crud_tests/write/findOneAndReplace-upsert.yml

@@ -3,18 +3,20 @@ data:
     - {_id: 2, x: 22}
     - {_id: 3, x: 33}
 minServerVersion: '2.6'
-# See SERVER-5289 for why the collection data is only checked for server versions >= 2.6
 
 tests:
     -
-        description: "FindOneAndReplace when no documents match with upsert returning the document before modification"
+        description: "FindOneAndReplace when no documents match without id specified with upsert returning the document before modification"
         operation:
             name: findOneAndReplace
             arguments:
                 filter: {_id: 4}
                 replacement: {x: 44}
                 projection: {x: 1, _id: 0}
-                sort: {x: 1}
+                # Omit the sort option as it has no effect when no documents
+                # match and would only cause an inconsistent return value on
+                # pre-3.0 servers when combined with returnDocument "before"
+                # (see: SERVER-17650).
                 upsert: true
 
         outcome:
@@ -26,7 +28,7 @@ tests:
                     - {_id: 3, x: 33}
                     - {_id: 4, x: 44}
     -
-        description: "FindOneAndReplace when no documents match with upsert returning the document after modification"
+        description: "FindOneAndReplace when no documents match without id specified with upsert returning the document after modification"
         operation:
             name: findOneAndReplace
             arguments:
@@ -45,3 +47,45 @@ tests:
                     - {_id: 2, x: 22}
                     - {_id: 3, x: 33}
                     - {_id: 4, x: 44}
+    -
+        description: "FindOneAndReplace when no documents match with id specified with upsert returning the document before modification"
+        operation:
+            name: findOneAndReplace
+            arguments:
+                filter: {_id: 4}
+                replacement: {_id: 4, x: 44}
+                projection: {x: 1, _id: 0}
+                # Omit the sort option as it has no effect when no documents
+                # match and would only cause an inconsistent return value on
+                # pre-3.0 servers when combined with returnDocument "before"
+                # (see: SERVER-17650).
+                upsert: true
+
+        outcome:
+            result: null
+            collection:
+                data:
+                    - {_id: 1, x: 11}
+                    - {_id: 2, x: 22}
+                    - {_id: 3, x: 33}
+                    - {_id: 4, x: 44}
+    -
+        description: "FindOneAndReplace when no documents match with id specified with upsert returning the document after modification"
+        operation:
+            name: findOneAndReplace
+            arguments:
+                filter: {_id: 4}
+                replacement: {_id: 4, x: 44}
+                projection: {x: 1, _id: 0}
+                returnDocument: After
+                sort: {x: 1}
+                upsert: true
+
+        outcome:
+            result: {x: 44}
+            collection:
+                data:
+                    - {_id: 1, x: 11}
+                    - {_id: 2, x: 22}
+                    - {_id: 3, x: 33}
+                    - {_id: 4, x: 44}