Skip to content

Ensure the permissions of the log file are actually really 0666 #2528

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
bwoebi merged 1 commit into from
Feb 22, 2024
+11 −1
Merged

Ensure the permissions of the log file are actually really 0666 #2528

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
10 changes: 10 additions & 0 deletions ext/logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ 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) {
#ifndef _WIN32
fchmod(fd, 0666); // ignore umask
#endif
atomic_store(&ddtrace_error_log_fd, fd);

time_t now;
Expand All @@ -60,6 +63,10 @@ void ddtrace_log_rinit(char *error_log) {
}

int desired = VCWD_OPEN_MODE(error_log, O_CREAT | O_RDWR | O_APPEND, 0666);
#ifndef _WIN32
fchmod(desired, 0666); // ignore umask
#endif

time_t now;
time(&now);
atomic_store(&dd_error_log_fd_rotated, (uintmax_t) now);
Expand Down Expand Up @@ -123,6 +130,9 @@ int ddtrace_log_with_time(int fd, const char *msg, int msg_len) {
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);
#ifndef _WIN32
fchmod(new_fd, 0666); // ignore umask
#endif
dup2(new_fd, fd); // atomic replace
close(new_fd);
}
Expand Down
2 changes: 1 addition & 1 deletion libdatadog
Open in desktop
Submodule libdatadog updated 10 files
+27 −50 crashtracker/src/api.rs
+8 −4 crashtracker/src/constants.rs
+245 −128 crashtracker/src/crash_handler.rs
+14 −9 crashtracker/src/crash_info.rs
+1 −0 crashtracker/src/lib.rs
+40 −22 crashtracker/src/receiver.rs
+4 −4 profiling-ffi/src/crashtracker.rs
+14 −5 sidecar/src/entry.rs
+8 −0 trace-protobuf/src/pb.rs
+4 −0 trace-protobuf/src/pb/stats.proto