X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconfigreader.cpp;h=52d349f5cac46166b1e32f59c1649336955bea3d;hb=8cb20e354533fbec24aafd4e61ff6fa69b434aa2;hp=168bdd09be8d2345018426e47cf4da41eb02592e;hpb=d23c030c9a8fd58807438245a004e4aa5b7288ba;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index 168bdd09b..52d349f5c 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -30,17 +30,17 @@ #include ServerLimits::ServerLimits(ConfigTag* tag) - : NickMax(tag->getInt("maxnick", 30)) - , ChanMax(tag->getInt("maxchan", 64)) - , MaxModes(tag->getInt("maxmodes", 20)) - , IdentMax(tag->getInt("maxident", 10)) - , MaxQuit(tag->getInt("maxquit", 255)) - , MaxTopic(tag->getInt("maxtopic", 307)) - , MaxKick(tag->getInt("maxkick", 255)) - , MaxGecos(tag->getInt("maxgecos", 128)) - , MaxAway(tag->getInt("maxaway", 200)) - , MaxLine(tag->getInt("maxline", 512)) - , MaxHost(tag->getInt("maxhost", 64)) + : NickMax(tag->getUInt("maxnick", 30)) + , ChanMax(tag->getUInt("maxchan", 64)) + , MaxModes(tag->getUInt("maxmodes", 20)) + , IdentMax(tag->getUInt("maxident", 10)) + , MaxQuit(tag->getUInt("maxquit", 255)) + , MaxTopic(tag->getUInt("maxtopic", 307)) + , MaxKick(tag->getUInt("maxkick", 255)) + , MaxReal(tag->getUInt("maxreal", tag->getUInt("maxgecos", 128))) + , MaxAway(tag->getUInt("maxaway", 200)) + , MaxLine(tag->getUInt("maxline", 512)) + , MaxHost(tag->getUInt("maxhost", 64)) { } @@ -72,26 +72,6 @@ ServerConfig::~ServerConfig() delete EmptyTag; } -static void ValidHost(const std::string& p, const std::string& msg) -{ - int num_dots = 0; - if (p.empty() || p[0] == '.') - throw CoreException("The value of "+msg+" is not a valid hostname"); - for (unsigned int i=0;i < p.length();i++) - { - switch (p[i]) - { - case ' ': - throw CoreException("The value of "+msg+" is not a valid hostname"); - case '.': - num_dots++; - break; - } - } - if (num_dots == 0) - throw CoreException("The value of "+msg+" is not a valid hostname"); -} - bool ServerConfig::ApplyDisabledCommands() { // Enable everything first. @@ -219,7 +199,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) } } - int blk_count = config_data.count("connect"); + size_t blk_count = config_data.count("connect"); if (blk_count == 0) { // No connect blocks found; make a trivial default block @@ -231,14 +211,14 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) } Classes.resize(blk_count); - std::map names; + std::map names; bool try_again = true; - for(int tries=0; try_again; tries++) + for(size_t tries = 0; try_again; tries++) { try_again = false; ConfigTagList tags = ConfTags("connect"); - int i=0; + size_t i = 0; for(ConfigIter it = tags.first; it != tags.second; ++it, ++i) { ConfigTag* tag = it->second; @@ -249,7 +229,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) std::string parentName = tag->getString("parent"); if (!parentName.empty()) { - std::map::iterator parentIter = names.find(parentName); + std::map::const_iterator parentIter = names.find(parentName); if (parentIter == names.end()) { try_again = true; @@ -311,24 +291,24 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) if (tag->readString("sendq", sendq)) { // attempt to guess a good hard/soft sendq from a single value - long value = atol(sendq.c_str()); + unsigned long value = strtoul(sendq.c_str(), NULL, 10); if (value > 16384) me->softsendqmax = value / 16; else me->softsendqmax = value; me->hardsendqmax = value * 8; } - me->softsendqmax = tag->getInt("softsendq", me->softsendqmax); - me->hardsendqmax = tag->getInt("hardsendq", me->hardsendqmax); - me->recvqmax = tag->getInt("recvq", me->recvqmax); - me->penaltythreshold = tag->getInt("threshold", me->penaltythreshold); - me->commandrate = tag->getInt("commandrate", me->commandrate); + me->softsendqmax = tag->getUInt("softsendq", me->softsendqmax); + me->hardsendqmax = tag->getUInt("hardsendq", me->hardsendqmax); + me->recvqmax = tag->getUInt("recvq", me->recvqmax); + me->penaltythreshold = tag->getUInt("threshold", me->penaltythreshold); + me->commandrate = tag->getUInt("commandrate", me->commandrate); me->fakelag = tag->getBool("fakelag", me->fakelag); - me->maxlocal = tag->getInt("localmax", me->maxlocal); - me->maxglobal = tag->getInt("globalmax", me->maxglobal); - me->maxchans = tag->getInt("maxchans", me->maxchans); + me->maxlocal = tag->getUInt("localmax", me->maxlocal); + me->maxglobal = tag->getUInt("globalmax", me->maxglobal); + me->maxchans = tag->getUInt("maxchans", me->maxchans); me->maxconnwarn = tag->getBool("maxconnwarn", me->maxconnwarn); - me->limit = tag->getInt("limit", me->limit); + me->limit = tag->getUInt("limit", me->limit); me->resolvehostnames = tag->getBool("resolvehostnames", me->resolvehostnames); std::string ports = tag->getString("port"); @@ -389,8 +369,7 @@ void ServerConfig::Fill() ConfigTag* server = ConfValue("server"); if (sid.empty()) { - ServerName = server->getString("name", "irc.example.com"); - ValidHost(ServerName, ""); + ServerName = server->getString("name", "irc.example.com", InspIRCd::IsHost); sid = server->getString("id"); if (!sid.empty() && !InspIRCd::IsSID(sid)) @@ -419,9 +398,9 @@ void ServerConfig::Fill() throw CoreException("You must restart to change the server casemapping"); } - SoftLimit = ConfValue("performance")->getInt("softlimit", (SocketEngine::GetMaxFds() > 0 ? SocketEngine::GetMaxFds() : LONG_MAX), 10); + SoftLimit = ConfValue("performance")->getUInt("softlimit", (SocketEngine::GetMaxFds() > 0 ? SocketEngine::GetMaxFds() : LONG_MAX), 10); CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true); - MaxConn = ConfValue("performance")->getInt("somaxconn", SOMAXCONN); + MaxConn = ConfValue("performance")->getUInt("somaxconn", SOMAXCONN); XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!")); ServerDesc = server->getString("description", "Configure Me"); Network = server->getString("network", "Network"); @@ -431,21 +410,20 @@ void ServerConfig::Fill() CustomVersion = security->getString("customversion"); HideSplits = security->getBool("hidesplits"); HideBans = security->getBool("hidebans"); - HideWhoisServer = security->getString("hidewhois"); + HideServer = security->getString("hideserver", security->getString("hidewhois")); HideKillsServer = security->getString("hidekills"); HideULineKills = security->getBool("hideulinekills"); - RestrictBannedUsers = security->getBool("restrictbannedusers", true); GenericOper = security->getBool("genericoper"); SyntaxHints = options->getBool("syntaxhints"); CycleHostsFromUser = options->getBool("cyclehostsfromuser"); FullHostInTopic = options->getBool("hostintopic"); - MaxTargets = security->getInt("maxtargets", 20, 1, 31); + MaxTargets = security->getUInt("maxtargets", 20, 1, 31); DefaultModes = options->getString("defaultmodes", "not"); PID = ConfValue("pid")->getString("file"); - MaxChans = ConfValue("channels")->getInt("users", 20); - OperMaxChans = ConfValue("channels")->getInt("opers"); - c_ipv4_range = ConfValue("cidr")->getInt("ipv4clone", 32); - c_ipv6_range = ConfValue("cidr")->getInt("ipv6clone", 128); + MaxChans = ConfValue("channels")->getUInt("users", 20); + OperMaxChans = ConfValue("channels")->getUInt("opers", 0); + c_ipv4_range = ConfValue("cidr")->getUInt("ipv4clone", 32, 1, 32); + c_ipv6_range = ConfValue("cidr")->getUInt("ipv6clone", 128, 1, 128); Limits = ServerLimits(ConfValue("limits")); Paths = ServerPaths(ConfValue("path")); NoSnoticeStack = options->getBool("nosnoticestack", false); @@ -474,6 +452,16 @@ void ServerConfig::Fill() ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K")); ReadXLine(this, "exception", "host", ServerInstance->XLines->GetFactory("E")); + const std::string restrictbannedusers = options->getString("restrictbannedusers", "yes"); + if (stdalgo::string::equalsci(restrictbannedusers, "no")) + RestrictBannedUsers = ServerConfig::BUT_NORMAL; + else if (stdalgo::string::equalsci(restrictbannedusers, "silent")) + RestrictBannedUsers = ServerConfig::BUT_RESTRICT_SILENT; + else if (stdalgo::string::equalsci(restrictbannedusers, "yes")) + RestrictBannedUsers = ServerConfig::BUT_RESTRICT_NOTIFY; + else + throw CoreException(restrictbannedusers + " is an invalid value, at " + options->getTagLocation()); + DisabledUModes.reset(); std::string modes = ConfValue("disabled")->getString("usermodes"); for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p) @@ -492,25 +480,6 @@ void ServerConfig::Fill() throw CoreException("Invalid chanmode " + std::string(1, *p) + " was found."); DisabledCModes.set(*p - 'A'); } - - std::string v = security->getString("announceinvites"); - - if (v == "ops") - AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_OPS; - else if (v == "all") - AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_ALL; - else if (v == "dynamic") - AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_DYNAMIC; - else - AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE; - - v = security->getString("operspywhois"); - if (v == "splitmsg") - OperSpyWhois = SPYWHOIS_SPLITMSG; - else if (v == "on" || v == "yes") - OperSpyWhois = SPYWHOIS_SINGLEMSG; - else - OperSpyWhois = SPYWHOIS_NONE; } // WARNING: it is not safe to use most of the codebase in this function, as it @@ -548,7 +517,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) /* The stuff in here may throw CoreException, be sure we're in a position to catch it. */ try { - for (int index = 0; index * sizeof(DeprecatedConfig) < sizeof(ChangedConfig); index++) + for (unsigned long index = 0; index * sizeof(DeprecatedConfig) < sizeof(ChangedConfig); index++) { std::string value; ConfigTagList tags = ConfTags(ChangedConfig[index].tag); @@ -643,9 +612,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) for (ClassVector::const_iterator it = this->Classes.begin(), it_end = this->Classes.end(); it != it_end; ++it) { ConfigTag *tag = (*it)->config; - // Make sure our connection class allows motd colors - if(!tag->getBool("allowmotdcolors")) - continue; ConfigFileCache::iterator file = this->Files.find(tag->getString("motd", "motd")); if (file != this->Files.end()) @@ -809,8 +775,6 @@ void ConfigReaderThread::Finish() ServerInstance->Users.RehashCloneCounts(); ServerInstance->XLines->CheckELines(); ServerInstance->XLines->ApplyLines(); - ChanModeReference ban(NULL, "ban"); - static_cast(*ban)->DoRehash(); Config->ApplyDisabledCommands(); User* user = ServerInstance->FindNick(TheUserUID); @@ -826,6 +790,8 @@ void ConfigReaderThread::Finish() catch (CoreException& modex) { ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Exception caught: " + modex.GetReason()); + if (user) + user->WriteNotice(i->first + ": " + modex.GetReason()); } }