diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-01-01 21:57:18 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-01-01 21:57:18 +0000 |
| commit | 573fe25203d8df257f01477bc429f0d0f311c3d6 (patch) | |
| tree | f9684aa2ae9c12d5a78a3aa77569b3e5ec4379c0 | |
| parent | 51225120ebfbc81d7c61b4abb513e37c7f8c5a99 (diff) | |
| download | postgresql-573fe25203d8df257f01477bc429f0d0f311c3d6.tar.gz postgresql-573fe25203d8df257f01477bc429f0d0f311c3d6.zip | |
fastpath code neglected to check whether user has privileges to call the
target function. Also, move SetQuerySnapshot() call to avoid assert
failure when a fastpath call is attempted in an aborted transaction.
| -rw-r--r-- | src/backend/tcop/fastpath.c | 17 | ||||
| -rw-r--r-- | src/backend/tcop/postgres.c | 7 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index 23cc25fc6de..c1353d0b312 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.54 2002/08/24 15:00:46 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.54.2.1 2003/01/01 21:57:18 tgl Exp $ * * NOTES * This cruft is the server side of PQfn. @@ -65,8 +65,10 @@ #include "libpq/libpq.h" #include "libpq/pqformat.h" #include "tcop/fastpath.h" +#include "utils/acl.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* ---------------- @@ -221,6 +223,7 @@ HandleFunctionRequest(void) int argsize; int nargs; int tmp; + AclResult aclresult; FunctionCallInfoData fcinfo; Datum retval; int i; @@ -337,6 +340,18 @@ HandleFunctionRequest(void) elog(ERROR, "current transaction is aborted, " "queries ignored until end of transaction block"); + /* Check permission to call function */ + aclresult = pg_proc_aclcheck(fid, GetUserId(), ACL_EXECUTE); + if (aclresult != ACLCHECK_OK) + aclcheck_error(aclresult, get_func_name(fid)); + + /* + * Set up a query snapshot in case function needs one. (It is not safe + * to do this if we are in transaction-abort state, so we have to postpone + * it till now. Ugh.) + */ + SetQuerySnapshot(); + #ifdef NO_FASTPATH /* force a NULL return */ retval = (Datum) 0; diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 82eebee4fa8..d756b6f2a6c 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.307 2002/10/31 21:34:16 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.307.2.1 2003/01/01 21:57:18 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -1781,7 +1781,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.307 $ $Date: 2002/10/31 21:34:16 $\n"); + puts("$Revision: 1.307.2.1 $ $Date: 2003/01/01 21:57:18 $\n"); } /* @@ -1965,9 +1965,6 @@ PostgresMain(int argc, char *argv[], const char *username) /* start an xact for this function invocation */ start_xact_command(); - /* assume it may need a snapshot */ - SetQuerySnapshot(); - if (HandleFunctionRequest() == EOF) { /* lost frontend connection during F message input */ |