database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

Clean up some SCRAM attribute processing

Browse Source 
Correct the comment for read_any_attr().  Give a clearer error message
when parsing at the end of the string, when the client-final-message
does not contain a "p" attribute (for some reason).

Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://www.postgresql.org/message-id/flat/2fb8a15b-de35-682d-a77b-edcc9c52fa12%402ndquadrant.com
This commit is contained in:
Peter Eisentraut 2019-08-20 22:25:58 +02:00
parent f8cf524da1
commit db1f28917b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -790,7 +790,8 @@ sanitize_str(const char *s)
/* /*
* Read the next attribute and value in a SCRAM exchange message. * Read the next attribute and value in a SCRAM exchange message.
* *
* Returns NULL if there is attribute. * The attribute character is set in *attr_p, the attribute value is the
* return value.
*/ */
static char * static char *
read_any_attr(char **input, char *attr_p) read_any_attr(char **input, char *attr_p)
@ -799,6 +800,12 @@ read_any_attr(char **input, char *attr_p)
char *end; char *end;
char attr = *begin; char attr = *begin;
if (attr == '\0')
ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("malformed SCRAM message"),
errdetail("Attribute expected, but found end of string.")));
/*------ /*------
* attr-val = ALPHA "=" value * attr-val = ALPHA "=" value
* ;; Generic syntax of any attribute sent * ;; Generic syntax of any attribute sent
@ -1298,7 +1305,7 @@ read_client_final_message(scram_state *state, const char *input)
state->client_final_nonce = read_attr_value(&p, 'r'); state->client_final_nonce = read_attr_value(&p, 'r');
/* ignore optional extensions */ /* ignore optional extensions, read until we find "p" attribute */
do do
{ {
proof = p - 1; proof = p - 1;