Use SASLprep to normalize passwords for SCRAM authentication

Enterprise / PostgreSQL - Heikki Linnakangas [iki.fi] - 7 April 2017 07:56 EDT

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

60f11b8 Use SASLprep to normalize passwords for SCRAM authentication.
src/backend/libpq/auth-scram.c | 63 +-
src/common/Makefile | 3 +-
src/common/saslprep.c | 1279 +++
src/common/scram-common.c | 25 +-
src/common/unicode/.gitignore | 7 +
src/common/unicode/Makefile | 53 +
src/common/unicode/README | 35 +
src/common/unicode/generate-norm_test_table.pl | 102 +
src/common/unicode/generate-unicode_norm_table.pl | 226 +
src/common/unicode/norm_test.c | 80 +
src/common/unicode_norm.c | 437 +
src/include/common/saslprep.h | 30 +
src/include/common/unicode_norm.h | 21 +
src/include/common/unicode_norm_table.h | 8859 +++++++++++++++++++++
src/interfaces/libpq/.gitignore | 2 +
src/interfaces/libpq/Makefile | 4 +-
src/interfaces/libpq/fe-auth-scram.c | 27 +-
src/test/authentication/t/002_saslprep.pl | 98 +
src/tools/msvc/Mkvcbuild.pm | 3 +-
19 files changed, 11322 insertions(+), 32 deletions(-)

Upstream: git.postgresql.org


  • Share