GODRIVER-3333 (options.ClientOptions).SetAuth with MONGODB-AWS does n…

…ot set default $external AuthSource
blink1073 · Sep 10, 2024 · a107bb4 · a107bb4
1 parent 06ccb6e
commit a107bb4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/x/mongo/driver/auth/auth.go b/x/mongo/driver/auth/auth.go
@@ -22,9 +22,6 @@ import (
 
 const sourceExternal = "$external"
 
-// Config contains the configuration for an Authenticator.
-type Config = driver.AuthConfig
-
 // AuthenticatorFactory constructs an authenticator.
 type AuthenticatorFactory func(*Cred, *http.Client) (Authenticator, error)
 

diff --git a/x/mongo/driver/auth/plain_test.go b/x/mongo/driver/auth/plain_test.go
@@ -12,8 +12,6 @@ import (
 	"strings"
 	"testing"
 
-	"encoding/base64"
-
 	"go.mongodb.org/mongo-driver/v2/internal/require"
 	"go.mongodb.org/mongo-driver/v2/x/bsonx/bsoncore"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver"

diff --git a/x/mongo/driver/topology/topology_options.go b/x/mongo/driver/topology/topology_options.go
@@ -19,7 +19,6 @@ import (
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/auth"
-	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/description"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/ocsp"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/operation"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/session"
@@ -148,9 +147,9 @@ func NewConfigFromOptions(opts *options.ClientOptions, clock *session.ClusterClo
 	var err error
 	if opts.Auth != nil {
 		authenticator, err = auth.CreateAuthenticator(
-			co.Auth.AuthMechanism,
-			ConvertCreds(co.Auth),
-			co.HTTPClient,
+			opts.Auth.AuthMechanism,
+			ConvertCreds(opts.Auth),
+			opts.HTTPClient,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("error creating authenticator: %w", err)
@@ -273,16 +272,9 @@ func NewConfigFromOptionsWithAuthenticator(opts *options.ClientOptions, clock *s
 			ClusterClock:  clock,
 		}
 
-		if co.Auth.AuthMechanism == "" {
+		if opts.Auth.AuthMechanism == "" {
 			// Required for SASL mechanism negotiation during handshake
-			handshakeOpts.DBUser = co.Auth.AuthSource + "." + co.Auth.Username
-		}
-
-		if co.AuthenticateToAnything != nil && *co.AuthenticateToAnything {
-			// Authenticate arbiters
-			handshakeOpts.PerformAuthentication = func(serv description.Server) bool {
-				return true
-			}
+			handshakeOpts.DBUser = opts.Auth.AuthSource + "." + opts.Auth.Username
 		}
 
 		handshaker = func(driver.Handshaker) driver.Handshaker {