CSHARP-603: changes from MONGO-CR to MONGODB-CR per server.

Author: craiggwilson

MongoDB.Driver/Communication/Security/Authenticator.cs

@@ -30,7 +30,7 @@ internal class Authenticator
         // private static fields
         private static readonly List<IAuthenticationProtocol> __clientSupportedProtocols = new List<IAuthenticationProtocol>
         {
-            // when we start negotiating, MONGO-CR should be moved to the bottom of the list...
+            // when we start negotiating, MONGODB-CR should be moved to the bottom of the list...
             new MongoCRAuthenticationProtocol(),
             new SaslAuthenticationProtocol(new GssapiMechanism()),
         };

MongoDB.Driver/Communication/Security/MongoCRAuthenticationProtocol.cs

@@ -20,14 +20,14 @@
 namespace MongoDB.Driver.Communication.Security
 {
     /// <summary>
-    /// Authenticates a credential using the MONGO-CR protocol.
+    /// Authenticates a credential using the MONGODB-CR protocol.
     /// </summary>
     internal class MongoCRAuthenticationProtocol : IAuthenticationProtocol
     {
         // public properties
         public string Name
         {
-            get { return "MONGO-CR"; }
+            get { return "MONGODB-CR"; }
         }
 
         // public methods
@@ -77,7 +77,7 @@ public void Authenticate(MongoConnection connection, MongoCredential credential)
         /// </returns>
         public bool CanUse(MongoCredential credential)
         {
-            return credential.Mechanism.Equals("MONGO-CR", StringComparison.InvariantCultureIgnoreCase) &&
+            return credential.Mechanism.Equals("MONGODB-CR", StringComparison.InvariantCultureIgnoreCase) &&
                 credential.Evidence is PasswordEvidence;
         }
     }

MongoDB.Driver/MongoCredential.cs

@@ -180,30 +180,30 @@ public static MongoCredential CreateGssapiCredential(string username, SecureStri
         }
 
         /// <summary>
-        /// Creates a credential used with MONGO-CR.
+        /// Creates a credential used with MONGODB-CR.
         /// </summary>
         /// <param name="databaseName">Name of the database.</param>
         /// <param name="username">The username.</param>
         /// <param name="password">The password.</param>
         /// <returns></returns>
         public static MongoCredential CreateMongoCRCredential(string databaseName, string username, string password)
         {
-            return FromComponents("MONGO-CR",
+            return FromComponents("MONGODB-CR",
                 databaseName,
                 username,
                 new PasswordEvidence(password));
         }
 
         /// <summary>
-        /// Creates a credential used with MONGO-CR.
+        /// Creates a credential used with MONGODB-CR.
         /// </summary>
         /// <param name="databaseName">Name of the database.</param>
         /// <param name="username">The username.</param>
         /// <param name="password">The password.</param>
         /// <returns></returns>
         public static MongoCredential CreateMongoCRCredential(string databaseName, string username, SecureString password)
         {
-            return FromComponents("MONGO-CR",
+            return FromComponents("MONGODB-CR",
                 databaseName,
                 username,
                 new PasswordEvidence(password));
@@ -288,24 +288,22 @@ private static MongoCredential FromComponents(string mechanism, string source, s
 
             switch (mechanism.ToUpperInvariant())
             {
-                case "MONGO-CR":
+                case "MONGODB-CR":
                     // it is allowed for a password to be an empty string, but not a username
                     source = source ?? "admin";
                     if (evidence == null || !(evidence is PasswordEvidence))
                     {
-                        throw new ArgumentException("A MONGO-CR credential must have a password.");
+                        throw new ArgumentException("A MONGODB-CR credential must have a password.");
                     }
 
                     return new MongoCredential(
                         mechanism,
                         new MongoInternalIdentity(source, username),
                         evidence);
                 case "GSSAPI":
-                    source = source ?? "$external";
-                    if (source != "$external")
-                    {
-                        throw new ArgumentException("The source for GSSAPI must be $external.");
-                    }
+                    // always $external for GSSAPI.  
+                    // this will likely need to change in 2.6.
+                    source = "$external";
 
                     return new MongoCredential(
                         "GSSAPI",

MongoDB.Driver/MongoDefaults.cs

@@ -25,7 +25,7 @@ public static class MongoDefaults
     {
         // private static fields
         private static bool __assignIdOnInsert = true;
-        private static string __authenticationMechanism = "MONGO-CR";
+        private static string __authenticationMechanism = "MONGODB-CR";
         private static TimeSpan __connectTimeout = TimeSpan.FromSeconds(30);
         private static TimeSpan __maxConnectionIdleTime = TimeSpan.FromMinutes(10);
         private static TimeSpan __maxConnectionLifeTime = TimeSpan.FromMinutes(30);

MongoDB.Driver/MongoUrlBuilder.cs

@@ -1000,7 +1000,7 @@ public override string ToString()
                 url.Append(_databaseName);
             }
             var query = new StringBuilder();
-            if (!_authenticationMechanism.Equals("MONGO-CR", StringComparison.InvariantCultureIgnoreCase))
+            if (!_authenticationMechanism.Equals("MONGODB-CR", StringComparison.InvariantCultureIgnoreCase))
             {
                 query.AppendFormat("authMechanism={0};", _authenticationMechanism);
             }

MongoDB.DriverUnitTests/MongoConnectionStringBuilderTests.cs

@@ -135,7 +135,7 @@ public void TestAll()
         }
 
         [Test]
-        [TestCase("MONGO-CR", "server=localhost;authMechanism=MONGO-CR")]
+        [TestCase("MONGODB-CR", "server=localhost;authMechanism=MONGODB-CR")]
         [TestCase("GSSAPI", "server=localhost;authMechanism=GSSAPI")]
         public void TestAuthMechanism(string mechanism, string connectionString)
         {

MongoDB.DriverUnitTests/MongoUrlBuilderTests.cs

@@ -131,7 +131,7 @@ public void TestAll()
         }
 
         [Test]
-        [TestCase("MONGO-CR", "mongodb://localhost")]
+        [TestCase("MONGODB-CR", "mongodb://localhost")]
         [TestCase("GSSAPI", "mongodb://localhost/?authMechanism=GSSAPI")]
         public void TestAuthMechanism(string mechanism, string connectionString)
         {
@@ -279,7 +279,7 @@ public void TestDefaults()
 
             foreach (var builder in EnumerateBuiltAndParsedBuilders(built, connectionString))
             {
-                Assert.AreEqual("MONGO-CR", builder.AuthenticationMechanism);
+                Assert.AreEqual("MONGODB-CR", builder.AuthenticationMechanism);
                 Assert.AreEqual(null, builder.AuthenticationSource);
                 Assert.AreEqual(MongoDefaults.ComputedWaitQueueSize, builder.ComputedWaitQueueSize);
                 Assert.AreEqual(ConnectionMode.Automatic, builder.ConnectionMode);