SERVER-36977 Set process umask before creating log file

1 files changed, 14 insertions, 6 deletions

diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp
index afc86a94aef..0c7a70b67b9 100644
--- a/src/mongo/db/initialize_server_global_state.cpp
+++ b/src/mongo/db/initialize_server_global_state.cpp
@@ -213,9 +213,12 @@ void forkServerOrDie() {
 }
 
 MONGO_EXPORT_SERVER_PARAMETER(maxLogSizeKB, int, logger::LogContext::kDefaultMaxLogSizeKB);
-MONGO_INITIALIZER_GENERAL(ServerLogRedirection,
-                          ("GlobalLogManager", "EndStartupOptionHandling", "ForkServer"),
-                          ("default"))
+// On POSIX platforms we need to set our umask before opening any log files, so this
+// should depend on MungeUmask above, but not on Windows.
+MONGO_INITIALIZER_GENERAL(
+    ServerLogRedirection,
+    ("GlobalLogManager", "EndStartupOptionHandling", "ForkServer", "MungeUmask"),
+    ("default"))
 (InitializerContext*) {
     using logger::LogManager;
     using logger::MessageEventEphemeral;
@@ -353,17 +356,22 @@ MONGO_INITIALIZER(RegisterShortCircuitExitHandler)(InitializerContext*) {
 // restrictions we want to apply and set it back. The overall effect
 // is to set the bits for 'other' and 'group', but leave umask bits
 // bits for 'user' unaltered.
-#ifndef _WIN32
 namespace {
+#ifndef _WIN32
 MONGO_EXPORT_STARTUP_SERVER_PARAMETER(honorSystemUmask, bool, false);
-MONGO_INITIALIZER(MungeUmask)(InitializerContext*) {
+#endif
+
+MONGO_INITIALIZER_WITH_PREREQUISITES(MungeUmask, ("EndStartupOptionHandling"))
+(InitializerContext*) {
+#ifndef _WIN32
     if (!honorSystemUmask) {
         umask(umask(S_IRWXU | S_IRWXG | S_IRWXO) | S_IRWXG | S_IRWXO);
     }
+#endif
+
     return Status::OK();
 }
 }  // namespace
-#endif
 
 bool initializeServerGlobalState(ServiceContext* service) {
 #ifndef _WIN32