mongo 2.10.5 → 2.11.0.rc0

data/spec/spec_tests/connection_string_spec.rb

@@ -1,46 +1,21 @@
-require 'lite_spec_helper'
+require 'spec_helper'
 
 describe 'ConnectionString' do
   include Mongo::ConnectionString
 
+  clean_slate_for_all
+
   CONNECTION_STRING_TESTS.each do |file|
 
     spec = Mongo::ConnectionString::Spec.new(file)
 
     context(spec.description) do
 
-      before(:all) do
-
-        module Mongo
-          class Address
-
-            private
-
-            alias :original_create_resolver :create_resolver
-            def create_resolver(timeout, ssl_options)
-              family = (host == 'localhost') ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
-              info = ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM)
-              FAMILY_MAP[info.first[4]].new(info[3], port, host)
-            end
-          end
-        end
-      end
-
-      after(:all) do
-
-        module Mongo
-          # Return the implementations to their originals for the other
-          # tests in the suite.
-          class Address
-            alias :create_resolver :original_create_resolver
-            remove_method(:original_create_resolver)
-          end
-        end
-      end
-
       spec.tests.each_with_index do |test, index|
-
         context "when a #{test.description} is provided" do
+          if test.description.downcase.include?("gssapi")
+            require_mongo_kerberos
+          end
 
           context 'when the uri is invalid', unless: test.valid? do
 

data/spec/spec_tests/data/auth/connection-string.yml

@@ -0,0 +1,297 @@
+tests:
+    -
+        description: "should use the default source and mechanism"
+        uri: "mongodb://user:password@localhost"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "admin"
+            mechanism: ~
+            mechanism_properties: ~
+    -
+        description: "should use the database when no authSource is specified"
+        uri: "mongodb://user:password@localhost/foo"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "foo"
+            mechanism: ~
+            mechanism_properties: ~
+    -
+        description: "should use the authSource when specified"
+        uri: "mongodb://user:password@localhost/foo?authSource=bar"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "bar"
+            mechanism: ~
+            mechanism_properties: ~
+    -
+        description: "should recognise the mechanism (GSSAPI)"
+        uri: "mongodb://user%40DOMAIN.COM@localhost/?authMechanism=GSSAPI"
+        valid: true
+        credential:
+            username: "user@DOMAIN.COM"
+            password: ~
+            source: "$external"
+            mechanism: "GSSAPI"
+            mechanism_properties:
+                SERVICE_NAME: "mongodb"
+    -
+        description: "should ignore the database (GSSAPI)"
+        uri: "mongodb://user%40DOMAIN.COM@localhost/foo?authMechanism=GSSAPI"
+        valid: true
+        credential:
+            username: "user@DOMAIN.COM"
+            password: ~
+            source: "$external"
+            mechanism: "GSSAPI"
+            mechanism_properties:
+                SERVICE_NAME: "mongodb"
+    -
+        description: "should accept valid authSource (GSSAPI)"
+        uri: "mongodb://user%40DOMAIN.COM@localhost/?authMechanism=GSSAPI&authSource=$external"
+        valid: true
+        credential:
+            username: "user@DOMAIN.COM"
+            password: ~
+            source: "$external"
+            mechanism: "GSSAPI"
+            mechanism_properties:
+                SERVICE_NAME: "mongodb"
+    -
+        description: "should accept generic mechanism property (GSSAPI)"
+        uri: "mongodb://user%40DOMAIN.COM@localhost/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:true"
+        valid: true
+        credential:
+            username: "user@DOMAIN.COM"
+            password: ~
+            source: "$external"
+            mechanism: "GSSAPI"
+            mechanism_properties:
+                SERVICE_NAME: "other"
+                CANONICALIZE_HOST_NAME: true
+    -
+        description: "should accept the password (GSSAPI)"
+        uri: "mongodb://user%40DOMAIN.COM:password@localhost/?authMechanism=GSSAPI&authSource=$external"
+        valid: true
+        credential:
+            username: "user@DOMAIN.COM"
+            password: "password"
+            source: "$external"
+            mechanism: "GSSAPI"
+            mechanism_properties:
+                SERVICE_NAME: "mongodb"
+    -
+        description: "should throw an exception if authSource is invalid (GSSAPI)"
+        uri: "mongodb://user%40DOMAIN.COM@localhost/?authMechanism=GSSAPI&authSource=foo"
+        valid: false
+    -
+        description: "should throw an exception if no username (GSSAPI)"
+        uri: "mongodb://localhost/?authMechanism=GSSAPI"
+        valid: false
+    -
+        description: "should recognize the mechanism (MONGODB-CR)"
+        uri: "mongodb://user:password@localhost/?authMechanism=MONGODB-CR"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "admin"
+            mechanism: "MONGODB-CR"
+            mechanism_properties: ~
+    -
+        description: "should use the database when no authSource is specified (MONGODB-CR)"
+        uri: "mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "foo"
+            mechanism: "MONGODB-CR"
+            mechanism_properties: ~
+    -
+        description: "should use the authSource when specified (MONGODB-CR)"
+        uri: "mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR&authSource=bar"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "bar"
+            mechanism: "MONGODB-CR"
+            mechanism_properties: ~
+    -
+        description: "should throw an exception if no username is supplied (MONGODB-CR)"
+        uri: "mongodb://localhost/?authMechanism=MONGODB-CR"
+        valid: false
+    -
+        description: "should recognize the mechanism (MONGODB-X509)"
+        uri: "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509"
+        valid: true
+        credential:
+            username: "CN=myName,OU=myOrgUnit,O=myOrg,L=myLocality,ST=myState,C=myCountry"
+            password: ~
+            source: "$external"
+            mechanism: "MONGODB-X509"
+            mechanism_properties: ~
+    -
+        description: "should ignore the database (MONGODB-X509)"
+        uri: "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/foo?authMechanism=MONGODB-X509"
+        valid: true
+        credential:
+            username: "CN=myName,OU=myOrgUnit,O=myOrg,L=myLocality,ST=myState,C=myCountry"
+            password: ~
+            source: "$external"
+            mechanism: "MONGODB-X509"
+            mechanism_properties: ~
+    -
+        description: "should accept valid authSource (MONGODB-X509)"
+        uri: "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509&authSource=$external"
+        valid: true
+        credential:
+            username: "CN=myName,OU=myOrgUnit,O=myOrg,L=myLocality,ST=myState,C=myCountry"
+            password: ~
+            source: "$external"
+            mechanism: "MONGODB-X509"
+            mechanism_properties: ~
+    -
+        description: "should recognize the mechanism with no username (MONGODB-X509)"
+        uri: "mongodb://localhost/?authMechanism=MONGODB-X509"
+        valid: true
+        credential:
+            username: ~
+            password: ~
+            source: "$external"
+            mechanism: "MONGODB-X509"
+            mechanism_properties: ~
+    -
+        description: "should throw an exception if supplied a password (MONGODB-X509)"
+        uri: "mongodb://user:password@localhost/?authMechanism=MONGODB-X509"
+        valid: false
+    -
+        description: "should throw an exception if authSource is invalid (MONGODB-X509)"
+        uri: "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/foo?authMechanism=MONGODB-X509&authSource=bar"
+        valid: false
+    -
+        description: "should recognize the mechanism (PLAIN)"
+        uri: "mongodb://user:password@localhost/?authMechanism=PLAIN"
+        valid: true
+        credential:
+          username: "user"
+          password: "password"
+          source: "$external"
+          mechanism: "PLAIN"
+          mechanism_properties: ~
+    -
+        description: "should use the database when no authSource is specified (PLAIN)"
+        uri: "mongodb://user:password@localhost/foo?authMechanism=PLAIN"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "foo"
+            mechanism: "PLAIN"
+            mechanism_properties: ~
+    -
+        description: "should use the authSource when specified (PLAIN)"
+        uri: "mongodb://user:password@localhost/foo?authMechanism=PLAIN&authSource=bar"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "bar"
+            mechanism: "PLAIN"
+            mechanism_properties: ~
+    -
+        description: "should throw an exception if no username (PLAIN)"
+        uri: "mongodb://localhost/?authMechanism=PLAIN"
+        valid: false
+    -
+        description: "should recognize the mechanism (SCRAM-SHA-1)"
+        uri: "mongodb://user:password@localhost/?authMechanism=SCRAM-SHA-1"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "admin"
+            mechanism: "SCRAM-SHA-1"
+            mechanism_properties: ~
+    -
+        description: "should use the database when no authSource is specified (SCRAM-SHA-1)"
+        uri: "mongodb://user:password@localhost/foo?authMechanism=SCRAM-SHA-1"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "foo"
+            mechanism: "SCRAM-SHA-1"
+            mechanism_properties: ~
+    -
+        description: "should accept valid authSource (SCRAM-SHA-1)"
+        uri: "mongodb://user:password@localhost/foo?authMechanism=SCRAM-SHA-1&authSource=bar"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "bar"
+            mechanism: "SCRAM-SHA-1"
+            mechanism_properties: ~
+    -
+        description: "should throw an exception if no username (SCRAM-SHA-1)"
+        uri: "mongodb://localhost/?authMechanism=SCRAM-SHA-1"
+        valid: false
+    -
+        description: "should recognize the mechanism (SCRAM-SHA-256)"
+        uri: "mongodb://user:password@localhost/?authMechanism=SCRAM-SHA-256"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "admin"
+            mechanism: "SCRAM-SHA-256"
+            mechanism_properties: ~
+    -
+        description: "should use the database when no authSource is specified (SCRAM-SHA-256)"
+        uri: "mongodb://user:password@localhost/foo?authMechanism=SCRAM-SHA-256"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "foo"
+            mechanism: "SCRAM-SHA-256"
+            mechanism_properties: ~
+    -
+        description: "should accept valid authSource (SCRAM-SHA-256)"
+        uri: "mongodb://user:password@localhost/foo?authMechanism=SCRAM-SHA-256&authSource=bar"
+        valid: true
+        credential:
+            username: "user"
+            password: "password"
+            source: "bar"
+            mechanism: "SCRAM-SHA-256"
+            mechanism_properties: ~
+    -
+        description: "should throw an exception if no username (SCRAM-SHA-256)"
+        uri: "mongodb://localhost/?authMechanism=SCRAM-SHA-256"
+        valid: false
+    -
+        description: "URI with no auth-related info doesn't create credential"
+        uri: "mongodb://localhost/"
+        valid: true
+        credential: ~
+    -
+        description: "database in URI path doesn't create credentials"
+        uri: "mongodb://localhost/foo"
+        valid: true
+        credential: ~
+    -
+        description: "should throw an exception if no username provided (userinfo implies default mechanism)"
+        uri: "mongodb://@localhost.com/"
+        valid: false
+    -
+        description: "should throw an exception if no username/password provided (userinfo implies default mechanism)"
+        uri: "mongodb://:@localhost.com/"
+        valid: false

data/spec/spec_tests/data/cmap/pool-checkout-error-closed.yml

@@ -15,14 +15,17 @@ events:
   - type: ConnectionPoolCreated
     address: 42
     options: 42
+  - type: ConnectionCheckOutStarted
   - type: ConnectionCheckedOut
     connectionId: 42
   - type: ConnectionCheckedIn
     connectionId: 42
   - type: ConnectionPoolClosed
     address: 42
+  - type: ConnectionCheckOutStarted
+  - type: ConnectionCheckOutFailed
+    reason: poolClosed
 ignore:
   - ConnectionCreated
   - ConnectionReady
   - ConnectionClosed
-  - ConnectionCheckOutStarted

data/spec/spec_tests/data/cmap/pool-create-with-options.yml

@@ -18,3 +18,4 @@ events:
       maxIdleTimeMS: 100
 ignore:
   - ConnectionCreated
+  - ConnectionReady

data/spec/spec_tests/data/command_monitoring/insertMany.yml

@@ -58,7 +58,7 @@ tests:
       arguments:
         documents:
           - { _id: 2, x: 22 }
-        ordered: false
+        options: { ordered: false }
     expectations:
       -
         command_started_event:

data/spec/spec_tests/data/connection_string/invalid-uris.yml

@@ -239,3 +239,23 @@ tests:
         hosts: ~
         auth: ~
         options: ~
+
+    -
+        description: "Username with password containing an unescaped percent sign and an escaped one"
+        uri: "mongodb://user%20%:password@localhost"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+
+    -
+        description: "Username with password containing an unescaped percent sign (non hex digit)"
+        uri: "mongodb://user%w:password@localhost"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+
+    

data/spec/spec_tests/data/connection_string/valid-auth.yml

@@ -188,6 +188,22 @@ tests:
             db: "admin?"
         options:
             authmechanism: "MONGODB-CR"
+    -
+        description: "Subdelimiters in user/pass don't need escaping (MONGODB-CR)"
+        uri: "mongodb://!$&'()*+,;=:!$&'()*+,;=@127.0.0.1/admin?authMechanism=MONGODB-CR"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "ipv4"
+                host: "127.0.0.1"
+                port: ~
+        auth:
+            username: "!$&'()*+,;="
+            password: "!$&'()*+,;="
+            db: "admin"
+        options:
+            authmechanism: "MONGODB-CR"
     -
         description: "Escaped username (MONGODB-X509)"
         uri: "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509"

data/spec/spec_tests/data/connection_string/valid-warnings.yml

@@ -11,21 +11,19 @@ tests:
                 port: ~
         auth: ~
         options: ~
-#
-# A Mongo::Client doesn't validate option values when initialized so the uri doesn't either.
-#    -
-#        description: "Unsupported option values are ignored"
-#        uri: "mongodb://example.com/?fsync=ifPossible"
-#        valid: true
-#        warning: true
-#        hosts:
-#            -
-#                type: "hostname"
-#                host: "example.com"
-#                port: ~
-#        auth: ~
-#        options: ~
-#    -
+    -
+        description: "Unsupported option values are ignored"
+        uri: "mongodb://example.com/?fsync=ifPossible"
+        valid: true
+        warning: true
+        hosts:
+            -
+                type: "hostname"
+                host: "example.com"
+                port: ~
+        auth: ~
+        options: ~
+    -
         description: "Repeated option keys"
         uri: "mongodb://example.com/?replicaSet=test&replicaSet=test"
         valid: true
@@ -38,18 +36,16 @@ tests:
         auth: ~
         options:
             replicaset: "test"
-#
-# Change this test in the future if there is a deprecated option in driver 2.0
-#    -
-#        description: "Deprecated (or unknown) options are ignored if replacement exists"
-#        uri: "mongodb://example.com/?wtimeout=5&wtimeoutMS=10"
-#        valid: true
-#        warning: true
-#        hosts:
-#            -
-#                type: "hostname"
-#                host: "example.com"
-#                port: ~
-#        auth: ~
-#        options:
-#            wtimeoutms: 10
+    -
+        description: "Deprecated (or unknown) options are ignored if replacement exists"
+        uri: "mongodb://example.com/?wtimeout=5&wtimeoutMS=10"
+        valid: true
+        warning: true
+        hosts:
+            -
+                type: "hostname"
+                host: "example.com"
+                port: ~
+        auth: ~
+        options:
+            wtimeoutms: 10