Revert "apply 0004-Refactor-decision-making-of-password-encryption-into.patch"

afiskon · afiskon · commit ea5de7dd274d · 2016-11-10T14:58:28.000+03:00
This reverts commit 759de09.
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
@@ -55,8 +55,6 @@ static void AddRoleMems(const char *rolename, Oid roleid,
 static void DelRoleMems(const char *rolename, Oid roleid,
 			List *memberSpecs, List *memberIds,
 			bool admin_opt);
-static char *encrypt_password(char *passwd, char *rolname,
-			int passwd_type);
 
 
 /* Check if current user has createrole privileges */
@@ -66,48 +64,6 @@ have_createrole_privilege(void)
 	return has_createrole_privilege(GetUserId());
 }
 
-/*
- * Encrypt a password if necessary for insertion in pg_authid.
- *
- * If a password is found as already MD5-encrypted, no error is raised
- * to ease the dump and reload of such data. Returns a palloc'ed string
- * holding the encrypted password.
- */
-static char *
-encrypt_password(char *password, char *rolname, int passwd_type)
-{
-	char *res;
-
-	Assert(password != NULL);
-
-	/*
-	 * If a password is already identified as MD5-encrypted, it is used
-	 * as such.  If the password given is not encrypted, adapt it depending
-	 * on the type wanted by the caller of this routine.
-	 */
-	if (isMD5(password))
-		res = pstrdup(password);
-	else
-	{
-		switch (passwd_type)
-		{
-			case PASSWORD_TYPE_PLAINTEXT:
-				res = pstrdup(password);
-				break;
-			case PASSWORD_TYPE_MD5:
-				res = (char *) palloc(MD5_PASSWD_LEN + 1);
-				if (!pg_md5_encrypt(password, rolname,
-									strlen(rolname),
-									res))
-					elog(ERROR, "password encryption failed");
-				break;
-			default:
-				Assert(0);	/* should not come here */
-		}
-	}
-
-	return res;
-}
 
 /*
  * CREATE ROLE
@@ -125,7 +81,7 @@ CreateRole(CreateRoleStmt *stmt)
 	ListCell   *option;
 	char	   *password = NULL;	/* user password */
 	int			password_type = Password_encryption;
-	char	   *encrypted_passwd;
+	char		encrypted_password[MD5_PASSWD_LEN + 1];
 	bool		issuper = false;	/* Make the user a superuser? */
 	bool		inherit = true; /* Auto inherit privileges? */
 	bool		createrole = false;		/* Can this user create roles? */
@@ -424,13 +380,17 @@ CreateRole(CreateRoleStmt *stmt)
 
 	if (password)
 	{
-		encrypted_passwd = encrypt_password(password,
-											stmt->role,
-											password_type);
-
-		new_record[Anum_pg_authid_rolpassword - 1] =
-			CStringGetTextDatum(encrypted_passwd);
-		pfree(encrypted_passwd);
+		if (password_type == PASSWORD_TYPE_PLAINTEXT || isMD5(password))
+			new_record[Anum_pg_authid_rolpassword - 1] =
+				CStringGetTextDatum(password);
+		else
+		{
+			if (!pg_md5_encrypt(password, stmt->role, strlen(stmt->role),
+								encrypted_password))
+				elog(ERROR, "password encryption failed");
+			new_record[Anum_pg_authid_rolpassword - 1] =
+				CStringGetTextDatum(encrypted_password);
+		}
 	}
 	else
 		new_record_nulls[Anum_pg_authid_rolpassword - 1] = true;
@@ -533,7 +493,7 @@ AlterRole(AlterRoleStmt *stmt)
 	char	   *rolename = NULL;
 	char	   *password = NULL;	/* user password */
 	int			password_type = Password_encryption;
-	char	   *encrypted_passwd;
+	char		encrypted_password[MD5_PASSWD_LEN + 1];
 	int			issuper = -1;	/* Make the user a superuser? */
 	int			inherit = -1;	/* Auto inherit privileges? */
 	int			createrole = -1;	/* Can this user create roles? */
@@ -831,14 +791,18 @@ AlterRole(AlterRoleStmt *stmt)
 	/* password */
 	if (password)
 	{
-		encrypted_passwd = encrypt_password(password,
-											rolename,
-											password_type);
-
-		new_record[Anum_pg_authid_rolpassword - 1] =
-			CStringGetTextDatum(encrypted_passwd);
+		if (password_type == PASSWORD_TYPE_PLAINTEXT || isMD5(password))
+			new_record[Anum_pg_authid_rolpassword - 1] =
+				CStringGetTextDatum(password);
+		else
+		{
+			if (!pg_md5_encrypt(password, rolename, strlen(rolename),
+								encrypted_password))
+				elog(ERROR, "password encryption failed");
+			new_record[Anum_pg_authid_rolpassword - 1] =
+				CStringGetTextDatum(encrypted_password);
+		}
 		new_record_repl[Anum_pg_authid_rolpassword - 1] = true;
-		pfree(encrypted_passwd);
 	}
 
 	/* unset password */
