mirror of
https://github.com/postgres/postgres.git
synced 2025-07-02 09:02:37 +03:00
Refactor dir/file permissions
Consolidate directory and file create permissions for tools which work with the PG data directory by adding a new module (common/file_perm.c) that contains variables (pg_file_create_mode, pg_dir_create_mode) and constants to initialize them (0600 for files and 0700 for directories). Convert mkdir() calls in the backend to MakePGDirectory() if the original call used default permissions (always the case for regular PG directories). Add tests to make sure permissions in PGDATA are set correctly by the tools which modify the PG data directory. Authors: David Steele <david@pgmasters.net>, Adam Brightwell <adam.brightwell@crunchydata.com> Reviewed-By: Michael Paquier, with discussion amongst many others. Discussion: https://postgr.es/m/ad346fe6-b23e-59f1-ecb7-0e08390ad629%40pgmasters.net
This commit is contained in:
@ -19,6 +19,7 @@
|
||||
#include "access/xlog_internal.h" /* for pg_start/stop_backup */
|
||||
#include "catalog/catalog.h"
|
||||
#include "catalog/pg_type.h"
|
||||
#include "common/file_perm.h"
|
||||
#include "lib/stringinfo.h"
|
||||
#include "libpq/libpq.h"
|
||||
#include "libpq/pqformat.h"
|
||||
@ -930,7 +931,7 @@ sendFileWithContent(const char *filename, const char *content)
|
||||
statbuf.st_gid = getegid();
|
||||
#endif
|
||||
statbuf.st_mtime = time(NULL);
|
||||
statbuf.st_mode = S_IRUSR | S_IWUSR;
|
||||
statbuf.st_mode = pg_file_create_mode;
|
||||
statbuf.st_size = len;
|
||||
|
||||
_tarWriteHeader(filename, NULL, &statbuf, false);
|
||||
@ -1628,7 +1629,7 @@ _tarWriteDir(const char *pathbuf, int basepathlen, struct stat *statbuf,
|
||||
#else
|
||||
if (pgwin32_is_junction(pathbuf))
|
||||
#endif
|
||||
statbuf->st_mode = S_IFDIR | S_IRWXU;
|
||||
statbuf->st_mode = S_IFDIR | pg_dir_create_mode;
|
||||
|
||||
return _tarWriteHeader(pathbuf + basepathlen + 1, NULL, statbuf, sizeonly);
|
||||
}
|
||||
|
@ -1166,13 +1166,14 @@ CreateSlotOnDisk(ReplicationSlot *slot)
|
||||
* It's just barely possible that some previous effort to create or drop a
|
||||
* slot with this name left a temp directory lying around. If that seems
|
||||
* to be the case, try to remove it. If the rmtree() fails, we'll error
|
||||
* out at the mkdir() below, so we don't bother checking success.
|
||||
* out at the MakePGDirectory() below, so we don't bother checking
|
||||
* success.
|
||||
*/
|
||||
if (stat(tmppath, &st) == 0 && S_ISDIR(st.st_mode))
|
||||
rmtree(tmppath, true);
|
||||
|
||||
/* Create and fsync the temporary slot directory. */
|
||||
if (mkdir(tmppath, S_IRWXU) < 0)
|
||||
if (MakePGDirectory(tmppath) < 0)
|
||||
ereport(ERROR,
|
||||
(errcode_for_file_access(),
|
||||
errmsg("could not create directory \"%s\": %m",
|
||||
|
Reference in New Issue
Block a user