database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-11 10:01:57 +03:00
Code Activity

Fix strsep() use for SCRAM secrets parsing

Browse Source 
The previous code (from commit 5d2e1cc117) did not detect end of
string correctly, so it would fail to error out if fewer than the
expected number of fields were present, which could then later lead to
a crash when NULL string pointers are accessed.

Reported-by: Alexander Lakhin <exclusion@gmail.com>
Reported-by: Ranier Vilela <ranier.vf@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/79692bf9-17d3-41e6-b9c9-fc8c3944222a@eisentraut.org
This commit is contained in:
Peter Eisentraut
2024-10-18 11:06:41 +02:00
parent 9272bdeac8
commit 24a36f91e3
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/libpq/auth-scram.c
View File

@ -608,13 +608,17 @@ parse_scram_secret(const char *secret, int *iterations,
* SCRAM-SHA-256$<iterations>:<salt>$<storedkey>:<serverkey> * SCRAM-SHA-256$<iterations>:<salt>$<storedkey>:<serverkey>
*/ */
v = pstrdup(secret); v = pstrdup(secret);
if ((scheme_str = strsep(&v, "$")) == NULL) scheme_str = strsep(&v, "$");
if (v == NULL)
goto invalid_secret; goto invalid_secret;
if ((iterations_str = strsep(&v, ":")) == NULL) iterations_str = strsep(&v, ":");
if (v == NULL)
goto invalid_secret; goto invalid_secret;
if ((salt_str = strsep(&v, "$")) == NULL) salt_str = strsep(&v, "$");
if (v == NULL)
goto invalid_secret; goto invalid_secret;
if ((storedkey_str = strsep(&v, ":")) == NULL) storedkey_str = strsep(&v, ":");
if (v == NULL)
goto invalid_secret; goto invalid_secret;
serverkey_str = v; serverkey_str = v;