Fix saslContinue crashing due to not found authentication conversat…

…ion (#4129)
FerretDB · Mar 5, 2024 · 0173295 · 0173295
1 parent 530e14e
commit 0173295
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/integration/users/connection_test.go b/integration/users/connection_test.go
@@ -101,7 +101,7 @@ func TestAuthentication(t *testing.T) {
 			mechanisms:          []string{"SCRAM-SHA-256"},
 			connectionMechanism: "SCRAM-SHA-256",
 			userNotFound:        true,
-			errorMessage:        "Authentication failed",
+			errorMessage:        "Authentication failed.",
 			topologyError:       true,
 		},
 		"BadPassword": {
@@ -111,7 +111,7 @@ func TestAuthentication(t *testing.T) {
 			connectionMechanism: "SCRAM-SHA-256",
 			wrongPassword:       true,
 			topologyError:       true,
-			errorMessage:        "Authentication failed",
+			errorMessage:        "Authentication failed.",
 		},
 		"MechanismNotSet": {
 			username:            "user_mechanism_not_set",

diff --git a/internal/handler/msg_saslcontinue.go b/internal/handler/msg_saslcontinue.go
@@ -44,11 +44,18 @@ func (h *Handler) MsgSASLContinue(ctx context.Context, msg *wire.OpMsg) (*wire.O
 
 	conv := conninfo.Get(ctx).Conv()
 
+	if conv == nil {
+		return nil, handlererrors.NewCommandErrorMsg(
+			handlererrors.ErrAuthenticationFailed,
+			"Authentication failed.",
+		)
+	}
+
 	response, err := conv.Step(string(payload))
 	if err != nil {
 		return nil, handlererrors.NewCommandErrorMsg(
 			handlererrors.ErrAuthenticationFailed,
-			"Authentication failed",
+			"Authentication failed.",
 		)
 	}
 

diff --git a/internal/handler/msg_saslstart.go b/internal/handler/msg_saslstart.go
@@ -245,7 +245,7 @@ func (h *Handler) scramCredentialLookup(ctx context.Context, username, dbName, m
 
 	return nil, handlererrors.NewCommandErrorMsg(
 		handlererrors.ErrAuthenticationFailed,
-		"Authentication failed",
+		"Authentication failed.",
 	)
 }