database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-18 12:22:09 +03:00
Code Activity

Tweak some SCRAM error messages and code comments

Browse Source 
Clarify/correct some error messages, fix up some code comments that
confused SASL and SCRAM, and other minor fixes.  No changes in
functionality.
This commit is contained in:
Peter Eisentraut
2017-08-23 12:01:43 -04:00
parent 580ddcec39
commit 85f4d6393d
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -573,7 +573,7 @@ mock_scram_verifier(const char *username, int *iterations, char **salt,
}
/*
* Read the value in a given SASL exchange message for given attribute.
* Read the value in a given SCRAM exchange message for given attribute.
*/
static char *
read_attr_value(char **input, char attr)
@@ -585,7 +585,7 @@ read_attr_value(char **input, char attr)
ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("malformed SCRAM message"),
errdetail("Expected attribute '%c' but found %s.",
errdetail("Expected attribute \"%c\" but found \"%s\".",
attr, sanitize_char(*begin))));
begin++;
@@ -593,7 +593,7 @@ read_attr_value(char **input, char attr)
ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("malformed SCRAM message"),
errdetail("Expected character = for attribute %c.", attr)));
errdetail("Expected character \"=\" for attribute \"%c\".", attr)));
begin++;
end = begin;
@@ -652,7 +652,7 @@ sanitize_char(char c)
}
/*
* Read the next attribute and value in a SASL exchange message.
* Read the next attribute and value in a SCRAM exchange message.
*
* Returns NULL if there is attribute.
*/
@@ -674,7 +674,7 @@ read_any_attr(char **input, char *attr_p)
ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("malformed SCRAM message"),
errdetail("Attribute expected, but found invalid character %s.",
errdetail("Attribute expected, but found invalid character \"%s\".",
sanitize_char(attr))));
if (attr_p)
*attr_p = attr;
@@ -684,7 +684,7 @@ read_any_attr(char **input, char *attr_p)
ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("malformed SCRAM message"),
errdetail("Expected character = for attribute %c.", attr)));
errdetail("Expected character \"=\" for attribute \"%c\".", attr)));
begin++;
end = begin;
@@ -703,7 +703,7 @@ read_any_attr(char **input, char *attr_p)
}
/*
* Read and parse the first message from client in the context of a SASL
* Read and parse the first message from client in the context of a SCRAM
* authentication exchange message.
*
* At this stage, any errors will be reported directly with ereport(ERROR).
@@ -802,14 +802,14 @@ read_client_first_message(scram_state *state, char *input)
ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("malformed SCRAM message"),
errdetail("Unexpected channel-binding flag %s.",
errdetail("Unexpected channel-binding flag \"%s\".",
sanitize_char(*input))));
}
if (*input != ',')
ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("malformed SCRAM message"),
errdetail("Comma expected, but found character %s.",
errdetail("Comma expected, but found character \"%s\".",
sanitize_char(*input))));
input++;
@@ -824,7 +824,7 @@ read_client_first_message(scram_state *state, char *input)
ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("malformed SCRAM message"),
errdetail("Unexpected attribute %s in client-first-message.",
errdetail("Unexpected attribute \"%s\" in client-first-message.",
sanitize_char(*input))));
input++;
@@ -929,7 +929,7 @@ verify_client_proof(scram_state *state)
}
/*
* Build the first server-side message sent to the client in a SASL
* Build the first server-side message sent to the client in a SCRAM
* communication exchange.
*/
static char *