Skip to content

PG-1932 Make sure archive and restore comamnds do not leak files #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeltz merged 1 commit into from
Nov 13, 2025
Merged

PG-1932 Make sure archive and restore comamnds do not leak files #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions src/bin/pg_tde_archive_decrypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#include "access/pg_tde_fe_init.h"
#include "access/pg_tde_xlog_smgr.h"

#include <signal.h>

#define TMPFS_DIRECTORY "/dev/shm"

static bool
Expand Down Expand Up @@ -134,6 +136,27 @@ usage(const char *progname)
"\n"), progname, progname);
}

static char tmpdir[MAXPGPATH] = TMPFS_DIRECTORY "/pg_tde_archiveXXXXXX";
static char tmppath[MAXPGPATH];

static void
cleanup_tmpdir(void)
{
if (unlink(tmppath) < 0 && errno != ENOENT)
pg_log_warning("could not remove file \"%s\": %m", tmppath);
if (rmdir(tmpdir) < 0 && errno != ENOENT)
pg_log_warning("could not remove directory \"%s\": %m", tmpdir);
}

/* Clean up temporary files and dirs on SIGINT/SIGTERM */
static void
trapsig(int signum)
{
cleanup_tmpdir();
signal(signum, SIG_DFL);
kill(getpid(), signum);
}

int
main(int argc, char *argv[])
{
Expand All @@ -143,8 +166,6 @@ main(int argc, char *argv[])
char *command;
char *sep;
char *sourcename;
char tmpdir[MAXPGPATH] = TMPFS_DIRECTORY "/pg_tde_archiveXXXXXX";
char tmppath[MAXPGPATH];
bool issegment;
int rc;

Expand Down Expand Up @@ -199,6 +220,11 @@ main(int argc, char *argv[])
s = stpcpy(s, "/");
stpcpy(s, sourcename);

/* There is a mostly harmless race condition with creating the dir */
signal(SIGTERM, trapsig);
signal(SIGINT, trapsig);
atexit(cleanup_tmpdir);

command = replace_percent_placeholders(command,
"ARCHIVE-COMMAND", "fp",
targetname, tmppath);
Expand Down Expand Up @@ -228,13 +254,5 @@ main(int argc, char *argv[])

free(command);

if (issegment)
{
if (unlink(tmppath) < 0)
pg_log_warning("could not remove file \"%s\": %m", tmppath);
if (rmdir(tmpdir) < 0)
pg_log_warning("could not remove directory \"%s\": %m", tmpdir);
}

return 0;
}
37 changes: 28 additions & 9 deletions src/bin/pg_tde_restore_encrypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#include "access/pg_tde_fe_init.h"
#include "access/pg_tde_xlog_smgr.h"

#include <signal.h>

#define TMPFS_DIRECTORY "/dev/shm"

/*
Expand Down Expand Up @@ -129,6 +131,27 @@ usage(const char *progname)
"\n"), progname, progname);
}

static char tmpdir[MAXPGPATH] = TMPFS_DIRECTORY "/pg_tde_restoreXXXXXX";
static char tmppath[MAXPGPATH];

static void
cleanup_tmpdir(void)
{
if (unlink(tmppath) < 0 && errno != ENOENT)
pg_log_warning("could not remove file \"%s\": %m", tmppath);
if (rmdir(tmpdir) < 0 && errno != ENOENT)
pg_log_warning("could not remove directory \"%s\": %m", tmpdir);
}

/* Clean up temporary files and dirs on SIGINT/SIGTERM */
static void
trapsig(int signum)
{
cleanup_tmpdir();
signal(signum, SIG_DFL);
kill(getpid(), signum);
}

int
main(int argc, char *argv[])
{
Expand All @@ -138,8 +161,6 @@ main(int argc, char *argv[])
char *command;
char *sep;
char *targetname;
char tmpdir[MAXPGPATH] = TMPFS_DIRECTORY "/pg_tde_restoreXXXXXX";
char tmppath[MAXPGPATH];
bool issegment;
int rc;

Expand Down Expand Up @@ -194,6 +215,11 @@ main(int argc, char *argv[])
s = stpcpy(s, "/");
stpcpy(s, targetname);

/* There is a mostly harmless race condition with creating the dir */
signal(SIGTERM, trapsig);
signal(SIGINT, trapsig);
atexit(cleanup_tmpdir);

command = replace_percent_placeholders(command,
"RESTORE-COMMAND", "fp",
sourcename, tmppath);
Expand Down Expand Up @@ -222,14 +248,7 @@ main(int argc, char *argv[])
free(command);

if (issegment)
{
write_encrypted_segment(targetpath, sourcename, tmppath);

if (unlink(tmppath) < 0)
pg_log_warning("could not remove file \"%s\": %m", tmppath);
if (rmdir(tmpdir) < 0)
pg_log_warning("could not remove directory \"%s\": %m", tmpdir);
}

return 0;
}