Handle double-quotes correctly in user names in ACL lists.

tglsfdc · tglsfdc · commit 2b5f049f7c62 · 2003-08-14T14:19:11.000Z
Christopher Kings-Lynne
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.94 2003/08/04 02:40:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.95 2003/08/14 14:19:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,8 +61,8 @@ static AclMode convert_schema_priv_string(text *priv_type_text);
  * RETURNS:
  *		the string position in 's' that points to the next non-space character
  *		in 's', after any quotes.  Also:
- *		- loads the identifier into 'name'.  (If no identifier is found, 'name'
- *		  contains an empty string.)  name must be NAMEDATALEN bytes.
+ *		- loads the identifier into 'n'.  (If no identifier is found, 'n'
+ *		  contains an empty string.)  'n' must be NAMEDATALEN bytes.
  */
 static const char *
 getid(const char *s, char *n)
@@ -74,7 +74,7 @@ getid(const char *s, char *n)
 
 	while (isspace((unsigned char) *s))
 		s++;
-	/* This test had better match what putid() does, below */
+	/* This code had better match what putid() does, below */
 	for (;
 		 *s != '\0' &&
 		 (isalnum((unsigned char) *s) ||
@@ -84,18 +84,26 @@ getid(const char *s, char *n)
 		 s++)
 	{
 		if (*s == '"')
-			in_quotes = !in_quotes;
-		else
 		{
-			if (len >= NAMEDATALEN - 1)
-				ereport(ERROR,
-						(errcode(ERRCODE_NAME_TOO_LONG),
-						 errmsg("identifier too long"),
-				 errdetail("Identifier must be less than %d characters.",
-						   NAMEDATALEN)));
-
-			n[len++] = *s;
+			/* safe to look at next char (could be '\0' though) */
+			if (*(s + 1) != '"')
+			{
+				in_quotes = !in_quotes;
+				continue;
+			}
+			/* it's an escaped double quote; skip the escaping char */
+			s++;
 		}
+
+		/* Add the character to the string */
+		if (len >= NAMEDATALEN - 1)
+			ereport(ERROR,
+					(errcode(ERRCODE_NAME_TOO_LONG),
+					 errmsg("identifier too long"),
+					 errdetail("Identifier must be less than %d characters.",
+							   NAMEDATALEN)));
+
+		n[len++] = *s;
 	}
 	n[len] = '\0';
 	while (isspace((unsigned char) *s))
@@ -104,8 +112,9 @@ getid(const char *s, char *n)
 }
 
 /*
- * Write a user or group Name at *p, surrounding it with double quotes if
- * needed.	There must be at least NAMEDATALEN+2 bytes available at *p.
+ * Write a user or group Name at *p, adding double quotes if needed.
+ * There must be at least (2*NAMEDATALEN)+2 bytes available at *p.
+ * This needs to be kept in sync with copyAclUserName in pg_dump/dumputils.c
  */
 static void
 putid(char *p, const char *s)
@@ -125,7 +134,12 @@ putid(char *p, const char *s)
 	if (!safe)
 		*p++ = '"';
 	for (src = s; *src; src++)
+	{
+		/* A double quote character in a username is encoded as "" */
+		if (*src == '"')
+			*p++ = '"';
 		*p++ = *src;
+	}
 	if (!safe)
 		*p++ = '"';
 	*p = '\0';
@@ -358,7 +372,7 @@ aclitemout(PG_FUNCTION_ARGS)
 
 	out = palloc(strlen("group =/") +
 				 2 * N_ACL_RIGHTS +
-				 2 * (NAMEDATALEN + 2) +
+				 2 * (2 * NAMEDATALEN + 2) +
 				 1);
 
 	p = out;
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/dumputils.c,v 1.8 2003/08/04 02:40:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/dumputils.c,v 1.9 2003/08/14 14:19:11 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -557,23 +557,28 @@ static char *
 copyAclUserName(PQExpBuffer output, char *input)
 {
 	resetPQExpBuffer(output);
+
 	while (*input && *input != '=')
 	{
+		/* If user name isn't quoted, then just add it to the output buffer */
 		if (*input != '"')
 			appendPQExpBufferChar(output, *input++);
 		else
 		{
+			/* Otherwise, it's a quoted username */ 
 			input++;
-			while (*input != '"')
+			/* Loop until we come across an unescaped quote */
+			while (!(*input == '"' && *(input + 1) != '"'))
 			{
 				if (*input == '\0')
 					return input;		/* really a syntax error... */
 
 				/*
-				 * There is no quoting convention here, thus we can't cope
-				 * with usernames containing double quotes.  Keep this
+				 * Quoting convention is to escape " as "".  Keep this
 				 * code in sync with putid() in backend's acl.c.
 				 */
+				if (*input == '"' && *(input + 1) == '"')
+					input++;
 				appendPQExpBufferChar(output, *input++);
 			}
 			input++;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/dumputils.c,v 1.8 2003/08/04 02:40:09 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/dumputils.c,v 1.9 2003/08/14 14:19:11 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -557,23 +557,28 @@ static char *`
`557`	`557`	`copyAclUserName(PQExpBuffer output, char *input)`
`558`	`558`	`{`
`559`	`559`	`resetPQExpBuffer(output);`
	`560`	`+`
`560`	`561`	`while (input && input != '=')`
`561`	`562`	`{`
	`563`	`+ /* If user name isn't quoted, then just add it to the output buffer */`
`562`	`564`	`if (*input != '"')`
`563`	`565`	`appendPQExpBufferChar(output, *input++);`
`564`	`566`	`else`
`565`	`567`	`{`
	`568`	`+ /* Otherwise, it's a quoted username */`
`566`	`569`	`input++;`
`567`		`- while (*input != '"')`
	`570`	`+ /* Loop until we come across an unescaped quote */`
	`571`	`+ while (!(input == '"' && (input + 1) != '"'))`
`568`	`572`	`{`
`569`	`573`	`if (*input == '\0')`
`570`	`574`	`return input; /* really a syntax error... */`
`571`	`575`
`572`	`576`	`/*`
`573`		`- * There is no quoting convention here, thus we can't cope`
`574`		`- * with usernames containing double quotes. Keep this`
	`577`	`+ * Quoting convention is to escape " as "". Keep this`
`575`	`578`	`* code in sync with putid() in backend's acl.c.`
`576`	`579`	`*/`
	`580`	`+ if (input == '"' && (input + 1) == '"')`
	`581`	`+ input++;`
`577`	`582`	`appendPQExpBufferChar(output, *input++);`
`578`	`583`	`}`
`579`	`584`	`input++;`