aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Fix trailing slash handling for capsicum_irclogs_path.

Browse Source 
This is mostly an anti-footshooting measure, but still.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
This commit is contained in:
Edward Tomasz Napierala 2017-07-29 20:04:28 +01:00
parent 7f2697d307
commit a29eeaa9f2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/capsicum.c
View File

@ -147,6 +147,7 @@ int capsicum_open(const char *path, int flags, int mode)
/* +1 is for the slash separating irclogs_path and the rest. */ /* +1 is for the slash separating irclogs_path and the rest. */
if (strlen(path) > irclogs_path_len + 1 && if (strlen(path) > irclogs_path_len + 1 &&
path[irclogs_path_len] == '/' &&
strncmp(path, irclogs_path, irclogs_path_len) == 0) { strncmp(path, irclogs_path, irclogs_path_len) == 0) {
fd = openat(irclogs_fd, path + irclogs_path_len + 1, fd = openat(irclogs_fd, path + irclogs_path_len + 1,
flags, mode); flags, mode);
@ -176,6 +177,7 @@ void capsicum_mkdir_with_parents(const char *path, int mode)
/* +1 is for the slash separating irclogs_path and the rest. */ /* +1 is for the slash separating irclogs_path and the rest. */
if (strlen(path) <= irclogs_path_len + 1 || if (strlen(path) <= irclogs_path_len + 1 ||
path[irclogs_path_len] != '/' ||
strncmp(path, irclogs_path, irclogs_path_len) != 0) { strncmp(path, irclogs_path, irclogs_path_len) != 0) {
g_warning("Cannot create %s: file system access restricted " g_warning("Cannot create %s: file system access restricted "
"to %s due to capability mode", path, irclogs_path); "to %s due to capability mode", path, irclogs_path);
@ -366,8 +368,15 @@ static void cmd_capsicum_enter(void)
port_max = settings_get_int("capsicum_port_max"); port_max = settings_get_int("capsicum_port_max");
irclogs_path = convert_home(settings_get_str("capsicum_irclogs_path")); irclogs_path = convert_home(settings_get_str("capsicum_irclogs_path"));
g_mkdir_with_parents(irclogs_path, log_dir_create_mode);
irclogs_path_len = strlen(irclogs_path); irclogs_path_len = strlen(irclogs_path);
/* Strip trailing slashes, if any. */
while (irclogs_path_len > 0 && irclogs_path[irclogs_path_len - 1] == '/') {
irclogs_path[irclogs_path_len - 1] = '\0';
irclogs_path_len--;
}
g_mkdir_with_parents(irclogs_path, log_dir_create_mode);
irclogs_fd = open(irclogs_path, O_DIRECTORY | O_CLOEXEC); irclogs_fd = open(irclogs_path, O_DIRECTORY | O_CLOEXEC);
if (irclogs_fd < 0) { if (irclogs_fd < 0) {
g_warning("Unable to open %s: %s", irclogs_path, strerror(errno)); g_warning("Unable to open %s: %s", irclogs_path, strerror(errno));