mirror of
https://github.com/postgres/postgres.git
synced 2025-04-22 23:02:54 +03:00
Check that the data directory does not have group or world access; remove
a similar check on postgresql.conf.
This commit is contained in:
parent
46e252141b
commit
f487e3da68
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.73 2001/07/03 16:49:48 tgl Exp $
|
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.74 2001/08/06 13:45:15 petere Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -120,6 +120,7 @@ void
|
|||||||
SetDataDir(const char *dir)
|
SetDataDir(const char *dir)
|
||||||
{
|
{
|
||||||
char *new;
|
char *new;
|
||||||
|
struct stat stat_buf;
|
||||||
|
|
||||||
AssertArg(dir);
|
AssertArg(dir);
|
||||||
|
|
||||||
@ -163,6 +164,21 @@ SetDataDir(const char *dir)
|
|||||||
elog(FATAL, "out of memory");
|
elog(FATAL, "out of memory");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check if the directory has group or world access. If so, reject.
|
||||||
|
*/
|
||||||
|
if (stat(new, &stat_buf) == -1)
|
||||||
|
{
|
||||||
|
free(new);
|
||||||
|
elog(FATAL, "could not read permissions of directory %s: %s", new, strerror(errno));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stat_buf.st_mode & (S_IRWXG | S_IRWXO))
|
||||||
|
{
|
||||||
|
free(new);
|
||||||
|
elog(FATAL, "data directory %s has group or world access; permissions should be u=rwx (0700)", new);
|
||||||
|
}
|
||||||
|
|
||||||
if (DataDir)
|
if (DataDir)
|
||||||
free(DataDir);
|
free(DataDir);
|
||||||
DataDir = new;
|
DataDir = new;
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*
|
*
|
||||||
* Copyright 2000 by PostgreSQL Global Development Group
|
* Copyright 2000 by PostgreSQL Global Development Group
|
||||||
*
|
*
|
||||||
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.8 2001/06/07 04:50:57 momjian Exp $
|
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.9 2001/08/06 13:45:15 petere Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
%{
|
%{
|
||||||
@ -130,7 +130,6 @@ ProcessConfigFile(GucContext context)
|
|||||||
int token, parse_state;
|
int token, parse_state;
|
||||||
char *opt_name, *opt_value;
|
char *opt_name, *opt_value;
|
||||||
char *filename;
|
char *filename;
|
||||||
struct stat stat_buf;
|
|
||||||
struct name_value_pair *item, *head, *tail;
|
struct name_value_pair *item, *head, *tail;
|
||||||
int elevel;
|
int elevel;
|
||||||
FILE * fp;
|
FILE * fp;
|
||||||
@ -161,25 +160,6 @@ ProcessConfigFile(GucContext context)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Check if the file is group or world writeable. If so, reject.
|
|
||||||
*/
|
|
||||||
if (fstat(fileno(fp), &stat_buf) == -1)
|
|
||||||
{
|
|
||||||
FreeFile(fp);
|
|
||||||
free(filename);
|
|
||||||
elog(elevel, "could not stat configuration file `" CONFIG_FILENAME "': %s", strerror(errno));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (stat_buf.st_mode & (S_IWGRP | S_IXGRP | S_IWOTH | S_IXOTH))
|
|
||||||
{
|
|
||||||
FreeFile(fp);
|
|
||||||
free(filename);
|
|
||||||
elog(elevel, "configuration file `" CONFIG_FILENAME "' has wrong permissions");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Parse
|
* Parse
|
||||||
*/
|
*/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user