Store IdentLine->pg_user as an AuthToken

michaelpq · michaelpq · commit 02d3448f4f79 · 2023-01-16T13:58:07.000+09:00
While system_user was stored as an AuthToken in IdentLine, pg_user was stored as a plain string. This commit changes the code as we start storing pg_user as an AuthToken too. This does not have any functional changes, as all the operations on pg_user only use the string from the AuthToken. There is no regexp compiled and no check based on its quoting, yet. This is in preparation of more features that intend to extend its capabilities, like support for regexps and group membership. Author: Jelte Fennema Discussion: https://postgr.es/m/CAGECzQRNow4MwkBjgPxywXdJU_K3a9+Pm78JB7De3yQwwkTDew@mail.gmail.com
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -2800,7 +2800,7 @@ parse_ident_line(TokenizedAuthLine *tok_line, int elevel)
 	tokens = lfirst(field);
 	IDENT_MULTI_VALUE(tokens);
 	token = linitial(tokens);
-	parsedline->pg_user = pstrdup(token->string);
+	parsedline->pg_user = copy_auth_token(token);
 
 	/*
 	 * Now that the field validation is done, compile a regex from the user
@@ -2865,7 +2865,7 @@ check_ident_usermap(IdentLine *identLine, const char *usermap_name,
 			return;
 		}
 
-		if ((ofs = strstr(identLine->pg_user, "\\1")) != NULL)
+		if ((ofs = strstr(identLine->pg_user->string, "\\1")) != NULL)
 		{
 			int			offset;
 
@@ -2875,7 +2875,7 @@ check_ident_usermap(IdentLine *identLine, const char *usermap_name,
 				ereport(LOG,
 						(errcode(ERRCODE_INVALID_REGULAR_EXPRESSION),
 						 errmsg("regular expression \"%s\" has no subexpressions as requested by backreference in \"%s\"",
-								identLine->system_user->string + 1, identLine->pg_user)));
+								identLine->system_user->string + 1, identLine->pg_user->string)));
 				*error_p = true;
 				return;
 			}
@@ -2884,9 +2884,9 @@ check_ident_usermap(IdentLine *identLine, const char *usermap_name,
 			 * length: original length minus length of \1 plus length of match
 			 * plus null terminator
 			 */
-			expanded_pg_user = palloc0(strlen(identLine->pg_user) - 2 + (matches[1].rm_eo - matches[1].rm_so) + 1);
-			offset = ofs - identLine->pg_user;
-			memcpy(expanded_pg_user, identLine->pg_user, offset);
+			expanded_pg_user = palloc0(strlen(identLine->pg_user->string) - 2 + (matches[1].rm_eo - matches[1].rm_so) + 1);
+			offset = ofs - identLine->pg_user->string;
+			memcpy(expanded_pg_user, identLine->pg_user->string, offset);
 			memcpy(expanded_pg_user + offset,
 				   system_user + matches[1].rm_so,
 				   matches[1].rm_eo - matches[1].rm_so);
@@ -2895,7 +2895,7 @@ check_ident_usermap(IdentLine *identLine, const char *usermap_name,
 		else
 		{
 			/* no substitution, so copy the match */
-			expanded_pg_user = pstrdup(identLine->pg_user);
+			expanded_pg_user = pstrdup(identLine->pg_user->string);
 		}
 
 		/*
@@ -2921,13 +2921,13 @@ check_ident_usermap(IdentLine *identLine, const char *usermap_name,
 		/* Not regular expression, so make complete match */
 		if (case_insensitive)
 		{
-			if (pg_strcasecmp(identLine->pg_user, pg_user) == 0 &&
+			if (pg_strcasecmp(identLine->pg_user->string, pg_user) == 0 &&
 				pg_strcasecmp(identLine->system_user->string, system_user) == 0)
 				*found_p = true;
 		}
 		else
 		{
-			if (strcmp(identLine->pg_user, pg_user) == 0 &&
+			if (strcmp(identLine->pg_user->string, pg_user) == 0 &&
 				strcmp(identLine->system_user->string, system_user) == 0)
 				*found_p = true;
 		}
@@ -3074,6 +3074,7 @@ load_ident(void)
 		{
 			newline = (IdentLine *) lfirst(parsed_line_cell);
 			free_auth_token(newline->system_user);
+			free_auth_token(newline->pg_user);
 		}
 		MemoryContextDelete(ident_context);
 		return false;
@@ -3086,6 +3087,7 @@ load_ident(void)
 		{
 			newline = (IdentLine *) lfirst(parsed_line_cell);
 			free_auth_token(newline->system_user);
+			free_auth_token(newline->pg_user);
 		}
 	}
 	if (parsed_ident_context != NULL)
diff --git a/src/backend/utils/adt/hbafuncs.c b/src/backend/utils/adt/hbafuncs.c
@@ -493,7 +493,7 @@ fill_ident_line(Tuplestorestate *tuple_store, TupleDesc tupdesc,
 	{
 		values[index++] = CStringGetTextDatum(ident->usermap);
 		values[index++] = CStringGetTextDatum(ident->system_user->string);
-		values[index++] = CStringGetTextDatum(ident->pg_user);
+		values[index++] = CStringGetTextDatum(ident->pg_user->string);
 	}
 	else
 	{
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
@@ -143,7 +143,7 @@ typedef struct IdentLine
 
 	char	   *usermap;
 	AuthToken  *system_user;
-	char	   *pg_user;
+	AuthToken  *pg_user;
 } IdentLine;
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -2800,7 +2800,7 @@ parse_ident_line(TokenizedAuthLine *tok_line, int elevel)`
`2800`	`2800`	`tokens = lfirst(field);`
`2801`	`2801`	`IDENT_MULTI_VALUE(tokens);`
`2802`	`2802`	`token = linitial(tokens);`
`2803`		`- parsedline->pg_user = pstrdup(token->string);`
	`2803`	`+ parsedline->pg_user = copy_auth_token(token);`
`2804`	`2804`
`2805`	`2805`	`/*`
`2806`	`2806`	`* Now that the field validation is done, compile a regex from the user`
`@@ -2865,7 +2865,7 @@ check_ident_usermap(IdentLine identLine, const char usermap_name,`
`2865`	`2865`	`return;`
`2866`	`2866`	`}`
`2867`	`2867`
`2868`		`- if ((ofs = strstr(identLine->pg_user, "\\1")) != NULL)`
	`2868`	`+ if ((ofs = strstr(identLine->pg_user->string, "\\1")) != NULL)`
`2869`	`2869`	`{`
`2870`	`2870`	`int offset;`
`2871`	`2871`
`@@ -2875,7 +2875,7 @@ check_ident_usermap(IdentLine identLine, const char usermap_name,`
`2875`	`2875`	`ereport(LOG,`
`2876`	`2876`	`(errcode(ERRCODE_INVALID_REGULAR_EXPRESSION),`
`2877`	`2877`	`errmsg("regular expression \"%s\" has no subexpressions as requested by backreference in \"%s\"",`
`2878`		`- identLine->system_user->string + 1, identLine->pg_user)));`
	`2878`	`+ identLine->system_user->string + 1, identLine->pg_user->string)));`
`2879`	`2879`	`*error_p = true;`
`2880`	`2880`	`return;`
`2881`	`2881`	`}`
`@@ -2884,9 +2884,9 @@ check_ident_usermap(IdentLine identLine, const char usermap_name,`
`2884`	`2884`	`* length: original length minus length of \1 plus length of match`
`2885`	`2885`	`* plus null terminator`
`2886`	`2886`	`*/`
`2887`		`- expanded_pg_user = palloc0(strlen(identLine->pg_user) - 2 + (matches[1].rm_eo - matches[1].rm_so) + 1);`
`2888`		`- offset = ofs - identLine->pg_user;`
`2889`		`- memcpy(expanded_pg_user, identLine->pg_user, offset);`
	`2887`	`+ expanded_pg_user = palloc0(strlen(identLine->pg_user->string) - 2 + (matches[1].rm_eo - matches[1].rm_so) + 1);`
	`2888`	`+ offset = ofs - identLine->pg_user->string;`
	`2889`	`+ memcpy(expanded_pg_user, identLine->pg_user->string, offset);`
`2890`	`2890`	`memcpy(expanded_pg_user + offset,`
`2891`	`2891`	`system_user + matches[1].rm_so,`
`2892`	`2892`	`matches[1].rm_eo - matches[1].rm_so);`
`@@ -2895,7 +2895,7 @@ check_ident_usermap(IdentLine identLine, const char usermap_name,`
`2895`	`2895`	`else`
`2896`	`2896`	`{`
`2897`	`2897`	`/* no substitution, so copy the match */`
`2898`		`- expanded_pg_user = pstrdup(identLine->pg_user);`
	`2898`	`+ expanded_pg_user = pstrdup(identLine->pg_user->string);`
`2899`	`2899`	`}`
`2900`	`2900`
`2901`	`2901`	`/*`
`@@ -2921,13 +2921,13 @@ check_ident_usermap(IdentLine identLine, const char usermap_name,`
`2921`	`2921`	`/* Not regular expression, so make complete match */`
`2922`	`2922`	`if (case_insensitive)`
`2923`	`2923`	`{`
`2924`		`- if (pg_strcasecmp(identLine->pg_user, pg_user) == 0 &&`
	`2924`	`+ if (pg_strcasecmp(identLine->pg_user->string, pg_user) == 0 &&`
`2925`	`2925`	`pg_strcasecmp(identLine->system_user->string, system_user) == 0)`
`2926`	`2926`	`*found_p = true;`
`2927`	`2927`	`}`
`2928`	`2928`	`else`
`2929`	`2929`	`{`
`2930`		`- if (strcmp(identLine->pg_user, pg_user) == 0 &&`
	`2930`	`+ if (strcmp(identLine->pg_user->string, pg_user) == 0 &&`
`2931`	`2931`	`strcmp(identLine->system_user->string, system_user) == 0)`
`2932`	`2932`	`*found_p = true;`
`2933`	`2933`	`}`
`@@ -3074,6 +3074,7 @@ load_ident(void)`
`3074`	`3074`	`{`
`3075`	`3075`	`newline = (IdentLine *) lfirst(parsed_line_cell);`
`3076`	`3076`	`free_auth_token(newline->system_user);`
	`3077`	`+ free_auth_token(newline->pg_user);`
`3077`	`3078`	`}`
`3078`	`3079`	`MemoryContextDelete(ident_context);`
`3079`	`3080`	`return false;`
`@@ -3086,6 +3087,7 @@ load_ident(void)`
`3086`	`3087`	`{`
`3087`	`3088`	`newline = (IdentLine *) lfirst(parsed_line_cell);`
`3088`	`3089`	`free_auth_token(newline->system_user);`
	`3090`	`+ free_auth_token(newline->pg_user);`
`3089`	`3091`	`}`
`3090`	`3092`	`}`
`3091`	`3093`	`if (parsed_ident_context != NULL)`
Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ fill_ident_line(Tuplestorestate *tuple_store, TupleDesc tupdesc,`
`493`	`493`	`{`
`494`	`494`	`values[index++] = CStringGetTextDatum(ident->usermap);`
`495`	`495`	`values[index++] = CStringGetTextDatum(ident->system_user->string);`
`496`		`- values[index++] = CStringGetTextDatum(ident->pg_user);`
	`496`	`+ values[index++] = CStringGetTextDatum(ident->pg_user->string);`
`497`	`497`	`}`
`498`	`498`	`else`
`499`	`499`	`{`