Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit fb464a1

Browse files
committed
Avoid masking EOF (no-password-supplied) conditions in auth.c.
CheckPWChallengeAuth() would return STATUS_ERROR if the user does not exist or has no password assigned, even if the client disconnected without responding to the password challenge (as libpq often will, for example). We should return STATUS_EOF in that case, and the lower-level functions do, but this code level got it wrong since the refactoring done in 7ac955b. This breaks the intent of not logging anything for EOF cases (cf. comments in auth_failed()) and might also confuse users of ClientAuthentication_hook. Per report from Liu Lang. Back-patch to all supported versions. Discussion: https://postgr.es/m/b725238c-539d-cb09-2bff-b5e6cb2c069c@esgyn.cn
1 parent 6521869 commit fb464a1

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/backend/libpq/auth.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -849,15 +849,13 @@ CheckPWChallengeAuth(Port *port, const char **logdetail)
849849

850850
if (shadow_pass)
851851
pfree(shadow_pass);
852-
853-
/*
854-
* If get_role_password() returned error, return error, even if the
855-
* authentication succeeded.
856-
*/
857-
if (!shadow_pass)
852+
else
858853
{
854+
/*
855+
* If get_role_password() returned error, authentication better not
856+
* have succeeded.
857+
*/
859858
Assert(auth_result != STATUS_OK);
860-
return STATUS_ERROR;
861859
}
862860

863861
if (auth_result == STATUS_OK)

0 commit comments

Comments
 (0)