database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

Meanwhile, database names with single quotes in names don't work very well

Browse Source 
at all, and because of shell quoting rules this can't be fixed, so I put
in error messages to that end.

Also, calling create or drop database in a transaction block is not so
good either, because the file system mysteriously refuses to roll back rm
calls on transaction aborts. :) So I put in checks to see if a transaction
is in progress and signal an error.

Also I put the whole call in a transaction of its own to be able to roll
back changes to pg_database in case the file system operations fail.

The alternative location issues I posted recently were untouched, awaiting
the outcome of that discussion. Other than that, this should be much more
fool-proof now.

The docs I cleaned up as well.

Peter Eisentraut                  Sernanders väg 10:115
This commit is contained in:
Bruce Momjian
1999-12-12 05:15:10 +00:00
parent 1ff0a475ee
commit 11023eb1f5
4 changed files with 236 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/backend/commands/dbcommands.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.46 1999/12/10 03:55:49 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.47 1999/12/12 05:15:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -43,6 +43,12 @@ createdb(char *dbname, char *dbpath, int encoding, CommandDest dest)
char *lp,
loc[MAXPGPATH];
/* no single quotes in dbname */
if (strchr(dbname, '\'') != NULL)
elog(ERROR, "Single quotes are not allowed in database names.");
if (dbpath && strchr(dbpath, '\'') != NULL)
elog(ERROR, "Single quotes are not allowed in database paths.");
/*
* If this call returns, the database does not exist and we're allowed
* to create databases.
@ -52,7 +58,7 @@ createdb(char *dbname, char *dbpath, int encoding, CommandDest dest)
/* close virtual file descriptors so we can do system() calls */
closeAllVfds();
/* Now create directory for this new database */
/* Make directory name for this new database */
if ((dbpath != NULL) && (strcmp(dbpath, dbname) != 0))
{
if (*(dbpath + strlen(dbpath) - 1) == SEP_CHAR)
@ -65,25 +71,45 @@ createdb(char *dbname, char *dbpath, int encoding, CommandDest dest)
lp = ExpandDatabasePath(loc);
if (lp == NULL)
elog(ERROR, "Unable to locate path '%s'"
"\n\tThis may be due to a missing environment variable"
" in the server", loc);
elog(ERROR, "The path '%s' is invalid.\n"
"This may be due to a missing environment variable"
" on the server.", loc);
if (mkdir(lp, S_IRWXU) != 0)
elog(ERROR, "Unable to create database directory '%s'", lp);
/* no single quotes in expanded path */
if (strchr(lp, '\'') != NULL)
elog(ERROR, "Single quotes are not allowed in database paths.");
/* don't call this in a transaction block */
if (IsTransactionBlock())
elog(ERROR, "createdb: May not be called in a transaction block.");
else
BeginTransactionBlock();
snprintf(buf, sizeof(buf),
"INSERT INTO pg_database (datname, datdba, encoding, datpath)"
" VALUES ('%s', '%d', '%d', '%s')", dbname, user_id, encoding, loc);
pg_exec_query_dest(buf, dest, false);
if (mkdir(lp, S_IRWXU) != 0) {
UserAbortTransactionBlock();
elog(ERROR, "Unable to create database directory '%s'.", lp);
}
snprintf(buf, sizeof(buf), "%s %s%cbase%ctemplate1%c* '%s'",
COPY_CMD, DataDir, SEP_CHAR, SEP_CHAR, SEP_CHAR, lp);
system(buf);
if (system(buf) != 0) {
rmdir(lp);
UserAbortTransactionBlock();
elog(ERROR, "Could not initialize database directory.");
}
snprintf(buf, sizeof(buf),
"insert into pg_database (datname, datdba, encoding, datpath)"
" values ('%s', '%d', '%d', '%s');", dbname, user_id, encoding,
loc);
pg_exec_query_dest(buf, dest, false);
if (IsTransactionBlock())
EndTransactionBlock();
}
void
dropdb(char *dbname, CommandDest dest)
{
@ -97,6 +123,10 @@ dropdb(char *dbname, CommandDest dest)
ScanKeyData key;
HeapTuple tup;
/* no single quotes in dbname */
if (strchr(dbname, '\'') != NULL)
elog(ERROR, "Single quotes are not allowed in database names.");
/*
* If this call returns, the database exists and we're allowed to
* remove it.
@ -109,13 +139,19 @@ dropdb(char *dbname, CommandDest dest)
path = ExpandDatabasePath(dbpath);
if (path == NULL)
elog(ERROR, "Unable to locate path '%s'"
"\n\tThis may be due to a missing environment variable"
" in the server", dbpath);
elog(ERROR, "The path '%s' is invalid.\n"
"This may be due to a missing environment variable"
" on the server.", path);
/* stop the vacuum daemon (dead code...) */
stop_vacuum(dbpath, dbname);
/* don't call this in a transaction block */
if (IsTransactionBlock())
elog(ERROR, "dropdb: May not be called in a transaction block.");
else
BeginTransactionBlock();
/*
* Obtain exclusive lock on pg_database. We need this to ensure
* that no new backend starts up in the target database while we
@ -130,9 +166,12 @@ dropdb(char *dbname, CommandDest dest)
/*
* Check for active backends in the target database.
*/
if (DatabaseHasActiveBackends(db_id))
elog(ERROR, "Database '%s' has running backends, can't destroy it",
if (DatabaseHasActiveBackends(db_id)) {
heap_close(pgdbrel, AccessExclusiveLock);
UserAbortTransactionBlock();
elog(ERROR, "Database '%s' has running backends, can't drop it.",
dbname);
}
/*
* Find the database's tuple by OID (should be unique, we trust).
@ -146,6 +185,7 @@ dropdb(char *dbname, CommandDest dest)
if (!HeapTupleIsValid(tup))
{
heap_close(pgdbrel, AccessExclusiveLock);
UserAbortTransactionBlock();
elog(ERROR, "Database '%s', OID %u, not found in pg_database",
dbname, db_id);
}
@ -179,10 +219,16 @@ dropdb(char *dbname, CommandDest dest)
/*
* Remove the database's subdirectory and everything in it.
*/
snprintf(buf, sizeof(buf), "rm -r '%s'", path);
system(buf);
snprintf(buf, sizeof(buf), "rm -rf '%s'", path);
if (system(buf)!=0)
elog(NOTICE, "The database directory '%s' could not be removed.", path);
if (IsTransactionBlock())
EndTransactionBlock();
}
static HeapTuple
get_pg_dbtup(char *command, char *dbname, Relation dbrel)
{
@ -252,7 +298,7 @@ check_permissions(char *command,
/* Check to make sure user has permission to use createdb */
if (!use_createdb)
{
elog(ERROR, "user '%s' is not allowed to create/destroy databases",
elog(ERROR, "user '%s' is not allowed to create/drop databases",
userName);
}