X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=0318dd602cb9f071dd9ca5a09369117046e6f23e;hb=66ecf04088b747c00e7fdf8380fbece7848018be;hp=58a932981a402a8213c7386c30a9fd083e9372da;hpb=802eed1734cf20e9a2549a5fe343d04c34e83a10;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index 58a932981..0318dd602 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,53 +72,10 @@ 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. - const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands(); - for (CommandParser::CommandMap::const_iterator x = commands.begin(); x != commands.end(); ++x) - x->second->Disable(false); - - // Now disable the commands specified in the config. - std::string command; - irc::spacesepstream commandlist(ConfValue("disabled")->getString("commands")); - while (commandlist.GetToken(command)) - { - Command* handler = ServerInstance->Parser.GetHandler(command); - if (!handler) - { - ServerInstance->Logs->Log("CONFIG", LOG_DEBUG, "Unable to disable the %s command as it does not exist!", command.c_str()); - continue; - } - - ServerInstance->Logs->Log("CONFIG", LOG_DEBUG, "The %s command has been disabled", command.c_str()); - handler->Disable(true); - } - return true; -} - static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::string& key, XLineFactory* make) { + insp::flat_set configlines; + ConfigTagList tags = conf->ConfTags(tag); for(ConfigIter i = tags.first; i != tags.second; ++i) { @@ -128,9 +85,13 @@ static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::str throw CoreException("<"+tag+":"+key+"> missing at " + ctag->getTagLocation()); std::string reason = ctag->getString("reason", ""); XLine* xl = make->Generate(ServerInstance->Time(), 0, "", reason, mask); + xl->from_config = true; + configlines.insert(xl->Displayable()); if (!ServerInstance->XLines->AddLine(xl, NULL)) delete xl; } + + ServerInstance->XLines->ExpireRemovedConfigLines(make->GetType(), configlines); } typedef std::map LocalIndex; @@ -318,17 +279,17 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) 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"); @@ -353,34 +314,22 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) } } -/** Represents a deprecated configuration tag. - */ -struct DeprecatedConfig +static std::string GetServerName() { - /** Tag name. */ - std::string tag; - - /** Attribute key. */ - std::string key; - - /** Attribute value. */ - std::string value; - - /** Reason for deprecation. */ - std::string reason; -}; - -static const DeprecatedConfig ChangedConfig[] = { - { "bind", "transport", "", "has been moved to as of 2.0" }, - { "die", "value", "", "you need to reread your config" }, - { "gnutls", "starttls", "", "has been replaced with m_starttls as of 3.0" }, - { "link", "autoconnect", "", "2.0+ does not use this attribute - define tags instead" }, - { "link", "transport", "", "has been moved to as of 2.0" }, - { "module", "name", "m_chanprotect.so", "has been replaced with m_customprefix as of 3.0" }, - { "module", "name", "m_halfop.so", "has been replaced with m_customprefix as of 3.0" }, - { "options", "cyclehosts", "", "has been replaced with m_hostcycle as of 3.0" }, - { "performance", "nouserdns", "", "has been moved to as of 3.0" } -}; +#ifndef _WIN32 + char hostname[256]; + if (gethostname(hostname, sizeof(hostname)) == 0) + { + std::string name(hostname); + if (name.find('.') == std::string::npos) + name.push_back('.'); + + if (name.length() <= ServerInstance->Config->Limits.MaxHost && InspIRCd::IsHost(name)) + return name; + } +#endif + return "irc.example.com"; +} void ServerConfig::Fill() { @@ -389,8 +338,7 @@ void ServerConfig::Fill() ConfigTag* server = ConfValue("server"); if (sid.empty()) { - ServerName = server->getString("name", "irc.example.com"); - ValidHost(ServerName, ""); + ServerName = server->getString("name", GetServerName(), InspIRCd::IsHost); sid = server->getString("id"); if (!sid.empty() && !InspIRCd::IsSID(sid)) @@ -419,33 +367,26 @@ 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); + TimeSkipWarn = ConfValue("performance")->getDuration("timeskipwarn", 2, 0, 30); XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!")); ServerDesc = server->getString("description", "Configure Me"); Network = server->getString("network", "Network"); NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240, 1024, 65534); - DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant"); - UserStats = security->getString("userstats"); CustomVersion = security->getString("customversion"); - HideSplits = security->getBool("hidesplits"); HideBans = security->getBool("hidebans"); 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, 1, 32); - c_ipv6_range = ConfValue("cidr")->getInt("ipv6clone", 128, 1, 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,24 +415,15 @@ void ServerConfig::Fill() ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K")); ReadXLine(this, "exception", "host", ServerInstance->XLines->GetFactory("E")); - DisabledUModes.reset(); - std::string modes = ConfValue("disabled")->getString("usermodes"); - for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p) - { - // Complain when the character is not a valid mode character. - if (!ModeParser::IsModeChar(*p)) - throw CoreException("Invalid usermode " + std::string(1, *p) + " was found."); - DisabledUModes.set(*p - 'A'); - } - - DisabledCModes.reset(); - modes = ConfValue("disabled")->getString("chanmodes"); - for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p) - { - if (!ModeParser::IsModeChar(*p)) - throw CoreException("Invalid chanmode " + std::string(1, *p) + " was found."); - DisabledCModes.set(*p - 'A'); - } + 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()); } // WARNING: it is not safe to use most of the codebase in this function, as it @@ -529,26 +461,16 @@ 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 (unsigned long index = 0; index * sizeof(DeprecatedConfig) < sizeof(ChangedConfig); index++) + // Ensure the user has actually edited ther config. + ConfigTagList dietags = ConfTags("die"); + if (dietags.first != dietags.second) { - std::string value; - ConfigTagList tags = ConfTags(ChangedConfig[index].tag); - for(ConfigIter i = tags.first; i != tags.second; ++i) + errstr << "Your configuration has not been edited correctly!" << std::endl; + for (ConfigIter iter = dietags.first; iter != dietags.second; ++iter) { - if (i->second->readString(ChangedConfig[index].key, value, true) - && (ChangedConfig[index].value.empty() || value == ChangedConfig[index].value)) - { - errstr << "Your configuration contains a deprecated value: <" << ChangedConfig[index].tag; - if (ChangedConfig[index].value.empty()) - { - errstr << ':' << ChangedConfig[index].key; - } - else - { - errstr << ' ' << ChangedConfig[index].key << "=\"" << ChangedConfig[index].value << "\""; - } - errstr << "> - " << ChangedConfig[index].reason << " (at " << i->second->getTagLocation() << ")" << std::endl; - } + ConfigTag* tag = iter->second; + const std::string reason = tag->getString("reason", "You left a tag in your config", 1); + errstr << reason << " (at " << tag->getTagLocation() << ")" << std::endl; } } @@ -620,19 +542,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) errstr.clear(); errstr.str(std::string()); - // Re-parse our MOTD and RULES files for colors -- Justasic - 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()) - InspIRCd::ProcessColors(file->second); - } - /* No old configuration -> initial boot, nothing more to do here */ if (!old) { @@ -790,7 +699,6 @@ void ConfigReaderThread::Finish() ServerInstance->Users.RehashCloneCounts(); ServerInstance->XLines->CheckELines(); ServerInstance->XLines->ApplyLines(); - Config->ApplyDisabledCommands(); User* user = ServerInstance->FindNick(TheUserUID); ConfigStatus status(user); @@ -805,6 +713,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()); } }