mirror of
https://github.com/AGWA/git-crypt.git
synced 2026-01-07 02:24:35 -08:00
Write and use create_protected_file() helper
Instead of using umask to ensure sensitive files are created with restrictive permissions, git-crypt now does: create_protected_file(filename); std::ofstream out(filename); // ... create_protected_file can have different Unix and Windows implementations. create_protected_file should be easier to implement on Windows than a umask equivalent, and this pattern keeps the amount of platform-specific code to a minimum and avoids #ifdefs.
This commit is contained in:
@@ -37,6 +37,7 @@
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <limits.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <dirent.h>
|
||||
#include <vector>
|
||||
@@ -72,14 +73,14 @@ void temp_fstream::open (std::ios_base::openmode mode)
|
||||
char* path = &path_buffer[0];
|
||||
std::strcpy(path, tmpdir);
|
||||
std::strcpy(path + tmpdir_len, "/git-crypt.XXXXXX");
|
||||
mode_t old_umask = util_umask(0077);
|
||||
mode_t old_umask = umask(0077);
|
||||
int fd = mkstemp(path);
|
||||
if (fd == -1) {
|
||||
int mkstemp_errno = errno;
|
||||
util_umask(old_umask);
|
||||
umask(old_umask);
|
||||
throw System_error("mkstemp", "", mkstemp_errno);
|
||||
}
|
||||
util_umask(old_umask);
|
||||
umask(old_umask);
|
||||
std::fstream::open(path, mode);
|
||||
if (!std::fstream::is_open()) {
|
||||
unlink(path);
|
||||
@@ -288,9 +289,13 @@ static void init_std_streams_platform ()
|
||||
{
|
||||
}
|
||||
|
||||
mode_t util_umask (mode_t mode)
|
||||
void create_protected_file (const char* path)
|
||||
{
|
||||
return umask(mode);
|
||||
int fd = open(path, O_WRONLY | O_CREAT, 0600);
|
||||
if (fd == -1) {
|
||||
throw System_error("open", path, errno);
|
||||
}
|
||||
close(fd);
|
||||
}
|
||||
|
||||
int util_rename (const char* from, const char* to)
|
||||
|
||||
Reference in New Issue
Block a user