X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=5a0ceff06b9e0462e38a5ae2dfa72fa5a4cab486;hb=4047a143fc1d16350db70c94b9ea77d79de05714;hp=125bf595de7b089e6299530f04786d28dcdafd08;hpb=124c17e14134a4999afc1a5e981ab7c75b3694b9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index 125bf595d..5a0ceff06 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -37,7 +37,7 @@ ServerLimits::ServerLimits(ConfigTag* tag) , MaxQuit(tag->getUInt("maxquit", 255)) , MaxTopic(tag->getUInt("maxtopic", 307)) , MaxKick(tag->getUInt("maxkick", 255)) - , MaxGecos(tag->getUInt("maxgecos", 128)) + , MaxReal(tag->getUInt("maxreal", tag->getUInt("maxgecos", 128))) , MaxAway(tag->getUInt("maxaway", 200)) , MaxLine(tag->getUInt("maxline", 512)) , MaxHost(tag->getUInt("maxhost", 64)) @@ -72,31 +72,6 @@ ServerConfig::~ServerConfig() delete EmptyTag; } -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) { ConfigTagList tags = conf->ConfTags(tag); @@ -108,6 +83,7 @@ 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; if (!ServerInstance->XLines->AddLine(xl, NULL)) delete xl; } @@ -333,35 +309,6 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) } } -/** Represents a deprecated configuration tag. - */ -struct DeprecatedConfig -{ - /** 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" } -}; - void ServerConfig::Fill() { ConfigTag* options = ConfValue("options"); @@ -401,21 +348,15 @@ void ServerConfig::Fill() SoftLimit = ConfValue("performance")->getUInt("softlimit", (SocketEngine::GetMaxFds() > 0 ? SocketEngine::GetMaxFds() : LONG_MAX), 10); CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true); 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"); - GenericOper = security->getBool("genericoper"); SyntaxHints = options->getBool("syntaxhints"); - CycleHostsFromUser = options->getBool("cyclehostsfromuser"); FullHostInTopic = options->getBool("hostintopic"); MaxTargets = security->getUInt("maxtargets", 20, 1, 31); DefaultModes = options->getString("defaultmodes", "not"); @@ -447,6 +388,7 @@ void ServerConfig::Fill() SocketEngine::Close(socktest); } + ServerInstance->XLines->ClearConfigLines(); ReadXLine(this, "badip", "ipmask", ServerInstance->XLines->GetFactory("Z")); ReadXLine(this, "badnick", "nick", ServerInstance->XLines->GetFactory("Q")); ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K")); @@ -461,25 +403,6 @@ void ServerConfig::Fill() 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) - { - // 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'); - } } // WARNING: it is not safe to use most of the codebase in this function, as it @@ -517,26 +440,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; } } @@ -608,16 +521,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; - - 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) { @@ -775,7 +678,6 @@ void ConfigReaderThread::Finish() ServerInstance->Users.RehashCloneCounts(); ServerInstance->XLines->CheckELines(); ServerInstance->XLines->ApplyLines(); - Config->ApplyDisabledCommands(); User* user = ServerInstance->FindNick(TheUserUID); ConfigStatus status(user);