mirror of
https://github.com/postgres/postgres.git
synced 2025-09-02 04:21:28 +03:00
Fix detection of passwords hashed with MD5 or SCRAM-SHA-256
This commit fixes a couple of issues related to the way password verifiers hashed with MD5 or SCRAM-SHA-256 are detected, leading to being able to store in catalogs passwords which do not follow the supported hash formats: - A MD5-hashed entry was checked based on if its header uses "md5" and if the string length matches what is expected. Unfortunately the code never checked if the hash only used hexadecimal characters, as reported by Tom Lane. - A SCRAM-hashed entry was checked based on only its header, which should be "SCRAM-SHA-256$", but it never checked for any fields afterwards, as reported by Jonathan Katz. Backpatch down to v10, which is where SCRAM has been introduced, and where password verifiers in plain format have been removed. Author: Jonathan Katz Reviewed-by: Tom Lane, Michael Paquier Discussion: https://postgr.es/m/016deb6b-1f0a-8e9f-1833-a8675b170aa9@postgresql.org Backpatch-through: 10
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
#ifndef PG_MD5_H
|
||||
#define PG_MD5_H
|
||||
|
||||
#define MD5_PASSWD_CHARSET "0123456789abcdef"
|
||||
#define MD5_PASSWD_LEN 35
|
||||
|
||||
extern bool pg_md5_hash(const void *buff, size_t len, char *hexsum);
|
||||
|
@@ -29,6 +29,8 @@ extern int pg_be_scram_exchange(void *opaq, const char *input, int inputlen,
|
||||
|
||||
/* Routines to handle and check SCRAM-SHA-256 verifier */
|
||||
extern char *pg_be_scram_build_verifier(const char *password);
|
||||
extern bool parse_scram_verifier(const char *verifier, int *iterations, char **salt,
|
||||
uint8 *stored_key, uint8 *server_key);
|
||||
extern bool scram_verify_plain_password(const char *username,
|
||||
const char *password, const char *verifier);
|
||||
|
||||
|
Reference in New Issue
Block a user