]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Convert InspIRCd::SetSignals to a static function.
[user/henk/code/inspircd.git] / src / inspircd.cpp
index 3ce5e553f0d094337ec703b095a0c1e140b8b3c5..6d82723612631b1796e6d5f39bb6a1bd4787c8ee 100644 (file)
@@ -78,6 +78,8 @@ const char* ExitCodes[] =
 
 namespace
 {
+       void VoidSignalHandler(int);
+
        // Deletes a pointer and then zeroes it.
        template<typename T>
        void DeleteZero(T*& pr)
@@ -87,6 +89,133 @@ namespace
                delete p;
        }
 
+       // Drops to the unprivileged user/group specified in <security:runas{user,group}>.
+       void DropRoot()
+       {
+#ifndef _WIN32
+               ConfigTag* security = ServerInstance->Config->ConfValue("security");
+
+               const std::string SetGroup = security->getString("runasgroup");
+               if (!SetGroup.empty())
+               {
+                       errno = 0;
+                       if (setgroups(0, NULL) == -1)
+                       {
+                               ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "setgroups() failed (wtf?): %s", strerror(errno));
+                               exit(EXIT_STATUS_CONFIG);
+                       }
+
+                       struct group* g = getgrnam(SetGroup.c_str());
+                       if (!g)
+                       {
+                               ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "getgrnam(%s) failed (wrong group?): %s", SetGroup.c_str(), strerror(errno));
+                               exit(EXIT_STATUS_CONFIG);
+                       }
+
+                       if (setgid(g->gr_gid) == -1)
+                       {
+                               ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "setgid(%d) failed (wrong group?): %s", g->gr_gid, strerror(errno));
+                               exit(EXIT_STATUS_CONFIG);
+                       }
+               }
+
+               const std::string SetUser = security->getString("runasuser");
+               if (!SetUser.empty())
+               {
+                       errno = 0;
+                       struct passwd* u = getpwnam(SetUser.c_str());
+                       if (!u)
+                       {
+                               ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "getpwnam(%s) failed (wrong user?): %s", SetUser.c_str(), strerror(errno));
+                               exit(EXIT_STATUS_CONFIG);
+                       }
+
+                       if (setuid(u->pw_uid) == -1)
+                       {
+                               ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "setuid(%d) failed (wrong user?): %s", u->pw_uid, strerror(errno));
+                               exit(EXIT_STATUS_CONFIG);
+                       }
+               }
+#endif
+       }
+
+       // Attempts to fork into the background.
+       bool ForkIntoBackground()
+       {
+#ifndef _WIN32
+               // We use VoidSignalHandler whilst forking to avoid breaking daemon scripts
+               // if the parent process exits with SIGTERM (15) instead of EXIT_STATUS_NOERROR (0).
+               signal(SIGTERM, VoidSignalHandler);
+
+               errno = 0;
+               int childpid = fork();
+               if (childpid < 0)
+               {
+                       ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "fork() failed: %s", strerror(errno));
+                       return false;
+               }
+               else if (childpid > 0)
+               {
+                       // Wait until the child process kills the parent so that the shell prompt
+                       // doesnt display over the output. Sending a kill with a signal of 0 just
+                       // checks that the child pid is still running. If it is not then an error
+                       // happened and the parent should exit.
+                       while (kill(childpid, 0) != -1)
+                               sleep(1);
+                       exit(EXIT_STATUS_NOERROR);
+               }
+               else
+               {
+                       setsid();
+                       signal(SIGTERM, InspIRCd::SetSignal);
+               }
+#endif
+               return true;
+       }
+
+       // Increase the size of a core dump file to improve debugging problems.
+       void IncreaseCoreDumpSize()
+       {
+#ifndef _WIN32
+               errno = 0;
+               rlimit rl;
+               if (getrlimit(RLIMIT_CORE, &rl) == -1)
+               {
+                       ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "Unable to increase core dump size: getrlimit(RLIMIT_CORE) failed: %s", strerror(errno));
+                       return;
+               }
+
+               rl.rlim_cur = rl.rlim_max;
+               if (setrlimit(RLIMIT_CORE, &rl) == -1)
+                       ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "Unable to increase core dump size: setrlimit(RLIMIT_CORE) failed: %s", strerror(errno));
+#endif
+       }
+
+       // Seeds the random number generator if applicable.
+       void SeedRng(timespec ts)
+       {
+#if defined _WIN32
+               srand(ts.tv_nsec ^ ts.tv_sec);
+#elif !defined HAS_ARC4RANDOM_BUF
+               srandom(ts.tv_nsec ^ ts.tv_sec);
+#endif
+       }
+
+       // Sets handlers for various process signals.
+       void SetSignals()
+       {
+#ifndef _WIN32
+               signal(SIGALRM, SIG_IGN);
+               signal(SIGCHLD, SIG_IGN);
+               signal(SIGHUP, InspIRCd::SetSignal);
+               signal(SIGPIPE, SIG_IGN);
+               signal(SIGUSR1, SIG_IGN);
+               signal(SIGUSR2, SIG_IGN);
+               signal(SIGXFSZ, SIG_IGN);
+#endif
+               signal(SIGTERM, InspIRCd::SetSignal);
+       }
+
        // Required for returning the proper value of EXIT_SUCCESS for the parent process.
        void VoidSignalHandler(int)
        {
@@ -130,65 +259,6 @@ void InspIRCd::Cleanup()
        Logs->CloseLogs();
 }
 
-void InspIRCd::SetSignals()
-{
-#ifndef _WIN32
-       signal(SIGALRM, SIG_IGN);
-       signal(SIGCHLD, SIG_IGN);
-       signal(SIGHUP, InspIRCd::SetSignal);
-       signal(SIGPIPE, SIG_IGN);
-       signal(SIGUSR1, SIG_IGN);
-       signal(SIGUSR2, SIG_IGN);
-       signal(SIGXFSZ, SIG_IGN);
-#endif
-       signal(SIGTERM, InspIRCd::SetSignal);
-}
-
-bool InspIRCd::DaemonSeed()
-{
-#ifdef _WIN32
-       std::cout << "InspIRCd Process ID: " << con_green << GetCurrentProcessId() << con_reset << std::endl;
-       return true;
-#else
-       // Do not use exit() here: It will exit with status SIGTERM which would break e.g. daemon scripts
-       signal(SIGTERM, VoidSignalHandler);
-
-       int childpid = fork();
-       if (childpid < 0)
-               return false;
-       else if (childpid > 0)
-       {
-               /* We wait here for the child process to kill us,
-                * so that the shell prompt doesnt come back over
-                * the output.
-                * Sending a kill with a signal of 0 just checks
-                * if the child pid is still around. If theyre not,
-                * they threw an error and we should give up.
-                */
-               while (kill(childpid, 0) != -1)
-                       sleep(1);
-               exit(EXIT_STATUS_NOERROR);
-       }
-       setsid ();
-       std::cout << "InspIRCd Process ID: " << con_green << getpid() << con_reset << std::endl;
-
-       signal(SIGTERM, InspIRCd::SetSignal);
-
-       rlimit rl;
-       if (getrlimit(RLIMIT_CORE, &rl) == -1)
-       {
-               this->Logs->Log("STARTUP", LOG_DEFAULT, "Failed to getrlimit()!");
-               return false;
-       }
-       rl.rlim_cur = rl.rlim_max;
-
-       if (setrlimit(RLIMIT_CORE, &rl) == -1)
-                       this->Logs->Log("STARTUP", LOG_DEFAULT, "setrlimit() failed, cannot increase coredump size.");
-
-       return true;
-#endif
-}
-
 void InspIRCd::WritePID(const std::string& filename, bool exitonfail)
 {
 #ifndef _WIN32
@@ -233,6 +303,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        UpdateTime();
        this->startup_time = TIME.tv_sec;
 
+       SeedRng(TIME);
        SocketEngine::Init();
 
        this->Config = new ServerConfig;
@@ -243,8 +314,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->Config->cmdline.argc = argc;
 
 #ifdef _WIN32
-       srand(TIME.tv_nsec ^ TIME.tv_sec);
-
        // Initialize the console values
        g_hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
        CONSOLE_SCREEN_BUFFER_INFO bufinf;
@@ -258,8 +327,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
                g_wOriginalColors = FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN;
                g_wBackgroundColor = 0;
        }
-#else
-       srandom(TIME.tv_nsec ^ TIME.tv_sec);
 #endif
 
        {
@@ -386,18 +453,18 @@ InspIRCd::InspIRCd(int argc, char** argv)
        }
 #endif
 
-       this->SetSignals();
+       SetSignals();
 
-       if (!Config->cmdline.nofork)
+       if (!Config->cmdline.nofork && !ForkIntoBackground())
        {
-               if (!this->DaemonSeed())
-               {
-                       std::cout << "ERROR: could not go into daemon mode. Shutting down." << std::endl;
-                       Logs->Log("STARTUP", LOG_DEFAULT, "ERROR: could not go into daemon mode. Shutting down.");
-                       Exit(EXIT_STATUS_FORK);
-               }
+               std::cout << "ERROR: could not go into daemon mode. Shutting down." << std::endl;
+               Logs->Log("STARTUP", LOG_DEFAULT, "ERROR: could not go into daemon mode. Shutting down.");
+               Exit(EXIT_STATUS_FORK);
        }
 
+       std::cout << "InspIRCd Process ID: " << con_green << getpid() << con_reset << std::endl;
+
+       IncreaseCoreDumpSize();
        SocketEngine::RecoverFromFork();
 
        /* During startup we read the configuration now, not in
@@ -499,74 +566,28 @@ InspIRCd::InspIRCd(int argc, char** argv)
        QueryPerformanceFrequency(&stats.QPFrequency);
 #endif
 
-       Logs->Log("STARTUP", LOG_DEFAULT, "Startup complete as '%s'[%s], %lu max open sockets", Config->ServerName.c_str(),Config->GetSID().c_str(), SocketEngine::GetMaxFds());
-
-#ifndef _WIN32
-       ConfigTag* security = Config->ConfValue("security");
-
-       const std::string SetGroup = security->getString("runasgroup");
-       if (!SetGroup.empty())
-       {
-               errno = 0;
-               if (setgroups(0, NULL) == -1)
-               {
-                       this->Logs->Log("STARTUP", LOG_DEFAULT, "setgroups() failed (wtf?): %s", strerror(errno));
-                       exit(EXIT_STATUS_CONFIG);
-               }
-
-               struct group* g = getgrnam(SetGroup.c_str());
-               if (!g)
-               {
-                       this->Logs->Log("STARTUP", LOG_DEFAULT, "getgrnam(%s) failed (wrong group?): %s", SetGroup.c_str(), strerror(errno));
-                       exit(EXIT_STATUS_CONFIG);
-               }
-
-               if (setgid(g->gr_gid) == -1)
-               {
-                       this->Logs->Log("STARTUP", LOG_DEFAULT, "setgid(%d) failed (wrong group?): %s", g->gr_gid, strerror(errno));
-                       exit(EXIT_STATUS_CONFIG);
-               }
-       }
-
-       const std::string SetUser = security->getString("runasuser");
-       if (!SetUser.empty())
-       {
-               errno = 0;
-               struct passwd* u = getpwnam(SetUser.c_str());
-               if (!u)
-               {
-                       this->Logs->Log("STARTUP", LOG_DEFAULT, "getpwnam(%s) failed (wrong user?): %s", SetUser.c_str(), strerror(errno));
-                       exit(EXIT_STATUS_CONFIG);
-               }
-
-               if (setuid(u->pw_uid) == -1)
-               {
-                       this->Logs->Log("STARTUP", LOG_DEFAULT, "setuid(%d) failed (wrong user?): %s", u->pw_uid, strerror(errno));
-                       exit(EXIT_STATUS_CONFIG);
-               }
-       }
+       WritePID(Config->PID);
+       DropRoot();
 
-       this->WritePID(Config->PID);
-#endif
+       Logs->Log("STARTUP", LOG_DEFAULT, "Startup complete as '%s'[%s], %lu max open sockets", Config->ServerName.c_str(),Config->GetSID().c_str(), SocketEngine::GetMaxFds());
 }
 
 void InspIRCd::UpdateTime()
 {
-#ifdef _WIN32
+#if defined HAS_CLOCK_GETTIME
+       clock_gettime(CLOCK_REALTIME, &TIME);
+#elif defined _WIN32
        SYSTEMTIME st;
        GetSystemTime(&st);
 
        TIME.tv_sec = time(NULL);
        TIME.tv_nsec = st.wMilliseconds;
 #else
-       #ifdef HAS_CLOCK_GETTIME
-               clock_gettime(CLOCK_REALTIME, &TIME);
-       #else
-               struct timeval tv;
-               gettimeofday(&tv, NULL);
-               TIME.tv_sec = tv.tv_sec;
-               TIME.tv_nsec = tv.tv_usec * 1000;
-       #endif
+       struct timeval tv;
+       gettimeofday(&tv, NULL);
+
+       TIME.tv_sec = tv.tv_sec;
+       TIME.tv_nsec = tv.tv_usec * 1000;
 #endif
 }