Use SASLprep to normalize passwords for SCRAM authentication.

An important step of SASLprep normalization, is to convert the string to
Unicode normalization form NFKC. Unicode normalization requires a fairly
large table of character decompositions, which is generated from data
published by the Unicode consortium. The script to generate the table is
put in src/common/unicode, as well test code for the normalization.
A pre-generated version of the tables is included in src/include/common,
so you don't need the code in src/common/unicode to build PostgreSQL, only
if you wish to modify the normalization tables.

The SASLprep implementation depends on the UTF-8 functions from
src/backend/utils/mb/wchar.c. So to use it, you must also compile and link
that. That doesn't change anything for the current users of these
functions, the backend and libpq, as they both already link with wchar.o.
It would be good to move those functions into a separate file in
src/commmon, but I'll leave that for another day.

No documentation changes included, because there is no details on the
SCRAM mechanism in the docs anyway. An overview on that in the protocol
specification would probably be good, even though SCRAM is documented in
detail in RFC5802. I'll write that as a separate patch. An important thing
to mention there is that we apply SASLprep even on invalid UTF-8 strings,
to support other encodings.

Patch by Michael Paquier and me.

Discussion: https://www.postgresql.org/message-id/CAB7nPqSByyEmAVLtEf1KxTRh=PWNKiWKEKQR=e1yGehz=wbymQ@mail.gmail.com

1 files changed, 25 insertions, 2 deletions

diff --git a/src/interfaces/libpq/fe-auth-scram.c b/src/interfaces/libpq/fe-auth-scram.c
index 818ade4993a..c56e91e0e04 100644
--- a/src/interfaces/libpq/fe-auth-scram.c
+++ b/src/interfaces/libpq/fe-auth-scram.c
@@ -15,6 +15,7 @@
 #include "postgres_fe.h"
 
 #include "common/base64.h"
+#include "common/saslprep.h"
 #include "common/scram-common.h"
 #include "fe-auth.h"
 
@@ -42,7 +43,7 @@ typedef struct
 
 	/* These are supplied by the user */
 	const char *username;
-	const char *password;
+	char	   *password;
 
 	/* We construct these */
 	char	   *client_nonce;
@@ -82,6 +83,8 @@ void *
 pg_fe_scram_init(const char *username, const char *password)
 {
 	fe_scram_state *state;
+	char	   *prep_password;
+	pg_saslprep_rc rc;
 
 	state = (fe_scram_state *) malloc(sizeof(fe_scram_state));
 	if (!state)
@@ -89,7 +92,24 @@ pg_fe_scram_init(const char *username, const char *password)
 	memset(state, 0, sizeof(fe_scram_state));
 	state->state = FE_SCRAM_INIT;
 	state->username = username;
-	state->password = password;
+
+	/* Normalize the password with SASLprep, if possible */
+	rc = pg_saslprep(password, &prep_password);
+	if (rc == SASLPREP_OOM)
+	{
+		free(state);
+		return NULL;
+	}
+	if (rc != SASLPREP_SUCCESS)
+	{
+		prep_password = strdup(password);
+		if (!prep_password)
+		{
+			free(state);
+			return NULL;
+		}
+	}
+	state->password = prep_password;
 
 	return state;
 }
@@ -102,6 +122,9 @@ pg_fe_scram_free(void *opaq)
 {
 	fe_scram_state *state = (fe_scram_state *) opaq;
 
+	if (state->password)
+		free(state->password);
+
 	/* client messages */
 	if (state->client_nonce)
 		free(state->client_nonce);