Skip to content
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

Fix #2563: ddtrace overrides php error log permissions #2583

Merged
merged 1 commit into from
Mar 21, 2024
Merged

Fix #2563: ddtrace overrides php error log permissions #2583

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: 27 additions & 11 deletions ext/logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,22 @@ _Atomic(uintmax_t) dd_error_log_fd_rotated = 0;

void ddtrace_log_minit(void) {
if (ZSTR_LEN(get_global_DD_TRACE_LOG_FILE())) {
int fd = VCWD_OPEN_MODE(ZSTR_VAL(get_global_DD_TRACE_LOG_FILE()), O_CREAT | O_RDWR | O_APPEND, 0666);
if (fd >= 0) {
int fd = VCWD_OPEN_MODE(ZSTR_VAL(get_global_DD_TRACE_LOG_FILE()), O_RDWR | O_APPEND, 0666);
if (fd < 0) {
// Retry with CREAT to only apply fchmod() on CREAT
fd = VCWD_OPEN_MODE(ZSTR_VAL(get_global_DD_TRACE_LOG_FILE()), O_CREAT | O_RDWR | O_APPEND, 0666);
if (fd < 0) {
return;
}
#ifndef _WIN32
fchmod(fd, 0666); // ignore umask
#endif
atomic_store(&ddtrace_error_log_fd, fd);

time_t now;
time(&now);
atomic_store(&dd_error_log_fd_rotated, (uintmax_t) now);
}
atomic_store(&ddtrace_error_log_fd, fd);

time_t now;
time(&now);
atomic_store(&dd_error_log_fd_rotated, (uintmax_t) now);
}

// no need to call dd_log_set_level here, ddtrace_config_minit() inits the debug config
Expand All @@ -62,10 +67,17 @@ void ddtrace_log_rinit(char *error_log) {
return;
}

int desired = VCWD_OPEN_MODE(error_log, O_CREAT | O_RDWR | O_APPEND, 0666);
int desired = VCWD_OPEN_MODE(error_log, O_RDWR | O_APPEND, 0666);
if (desired < 0) {
// Retry with CREAT to only apply fchmod() on CREAT
desired = VCWD_OPEN_MODE(error_log, O_CREAT | O_RDWR | O_APPEND, 0666);

#ifndef _WIN32
fchmod(desired, 0666); // ignore umask
if (desired >= 0) {
fchmod(desired, 0666); // ignore umask
}
#endif
}

time_t now;
time(&now);
Expand Down Expand Up @@ -129,10 +141,14 @@ int ddtrace_log_with_time(int fd, const char *msg, int msg_len) {
if (last_check < (uintmax_t)now - 60) { // 1x/min
char pathbuf[MAXPATHLEN];
if (ddtrace_get_fd_path(fd, pathbuf) >= 0) {
int new_fd = VCWD_OPEN_MODE(pathbuf, O_CREAT | O_RDWR | O_APPEND, 0666);
int new_fd = VCWD_OPEN_MODE(pathbuf, O_RDWR | O_APPEND, 0666);
if (new_fd < 0) {
// Retry with CREAT to only apply fchmod() on CREAT
new_fd = VCWD_OPEN_MODE(pathbuf, O_CREAT | O_RDWR | O_APPEND, 0666);
#ifndef _WIN32
fchmod(new_fd, 0666); // ignore umask
fchmod(new_fd, 0666); // ignore umask
#endif
}
dup2(new_fd, fd); // atomic replace
close(new_fd);
}
Expand Down
Loading