X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=6d82723612631b1796e6d5f39bb6a1bd4787c8ee;hb=9ad873886e518bf3621a88e8c48607ab79020c0a;hp=70e5fcf38649b93102b42cbc911f7dbf42c5f22b;hpb=ce6c5fc3de38ab42173d85c3c91bb2ac34a0f792;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 70e5fcf38..6d8272361 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -76,11 +76,151 @@ const char* ExitCodes[] = "Received SIGTERM" // 10 }; -template static void DeleteZero(T*&n) +namespace { - T* t = n; - n = NULL; - delete t; + void VoidSignalHandler(int); + + // Deletes a pointer and then zeroes it. + template + void DeleteZero(T*& pr) + { + T* p = pr; + pr = NULL; + delete p; + } + + // Drops to the unprivileged user/group specified in . + 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) + { + exit(EXIT_STATUS_NOERROR); + } } void InspIRCd::Cleanup() @@ -93,8 +233,11 @@ void InspIRCd::Cleanup() } ports.clear(); - // Disconnect all local users + // Tell modules that we're shutting down. const std::string quitmsg = "Server shutting down"; + FOREACH_MOD(OnShutdown, (quitmsg)); + + // Disconnect all local users const UserManager::LocalList& list = Users.GetLocalUsers(); while (!list.empty()) ServerInstance->Users.QuitUser(list.front(), quitmsg); @@ -116,71 +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); -} - -// Required for returning the proper value of EXIT_SUCCESS for the parent process -static void VoidSignalHandler(int signalreceived) -{ - exit(EXIT_STATUS_NOERROR); -} - -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 @@ -208,36 +286,24 @@ void InspIRCd::WritePID(const std::string& filename, bool exitonfail) #endif } -InspIRCd::InspIRCd(int argc, char** argv) : - ConfigFileName(INSPIRCD_CONFIG_PATH "/inspircd.conf"), - PI(&DefaultProtocolInterface), - - /* Functor pointer initialisation. - * - * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods - * themselves within the class. - */ - GenRandom(&DefaultGenRandom), - IsChannel(&DefaultIsChannel), - IsNick(&DefaultIsNick), - IsIdent(&DefaultIsIdent) +InspIRCd::InspIRCd(int argc, char** argv) + : FakeClient(NULL) + , ConfigFileName(INSPIRCD_CONFIG_PATH "/inspircd.conf") + , ConfigThread(NULL) + , Config(NULL) + , XLines(NULL) + , PI(&DefaultProtocolInterface) + , GenRandom(&DefaultGenRandom) + , IsChannel(&DefaultIsChannel) + , IsNick(&DefaultIsNick) + , IsIdent(&DefaultIsIdent) { ServerInstance = this; - FailedPortList pl; - // Flag variables passed to getopt_long() later - int do_version = 0, do_nofork = 0, do_debug = 0, - do_nolog = 0, do_nopid = 0, do_root = 0; - - // Initialize so that if we exit before proper initialization they're not deleted - this->Config = 0; - this->XLines = 0; - this->ConfigThread = NULL; - this->FakeClient = NULL; - UpdateTime(); this->startup_time = TIME.tv_sec; + SeedRng(TIME); SocketEngine::Init(); this->Config = new ServerConfig; @@ -248,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; @@ -263,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 { @@ -277,6 +339,9 @@ InspIRCd::InspIRCd(int argc, char** argv) : Modules.AddServices(provs, sizeof(provs)/sizeof(provs[0])); } + // Flag variables passed to getopt_long() later + int do_version = 0, do_nofork = 0, do_debug = 0, + do_nolog = 0, do_nopid = 0, do_root = 0; struct option longopts[] = { { "nofork", no_argument, &do_nofork, 1 }, @@ -388,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 @@ -422,6 +487,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : // This is needed as all new XLines are marked pending until ApplyLines() is called this->XLines->ApplyLines(); + FailedPortList pl; int bounditems = BindPorts(pl); std::cout << std::endl; @@ -500,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"); + WritePID(Config->PID); + DropRoot(); - 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); - } - } - - 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 }