From b20aaee8fb883894a288372f167076aeb4fb637f Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 26 Sep 2016 14:57:07 +0900 Subject: [PATCH 7/8] Add clause PASSWORD val USING protocol to CREATE/ALTER ROLE This clause allows users to be able to enforce with which protocol a given password is used with. if the value given is already encrypted, the value is used as-is. --- doc/src/sgml/ref/alter_role.sgml | 2 ++ doc/src/sgml/ref/create_role.sgml | 19 +++++++++++ src/backend/commands/user.c | 72 ++++++++++++++++++++++++++++++++++++--- src/backend/parser/gram.y | 7 ++++ 4 files changed, 95 insertions(+), 5 deletions(-) diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml index da36ad9..3cae101 100644 --- a/doc/src/sgml/ref/alter_role.sgml +++ b/doc/src/sgml/ref/alter_role.sgml @@ -34,6 +34,7 @@ ALTER ROLE role_specification [ WIT | BYPASSRLS | NOBYPASSRLS | CONNECTION LIMIT connlimit | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password' + | PASSWORD 'password' USING 'protocol' | VALID UNTIL 'timestamp' ALTER ROLE name RENAME TO new_name @@ -169,6 +170,7 @@ ALTER ROLE { role_specification | A NOBYPASSRLS CONNECTION LIMIT connlimit PASSWORD password + PASSWORD password USING protocol ENCRYPTED UNENCRYPTED VALID UNTIL 'timestamp' diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml index 93f0763..fa74466 100644 --- a/doc/src/sgml/ref/create_role.sgml +++ b/doc/src/sgml/ref/create_role.sgml @@ -34,6 +34,7 @@ CREATE ROLE name [ [ WITH ] connlimit | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password' + | PASSWORD 'password' USING 'protocol' | VALID UNTIL 'timestamp' | IN ROLE role_name [, ...] | IN GROUP role_name [, ...] @@ -245,6 +246,24 @@ CREATE ROLE name [ [ WITH ] + PASSWORD password USING protocol + + + Sets the role's password using the requested protocol. (A password + is only of use for roles having the LOGIN + attribute, but you can nonetheless define one for roles without it.) + If you do not plan to use password authentication you can omit this + option. The protocols supported are md5 to enforce + a password to be MD5-encrypted, scram to enforce a password + to be encrypted with SCRAM-SHA256, or plain to use + an unencrypted password. If the password string is already in + MD5-encrypted or SCRAM-encrypted format, then it is stored encrypted + as-is. + + + + + VALID UNTIL 'timestamp' diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index c76d273..e7a4b8f 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -179,7 +179,8 @@ CreateRole(ParseState *pstate, CreateRoleStmt *stmt) if (strcmp(defel->defname, "password") == 0 || strcmp(defel->defname, "encryptedPassword") == 0 || - strcmp(defel->defname, "unencryptedPassword") == 0) + strcmp(defel->defname, "unencryptedPassword") == 0 || + strcmp(defel->defname, "protocolPassword") == 0) { if (dpassword) ereport(ERROR, @@ -188,9 +189,41 @@ CreateRole(ParseState *pstate, CreateRoleStmt *stmt) parser_errposition(pstate, defel->location))); dpassword = defel; if (strcmp(defel->defname, "encryptedPassword") == 0) + { password_type = PASSWORD_TYPE_MD5; + if (dpassword && dpassword->arg) + password = strVal(dpassword->arg); + } else if (strcmp(defel->defname, "unencryptedPassword") == 0) + { password_type = PASSWORD_TYPE_PLAINTEXT; + if (dpassword && dpassword->arg) + password = strVal(dpassword->arg); + } + else if (strcmp(defel->defname, "protocolPassword") == 0) + { + /* + * This is a list of two elements, the password is first and + * then there is the protocol wanted by caller. + */ + if (dpassword && dpassword->arg) + { + char *protocol = strVal(lsecond((List *) dpassword->arg)); + + password = strVal(linitial((List *) dpassword->arg)); + + if (strcmp(protocol, "md5") == 0) + password_type = PASSWORD_TYPE_MD5; + else if (strcmp(protocol, "plain") == 0) + password_type = PASSWORD_TYPE_PLAINTEXT; + else if (strcmp(protocol, "scram") == 0) + password_type = PASSWORD_TYPE_SCRAM; + else + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("unsupported password protocol %s", protocol))); + } + } } else if (strcmp(defel->defname, "sysid") == 0) { @@ -310,8 +343,6 @@ CreateRole(ParseState *pstate, CreateRoleStmt *stmt) defel->defname); } - if (dpassword && dpassword->arg) - password = strVal(dpassword->arg); if (dissuper) issuper = intVal(dissuper->arg) != 0; if (dinherit) @@ -586,6 +617,7 @@ AlterRole(AlterRoleStmt *stmt) if (strcmp(defel->defname, "password") == 0 || strcmp(defel->defname, "encryptedPassword") == 0 || + strcmp(defel->defname, "protocolPassword") == 0 || strcmp(defel->defname, "unencryptedPassword") == 0) { if (dpassword) @@ -594,9 +626,41 @@ AlterRole(AlterRoleStmt *stmt) errmsg("conflicting or redundant options"))); dpassword = defel; if (strcmp(defel->defname, "encryptedPassword") == 0) + { password_type = PASSWORD_TYPE_MD5; + if (dpassword && dpassword->arg) + password = strVal(dpassword->arg); + } else if (strcmp(defel->defname, "unencryptedPassword") == 0) + { password_type = PASSWORD_TYPE_PLAINTEXT; + if (dpassword && dpassword->arg) + password = strVal(dpassword->arg); + } + else if (strcmp(defel->defname, "protocolPassword") == 0) + { + /* + * This is a list of two elements, the password is first and + * then there is the protocol wanted by caller. + */ + if (dpassword && dpassword->arg) + { + char *protocol = strVal(lsecond((List *) dpassword->arg)); + + if (strcmp(protocol, "md5") == 0) + password_type = PASSWORD_TYPE_MD5; + else if (strcmp(protocol, "plain") == 0) + password_type = PASSWORD_TYPE_PLAINTEXT; + else if (strcmp(protocol, "scram") == 0) + password_type = PASSWORD_TYPE_SCRAM; + else + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("unsupported password protocol %s", protocol))); + + password = strVal(linitial((List *) dpassword->arg)); + } + } } else if (strcmp(defel->defname, "superuser") == 0) { @@ -684,8 +748,6 @@ AlterRole(AlterRoleStmt *stmt) defel->defname); } - if (dpassword && dpassword->arg) - password = strVal(dpassword->arg); if (dissuper) issuper = intVal(dissuper->arg); if (dinherit) diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 1526c73..bed09f4 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -934,6 +934,13 @@ AlterOptRoleElem: { $$ = makeDefElem("password", NULL, @1); } + | PASSWORD Sconst USING Sconst + { + $$ = makeDefElem("protocolPassword", + (Node *)list_make2(makeString($2), + makeString($4)), + @1); + } | ENCRYPTED PASSWORD Sconst { $$ = makeDefElem("encryptedPassword", -- 2.9.3