Check if the role exists before doing more complex ident and Kerberos

bmomjian · bmomjian · commit fe03a5f4aee4 · 2007-02-08T04:52:18.000Z
authentication checks in the backend.

Gavin Sherry
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.147 2007/01/05 22:19:29 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.148 2007/02/08 04:52:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -216,6 +216,9 @@ pg_krb5_recvauth(Port *port)
 	krb5_ticket *ticket;
 	char	   *kusername;
 
+	if (get_role_line(port->user_name) == NULL)
+		return STATUS_ERROR;
+	
 	ret = pg_krb5_init();
 	if (ret != STATUS_OK)
 		return ret;
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.158 2007/01/05 22:19:29 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.159 2007/02/08 04:52:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1589,6 +1589,9 @@ authident(hbaPort *port)
 {
 	char		ident_user[IDENT_USERNAME_MAX + 1];
 
+	if (get_role_line(port->user_name) == NULL)
+		return STATUS_ERROR;
+	
 	switch (port->raddr.addr.ss_family)
 	{
 		case AF_INET:

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.147 2007/01/05 22:19:29 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.148 2007/02/08 04:52:18 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -216,6 +216,9 @@ pg_krb5_recvauth(Port *port)`
`216`	`216`	`krb5_ticket *ticket;`
`217`	`217`	`char *kusername;`
`218`	`218`
	`219`	`+ if (get_role_line(port->user_name) == NULL)`
	`220`	`+ return STATUS_ERROR;`
	`221`	`+`
`219`	`222`	`ret = pg_krb5_init();`
`220`	`223`	`if (ret != STATUS_OK)`
`221`	`224`	`return ret;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.158 2007/01/05 22:19:29 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.159 2007/02/08 04:52:18 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -1589,6 +1589,9 @@ authident(hbaPort *port)`
`1589`	`1589`	`{`
`1590`	`1590`	`char ident_user[IDENT_USERNAME_MAX + 1];`
`1591`	`1591`
	`1592`	`+ if (get_role_line(port->user_name) == NULL)`
	`1593`	`+ return STATUS_ERROR;`
	`1594`	`+`
`1592`	`1595`	`switch (port->raddr.addr.ss_family)`
`1593`	`1596`	`{`
`1594`	`1597`	`case AF_INET:`