PR Fixes

Author: katcharov

driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java

@@ -80,6 +80,7 @@ public class OidcAuthenticator extends SaslAuthenticator {
 
     private static final String AWS_WEB_IDENTITY_TOKEN_FILE = "AWS_WEB_IDENTITY_TOKEN_FILE";
 
+    @Nullable
     private ServerAddress serverAddress;
 
     @Nullable
@@ -497,7 +498,7 @@ private static IdpInfo toIdpInfo(final byte[] challenge) {
 
     private void validateAllowedHosts(final MongoCredential credential) {
         List<String> allowedHosts = assertNotNull(credential.getMechanismProperty(ALLOWED_HOSTS_KEY, DEFAULT_ALLOWED_HOSTS));
-        String host = serverAddress.getHost();
+        String host = assertNotNull(serverAddress).getHost();
         boolean permitted = allowedHosts.stream().anyMatch(allowedHost -> {
             if (allowedHost.startsWith("*.")) {
                 String ending = allowedHost.substring(1);

driver-core/src/test/unit/com/mongodb/AuthConnectionStringTest.java

@@ -36,6 +36,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import static com.mongodb.AuthenticationMechanism.MONGODB_OIDC;
 import static com.mongodb.MongoCredential.REFRESH_TOKEN_CALLBACK_KEY;
 import static com.mongodb.MongoCredential.REQUEST_TOKEN_CALLBACK_KEY;
 
@@ -113,21 +114,25 @@ private MongoCredential getMongoCredential() {
         MongoCredential credential = connectionString.getCredential();
         if (credential != null) {
             BsonArray callbacks = (BsonArray) getExpectedValue("callback");
-            for (BsonValue v : callbacks) {
-                String string = ((BsonString) v).getValue();
-                if ("oidcRequest".equals(string)) {
-                    credential = credential.withMechanismProperty(
-                            REQUEST_TOKEN_CALLBACK_KEY,
-                            (MongoCredential.OidcRequestCallback) (context) -> null);
-                } else if ("oidcRefresh".equals(string)) {
-                    credential = credential.withMechanismProperty(
-                            REFRESH_TOKEN_CALLBACK_KEY,
-                            (MongoCredential.OidcRefreshCallback) (context) -> null);
-                } else {
-                    fail("Unsupported callback: " + string);
+            if (callbacks != null) {
+                for (BsonValue v : callbacks) {
+                    String string = ((BsonString) v).getValue();
+                    if ("oidcRequest".equals(string)) {
+                        credential = credential.withMechanismProperty(
+                                REQUEST_TOKEN_CALLBACK_KEY,
+                                (MongoCredential.OidcRequestCallback) (context) -> null);
+                    } else if ("oidcRefresh".equals(string)) {
+                        credential = credential.withMechanismProperty(
+                                REFRESH_TOKEN_CALLBACK_KEY,
+                                (MongoCredential.OidcRefreshCallback) (context) -> null);
+                    } else {
+                        fail("Unsupported callback: " + string);
+                    }
                 }
             }
-            OidcAuthenticator.OidcValidator.validateBeforeUse(credential);
+            if (MONGODB_OIDC.getMechanismName().equals(credential.getMechanism())) {
+                OidcAuthenticator.OidcValidator.validateBeforeUse(credential);
+            }
         }
         return credential;
     }