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

bwoebi · web-flow · commit ab2dd7d9e8f7 · 2024-02-22T16:51:49.000+01:00
Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/ext/logging.c b/ext/logging.c
@@ -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;
@@ -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);
@@ -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);
         }
diff --git a/libdatadog b/libdatadog
@@ -1 +1 @@
-Subproject commit 6f51af7534e0dcea323fd2a39f6abbd09fe22d2e
+Subproject commit 446a338c5aec4f7cc5db17f8148393696fa9e2f2
