RUST-992 Enable auth tests for PLAIN and fix default authSource for such

mongodb · Sep 8, 2021 · c799ad4 · c799ad4
1 parent 648ebe3
commit c799ad4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/client/auth/mod.rs b/src/client/auth/mod.rs
@@ -205,7 +205,7 @@ impl AuthMechanism {
                 uri_db.unwrap_or("admin")
             }
             AuthMechanism::MongoDbX509 => "$external",
-            AuthMechanism::Plain => "$external",
+            AuthMechanism::Plain => uri_db.unwrap_or("$external"),
             #[cfg(feature = "aws-auth")]
             AuthMechanism::MongoDbAws => "$external",
             _ => "",
@@ -336,7 +336,8 @@ pub struct Credential {
     pub username: Option<String>,
 
     /// The database used to authenticate. This applies to all mechanisms and defaults to "admin"
-    /// in SCRAM authentication mechanisms and "$external" for GSSAPI, MONGODB-X509 and PLAIN.
+    /// in SCRAM authentication mechanisms, "$external" for GSSAPI and MONGODB-X509, and the
+    /// database name or "$external" for PLAIN.
     pub source: Option<String>,
 
     /// The password to authenticate with. This does not apply to all mechanisms.

diff --git a/src/test/spec/auth.rs b/src/test/spec/auth.rs
@@ -52,14 +52,12 @@ async fn run_auth_test(test_file: TestFile) {
 
         let skipped_mechanisms = [
             "GSSAPI",
-            "PLAIN",
             "MONGODB-CR",
             #[cfg(not(feature = "aws-auth"))]
             "MONGODB-AWS",
         ];
 
         // TODO: GSSAPI (RUST-196)
-        // TODO: PLAIN (RUST-992)
         if skipped_mechanisms
             .iter()
             .any(|mech| test_case.description.contains(mech))