pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1691 from pi-hole/fix/rotation_permissions

Browse Source 
Explicitly chown all rotated files
This commit is contained in:
DL6ER
2023-10-22 23:16:05 +02:00
committed by GitHub
parent 492759ac03 3d571ba862
commit 8664165ebc
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+1 -1
View File
@@ -339,7 +339,7 @@ find_program(SETCAP setcap)
install(TARGETS pihole-FTL
RUNTIME DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
install(CODE "execute_process(COMMAND ${SETCAP} CAP_NET_BIND_SERVICE,CAP_NET_RAW,CAP_NET_ADMIN,CAP_SYS_NICE+eip \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/pihole-FTL)")
install(CODE "execute_process(COMMAND ${SETCAP} CAP_NET_BIND_SERVICE,CAP_NET_RAW,CAP_NET_ADMIN,CAP_SYS_NICE,CAP_CHOWN+eip \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/pihole-FTL)")
add_subdirectory(api)
add_subdirectory(webserver)
src/files.c
+35
View File
@@ -398,7 +398,33 @@ static int copy_file(const char *source, const char *destination)
#endif
}
// Change ownership of file to pihole user
static bool chown_pihole(const char *path)
{
// Get pihole user's uid and gid
struct passwd *pwd = getpwnam("pihole");
if(pwd == NULL)
{
log_warn("chown_pihole(): Failed to get pihole user's uid: %s", strerror(errno));
return false;
}
struct group *grp = getgrnam("pihole");
if(grp == NULL)
{
log_warn("chown_pihole(): Failed to get pihole user's gid: %s", strerror(errno));
return false;
}
// Change ownership of file to pihole user
if(chown(path, pwd->pw_uid, grp->gr_gid) < 0)
{
log_warn("chown_pihole(): Failed to change ownership of \"%s\" to %u:%u: %s",
path, pwd->pw_uid, grp->gr_gid, strerror(errno));
return false;
}
return true;
}
// Rotate files in a directory
void rotate_files(const char *path, char **first_file)
@@ -479,6 +505,9 @@ void rotate_files(const char *path, char **first_file)
old_path, new_path);
}
// Change ownership of file to pihole user
chown_pihole(new_path);
// Compress file if we are rotating a sufficiently old file
if(i > ZIP_ROTATIONS)
{
@@ -489,6 +518,9 @@ void rotate_files(const char *path, char **first_file)
// On success, we remove the uncompressed file
remove(new_path);
}
// Change ownership of file to pihole user
chown_pihole(new_path_compressed);
}
}
else if(file_exists(old_path_compressed))
@@ -505,6 +537,9 @@ void rotate_files(const char *path, char **first_file)
log_debug(DEBUG_CONFIG, "Rotated %s -> %s",
old_path_compressed, new_path_compressed);
}
// Change ownership of file to pihole user
chown_pihole(new_path_compressed);
}
// Free memory