X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=56b8178d235b733bb6c289b434d6b253c2a4a9a9;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=f35da105d6174a8c14731de5cab289bb8dd808e8;hpb=bd20bdda21a242f0a54da327bf08049562078a9b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index f35da105d..56b8178d2 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -1,16 +1,21 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2012 William Pitcock + * Copyright (C) 2020 Matt Schatz + * Copyright (C) 2018 Chris Novakovic + * Copyright (C) 2013, 2017-2021 Sadie Powell + * Copyright (C) 2013 Adam + * Copyright (C) 2012-2014, 2016, 2018 Attila Molnar + * Copyright (C) 2012-2013 ChrisTX + * Copyright (C) 2012 Robby + * Copyright (C) 2012 Ariadne Conill * Copyright (C) 2009-2010 Daniel De Graaf - * Copyright (C) 2003-2008 Craig Edwards - * Copyright (C) 2008 Uli Schlachter - * Copyright (C) 2006-2008 Robin Burchell - * Copyright (C) 2006-2007 Oliver Lupton + * Copyright (C) 2008-2009 Uli Schlachter + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007-2008 Robin Burchell * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2007 Burlex - * Copyright (C) 2003 Craig McLure - * Copyright (C) 2003 randomdan + * Copyright (C) 2006-2007 Oliver Lupton + * Copyright (C) 2005-2010 Craig Edwards * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -32,14 +37,15 @@ #ifndef _WIN32 #include #include - #include #include #include // setuid #include // setgid #else - WORD g_wOriginalColors; - WORD g_wBackgroundColor; - HANDLE g_hStdout; + /** Manages formatting lines written to stderr on Windows. */ + WindowsStream StandardError(STD_ERROR_HANDLE); + + /** Manages formatting lines written to stdout on Windows. */ + WindowsStream StandardOutput(STD_OUTPUT_HANDLE); #endif #include @@ -49,7 +55,7 @@ InspIRCd* ServerInstance = NULL; -/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping +/** Separate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping * if it must. * * This is provided as a pointer so that modules can change it to their custom mapping tables, @@ -80,6 +86,32 @@ namespace { void VoidSignalHandler(int); + // Warns a user running as root that they probably shouldn't. + void CheckRoot() + { +#ifndef _WIN32 + if (getegid() != 0 && geteuid() != 0) + return; + + std::cout << con_red << "Warning!" << con_reset << " You have started as root. Running as root is generally not required" << std::endl + << "and may allow an attacker to gain access to your system if they find a way to" << std::endl + << "exploit your IRC server." << std::endl + << std::endl; + if (isatty(fileno(stdout))) + { + std::cout << "InspIRCd will start in 30 seconds. If you are sure that you need to run as root" << std::endl + << "then you can pass the " << con_bright << "--runasroot" << con_reset << " option to disable this wait." << std::endl; + sleep(30); + } + else + { + std::cout << "If you are sure that you need to run as root then you can pass the " << con_bright << "--runasroot" << con_reset << std::endl + << "option to disable this error." << std::endl; + ServerInstance->Exit(EXIT_STATUS_ROOT); + } +#endif + } + // Collects performance statistics for the STATS command. void CollectStats() { @@ -106,13 +138,19 @@ namespace #endif } - // Deletes a pointer and then zeroes it. - template - void DeleteZero(T*& pr) + // Checks whether the server clock has skipped too much and warn about it if it has. + void CheckTimeSkip(time_t oldtime, time_t newtime) { - T* p = pr; - pr = NULL; - delete p; + if (!ServerInstance->Config->TimeSkipWarn) + return; + + time_t timediff = newtime - oldtime; + + if (timediff > ServerInstance->Config->TimeSkipWarn) + ServerInstance->SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped forwards by %lu seconds!", timediff); + + else if (timediff < -ServerInstance->Config->TimeSkipWarn) + ServerInstance->SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped backwards by %lu seconds!", labs(timediff)); } // Drops to the unprivileged user/group specified in . @@ -165,6 +203,21 @@ namespace #endif } + // Expands a path relative to the current working directory. + std::string ExpandPath(const char* path) + { +#ifdef _WIN32 + TCHAR configPath[MAX_PATH + 1]; + if (GetFullPathName(path, MAX_PATH, configPath, NULL) > 0) + return configPath; +#else + char configPath[PATH_MAX + 1]; + if (realpath(path, configPath)) + return configPath; +#endif + return path; + } + // Locates a config file on the file system. bool FindConfigFile(std::string& path) { @@ -185,7 +238,7 @@ namespace } // Attempts to fork into the background. - bool ForkIntoBackground() + void ForkIntoBackground() { #ifndef _WIN32 // We use VoidSignalHandler whilst forking to avoid breaking daemon scripts @@ -197,7 +250,8 @@ namespace if (childpid < 0) { ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "fork() failed: %s", strerror(errno)); - return false; + std::cout << con_red << "Error:" << con_reset << " unable to fork into background: " << strerror(errno); + ServerInstance->Exit(EXIT_STATUS_FORK); } else if (childpid > 0) { @@ -216,7 +270,6 @@ namespace SocketEngine::RecoverFromFork(); } #endif - return true; } // Increase the size of a core dump file to improve debugging problems. @@ -237,6 +290,61 @@ namespace #endif } + // Parses the command line options. + void ParseOptions() + { + int do_debug = 0, do_nofork = 0, do_nolog = 0; + int do_nopid = 0, do_runasroot = 0, do_version = 0; + struct option longopts[] = + { + { "config", required_argument, NULL, 'c' }, + { "debug", no_argument, &do_debug, 1 }, + { "nofork", no_argument, &do_nofork, 1 }, + { "nolog", no_argument, &do_nolog, 1 }, + { "nopid", no_argument, &do_nopid, 1 }, + { "runasroot", no_argument, &do_runasroot, 1 }, + { "version", no_argument, &do_version, 1 }, + { 0, 0, 0, 0 } + }; + + char** argv = ServerInstance->Config->cmdline.argv; + int ret; + while ((ret = getopt_long(ServerInstance->Config->cmdline.argc, argv, ":c:", longopts, NULL)) != -1) + { + switch (ret) + { + case 0: + // A long option was specified. + break; + + case 'c': + // The -c option was specified. + ServerInstance->ConfigFileName = ExpandPath(optarg); + break; + + default: + // An unknown option was specified. + std::cout << con_red << "Error:" << con_reset << " unknown option '" << argv[optind] << "'." << std::endl + << con_bright << "Usage: " << con_reset << argv[0] << " [--config ] [--debug] [--nofork] [--nolog]" << std::endl + << std::string(strlen(argv[0]) + 8, ' ') << "[--nopid] [--runasroot] [--version]" << std::endl; + ServerInstance->Exit(EXIT_STATUS_ARGV); + break; + } + } + + if (do_version) + { + std::cout << INSPIRCD_VERSION << std::endl; + ServerInstance->Exit(EXIT_STATUS_NOERROR); + } + + // Store the relevant parsed arguments + ServerInstance->Config->cmdline.forcedebug = !!do_debug; + ServerInstance->Config->cmdline.nofork = !!do_nofork; + ServerInstance->Config->cmdline.runasroot = !!do_runasroot; + ServerInstance->Config->cmdline.writelog = !do_nolog; + ServerInstance->Config->cmdline.writepid = !do_nopid; + } // Seeds the random number generator if applicable. void SeedRng(timespec ts) { @@ -262,6 +370,31 @@ namespace signal(SIGTERM, InspIRCd::SetSignal); } + void TryBindPorts() + { + FailedPortList pl; + ServerInstance->BindPorts(pl); + + if (!pl.empty()) + { + std::cout << con_red << "Warning!" << con_reset << " Some of your listener" << (pl.size() == 1 ? "s" : "") << " failed to bind:" << std::endl + << std::endl; + + for (FailedPortList::const_iterator iter = pl.begin(); iter != pl.end(); ++iter) + { + const FailedPort& fp = *iter; + std::cout << " " << con_bright << fp.sa.str() << con_reset << ": " << strerror(fp.error) << '.' << std::endl + << " " << "Created from tag at " << fp.tag->getTagLocation() << std::endl + << std::endl; + } + + std::cout << con_bright << "Hints:" << con_reset << std::endl + << "- For TCP/IP listeners try using a public IP address in instead" << std::endl + << " of * or leaving it blank." << std::endl + << "- For UNIX socket listeners try enabling to replace old sockets." << std::endl; + } + } + // Required for returning the proper value of EXIT_SUCCESS for the parent process. void VoidSignalHandler(int) { @@ -298,9 +431,9 @@ void InspIRCd::Cleanup() delete FakeClient->server; FakeClient->cull(); } - DeleteZero(this->FakeClient); - DeleteZero(this->XLines); - DeleteZero(this->Config); + stdalgo::delete_zero(this->FakeClient); + stdalgo::delete_zero(this->XLines); + stdalgo::delete_zero(this->Config); SocketEngine::Deinit(); Logs->CloseLogs(); } @@ -314,7 +447,7 @@ void InspIRCd::WritePID(const std::string& filename, bool exitonfail) return; } - std::string fname = ServerInstance->Config->Paths.PrependData(filename.empty() ? "inspircd.pid" : filename); + std::string fname = ServerInstance->Config->Paths.PrependRuntime(filename.empty() ? "inspircd.pid" : filename); std::ofstream outfile(fname.c_str()); if (outfile.is_open()) { @@ -359,22 +492,7 @@ InspIRCd::InspIRCd(int argc, char** argv) this->Config->cmdline.argv = argv; this->Config->cmdline.argc = argc; - -#ifdef _WIN32 - // Initialize the console values - g_hStdout = GetStdHandle(STD_OUTPUT_HANDLE); - CONSOLE_SCREEN_BUFFER_INFO bufinf; - if(GetConsoleScreenBufferInfo(g_hStdout, &bufinf)) - { - g_wOriginalColors = bufinf.wAttributes & 0x00FF; - g_wBackgroundColor = bufinf.wAttributes & 0x00F0; - } - else - { - g_wOriginalColors = FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN; - g_wBackgroundColor = 0; - } -#endif + ParseOptions(); { ServiceProvider* provs[] = @@ -386,78 +504,18 @@ 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 }, - { "config", required_argument, NULL, 'c' }, - { "debug", no_argument, &do_debug, 1 }, - { "nolog", no_argument, &do_nolog, 1 }, - { "nopid", no_argument, &do_nopid, 1 }, - { "runasroot", no_argument, &do_root, 1 }, - { "version", no_argument, &do_version, 1 }, - { 0, 0, 0, 0 } - }; - - int c; - int index; - while ((c = getopt_long(argc, argv, ":c:", longopts, &index)) != -1) - { - switch (c) - { - case 'c': - /* Config filename was set */ - ConfigFileName = optarg; -#ifdef _WIN32 - TCHAR configPath[MAX_PATH + 1]; - if (GetFullPathName(optarg, MAX_PATH, configPath, NULL) > 0) - ConfigFileName = configPath; -#else - char configPath[PATH_MAX + 1]; - if (realpath(optarg, configPath)) - ConfigFileName = configPath; -#endif - break; - case 0: - /* getopt_long_only() set an int variable, just keep going */ - break; - case '?': - /* Unknown parameter */ - default: - /* Fall through to handle other weird values too */ - std::cout << "Unknown parameter '" << argv[optind-1] << "'" << std::endl; - std::cout << "Usage: " << argv[0] << " [--nofork] [--nolog] [--nopid] [--debug] [--config ]" << std::endl << - std::string(static_cast(8+strlen(argv[0])), ' ') << "[--runasroot] [--version]" << std::endl; - Exit(EXIT_STATUS_ARGV); - break; - } - } - - if (do_version) - { - std::cout << std::endl << INSPIRCD_VERSION << std::endl; - Exit(EXIT_STATUS_NOERROR); - } - - /* Set the finished argument values */ - Config->cmdline.nofork = (do_nofork != 0); - Config->cmdline.forcedebug = (do_debug != 0); - Config->cmdline.writelog = !do_nolog; - Config->cmdline.writepid = !do_nopid; + std::cout << con_green << "InspIRCd - Internet Relay Chat Daemon" << con_reset << std::endl + << "See " << con_green << "/INFO" << con_reset << " for contributors & authors" << std::endl + << std::endl; - if (do_debug) + if (Config->cmdline.forcedebug) { - FileWriter* fw = new FileWriter(stdout, 1); + FILE* newstdout = fdopen(dup(STDOUT_FILENO), "w"); + FileWriter* fw = new FileWriter(newstdout, 1); FileLogStream* fls = new FileLogStream(LOG_RAWIO, fw); Logs->AddLogTypes("*", fls, true); } - std::cout << con_green << "InspIRCd - Internet Relay Chat Daemon" << con_reset << std::endl - << "See " << con_green << "/INFO" << con_reset << " for contributors & authors" << std::endl - << std::endl; - if (!FindConfigFile(ConfigFileName)) { this->Logs->Log("STARTUP", LOG_DEFAULT, "Unable to open config file %s", ConfigFileName.c_str()); @@ -465,36 +523,16 @@ InspIRCd::InspIRCd(int argc, char** argv) Exit(EXIT_STATUS_CONFIG); } -#ifndef _WIN32 - if (!do_root) - this->CheckRoot(); - else - { - std::cout << "* WARNING * WARNING * WARNING * WARNING * WARNING *" << std::endl - << "YOU ARE RUNNING INSPIRCD AS ROOT. THIS IS UNSUPPORTED" << std::endl - << "AND IF YOU ARE HACKED, CRACKED, SPINDLED OR MUTILATED" << std::endl - << "OR ANYTHING ELSE UNEXPECTED HAPPENS TO YOU OR YOUR" << std::endl - << "SERVER, THEN IT IS YOUR OWN FAULT. IF YOU DID NOT MEAN" << std::endl - << "TO START INSPIRCD AS ROOT, HIT CTRL+C NOW AND RESTART" << std::endl - << "THE PROGRAM AS A NORMAL USER. YOU HAVE BEEN WARNED!" << std::endl << std::endl - << "InspIRCd starting in 20 seconds, ctrl+c to abort..." << std::endl; - sleep(20); - } -#endif - SetSignals(); - - if (!Config->cmdline.nofork && !ForkIntoBackground()) - { - 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); - } + if (!Config->cmdline.runasroot) + CheckRoot(); + if (!Config->cmdline.nofork) + ForkIntoBackground(); std::cout << "InspIRCd Process ID: " << con_green << getpid() << con_reset << std::endl; /* During startup we read the configuration now, not in - * a seperate thread + * a separate thread */ this->Config->Read(); this->Config->Apply(NULL, ""); @@ -513,30 +551,15 @@ 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; + TryBindPorts(); + this->Modules->LoadAll(); // Build ISupport as ModuleManager::LoadAll() does not do it this->ISupport.Build(); - if (!pl.empty()) - { - std::cout << std::endl << "WARNING: Not all your client ports could be bound -- " << std::endl << "starting anyway with " << bounditems - << " of " << bounditems + (int)pl.size() << " client ports bound." << std::endl << std::endl; - std::cout << "The following port(s) failed to bind:" << std::endl << std::endl; - int j = 1; - for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++) - { - std::cout << j << ".\tAddress: " << i->first.str() << " \tReason: " << strerror(i->second) << std::endl; - } - - std::cout << std::endl << "Hint: Try using a public IP instead of blank or *" << std::endl; - } - std::cout << "InspIRCd is now running as '" << Config->ServerName << "'[" << Config->GetSID() << "] with " << SocketEngine::GetMaxFds() << " max open sockets" << std::endl; #ifndef _WIN32 @@ -559,7 +582,7 @@ InspIRCd::InspIRCd(int argc, char** argv) * * -- nenolod */ - if ((!do_nofork) && (!Config->cmdline.forcedebug)) + if ((!Config->cmdline.nofork) && (!Config->cmdline.forcedebug)) { int fd = open("/dev/null", O_RDWR); @@ -584,7 +607,7 @@ InspIRCd::InspIRCd(int argc, char** argv) SetServiceRunning(); // Handle forking - if(!do_nofork) + if(!Config->cmdline.nofork) { FreeConsole(); } @@ -640,24 +663,14 @@ void InspIRCd::Run() UpdateTime(); /* Run background module timers every few seconds - * (the docs say modules shouldnt rely on accurate + * (the docs say modules should not rely on accurate * timing using this event, so we dont have to * time this exactly). */ if (TIME.tv_sec != OLDTIME) { CollectStats(); - - if (Config->TimeSkipWarn) - { - time_t timediff = TIME.tv_sec - OLDTIME; - - if (timediff > Config->TimeSkipWarn) - SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped forwards by %lu seconds!", timediff); - - else if (timediff < -Config->TimeSkipWarn) - SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped backwards by %lu seconds!", labs(timediff)); - } + CheckTimeSkip(OLDTIME, TIME.tv_sec); OLDTIME = TIME.tv_sec;