X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=10fea3effa9b3f7d0dbf7104c65d0f6f82453d58;hb=548eacee47a757beb90226f3f8a36ba94619bee6;hp=9ec8aa367bf7b0c1652542f882a2fcffdf219fd2;hpb=dfba08638c3b940fb6e96389c12376a411769be1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index 9ec8aa367..10fea3eff 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -21,26 +21,41 @@ /* $CopyInstall: conf/inspircd.filter.example $(CONPATH) */ /* $CopyInstall: conf/inspircd.conf.example $(CONPATH) */ /* $CopyInstall: conf/modules.conf.example $(CONPATH) */ +/* $CopyInstall: conf/opers.conf.example $(CONPATH) */ +/* $CopyInstall: conf/links.conf.example $(CONPATH) */ +/* $CopyInstall: .gdbargs $(BASE) */ #include "inspircd.h" #include #include "xline.h" #include "exitcodes.h" #include "commands/cmd_whowas.h" +#include "modes/cmode_h.h" -std::vector old_module_names, new_module_names, added_modules, removed_modules; +static void ReqRead(ServerConfig* src, const std::string& tag, const std::string& key, std::string& dest) +{ + ConfigTag* t = src->ConfValue(tag); + if (!t || !t->readString(key, dest)) + throw CoreException("You must specify a value for <" + tag + ":" + key + ">"); +} -/* Needs forward declaration */ -bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data); -bool DoneELine(ServerConfig* conf, const char* tag); +/** Represents a deprecated configuration tag. + */ +struct Deprecated +{ + /** Tag name + */ + const char* tag; + /** Tag value + */ + const char* value; + /** Reason for deprecation + */ + const char* reason; +}; -ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance) +ServerConfig::ServerConfig() { - this->ClearStack(); - *sid = *ServerName = *Network = *ServerDesc = *AdminName = '\0'; - *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = *FixedQuit = *HideKillsServer = '\0'; - *DefaultModes = *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0'; - *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = *SuffixQuit = '\0'; WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0; log_file = NULL; NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = UndernetMsgPrefix = false; @@ -48,7 +63,7 @@ ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance) dns_timeout = DieDelay = 5; MaxTargets = 20; NetBufferSize = 10240; - SoftLimit = Instance->SE->GetMaxFds(); + SoftLimit = ServerInstance->SE->GetMaxFds(); MaxConn = SOMAXCONN; MaxWhoResults = 0; debugging = 0; @@ -56,44 +71,6 @@ ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance) OperMaxChans = 30; c_ipv4_range = 32; c_ipv6_range = 128; - maxbans.clear(); - DNSServerValidator = &ValidateDnsServer; -} - -void ServerConfig::ClearStack() -{ - include_stack.clear(); -} - -Module* ServerConfig::GetIOHook(BufferedSocket* is) -{ - std::map::iterator x = SocketIOHookModule.find(is); - return (x != SocketIOHookModule.end() ? x->second : NULL); -} - -bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is) -{ - if (!GetIOHook(is)) - { - SocketIOHookModule[is] = iomod; - is->IsIOHooked = true; - return true; - } - else - { - throw ModuleException("BufferedSocket derived class already hooked by another module"); - } -} - -bool ServerConfig::DelIOHook(BufferedSocket* is) -{ - std::map::iterator x = SocketIOHookModule.find(is); - if (x != SocketIOHookModule.end()) - { - SocketIOHookModule.erase(x); - return true; - } - return false; } void ServerConfig::Update005() @@ -130,42 +107,33 @@ void ServerConfig::Send005(User* user) user->WriteNumeric(RPL_ISUPPORT, "%s %s", user->nick.c_str(), line->c_str()); } -bool ServerConfig::CheckOnce(const char* tag, ConfigDataHash &newconf) -{ - int count = ConfValueEnum(newconf, tag); - - if (count > 1) - throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted."); - if (count < 1) - throw CoreException("You have not defined a <"+std::string(tag)+"> tag, this is required."); - return true; -} - -bool NoValidation(ServerConfig*, const char*, const char*, ValueItem&) +template +static void range(T& value, V min, V max, V def, const char* msg) { - return true; + if (value >= (T)min && value <= (T)max) + return; + ServerInstance->Logs->Log("CONFIG", DEFAULT, + "WARNING: %s value of %ld is not between %ld and %ld; set to %ld.", + msg, (long)value, (long)min, (long)max, (long)def); + value = def; } -bool DoneConfItem(ServerConfig* conf, const char* tag) +bool ServerConfig::CheckOnce(const char* tag) { + if (!ConfValue(tag)) + throw CoreException("You have not defined a <"+std::string(tag)+"> tag, this is required."); + if (ConfValue(tag, 1)) + throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted."); return true; } -void ServerConfig::ValidateNoSpaces(const char* p, const std::string &tag, const std::string &val) -{ - for (const char* ptr = p; *ptr; ++ptr) - { - if (*ptr == ' ') - throw CoreException("The value of <"+tag+":"+val+"> cannot contain spaces"); - } -} - /* NOTE: Before anyone asks why we're not using inet_pton for this, it is because inet_pton and friends do not return so much detail, * even in strerror(errno). They just return 'yes' or 'no' to an address without such detail as to whats WRONG with the address. * Because ircd users arent as technical as they used to be (;)) we are going to give more of a useful error message. */ -void ServerConfig::ValidateIP(const char* p, const std::string &tag, const std::string &val, bool wild) +static void ValidIP(const std::string& ip, const std::string& key) { + const char* p = ip.c_str(); int num_dots = 0; int num_seps = 0; int not_numbers = false; @@ -174,13 +142,10 @@ void ServerConfig::ValidateIP(const char* p, const std::string &tag, const std:: if (*p) { if (*p == '.') - throw CoreException("The value of <"+tag+":"+val+"> is not an IP address"); + throw CoreException("The value of "+key+" is not an IP address"); for (const char* ptr = p; *ptr; ++ptr) { - if (wild && (*ptr == '*' || *ptr == '?' || *ptr == '/')) - continue; - if (*ptr != ':' && *ptr != '.') { if (*ptr < '0' || *ptr > '9') @@ -191,7 +156,7 @@ void ServerConfig::ValidateIP(const char* p, const std::string &tag, const std:: switch (*ptr) { case ' ': - throw CoreException("The value of <"+tag+":"+val+"> is not an IP address"); + throw CoreException("The value of "+key+" is not an IP address"); case '.': num_dots++; break; @@ -202,76 +167,48 @@ void ServerConfig::ValidateIP(const char* p, const std::string &tag, const std:: } if (num_dots > 3) - throw CoreException("The value of <"+tag+":"+val+"> is an IPv4 address with too many fields!"); + throw CoreException("The value of "+key+" is an IPv4 address with too many fields!"); if (num_seps > 8) - throw CoreException("The value of <"+tag+":"+val+"> is an IPv6 address with too many fields!"); + throw CoreException("The value of "+key+" is an IPv6 address with too many fields!"); - if (num_seps == 0 && num_dots < 3 && !wild) - throw CoreException("The value of <"+tag+":"+val+"> looks to be a malformed IPv4 address"); + if (num_seps == 0 && num_dots < 3) + throw CoreException("The value of "+key+" looks to be a malformed IPv4 address"); if (num_seps == 0 && num_dots == 3 && not_numbers) - throw CoreException("The value of <"+tag+":"+val+"> contains non-numeric characters in an IPv4 address"); + throw CoreException("The value of "+key+" contains non-numeric characters in an IPv4 address"); if (num_seps != 0 && not_hex) - throw CoreException("The value of <"+tag+":"+val+"> contains non-hexdecimal characters in an IPv6 address"); + throw CoreException("The value of "+key+" contains non-hexdecimal characters in an IPv6 address"); - if (num_seps != 0 && num_dots != 3 && num_dots != 0 && !wild) - throw CoreException("The value of <"+tag+":"+val+"> is a malformed IPv6 4in6 address"); + if (num_seps != 0 && num_dots != 3 && num_dots != 0) + throw CoreException("The value of "+key+" is a malformed IPv6 4in6 address"); } } -void ServerConfig::ValidateHostname(const char* p, const std::string &tag, const std::string &val) +static void ValidHost(const std::string& p, const std::string& msg) { int num_dots = 0; - if (*p) + 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++) { - if (*p == '.') - throw CoreException("The value of <"+tag+":"+val+"> is not a valid hostname"); - for (const char* ptr = p; *ptr; ++ptr) + switch (p[i]) { - switch (*ptr) - { - case ' ': - throw CoreException("The value of <"+tag+":"+val+"> is not a valid hostname"); - case '.': - num_dots++; - break; - } + 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 <"+tag+":"+val+"> is not a valid hostname"); - } -} - -bool ValidateMaxTargets(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - if ((data.GetInteger() < 0) || (data.GetInteger() > 31)) - { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: value is greater than 31 or less than 0, set to 20."); - data.Set(20); } - return true; -} - -bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - if ((data.GetInteger() < 1) || (data.GetInteger() > conf->GetInstance()->SE->GetMaxFds())) - { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: value is greater than %d or less than 0, set to %d.",conf->GetInstance()->SE->GetMaxFds(),conf->GetInstance()->SE->GetMaxFds()); - data.Set(conf->GetInstance()->SE->GetMaxFds()); - } - return true; + if (num_dots == 0) + throw CoreException("The value of "+msg+" is not a valid hostname"); } -bool ValidateMaxConn(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - if (data.GetInteger() > SOMAXCONN) - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: value may be higher than the system-defined SOMAXCONN value!"); - return true; -} +// Specialized validators -bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance) +bool ServerConfig::ApplyDisabledCommands(const std::string& data) { std::stringstream dcmds(data); std::string thiscmd; @@ -292,1062 +229,593 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance) return true; } -bool ValidateDisabledUModes(ServerConfig* conf, const char*, const char*, ValueItem &data) +#ifdef WINDOWS +// Note: the windows validator is in win32wrapper.cpp +void ValidateDnsServer(std::string& server); +#else +static void ValidateDnsServer(std::string& server) { - memset(conf->DisabledUModes, 0, sizeof(conf->DisabledUModes)); - for (const unsigned char* p = (const unsigned char*)data.GetString(); *p; ++p) + if (!server.empty()) { - if (*p < 'A' || *p > ('A' + 64)) throw CoreException(std::string("Invalid usermode ")+(char)*p+" was found."); - conf->DisabledUModes[*p - 'A'] = 1; + ValidIP(server, ""); + return; } - return true; + + // attempt to look up their nameserver from /etc/resolv.conf + ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: not defined, attempting to find working server in /etc/resolv.conf..."); + + std::ifstream resolv("/etc/resolv.conf"); + + while (resolv >> server) + { + if (server == "nameserver") + { + resolv >> server; + ServerInstance->Logs->Log("CONFIG",DEFAULT," set to '%s' as first resolver in /etc/resolv.conf.",server.c_str()); + return; + } + } + + ServerInstance->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!"); + server = "127.0.0.1"; } +#endif -bool ValidateDisabledCModes(ServerConfig* conf, const char*, const char*, ValueItem &data) +static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::string& key, XLineFactory* make) { - memset(conf->DisabledCModes, 0, sizeof(conf->DisabledCModes)); - for (const unsigned char* p = (const unsigned char*)data.GetString(); *p; ++p) + for(int i=0;; ++i) { - if (*p < 'A' || *p > ('A' + 64)) throw CoreException(std::string("Invalid chanmode ")+(char)*p+" was found."); - conf->DisabledCModes[*p - 'A'] = 1; + ConfigTag* ctag = conf->ConfValue(tag, i); + if (!ctag) + break; + std::string mask; + if (!ctag->readString(key, mask)) + throw CoreException("<"+tag+":"+key+"> missing"); + std::string reason = ctag->getString("reason", ""); + XLine* xl = make->Generate(ServerInstance->Time(), 0, "", reason, mask); + if (!ServerInstance->XLines->AddLine(xl, NULL)) + delete xl; + } +} + +void ServerConfig::CrossCheckOperClassType() +{ + for (int i = 0;; ++i) + { + ConfigTag* tag = ConfValue("class", i); + if (!tag) + break; + std::string name = tag->getString("name"); + if (name.empty()) + throw CoreException(" is required for all tags"); + operclass[name] = tag; + } + for (int i = 0;; ++i) + { + ConfigTag* tag = ConfValue("type", i); + if (!tag) + break; + + std::string name = tag->getString("name"); + if (name.empty()) + throw CoreException(" is required for all tags"); + opertypes[name] = tag; + + std::string classname; + irc::spacesepstream str(tag->getString("classes")); + while (str.GetToken(classname)) + { + if (operclass.find(classname) == operclass.end()) + throw CoreException("Oper type " + name + " has missing class " + classname); + } } - return true; } -bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &data) +void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) { - if (!*(data.GetString())) + typedef std::map ClassMap; + ClassMap oldBlocksByMask; + if (current) { - std::string nameserver; - // attempt to look up their nameserver from /etc/resolv.conf - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: not defined, attempting to find working server in /etc/resolv.conf..."); - std::ifstream resolv("/etc/resolv.conf"); - bool found_server = false; + for(ClassVector::iterator i = current->Classes.begin(); i != current->Classes.end(); ++i) + { + ConnectClass* c = *i; + std::string typeMask = (c->type == CC_ALLOW) ? "a" : "d"; + typeMask += c->host; + oldBlocksByMask[typeMask] = c; + } + } + + ClassMap newBlocksByMask; + std::map names; - if (resolv.is_open()) + bool try_again = true; + for(int tries=0; try_again; tries++) + { + try_again = false; + for(unsigned int i=0;; i++) { - while (resolv >> nameserver) + ConfigTag* tag = ConfValue("connect", i); + if (!tag) + break; + if (Classes.size() <= i) + Classes.resize(i+1); + if (Classes[i]) + continue; + + ConnectClass* parent = NULL; + std::string parentName = tag->getString("parent"); + if (!parentName.empty()) { - if ((nameserver == "nameserver") && (!found_server)) + std::map::iterator parentIter = names.find(parentName); + if (parentIter == names.end()) { - resolv >> nameserver; - data.Set(nameserver.c_str()); - found_server = true; - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT," set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str()); + try_again = true; + // couldn't find parent this time. If it's the last time, we'll never find it. + if (tries == 50) + throw CoreException("Could not find parent connect class \"" + parentName + "\" for connect block " + ConvToStr(i)); + continue; } + parent = Classes[parentIter->second]; } - if (!found_server) + std::string name = tag->getString("name"); + if (!name.empty()) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!"); - data.Set("127.0.0.1"); + if (names.find(name) != names.end()) + throw CoreException("Two connect classes with name \"" + name + "\" defined!"); + names[name] = i; } - } - else - { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!"); - data.Set("127.0.0.1"); + + std::string mask, typeMask; + char type; + + if (tag->readString("allow", mask, false)) + { + type = CC_ALLOW; + typeMask = 'a' + mask; + } + else if (tag->readString("deny", mask, false)) + { + type = CC_DENY; + typeMask = 'd' + mask; + } + else + { + throw CoreException("Connect class must have an allow or deny mask (#" + ConvToStr(i) + ")"); + } + ClassMap::iterator dupMask = newBlocksByMask.find(typeMask); + if (dupMask != newBlocksByMask.end()) + throw CoreException("Two connect classes cannot have the same mask (" + mask + ")"); + + ConnectClass* me = parent ? + new ConnectClass(tag, type, mask, *parent) : + new ConnectClass(tag, type, mask); + + if (!name.empty()) + me->name = name; + + tag->readString("password", me->pass); + tag->readString("hash", me->hash); + me->registration_timeout = tag->getInt("timeout", me->registration_timeout); + me->pingtime = tag->getInt("pingfreq", me->pingtime); + std::string sendq; + if (tag->readString("sendq", sendq)) + { + // attempt to guess a good hard/soft sendq from a single value + long value = atol(sendq.c_str()); + 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->maxlocal = tag->getInt("localmax", me->maxlocal); + me->maxglobal = tag->getInt("globalmax", me->maxglobal); + me->port = tag->getInt("port", me->port); + me->maxchans = tag->getInt("maxchans", me->maxchans); + me->limit = tag->getInt("limit", me->limit); + + ClassMap::iterator oldMask = oldBlocksByMask.find(typeMask); + if (oldMask != oldBlocksByMask.end()) + { + ConnectClass* old = oldMask->second; + oldBlocksByMask.erase(oldMask); + old->Update(me); + delete me; + me = old; + } + newBlocksByMask[typeMask] = me; + Classes[i] = me; } } - return true; } -bool ValidateServerName(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Validating server name"); - /* If we already have a servername, and they changed it, we should throw an exception. */ - if (!strchr(data.GetString(), '.')) +static const Deprecated ChangedConfig[] = { + {"options", "hidelinks", "has been moved to as of 1.2a3"}, + {"options", "hidewhois", "has been moved to as of 1.2a3"}, + {"options", "userstats", "has been moved to as of 1.2a3"}, + {"options", "customversion", "has been moved to as of 1.2a3"}, + {"options", "hidesplits", "has been moved to as of 1.2a3"}, + {"options", "hidebans", "has been moved to as of 1.2a3"}, + {"options", "hidekills", "has been moved to as of 1.2a3"}, + {"options", "operspywhois", "has been moved to as of 1.2a3"}, + {"options", "announceinvites", "has been moved to as of 1.2a3"}, + {"options", "hidemodes", "has been moved to as of 1.2a3"}, + {"options", "maxtargets", "has been moved to as of 1.2a3"}, + {"options", "nouserdns", "has been moved to as of 1.2a3"}, + {"options", "maxwho", "has been moved to as of 1.2a3"}, + {"options", "softlimit", "has been moved to as of 1.2a3"}, + {"options", "somaxconn", "has been moved to as of 1.2a3"}, + {"options", "netbuffersize", "has been moved to as of 1.2a3"}, + {"options", "maxwho", "has been moved to as of 1.2a3"}, + {"options", "loglevel", "1.2 does not use the loglevel value. Please define tags instead."}, + {"die", "value", "has always been deprecated"}, +}; + +void ServerConfig::Fill() +{ + ReqRead(this, "server", "name", ServerName); + ReqRead(this, "power", "diepass", diepass); + ReqRead(this, "power", "restartpass", restartpass); + + ConfigTag* options = ConfValue("options"); + ConfigTag* security = ConfValue("security"); + powerhash = ConfValue("power")->getString("hash"); + DieDelay = ConfValue("power")->getInt("pause"); + PrefixQuit = options->getString("prefixquit"); + SuffixQuit = options->getString("suffixquit"); + FixedQuit = options->getString("fixedquit"); + PrefixPart = options->getString("prefixpart"); + SuffixPart = options->getString("suffixpart"); + FixedPart = options->getString("fixedpart"); + SoftLimit = ConfValue("performance")->getInt("softlimit", ServerInstance->SE->GetMaxFds()); + MaxConn = ConfValue("performance")->getInt("somaxconn", SOMAXCONN); + MoronBanner = options->getString("moronbanner", "You're banned!"); + ServerDesc = ConfValue("server")->getString("description", "Configure Me"); + Network = ConfValue("server")->getString("network", "Network"); + sid = ConfValue("server")->getString("id", ""); + AdminName = ConfValue("admin")->getString("name", ""); + AdminEmail = ConfValue("admin")->getString("email", "null@example.com"); + AdminNick = ConfValue("admin")->getString("nick", "admin"); + ModPath = options->getString("moduledir", MOD_PATH); + NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240); + MaxWhoResults = ConfValue("performance")->getInt("maxwho", 1024); + DNSServer = ConfValue("dns")->getString("server"); + dns_timeout = ConfValue("dns")->getInt("timeout", 5); + DisabledCommands = ConfValue("disabled")->getString("commands", ""); + DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant"); + SetUser = security->getString("runasuser"); + SetGroup = security->getString("runasgroup"); + UserStats = security->getString("userstats"); + CustomVersion = security->getString("customversion"); + HideSplits = security->getBool("hidesplits"); + HideBans = security->getBool("hidebans"); + HideWhoisServer = security->getString("hidewhois"); + HideKillsServer = security->getString("hidekills"); + OperSpyWhois = security->getBool("operspywhois"); + RestrictBannedUsers = security->getBool("restrictbannedusers"); + GenericOper = security->getBool("genericoper"); + NoUserDns = ConfValue("performance")->getBool("nouserdns"); + SyntaxHints = options->getBool("syntaxhints"); + CycleHosts = options->getBool("cyclehosts"); + UndernetMsgPrefix = options->getBool("ircumsgprefix"); + FullHostInTopic = options->getBool("hostintopic"); + MaxTargets = security->getInt("maxtargets"); + DefaultModes = options->getString("defaultmodes"); + PID = ConfValue("pid")->getString("file"); + WhoWasGroupSize = ConfValue("whowas")->getInt("groupsize"); + WhoWasMaxGroups = ConfValue("whowas")->getInt("maxgroups"); + WhoWasMaxKeep = ServerInstance->Duration(ConfValue("whowas")->getString("maxkeep")); + DieValue = ConfValue("die")->getString("value"); + MaxChans = ConfValue("channels")->getInt("users"); + OperMaxChans = ConfValue("channels")->getInt("opers"); + c_ipv4_range = ConfValue("cidr")->getInt("ipv4clone"); + c_ipv6_range = ConfValue("cidr")->getInt("ipv6clone"); + Limits.NickMax = ConfValue("limits")->getInt("maxnick"); + Limits.ChanMax = ConfValue("limits")->getInt("maxchan"); + Limits.MaxModes = ConfValue("limits")->getInt("maxmodes"); + Limits.IdentMax = ConfValue("limits")->getInt("maxident"); + Limits.MaxQuit = ConfValue("limits")->getInt("maxquit"); + Limits.MaxTopic = ConfValue("limits")->getInt("maxtopic"); + Limits.MaxKick = ConfValue("limits")->getInt("maxkick"); + Limits.MaxGecos = ConfValue("limits")->getInt("maxgecos"); + Limits.MaxAway = ConfValue("limits")->getInt("maxaway"); + InvBypassModes = options->getBool("invitebypassmodes"); + + ReadFile(MOTD, ConfValue("files")->getString("motd")); + ReadFile(RULES, ConfValue("files")->getString("rules")); + ValidateDnsServer(DNSServer); + + range(SoftLimit, 10, ServerInstance->SE->GetMaxFds(), ServerInstance->SE->GetMaxFds(), ""); + range(MaxConn, 0, SOMAXCONN, SOMAXCONN, ""); + range(MaxTargets, 1, 31, 20, ""); + range(NetBufferSize, 1024, 65534, 10240, ""); + range(MaxWhoResults, 1, 65535, 1024, ""); + range(WhoWasGroupSize, 0, 10000, 10, ""); + range(WhoWasMaxGroups, 0, 1000000, 10240, ""); + range(WhoWasMaxKeep, 3600, INT_MAX, 3600, ""); + + ValidHost(ServerName, ""); + if (!sid.empty() && !ServerInstance->IsSID(sid)) + throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter."); + + for (int i = 0;; ++i) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: '%s' is not a fully-qualified domain name. Changed to '%s%c'",data.GetString(),data.GetString(),'.'); - std::string moo = std::string(data.GetString()).append("."); - data.Set(moo.c_str()); + ConfigTag* tag = ConfValue("uline", i); + if (!tag) + break; + std::string server; + if (!tag->readString("server", server)) + throw CoreException(" tag missing server"); + ulines[assign(server)] = tag->getBool("silent"); } - conf->ValidateHostname(data.GetString(), "server", "name"); - return true; -} -bool ValidateNetBufferSize(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - // 65534 not 65535 because of null terminator - if ((!data.GetInteger()) || (data.GetInteger() > 65534) || (data.GetInteger() < 1024)) + for(int i=0;; ++i) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240."); - data.Set(10240); + ConfigTag* tag = ConfValue("banlist", i); + if (!tag) + break; + std::string chan; + if (!tag->readString("chan", chan)) + throw CoreException(" tag missing chan"); + maxbans[chan] = tag->getInt("limit"); } - return true; -} -bool ValidateMaxWho(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - if ((data.GetInteger() > 65535) || (data.GetInteger() < 1)) + ReadXLine(this, "badip", "ipmask", ServerInstance->XLines->GetFactory("Z")); + ReadXLine(this, "badnick", "nick", ServerInstance->XLines->GetFactory("Q")); + ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K")); + ReadXLine(this, "exception", "host", ServerInstance->XLines->GetFactory("E")); + + memset(DisabledUModes, 0, sizeof(DisabledUModes)); + for (const unsigned char* p = (const unsigned char*)ConfValue("disabled")->getString("usermodes").c_str(); *p; ++p) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT," size out of range, setting to default of 128."); - data.Set(128); + if (*p < 'A' || *p > ('A' + 64)) throw CoreException(std::string("Invalid usermode ")+(char)*p+" was found."); + DisabledUModes[*p - 'A'] = 1; } - return true; -} - -bool ValidateMotd(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - conf->ReadFile(conf->MOTD, data.GetString()); - return true; -} - -bool ValidateNotEmpty(ServerConfig*, const char* tag, const char*, ValueItem &data) -{ - if (!*data.GetString()) - throw CoreException(std::string("The value for ")+tag+" cannot be empty!"); - return true; -} - -bool ValidateRules(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - conf->ReadFile(conf->RULES, data.GetString()); - return true; -} - -bool ValidateModeLists(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - memset(conf->HideModeLists, 0, sizeof(conf->HideModeLists)); - for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x) - conf->HideModeLists[*x] = true; - return true; -} -bool ValidateExemptChanOps(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - memset(conf->ExemptChanOps, 0, sizeof(conf->ExemptChanOps)); - for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x) - conf->ExemptChanOps[*x] = true; - return true; -} + memset(DisabledCModes, 0, sizeof(DisabledCModes)); + for (const unsigned char* p = (const unsigned char*)ConfValue("disabled")->getString("chanmodes").c_str(); *p; ++p) + { + if (*p < 'A' || *p > ('A' + 64)) throw CoreException(std::string("Invalid chanmode ")+(char)*p+" was found."); + DisabledCModes[*p - 'A'] = 1; + } -bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - std::string v = data.GetString(); + memset(HideModeLists, 0, sizeof(HideModeLists)); + for (const unsigned char* p = (const unsigned char*)ConfValue("security")->getString("hidemodes").c_str(); *p; ++p) + HideModeLists[*p] = true; + + std::string v = security->getString("announceinvites"); if (v == "ops") - conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_OPS; + AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_OPS; else if (v == "all") - conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_ALL; + AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_ALL; else if (v == "dynamic") - conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_DYNAMIC; + AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_DYNAMIC; else - conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE; + AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE; + + bool AllowHalfOp = options->getBool("allowhalfop"); + ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL); + if (AllowHalfOp && !mh) { + ServerInstance->Logs->Log("CONFIG", DEFAULT, "Enabling halfop mode."); + mh = new ModeChannelHalfOp; + ServerInstance->Modes->AddMode(mh); + } else if (!AllowHalfOp && mh) { + ServerInstance->Logs->Log("CONFIG", DEFAULT, "Disabling halfop mode."); + ServerInstance->Modes->DelMode(mh); + delete mh; + } + + Module* whowas = ServerInstance->Modules->Find("cmd_whowas.so"); + if (whowas) + WhowasRequest(NULL, whowas, WhowasRequest::WHOWAS_PRUNE).Send(); + Limits.Finalise(); - return true; } -bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Validating server id"); +/* These tags MUST occur and must ONLY occur once in the config file */ +static const char* const Once[] = { "server", "admin", "files", "power", "options" }; - const char *sid = data.GetString(); +// WARNING: it is not safe to use most of the codebase in this function, as it +// will run in the config reader thread +void ServerConfig::Read() +{ + /* Load and parse the config file, if there are any errors then explode */ - if (*sid && !conf->GetInstance()->IsSID(sid)) + if (!this->DoInclude(ServerInstance->ConfigFileName, true)) { - throw CoreException(std::string(sid) + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter."); + valid = false; + return; } - - strlcpy(conf->sid, sid, 5); - - return true; } -bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &data) +void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) { - conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString()); + valid = true; + /* std::ostringstream::clear() does not clear the string itself, only the error flags. */ + errstr.clear(); + errstr.str().clear(); + include_stack.clear(); + + /* The stuff in here may throw CoreException, be sure we're in a position to catch it. */ + try + { + /* Check we dont have more than one of singular tags, or any of them missing + */ + for (int Index = 0; Index * sizeof(*Once) < sizeof(Once); Index++) + CheckOnce(Once[Index]); - if (conf->WhoWasGroupSize < 0) - conf->WhoWasGroupSize = 0; + for (int Index = 0; Index * sizeof(Deprecated) < sizeof(ChangedConfig); Index++) + { + std::string dummy; + if (ConfValue(ChangedConfig[Index].tag)->readString(ChangedConfig[Index].value, dummy, true)) + throw CoreException(std::string("Your configuration contains a deprecated value: <") + ChangedConfig[Index].tag + ":" + ChangedConfig[Index].value + "> - " + ChangedConfig[Index].reason); + } - if (conf->WhoWasMaxGroups < 0) - conf->WhoWasMaxGroups = 0; + Fill(); - if (conf->WhoWasMaxKeep < 3600) + // Handle special items + CrossCheckOperClassType(); + CrossCheckConnectBlocks(old); + } + catch (CoreException &ce) { - conf->WhoWasMaxKeep = 3600; - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: value less than 3600, setting to default 3600"); + errstr << ce.GetReason(); + valid = false; } - Command* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS"); - if (whowas_command) + // write once here, to try it out and make sure its ok + ServerInstance->WritePID(this->PID); + + /* + * These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername. + */ + if (old) { - std::deque params; - whowas_command->HandleInternal(WHOWAS_PRUNE, params); + this->ServerName = old->ServerName; + this->sid = old->sid; + this->argv = old->argv; + this->argc = old->argc; + + // Same for ports... they're bound later on first run. + FailedPortList pl; + ServerInstance->BindPorts(pl); + if (pl.size()) + { + errstr << "Not all your client ports could be bound.\nThe following port(s) failed to bind:\n"; + + int j = 1; + for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++) + { + char buf[MAXBUF]; + snprintf(buf, MAXBUF, "%d. Address: %s Reason: %s\n", j, i->first.empty() ? "" : i->first.c_str(), i->second.c_str()); + errstr << buf; + } + } } - return true; -} + User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid); -/* Callback called before processing the first tag - */ -bool InitConnect(ServerConfig* conf, const char*) -{ - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Reading connect classes..."); + valid = errstr.str().empty(); + if (!valid) + ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file:"); - for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end() ; ) + while (errstr.good()) { - ConnectClass* c = *i; + std::string line; + getline(errstr, line, '\n'); + if (!line.empty()) + { + if (user) + user->WriteServ("NOTICE %s :*** %s", user->nick.c_str(), line.c_str()); + else + ServerInstance->SNO->WriteGlobalSno('a', line); + } - /* only delete a class with refcount 0 */ - if (c->RefCount == 0) + if (!old) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Removing connect class, refcount is 0!"); - - /* This was causing a crash, because we'd set i to .begin() just here, but then the for loop's increment would - * set it to .begin() + 1. Which if it was already the last thing in the list, wasn't good. - * Now the increment is in the else { } below. - */ - conf->Classes.erase(i); - i = conf->Classes.begin(); // start over so we don't trample on a bad iterator + // Starting up, so print it out so it's seen. XXX this is a bit of a hack. + printf("%s\n", line.c_str()); } - else + } + + errstr.clear(); + errstr.str(std::string()); + + /* No old configuration -> initial boot, nothing more to do here */ + if (!old) + { + if (!valid) { - /* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */ - c->SetDisabled(true); - i++; + ServerInstance->Exit(EXIT_STATUS_CONFIG); } + + return; } - return true; + // If there were errors processing configuration, don't touch modules. + if (!valid) + return; + + ApplyModules(user); } -/* Callback called to process a single tag - */ -bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) +void ServerConfig::ApplyModules(User* user) { - ConnectClass c; - const char* allow = values[0].GetString(); /* Yeah, there are a lot of values. Live with it. */ - const char* deny = values[1].GetString(); - const char* password = values[2].GetString(); - int timeout = values[3].GetInteger(); - int pingfreq = values[4].GetInteger(); - int flood = values[5].GetInteger(); - int threshold = values[6].GetInteger(); - int sendq = values[7].GetInteger(); - int recvq = values[8].GetInteger(); - int localmax = values[9].GetInteger(); - int globalmax = values[10].GetInteger(); - int port = values[11].GetInteger(); - const char* name = values[12].GetString(); - const char* parent = values[13].GetString(); - int maxchans = values[14].GetInteger(); - unsigned long limit = values[15].GetInteger(); - const char* hashtype = values[16].GetString(); + const std::vector v = ServerInstance->Modules->GetAllModuleNames(0); + std::vector added_modules; + std::set removed_modules(v.begin(), v.end()); - /* - * duplicates check: Now we don't delete all connect classes on rehash, we need to ensure we don't add dupes. - * easier said than done, but for now we'll just disallow anything with a duplicate host or name. -- w00t - */ - for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item) + for(int i=0; ; i++) { - ConnectClass* cc = *item; - if ( - ((*name && (cc->GetName() == name)) || // if the name is the same - (*allow && (cc->GetHost() == allow)) || // or the allow is the same - (*deny && (cc->GetHost() == deny))) && // or the deny is the same - (!port || (port && (cc->GetPort() == port))) // and there is no port, or there is a port and the port is the same - ) + ConfigTag* tag = ConfValue("module", i); + if (!tag) + break; + std::string name; + if (tag->readString("name", name)) { - /* reenable class so users can be shoved into it :P */ - cc->SetDisabled(false); - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Not adding class, it already exists!"); - return true; - } + // if this module is already loaded, the erase will succeed, so we need do nothing + // otherwise, we need to add the module (which will be done later) + if (removed_modules.erase(name) == 0) + added_modules.push_back(name); + } } - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Adding a connect class!"); - - if (*parent) + for (std::set::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) { - /* Find 'parent' and inherit a new class from it, - * then overwrite any values that are set here - */ - ClassVector::iterator item = conf->Classes.begin(); - for (; item != conf->Classes.end(); ++item) + // Don't remove cmd_*.so, just remove m_*.so + if (removing->c_str()[0] == 'c') + continue; + Module* m = ServerInstance->Modules->Find(*removing); + if (m && ServerInstance->Modules->Unload(m)) { - ConnectClass* cc = *item; - conf->GetInstance()->Logs->Log("CONFIG",DEBUG,"Class: %s", cc->GetName().c_str()); - if (cc->GetName() == parent) - { - ConnectClass* newclass = new ConnectClass(name, cc); - newclass->Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit); - conf->Classes.push_back(newclass); - break; - } + ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH UNLOADED MODULE: %s",removing->c_str()); + + if (user) + user->WriteNumeric(RPL_UNLOADEDMODULE, "%s %s :Module %s successfully unloaded.",user->nick.c_str(), removing->c_str(), removing->c_str()); + else + ServerInstance->SNO->WriteGlobalSno('a', "Module %s successfully unloaded.", removing->c_str()); + } + else + { + if (user) + user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s %s :Failed to unload module %s: %s",user->nick.c_str(), removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError().c_str()); + else + ServerInstance->SNO->WriteGlobalSno('a', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str()); } - if (item == conf->Classes.end()) - throw CoreException("Class name '" + std::string(name) + "' is configured to inherit from class '" + std::string(parent) + "' which cannot be found."); } - else + + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - if (*allow) + if (ServerInstance->Modules->Load(adding->c_str())) { - /* Find existing class by mask, the mask should be unique */ - for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item) - { - if ((*item)->GetHost() == allow) - { - (*item)->Update(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit); - return true; - } - } - ConnectClass* cc = new ConnectClass(name, timeout, flood, allow, pingfreq, password, hashtype, threshold, sendq, recvq, localmax, globalmax, maxchans); - cc->limit = limit; - cc->SetPort(port); - conf->Classes.push_back(cc); + ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH LOADED MODULE: %s",adding->c_str()); + if (user) + user->WriteNumeric(RPL_LOADEDMODULE, "%s %s :Module %s successfully loaded.",user->nick.c_str(), adding->c_str(), adding->c_str()); + else + ServerInstance->SNO->WriteGlobalSno('a', "Module %s successfully loaded.", adding->c_str()); } else { - /* Find existing class by mask, the mask should be unique */ - for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item) - { - if ((*item)->GetHost() == deny) - { - (*item)->Update(name, deny); - (*item)->SetPort(port); - return true; - } - } - ConnectClass* cc = new ConnectClass(name, deny); - cc->SetPort(port); - conf->Classes.push_back(cc); + if (user) + user->WriteNumeric(ERR_CANTLOADMODULE, "%s %s :Failed to load module %s: %s",user->nick.c_str(), adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str()); + else + ServerInstance->SNO->WriteGlobalSno('a', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str()); } } - return true; -} - -/* Callback called when there are no more tags - */ -bool DoneConnect(ServerConfig *conf, const char*) -{ - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Done adding connect classes!"); - return true; -} - -/* Callback called before processing the first tag - */ -bool InitULine(ServerConfig* conf, const char*) -{ - conf->ulines.clear(); - return true; -} - -/* Callback called to process a single tag - */ -bool DoULine(ServerConfig* conf, const char*, char**, ValueList &values, int*) -{ - const char* server = values[0].GetString(); - const bool silent = values[1].GetBool(); - conf->ulines[server] = silent; - return true; -} - -/* Callback called when there are no more tags - */ -bool DoneULine(ServerConfig*, const char*) -{ - return true; -} - -/* Callback called before processing the first tag - */ -bool InitModule(ServerConfig* conf, const char*) -{ - old_module_names = conf->GetInstance()->Modules->GetAllModuleNames(0); - new_module_names.clear(); - added_modules.clear(); - removed_modules.clear(); - return true; -} - -/* Callback called to process a single tag - */ -bool DoModule(ServerConfig*, const char*, char**, ValueList &values, int*) -{ - const char* modname = values[0].GetString(); - new_module_names.push_back(modname); - return true; -} - -/* Callback called when there are no more tags - */ -bool DoneModule(ServerConfig*, const char*) -{ - // now create a list of new modules that are due to be loaded - // and a seperate list of modules which are due to be unloaded - for (std::vector::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++) - { - bool added = true; - - for (std::vector::iterator old = old_module_names.begin(); old != old_module_names.end(); old++) - { - if (*old == *_new) - added = false; - } - - if (added) - added_modules.push_back(*_new); - } - - for (std::vector::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++) - { - bool removed = true; - for (std::vector::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++) - { - if (*newm == *oldm) - removed = false; - } - - if (removed) - removed_modules.push_back(*oldm); - } - return true; -} - -/* Callback called before processing the first tag - */ -bool InitMaxBans(ServerConfig* conf, const char*) -{ - conf->maxbans.clear(); - return true; -} - -/* Callback called to process a single tag - */ -bool DoMaxBans(ServerConfig* conf, const char*, char**, ValueList &values, int*) -{ - const char* channel = values[0].GetString(); - int limit = values[1].GetInteger(); - conf->maxbans[channel] = limit; - return true; -} - -/* Callback called when there are no more tags. - */ -bool DoneMaxBans(ServerConfig*, const char*) -{ - return true; -} - -void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, User* user) -{ - ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file: %s", errormessage.c_str()); - if (bail) - { - /* Unneeded because of the ServerInstance->Log() aboive? */ - printf("There were errors in your configuration:\n%s\n\n",errormessage.c_str()); - ServerInstance->Exit(EXIT_STATUS_CONFIG); - } - else - { - std::string errors = errormessage; - std::string::size_type start; - unsigned int prefixlen; - start = 0; - /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */ - if (user) - { - prefixlen = strlen(this->ServerName) + user->nick.length() + 11; - user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick.c_str()); - while (start < errors.length()) - { - user->WriteServ("NOTICE %s :%s",user->nick.c_str(), errors.substr(start, 510 - prefixlen).c_str()); - start += 510 - prefixlen; - } - } - else - { - ServerInstance->SNO->WriteToSnoMask('A', "There were errors in the configuration file:"); - while (start < errors.length()) - { - ServerInstance->SNO->WriteToSnoMask('A', errors.substr(start, 360)); - start += 360; - } - } - return; - } -} - -void ServerConfig::Read(bool bail, User* user) -{ - int rem = 0, add = 0; /* Number of modules added, number of modules removed */ - - static char maxkeep[MAXBUF]; /* Temporary buffer for WhoWasMaxKeep value */ - static char hidemodes[MAXBUF]; /* Modes to not allow listing from users below halfop */ - static char exemptchanops[MAXBUF]; /* Exempt channel ops from these modes */ - static char announceinvites[MAXBUF]; /* options:announceinvites setting */ - static char disabledumodes[MAXBUF]; /* Disabled usermodes */ - static char disabledcmodes[MAXBUF]; /* Disabled chanmodes */ - errstr.clear(); - - include_stack.clear(); - - /* These tags MUST occur and must ONLY occur once in the config file */ - static const char* Once[] = { "server", "admin", "files", "power", "options", NULL }; - - Deprecated ChangedConfig[] = { - {"options", "hidelinks", "has been moved to as of 1.2a3"}, - {"options", "hidewhois", "has been moved to as of 1.2a3"}, - {"options", "userstats", "has been moved to as of 1.2a3"}, - {"options", "customversion", "has been moved to as of 1.2a3"}, - {"options", "hidesplits", "has been moved to as of 1.2a3"}, - {"options", "hidebans", "has been moved to as of 1.2a3"}, - {"options", "hidekills", "has been moved to as of 1.2a3"}, - {"options", "operspywhois", "has been moved to as of 1.2a3"}, - {"options", "announceinvites", "has been moved to as of 1.2a3"}, - {"options", "hidemodes", "has been moved to as of 1.2a3"}, - {"options", "maxtargets", "has been moved to as of 1.2a3"}, - {"options", "nouserdns", "has been moved to as of 1.2a3"}, - {"options", "maxwho", "has been moved to as of 1.2a3"}, - {"options", "softlimit", "has been moved to as of 1.2a3"}, - {"options", "somaxconn", "has been moved to as of 1.2a3"}, - {"options", "netbuffersize", "has been moved to as of 1.2a3"}, - {"options", "maxwho", "has been moved to as of 1.2a3"}, - {"options", "loglevel", "1.2 does not use the loglevel value. Please define tags instead."}, - {NULL, NULL, NULL} - }; - - /* These tags can occur ONCE or not at all */ - InitialConfig Values[] = { - {"performance", "softlimit", "0", new ValueContainerUInt (&this->SoftLimit), DT_INTEGER, ValidateSoftLimit}, - {"performance", "somaxconn", SOMAXCONN_S, new ValueContainerInt (&this->MaxConn), DT_INTEGER, ValidateMaxConn}, - {"options", "moronbanner", "Youre banned!", new ValueContainerChar (this->MoronBanner), DT_CHARPTR, NoValidation}, - {"server", "name", "", new ValueContainerChar (this->ServerName), DT_HOSTNAME|DT_BOOTONLY, ValidateServerName}, - {"server", "description", "Configure Me", new ValueContainerChar (this->ServerDesc), DT_CHARPTR, NoValidation}, - {"server", "network", "Network", new ValueContainerChar (this->Network), DT_NOSPACES, NoValidation}, - {"server", "id", "", new ValueContainerChar (this->sid), DT_CHARPTR|DT_BOOTONLY, ValidateSID}, - {"admin", "name", "", new ValueContainerChar (this->AdminName), DT_CHARPTR, NoValidation}, - {"admin", "email", "Mis@configu.red", new ValueContainerChar (this->AdminEmail), DT_CHARPTR, NoValidation}, - {"admin", "nick", "Misconfigured", new ValueContainerChar (this->AdminNick), DT_CHARPTR, NoValidation}, - {"files", "motd", "", new ValueContainerChar (this->motd), DT_CHARPTR, ValidateMotd}, - {"files", "rules", "", new ValueContainerChar (this->rules), DT_CHARPTR, ValidateRules}, - {"power", "diepass", "", new ValueContainerChar (this->diepass), DT_CHARPTR, ValidateNotEmpty}, - {"power", "pause", "", new ValueContainerInt (&this->DieDelay), DT_INTEGER, NoValidation}, - {"power", "hash", "", new ValueContainerChar (this->powerhash), DT_CHARPTR, NoValidation}, - {"power", "restartpass", "", new ValueContainerChar (this->restartpass), DT_CHARPTR, ValidateNotEmpty}, - {"options", "prefixquit", "", new ValueContainerChar (this->PrefixQuit), DT_CHARPTR, NoValidation}, - {"options", "suffixquit", "", new ValueContainerChar (this->SuffixQuit), DT_CHARPTR, NoValidation}, - {"options", "fixedquit", "", new ValueContainerChar (this->FixedQuit), DT_CHARPTR, NoValidation}, - {"options", "prefixpart", "", new ValueContainerChar (this->PrefixPart), DT_CHARPTR, NoValidation}, - {"options", "suffixpart", "", new ValueContainerChar (this->SuffixPart), DT_CHARPTR, NoValidation}, - {"options", "fixedpart", "", new ValueContainerChar (this->FixedPart), DT_CHARPTR, NoValidation}, - {"performance", "netbuffersize","10240", new ValueContainerInt (&this->NetBufferSize), DT_INTEGER, ValidateNetBufferSize}, - {"performance", "maxwho", "128", new ValueContainerInt (&this->MaxWhoResults), DT_INTEGER, ValidateMaxWho}, - {"options", "allowhalfop", "0", new ValueContainerBool (&this->AllowHalfop), DT_BOOLEAN, NoValidation}, - {"dns", "server", "", new ValueContainerChar (this->DNSServer), DT_IPADDRESS,DNSServerValidator}, - {"dns", "timeout", "5", new ValueContainerInt (&this->dns_timeout), DT_INTEGER, NoValidation}, - {"options", "moduledir", MOD_PATH, new ValueContainerChar (this->ModPath), DT_CHARPTR, NoValidation}, - {"disabled", "commands", "", new ValueContainerChar (this->DisabledCommands), DT_CHARPTR, NoValidation}, - {"disabled", "usermodes", "", new ValueContainerChar (disabledumodes), DT_CHARPTR, ValidateDisabledUModes}, - {"disabled", "chanmodes", "", new ValueContainerChar (disabledcmodes), DT_CHARPTR, ValidateDisabledCModes}, - {"disabled", "fakenonexistant", "0", new ValueContainerBool (&this->DisabledDontExist), DT_BOOLEAN, NoValidation}, - {"security", "userstats", "", new ValueContainerChar (this->UserStats), DT_CHARPTR, NoValidation}, - {"security", "customversion","", new ValueContainerChar (this->CustomVersion), DT_CHARPTR, NoValidation}, - {"security", "hidesplits", "0", new ValueContainerBool (&this->HideSplits), DT_BOOLEAN, NoValidation}, - {"security", "hidebans", "0", new ValueContainerBool (&this->HideBans), DT_BOOLEAN, NoValidation}, - {"security", "hidewhois", "", new ValueContainerChar (this->HideWhoisServer), DT_NOSPACES, NoValidation}, - {"security", "hidekills", "", new ValueContainerChar (this->HideKillsServer), DT_NOSPACES, NoValidation}, - {"security", "operspywhois", "0", new ValueContainerBool (&this->OperSpyWhois), DT_BOOLEAN, NoValidation}, - {"performance", "nouserdns", "0", new ValueContainerBool (&this->NoUserDns), DT_BOOLEAN, NoValidation}, - {"options", "syntaxhints", "0", new ValueContainerBool (&this->SyntaxHints), DT_BOOLEAN, NoValidation}, - {"options", "cyclehosts", "0", new ValueContainerBool (&this->CycleHosts), DT_BOOLEAN, NoValidation}, - {"options", "ircumsgprefix","0", new ValueContainerBool (&this->UndernetMsgPrefix), DT_BOOLEAN, NoValidation}, - {"security", "announceinvites", "1", new ValueContainerChar (announceinvites), DT_CHARPTR, ValidateInvite}, - {"options", "hostintopic", "1", new ValueContainerBool (&this->FullHostInTopic), DT_BOOLEAN, NoValidation}, - {"security", "hidemodes", "", new ValueContainerChar (hidemodes), DT_CHARPTR, ValidateModeLists}, - {"options", "exemptchanops","", new ValueContainerChar (exemptchanops), DT_CHARPTR, ValidateExemptChanOps}, - {"security", "maxtargets", "20", new ValueContainerUInt (&this->MaxTargets), DT_INTEGER, ValidateMaxTargets}, - {"options", "defaultmodes", "nt", new ValueContainerChar (this->DefaultModes), DT_CHARPTR, NoValidation}, - {"pid", "file", "", new ValueContainerChar (this->PID), DT_CHARPTR, NoValidation}, - {"whowas", "groupsize", "10", new ValueContainerInt (&this->WhoWasGroupSize), DT_INTEGER, NoValidation}, - {"whowas", "maxgroups", "10240", new ValueContainerInt (&this->WhoWasMaxGroups), DT_INTEGER, NoValidation}, - {"whowas", "maxkeep", "3600", new ValueContainerChar (maxkeep), DT_CHARPTR, ValidateWhoWas}, - {"die", "value", "", new ValueContainerChar (this->DieValue), DT_CHARPTR, NoValidation}, - {"channels", "users", "20", new ValueContainerUInt (&this->MaxChans), DT_INTEGER, NoValidation}, - {"channels", "opers", "60", new ValueContainerUInt (&this->OperMaxChans), DT_INTEGER, NoValidation}, - {"cidr", "ipv4clone", "32", new ValueContainerInt (&this->c_ipv4_range), DT_INTEGER, NoValidation}, - {"cidr", "ipv6clone", "128", new ValueContainerInt (&this->c_ipv6_range), DT_INTEGER, NoValidation}, - {"limits", "maxnick", "32", new ValueContainerST (&this->Limits.NickMax), DT_INTEGER, NoValidation}, - {"limits", "maxchan", "64", new ValueContainerST (&this->Limits.ChanMax), DT_INTEGER, NoValidation}, - {"limits", "maxmodes", "20", new ValueContainerST (&this->Limits.MaxModes), DT_INTEGER, NoValidation}, - {"limits", "maxident", "11", new ValueContainerST (&this->Limits.IdentMax), DT_INTEGER, NoValidation}, - {"limits", "maxquit", "255", new ValueContainerST (&this->Limits.MaxQuit), DT_INTEGER, NoValidation}, - {"limits", "maxtopic", "307", new ValueContainerST (&this->Limits.MaxTopic), DT_INTEGER, NoValidation}, - {"limits", "maxkick", "255", new ValueContainerST (&this->Limits.MaxKick), DT_INTEGER, NoValidation}, - {"limits", "maxgecos", "128", new ValueContainerST (&this->Limits.MaxGecos), DT_INTEGER, NoValidation}, - {"limits", "maxaway", "200", new ValueContainerST (&this->Limits.MaxAway), DT_INTEGER, NoValidation}, - {"options", "invitebypassmodes", "1", new ValueContainerBool (&this->InvBypassModes), DT_BOOLEAN, NoValidation}, - {NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation} - }; - - - /* These tags can occur multiple times, and therefore they have special code to read them - * which is different to the code for reading the singular tags listed above. - */ - MultiConfig MultiValues[] = { - - {"connect", - {"allow", "deny", "password", "timeout", "pingfreq", "flood", - "threshold", "sendq", "recvq", "localmax", "globalmax", "port", - "name", "parent", "maxchans", "limit", "hash", - NULL}, - {"", "", "", "", "120", "", - "", "", "", "3", "3", "0", - "", "", "0", "0", "", - NULL}, - {DT_IPADDRESS|DT_ALLOW_WILD, - DT_IPADDRESS|DT_ALLOW_WILD, - DT_CHARPTR, DT_INTEGER, DT_INTEGER, DT_INTEGER, - DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, - DT_NOSPACES, DT_NOSPACES, DT_INTEGER, DT_INTEGER, DT_CHARPTR}, - InitConnect, DoConnect, DoneConnect}, - - {"uline", - {"server", "silent", NULL}, - {"", "0", NULL}, - {DT_HOSTNAME, DT_BOOLEAN}, - InitULine,DoULine,DoneULine}, - - {"banlist", - {"chan", "limit", NULL}, - {"", "", NULL}, - {DT_CHARPTR, DT_INTEGER}, - InitMaxBans, DoMaxBans, DoneMaxBans}, - - {"module", - {"name", NULL}, - {"", NULL}, - {DT_CHARPTR}, - InitModule, DoModule, DoneModule}, - - {"badip", - {"reason", "ipmask", NULL}, - {"No reason", "", NULL}, - {DT_CHARPTR, DT_IPADDRESS|DT_ALLOW_WILD}, - InitXLine, DoZLine, DoneConfItem}, - - {"badnick", - {"reason", "nick", NULL}, - {"No reason", "", NULL}, - {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoQLine, DoneConfItem}, - - {"badhost", - {"reason", "host", NULL}, - {"No reason", "", NULL}, - {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoKLine, DoneConfItem}, - - {"exception", - {"reason", "host", NULL}, - {"No reason", "", NULL}, - {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoELine, DoneELine}, - - {"type", - {"name", "classes", NULL}, - {"", "", NULL}, - {DT_NOSPACES, DT_CHARPTR}, - InitTypes, DoType, DoneClassesAndTypes}, - - {"class", - {"name", "commands", "usermodes", "chanmodes", NULL}, - {"", "", "", "", NULL}, - {DT_NOSPACES, DT_CHARPTR, DT_CHARPTR, DT_CHARPTR}, - InitClasses, DoClass, DoneClassesAndTypes}, - - {NULL, - {NULL}, - {NULL}, - {0}, - NULL, NULL, NULL} - }; - - /* Load and parse the config file, if there are any errors then explode */ - - /* Make a copy here so if it fails then we can carry on running with an unaffected config */ - newconfig.clear(); - - if (!this->DoInclude(newconfig, ServerInstance->ConfigFileName, errstr)) - { - ReportConfigError(errstr.str(), bail, user); - return; - } - - /* The stuff in here may throw CoreException, be sure we're in a position to catch it. */ - try - { - /* Check we dont have more than one of singular tags, or any of them missing - */ - for (int Index = 0; Once[Index]; Index++) - if (!CheckOnce(Once[Index], newconfig)) - return; - - for (int Index = 0; ChangedConfig[Index].tag; Index++) - { - char item[MAXBUF]; - *item = 0; - if (ConfValue(newconfig, ChangedConfig[Index].tag, ChangedConfig[Index].value, "", 0, item, MAXBUF, true) || *item) - throw CoreException(std::string("Your configuration contains a deprecated value: <") + ChangedConfig[Index].tag + ":" + ChangedConfig[Index].value + "> - " + ChangedConfig[Index].reason); - else - ServerInstance->Logs->Log("CONFIG",DEBUG,"Deprecated item <%s:%s> does not exist, good.", ChangedConfig[Index].tag, ChangedConfig[Index].value); - } - - /* Read the values of all the tags which occur once or not at all, and call their callbacks. - */ - for (int Index = 0; Values[Index].tag; ++Index) - { - char item[MAXBUF]; - int dt = Values[Index].datatype; - bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0); - bool allow_wild = ((dt & DT_ALLOW_WILD) > 0); - bool bootonly = ((dt & DT_BOOTONLY) > 0); - dt &= ~DT_ALLOW_NEWLINE; - dt &= ~DT_ALLOW_WILD; - dt &= ~DT_BOOTONLY; - - /* Silently ignore boot only values */ - if (bootonly && !bail) - continue; - - ConfValue(newconfig, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines); - ValueItem vi(item); - - if (!Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi)) - throw CoreException("One or more values in your configuration file failed to validate. Please see your ircd.log for more information."); - - ServerInstance->Threads->Mutex(true); - switch (dt) - { - case DT_NOSPACES: - { - ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; - this->ValidateNoSpaces(vi.GetString(), Values[Index].tag, Values[Index].value); - vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); - } - break; - case DT_HOSTNAME: - { - ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; - this->ValidateHostname(vi.GetString(), Values[Index].tag, Values[Index].value); - vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); - } - break; - case DT_IPADDRESS: - { - ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; - this->ValidateIP(vi.GetString(), Values[Index].tag, Values[Index].value, allow_wild); - vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); - } - break; - case DT_CHANNEL: - { - ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; - if (*(vi.GetString()) && !ServerInstance->IsChannel(vi.GetString(), MAXBUF)) - { - ServerInstance->Threads->Mutex(false); - throw CoreException("The value of <"+std::string(Values[Index].tag)+":"+Values[Index].value+"> is not a valid channel name"); - } - vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); - } - break; - case DT_CHARPTR: - { - ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; - /* Make sure we also copy the null terminator */ - vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); - } - break; - case DT_INTEGER: - { - int val = vi.GetInteger(); - ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val; - vci->Set(&val, sizeof(int)); - } - break; - case DT_BOOLEAN: - { - bool val = vi.GetBool(); - ValueContainerBool* vcb = (ValueContainerBool*)Values[Index].val; - vcb->Set(&val, sizeof(bool)); - } - break; - default: - /* You don't want to know what happens if someones bad code sends us here. */ - break; - } - /* We're done with this now */ - delete Values[Index].val; - ServerInstance->Threads->Mutex(false); - } - - /* Read the multiple-tag items (class tags, connect tags, etc) - * and call the callbacks associated with them. We have three - * callbacks for these, a 'start', 'item' and 'end' callback. - */ - for (int Index = 0; MultiValues[Index].tag; ++Index) - { - ServerInstance->Threads->Mutex(true); - MultiValues[Index].init_function(this, MultiValues[Index].tag); - ServerInstance->Threads->Mutex(false); - - int number_of_tags = ConfValueEnum(newconfig, MultiValues[Index].tag); - - for (int tagnum = 0; tagnum < number_of_tags; ++tagnum) - { - ValueList vl; - for (int valuenum = 0; (MultiValues[Index].items[valuenum]) && (valuenum < MAX_VALUES_PER_TAG); ++valuenum) - { - int dt = MultiValues[Index].datatype[valuenum]; - bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0); - bool allow_wild = ((dt & DT_ALLOW_WILD) > 0); - dt &= ~DT_ALLOW_NEWLINE; - dt &= ~DT_ALLOW_WILD; - - ServerInstance->Threads->Mutex(true); - /* We catch and rethrow any exception here just so we can free our mutex - */ - try - { - switch (dt) - { - case DT_NOSPACES: - { - char item[MAXBUF]; - if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) - vl.push_back(ValueItem(item)); - else - vl.push_back(ValueItem("")); - this->ValidateNoSpaces(vl[vl.size()-1].GetString(), MultiValues[Index].tag, MultiValues[Index].items[valuenum]); - } - break; - case DT_HOSTNAME: - { - char item[MAXBUF]; - if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) - vl.push_back(ValueItem(item)); - else - vl.push_back(ValueItem("")); - this->ValidateHostname(vl[vl.size()-1].GetString(), MultiValues[Index].tag, MultiValues[Index].items[valuenum]); - } - break; - case DT_IPADDRESS: - { - char item[MAXBUF]; - if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) - vl.push_back(ValueItem(item)); - else - vl.push_back(ValueItem("")); - this->ValidateIP(vl[vl.size()-1].GetString(), MultiValues[Index].tag, MultiValues[Index].items[valuenum], allow_wild); - } - break; - case DT_CHANNEL: - { - char item[MAXBUF]; - if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) - vl.push_back(ValueItem(item)); - else - vl.push_back(ValueItem("")); - if (!ServerInstance->IsChannel(vl[vl.size()-1].GetString(), MAXBUF)) - throw CoreException("The value of <"+std::string(MultiValues[Index].tag)+":"+MultiValues[Index].items[valuenum]+"> number "+ConvToStr(tagnum + 1)+" is not a valid channel name"); - } - break; - case DT_CHARPTR: - { - char item[MAXBUF]; - if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) - vl.push_back(ValueItem(item)); - else - vl.push_back(ValueItem("")); - } - break; - case DT_INTEGER: - { - int item = 0; - if (ConfValueInteger(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item)) - vl.push_back(ValueItem(item)); - else - vl.push_back(ValueItem(0)); - } - break; - case DT_BOOLEAN: - { - bool item = ConfValueBool(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum); - vl.push_back(ValueItem(item)); - } - break; - default: - /* Someone was smoking craq if we got here, and we're all gonna die. */ - break; - } - } - catch (CoreException &e) - { - ServerInstance->Threads->Mutex(false); - throw e; - } - ServerInstance->Threads->Mutex(false); - } - MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype); - } - MultiValues[Index].finish_function(this, MultiValues[Index].tag); - } - - /* Finalise the limits, increment them all by one so that we can just put assign(str, 0, val) - * rather than assign(str, 0, val + 1) - */ - Limits.Finalise(); - - } - - catch (CoreException &ce) - { - ReportConfigError(ce.GetReason(), bail, user); - return; - } - - ServerInstance->Threads->Mutex(true); - for (int i = 0; i < ConfValueEnum(newconfig, "type"); ++i) - { - char item[MAXBUF], classn[MAXBUF], classes[MAXBUF]; - std::string classname; - ConfValue(newconfig, "type", "classes", "", i, classes, MAXBUF, false); - irc::spacesepstream str(classes); - ConfValue(newconfig, "type", "name", "", i, item, MAXBUF, false); - while (str.GetToken(classname)) - { - std::string lost; - bool foundclass = false; - for (int j = 0; j < ConfValueEnum(newconfig, "class"); ++j) - { - ConfValue(newconfig, "class", "name", "", j, classn, MAXBUF, false); - if (!strcmp(classn, classname.c_str())) - { - foundclass = true; - break; - } - } - if (!foundclass) - { - if (user) - user->WriteServ("NOTICE %s :*** Warning: Oper type '%s' has a missing class named '%s', this does nothing!", user->nick.c_str(), item, classname.c_str()); - else - { - if (bail) - printf("Warning: Oper type '%s' has a missing class named '%s', this does nothing!\n", item, classname.c_str()); - else - ServerInstance->SNO->WriteToSnoMask('A', "Warning: Oper type '%s' has a missing class named '%s', this does nothing!", item, classname.c_str()); - } - } - } - } - - /* If we succeeded, set the ircd config to the new one */ - this->config_data = newconfig; - - ServerInstance->Threads->Mutex(false); - - // write once here, to try it out and make sure its ok - ServerInstance->WritePID(this->PID); - - /* Switch over logfiles */ - ServerInstance->Logs->CloseLogs(); - ServerInstance->Logs->OpenFileLogs(); - - ServerInstance->Logs->Log("CONFIG", DEFAULT, "Done reading configuration file."); - - /* If we're rehashing, let's load any new modules, and unload old ones - */ - if (!bail) - { - int found_ports = 0; - FailedPortList pl; - ServerInstance->BindPorts(false, found_ports, pl); - - if (pl.size() && user) - { - ServerInstance->Threads->Mutex(true); - user->WriteServ("NOTICE %s :*** Not all your client ports could be bound.", user->nick.c_str()); - user->WriteServ("NOTICE %s :*** The following port(s) failed to bind:", user->nick.c_str()); - int j = 1; - for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++) - { - user->WriteServ("NOTICE %s :*** %d. Address: %s Reason: %s", user->nick.c_str(), j, i->first.empty() ? "" : i->first.c_str(), i->second.c_str()); - } - ServerInstance->Threads->Mutex(false); - } - - ServerInstance->Threads->Mutex(true); - if (!removed_modules.empty()) - { - for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) - { - if (ServerInstance->Modules->Unload(removing->c_str())) - { - ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH UNLOADED MODULE: %s",removing->c_str()); - - if (user) - user->WriteNumeric(RPL_UNLOADEDMODULE, "%s %s :Module %s successfully unloaded.",user->nick.c_str(), removing->c_str(), removing->c_str()); - - rem++; - } - else - { - if (user) - user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s %s :Failed to unload module %s: %s",user->nick.c_str(), removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError().c_str()); - } - } - } - - if (!added_modules.empty()) - { - for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) - { - if (ServerInstance->Modules->Load(adding->c_str())) - { - ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH LOADED MODULE: %s",adding->c_str()); - - if (user) - user->WriteNumeric(RPL_LOADEDMODULE, "%s %s :Module %s successfully loaded.",user->nick.c_str(), adding->c_str(), adding->c_str()); - - add++; - } - else - { - if (user) - user->WriteNumeric(ERR_CANTLOADMODULE, "%s %s :Failed to load module %s: %s",user->nick.c_str(), adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str()); - } - } - } - - ServerInstance->Logs->Log("CONFIG", DEFAULT, "Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size()); - - ServerInstance->Threads->Mutex(false); - - } - - if (bail) - { - /** Note: This is safe, the method checks for user == NULL */ - ServerInstance->Threads->Mutex(true); - ServerInstance->Parser->SetupCommandTable(user); - ServerInstance->Threads->Mutex(false); - } + if (user) + user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str()); else - { - if (user) - user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str()); - else - ServerInstance->SNO->WriteToSnoMask('A', "*** Successfully rehashed server."); - } - + ServerInstance->SNO->WriteGlobalSno('a', "*** Successfully rehashed server."); } - -bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* filename, std::ostringstream &errorstream) +bool ServerConfig::LoadConf(FILE* &conf, const char* filename, bool allowexeinc) { std::string line; char ch; @@ -1367,7 +835,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil /* Check if the file open failed first */ if (!conf) { - errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl; + errstr << "LoadConf: Couldn't open config file: " << filename << std::endl; return false; } @@ -1375,7 +843,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil { if (std::string(filename) == include_stack[t]) { - errorstream << "File " << filename << " is included recursively (looped inclusion)." << std::endl; + errstr << "File " << filename << " is included recursively (looped inclusion)." << std::endl; return false; } } @@ -1396,7 +864,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil */ if ((character_count++ < 2) && (ch == '\xFF' || ch == '\xFE')) { - errorstream << "File " << filename << " cannot be read, as it is encoded in braindead UTF-16. Save your file as plain ASCII!" << std::endl; + errstr << "File " << filename << " cannot be read, as it is encoded in braindead UTF-16. Save your file as plain ASCII!" << std::endl; return false; } @@ -1452,7 +920,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil } else { - errorstream << "End of file after a \\, what did you want to escape?: " << filename << ":" << linenumber << std::endl; + errstr << "End of file after a \\, what did you want to escape?: " << filename << ":" << linenumber << std::endl; return false; } } @@ -1462,7 +930,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil if ((ch != '<') && (!in_tag) && (!in_comment) && (ch > ' ') && (ch != 9)) { - errorstream << "You have stray characters beyond the tag which starts at " << filename << ":" << last_successful_parse << std::endl; + errstr << "You have stray characters beyond the tag which starts at " << filename << ":" << last_successful_parse << std::endl; return false; } @@ -1472,7 +940,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil { if (!in_quote) { - errorstream << "The tag at location " << filename << ":" << last_successful_parse << " was valid, but there is an error in the tag which comes after it. You are possibly missing a \" or >. Please check this." << std::endl; + errstr << "The tag at location " << filename << ":" << last_successful_parse << " was valid, but there is an error in the tag which comes after it. You are possibly missing a \" or >. Please check this." << std::endl; return false; } } @@ -1480,12 +948,12 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil { if (in_quote) { - errorstream << "Parser error: Inside a quote but not within the last valid tag, which was opened at: " << filename << ":" << last_successful_parse << std::endl; + errstr << "Parser error: Inside a quote but not within the last valid tag, which was opened at: " << filename << ":" << last_successful_parse << std::endl; return false; } else { - // errorstream << "Opening new config tag on line " << linenumber << std::endl; + // errstr << "Opening new config tag on line " << linenumber << std::endl; in_tag = true; } } @@ -1496,12 +964,12 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil { if (in_quote) { - // errorstream << "Closing quote in config tag on line " << linenumber << std::endl; + // errstr << "Closing quote in config tag on line " << linenumber << std::endl; in_quote = false; } else { - // errorstream << "Opening quote in config tag on line " << linenumber << std::endl; + // errstr << "Opening quote in config tag on line " << linenumber << std::endl; in_quote = true; } } @@ -1509,11 +977,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil { if (in_quote) { - errorstream << "The tag immediately after the one at " << filename << ":" << last_successful_parse << " has a missing closing \" symbol. Please check this." << std::endl; + errstr << "The tag immediately after the one at " << filename << ":" << last_successful_parse << " has a missing closing \" symbol. Please check this." << std::endl; } else { - errorstream << "You have opened a quote (\") beyond the tag at " << filename << ":" << last_successful_parse << " without opening a new tag. Please check this." << std::endl; + errstr << "You have opened a quote (\") beyond the tag at " << filename << ":" << last_successful_parse << " without opening a new tag. Please check this." << std::endl; } } } @@ -1523,25 +991,25 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil { if (in_tag) { - // errorstream << "Closing config tag on line " << linenumber << std::endl; + // errstr << "Closing config tag on line " << linenumber << std::endl; in_tag = false; - + /* * If this finds an then ParseLine can simply call * LoadConf() and load the included config into the same ConfigDataHash */ long bl = linenumber; - if (!this->ParseLine(target, filename, line, linenumber, errorstream)) + if (!this->ParseLine(filename, line, linenumber, allowexeinc)) return false; last_successful_parse = linenumber; linenumber = bl; - + line.clear(); } else { - errorstream << "You forgot to close the tag which comes immediately after the one at " << filename << ":" << last_successful_parse << std::endl; + errstr << "You forgot to close the tag which comes immediately after the one at " << filename << ":" << last_successful_parse << std::endl; return false; } } @@ -1551,7 +1019,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil /* Fix for bug #392 - if we reach the end of a file and we are still in a quote or comment, most likely the user fucked up */ if (in_comment || in_quote) { - errorstream << "Reached end of file whilst still inside a quoted section or tag. This is most likely an error or there \ + errstr << "Reached end of file whilst still inside a quoted section or tag. This is most likely an error or there \ is a newline missing from the end of the file: " << filename << ":" << linenumber << std::endl; } @@ -1559,27 +1027,26 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil } -bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const std::string &filename, std::ostringstream &errorstream) +bool ServerConfig::LoadConf(FILE* &conf, const std::string &filename, bool allowexeinc) { - return this->LoadConf(target, conf, filename.c_str(), errorstream); + return this->LoadConf(conf, filename.c_str(), allowexeinc); } -bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename, std::string &line, long &linenumber, std::ostringstream &errorstream) +bool ServerConfig::ParseLine(const std::string &filename, std::string &line, long &linenumber, bool allowexeinc) { std::string tagname; std::string current_key; std::string current_value; - KeyValList results; + reference result; char last_char = 0; - bool got_name; bool got_key; bool in_quote; - got_name = got_key = in_quote = false; + got_key = in_quote = false; for(std::string::iterator c = line.begin(); c != line.end(); c++) { - if (!got_name) + if (!result) { /* We don't know the tag name yet. */ @@ -1591,7 +1058,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename tagname += *c; else { - errorstream << "Invalid character in value name of tag: '" << *c << "' in value '" << tagname << "' in filename: " << filename << ":" << linenumber << std::endl; + errstr << "Invalid character in value name of tag: '" << *c << "' in value '" << tagname << "' in filename: " << filename << ":" << linenumber << std::endl; return false; } } @@ -1601,7 +1068,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename /* We got to a space, we should have the tagname now. */ if(tagname.length()) { - got_name = true; + result = new ConfigTag(tagname); } } } @@ -1619,7 +1086,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename current_key += *c; else { - errorstream << "Invalid character in key: '" << *c << "' in key '" << current_key << "' in filename: " << filename << ":" << linenumber << std::endl; + errstr << "Invalid character in key: '" << *c << "' in key '" << current_key << "' in filename: " << filename << ":" << linenumber << std::endl; return false; } } @@ -1648,7 +1115,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename } else if ((*c == '\\') && (!in_quote)) { - errorstream << "You can't have an escape sequence outside of a quoted section: " << filename << ":" << linenumber << std::endl; + errstr << "You can't have an escape sequence outside of a quoted section: " << filename << ":" << linenumber << std::endl; return false; } else if ((*c == '\n') && (in_quote)) @@ -1673,7 +1140,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename else { /* Leaving the quotes, we have the current value */ - results.push_back(KeyVal(current_key, current_value)); + result->items.push_back(KeyVal(current_key, current_value)); // std::cout << "<" << tagname << ":" << current_key << "> " << current_value << std::endl; @@ -1681,14 +1148,23 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename got_key = false; if ((tagname == "include") && (current_key == "file")) - { - if (!this->DoInclude(target, current_value, errorstream)) + { + if (!this->DoInclude(current_value, allowexeinc)) return false; } else if ((tagname == "include") && (current_key == "executable")) { + if (!allowexeinc) + { + errstr << "Executable includes are not allowed to use \n" + "This could be an attempt to execute commands from a malicious remote include.\n" + "If you need multiple levels of remote include, create a script to assemble the " + "contents locally or include files using \n"; + return false; + } + /* Pipe an executable and use its stdout as config data */ - if (!this->DoPipe(target, current_value, errorstream)) + if (!this->DoPipe(current_value)) return false; } @@ -1709,23 +1185,23 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename } /* Finished parsing the tag, add it to the config hash */ - target.insert(std::pair (tagname, results)); + config_data.insert(std::make_pair(tagname, result)); return true; } -bool ServerConfig::DoPipe(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream) +bool ServerConfig::DoPipe(const std::string &file) { FILE* conf = popen(file.c_str(), "r"); bool ret = false; if (conf) { - ret = LoadConf(target, conf, file.c_str(), errorstream); + ret = LoadConf(conf, file.c_str(), false); pclose(conf); } else - errorstream << "Couldn't execute: " << file << std::endl; + errstr << "Couldn't execute: " << file << std::endl; return ret; } @@ -1735,233 +1211,113 @@ bool ServerConfig::StartsWithWindowsDriveLetter(const std::string &path) return (path.length() > 2 && isalpha(path[0]) && path[1] == ':'); } -bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream) +bool ServerConfig::DoInclude(const std::string &file, bool allowexeinc) { - std::string confpath; - std::string newfile; - std::string::size_type pos; - - confpath = ServerInstance->ConfigFileName; - newfile = file; - - std::replace(newfile.begin(),newfile.end(),'\\','/'); - std::replace(confpath.begin(),confpath.end(),'\\','/'); - - if ((newfile[0] != '/') && (!StartsWithWindowsDriveLetter(newfile))) - { - if((pos = confpath.rfind("/")) != std::string::npos) - { - /* Leaves us with just the path */ - newfile = confpath.substr(0, pos) + std::string("/") + newfile; - } - else - { - errorstream << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl; - return false; - } - } - - FILE* conf = fopen(newfile.c_str(), "r"); + FILE* conf = fopen(file.c_str(), "r"); bool ret = false; if (conf) { - ret = LoadConf(target, conf, newfile, errorstream); + ret = LoadConf(conf, file, allowexeinc); fclose(conf); } else - errorstream << "Couldn't open config file: " << file << std::endl; + errstr << "Couldn't open config file: " << file << std::endl; return ret; } -bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds) -{ - return ConfValue(target, tag, var, "", index, result, length, allow_linefeeds); -} - -bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, char* result, int length, bool allow_linefeeds) +ConfigTag* ServerConfig::ConfValue(const std::string &tag, int offset) { - std::string value; - bool r = ConfValue(target, std::string(tag), std::string(var), std::string(default_value), index, value, allow_linefeeds); - strlcpy(result, value.c_str(), length); - return r; -} + ConfigDataHash::size_type pos = offset; + if (pos >= config_data.count(tag)) + return NULL; + + ConfigDataHash::iterator iter = config_data.find(tag); -bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, std::string &result, bool allow_linefeeds) -{ - return ConfValue(target, tag, var, "", index, result, allow_linefeeds); + for(int i = 0; i < offset; i++) + iter++; + + return iter->second; } -bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, std::string &result, bool allow_linefeeds) +bool ConfigTag::readString(const std::string& key, std::string& value, bool allow_lf) { - ConfigDataHash::size_type pos = index; - if (pos < target.count(tag)) - { - ConfigDataHash::iterator iter = target.find(tag); - - for(int i = 0; i < index; i++) - iter++; - - for(KeyValList::iterator j = iter->second.begin(); j != iter->second.end(); j++) - { - if(j->first == var) - { - if ((!allow_linefeeds) && (j->second.find('\n') != std::string::npos)) - { - ServerInstance->Logs->Log("CONFIG",DEFAULT, "Value of <" + tag + ":" + var+ "> contains a linefeed, and linefeeds in this value are not permitted -- stripped to spaces."); - for (std::string::iterator n = j->second.begin(); n != j->second.end(); n++) - if (*n == '\n') - *n = ' '; - } - else - { - result = j->second; - return true; - } - } - } - if (!default_value.empty()) - { - result = default_value; - return true; - } - } - else if (pos == 0) + if (!this) + return false; + for(std::vector::iterator j = items.begin(); j != items.end(); ++j) { - if (!default_value.empty()) + if(j->first != key) + continue; + value = j->second; + if (!allow_lf && (value.find('\n') != std::string::npos)) { - result = default_value; - return true; + ServerInstance->Logs->Log("CONFIG",DEFAULT, "Value of <" + tag + ":" + key + "> contains a linefeed, and linefeeds in this value are not permitted -- stripped to spaces."); + for (std::string::iterator n = value.begin(); n != value.end(); n++) + if (*n == '\n') + *n = ' '; } + return true; } return false; } -bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, int index, int &result) -{ - return ConfValueInteger(target, std::string(tag), std::string(var), "", index, result); -} - -bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, int &result) +std::string ConfigTag::getString(const std::string& key, const std::string& def) { - return ConfValueInteger(target, std::string(tag), std::string(var), std::string(default_value), index, result); + std::string res = def; + if (this) + readString(key, res); + return res; } -bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, int &result) +long ConfigTag::getInt(const std::string &key, long def) { - return ConfValueInteger(target, tag, var, "", index, result); -} - -bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, int &result) -{ - std::string value; - std::istringstream stream; - bool r = ConfValue(target, tag, var, default_value, index, value); - stream.str(value); - if(!(stream >> result)) - return false; - else + std::string result; + if(!this || !readString(key, result)) + return def; + + const char* res_cstr = result.c_str(); + char* res_tail = NULL; + long res = strtol(res_cstr, &res_tail, 0); + if (res_tail == res_cstr) + return def; + switch (toupper(*res_tail)) { - if (!value.empty()) - { - if (value.substr(0,2) == "0x") - { - char* endptr; - - value.erase(0,2); - result = strtol(value.c_str(), &endptr, 16); - - /* No digits found */ - if (endptr == value.c_str()) - return false; - } - else - { - char denominator = *(value.end() - 1); - switch (toupper(denominator)) - { - case 'K': - /* Kilobytes -> bytes */ - result = result * 1024; - break; - case 'M': - /* Megabytes -> bytes */ - result = result * 1024 * 1024; - break; - case 'G': - /* Gigabytes -> bytes */ - result = result * 1024 * 1024 * 1024; - break; - } - } - } + case 'K': + res= res* 1024; + break; + case 'M': + res= res* 1024 * 1024; + break; + case 'G': + res= res* 1024 * 1024 * 1024; + break; } - return r; + return res; } - -bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, int index) -{ - return ConfValueBool(target, std::string(tag), std::string(var), "", index); -} - -bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index) -{ - return ConfValueBool(target, std::string(tag), std::string(var), std::string(default_value), index); -} - -bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, int index) -{ - return ConfValueBool(target, tag, var, "", index); -} - -bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index) +double ConfigTag::getFloat(const std::string &key, double def) { std::string result; - if(!ConfValue(target, tag, var, default_value, index, result)) - return false; - - return ((result == "yes") || (result == "true") || (result == "1")); -} - -int ServerConfig::ConfValueEnum(ConfigDataHash &target, const char* tag) -{ - return target.count(tag); -} - -int ServerConfig::ConfValueEnum(ConfigDataHash &target, const std::string &tag) -{ - return target.count(tag); + if (!readString(key, result)) + return def; + return strtod(result.c_str(), NULL); } -int ServerConfig::ConfVarEnum(ConfigDataHash &target, const char* tag, int index) +bool ConfigTag::getBool(const std::string &key, bool def) { - return ConfVarEnum(target, std::string(tag), index); -} - -int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, int index) -{ - ConfigDataHash::size_type pos = index; - - if (pos < target.count(tag)) - { - ConfigDataHash::const_iterator iter = target.find(tag); - - for(int i = 0; i < index; i++) - iter++; - - return iter->second.size(); - } + std::string result; + if(!readString(key, result)) + return def; - return 0; + return (result == "yes" || result == "true" || result == "1" || result == "on"); } /** Read the contents of a file located by `fname' into a file_cache pointed at by `F'. */ -bool ServerConfig::ReadFile(file_cache &F, const char* fname) +bool ServerConfig::ReadFile(file_cache &F, const std::string& fname) { - if (!fname || !*fname) + if (fname.empty()) return false; FILE* file = NULL; @@ -1969,29 +1325,9 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname) F.clear(); - if ((*fname != '/') && (*fname != '\\') && (!StartsWithWindowsDriveLetter(fname))) - { - std::string::size_type pos; - std::string confpath = ServerInstance->ConfigFileName; - std::string newfile = fname; - - if (((pos = confpath.rfind("/"))) != std::string::npos) - newfile = confpath.substr(0, pos) + std::string("/") + fname; - else if (((pos = confpath.rfind("\\"))) != std::string::npos) - newfile = confpath.substr(0, pos) + std::string("\\") + fname; - - ServerInstance->Logs->Log("config", DEBUG, "Filename: %s", newfile.c_str()); - - if (!FileExists(newfile.c_str())) - return false; - file = fopen(newfile.c_str(), "r"); - } - else - { - if (!FileExists(fname)) - return false; - file = fopen(fname, "r"); - } + if (!FileExists(fname.c_str())) + return false; + file = fopen(fname.c_str(), "r"); if (file) { @@ -2021,9 +1357,9 @@ bool ServerConfig::FileExists(const char* file) if ((sb.st_mode & S_IFDIR) > 0) return false; - - FILE *input; - if ((input = fopen (file, "r")) == NULL) + + FILE *input = fopen(file, "r"); + if (input == NULL) return false; else { @@ -2032,339 +1368,61 @@ bool ServerConfig::FileExists(const char* file) } } -char* ServerConfig::CleanFilename(char* name) +const char* ServerConfig::CleanFilename(const char* name) { - char* p = name + strlen(name); + const char* p = name + strlen(name); while ((p != name) && (*p != '/') && (*p != '\\')) p--; return (p != name ? ++p : p); } -bool ServerConfig::DirValid(const char* dirandfile) -{ -#ifdef WINDOWS - return true; -#else - - char work[1024]; - char buffer[1024]; - char otherdir[1024]; - int p; - - strlcpy(work, dirandfile, 1024); - p = strlen(work); - - // we just want the dir - while (*work) - { - if (work[p] == '/') - { - work[p] = '\0'; - break; - } - - work[p--] = '\0'; - } - - // Get the current working directory - if (getcwd(buffer, 1024 ) == NULL ) - return false; - - if (chdir(work) == -1) - return false; - - if (getcwd(otherdir, 1024 ) == NULL ) - return false; - - if (chdir(buffer) == -1) - return false; - - size_t t = strlen(work); - - if (strlen(otherdir) >= t) - { - otherdir[t] = '\0'; - if (!strcmp(otherdir,work)) - { - return true; - } - - return false; - } - else - { - return false; - } -#endif -} - -std::string ServerConfig::GetFullProgDir() -{ - char buffer[PATH_MAX]; -#ifdef WINDOWS - /* Windows has specific api calls to get the exe path that never fail. - * For once, windows has something of use, compared to the POSIX code - * for this, this is positively neato. - */ - if (GetModuleFileName(NULL, buffer, MAX_PATH)) - { - std::string fullpath = buffer; - std::string::size_type n = fullpath.rfind("\\inspircd.exe"); - return std::string(fullpath, 0, n); - } -#else - // Get the current working directory - if (getcwd(buffer, PATH_MAX)) - { - std::string remainder = this->argv[0]; - - /* Does argv[0] start with /? its a full path, use it */ - if (remainder[0] == '/') - { - std::string::size_type n = remainder.rfind("/inspircd"); - return std::string(remainder, 0, n); - } - - std::string fullpath = std::string(buffer) + "/" + remainder; - std::string::size_type n = fullpath.rfind("/inspircd"); - return std::string(fullpath, 0, n); - } -#endif - return "/"; -} - -InspIRCd* ServerConfig::GetInstance() -{ - return ServerInstance; -} - std::string ServerConfig::GetSID() { return sid; } -ValueItem::ValueItem(int value) -{ - std::stringstream n; - n << value; - v = n.str(); -} - -ValueItem::ValueItem(bool value) -{ - std::stringstream n; - n << value; - v = n.str(); -} - -ValueItem::ValueItem(const char* value) -{ - v = value; -} - -void ValueItem::Set(const char* value) -{ - v = value; -} - -void ValueItem::Set(int value) -{ - std::stringstream n; - n << value; - v = n.str(); -} - -int ValueItem::GetInteger() -{ - if (v.empty()) - return 0; - return atoi(v.c_str()); -} - -char* ValueItem::GetString() -{ - return (char*)v.c_str(); -} - -bool ValueItem::GetBool() -{ - return (GetInteger() || v == "yes" || v == "true"); -} - - - - -/* - * XXX should this be in a class? -- w00t - */ -bool InitTypes(ServerConfig* conf, const char*) -{ - if (conf->opertypes.size()) - { - for (opertype_t::iterator n = conf->opertypes.begin(); n != conf->opertypes.end(); n++) - { - if (n->second) - delete[] n->second; - } - } - - conf->opertypes.clear(); - return true; -} - -/* - * XXX should this be in a class? -- w00t - */ -bool InitClasses(ServerConfig* conf, const char*) -{ - if (conf->operclass.size()) - { - for (operclass_t::iterator n = conf->operclass.begin(); n != conf->operclass.end(); n++) - { - if (n->second.commandlist) - delete[] n->second.commandlist; - if (n->second.cmodelist) - delete[] n->second.cmodelist; - if (n->second.umodelist) - delete[] n->second.umodelist; - } - } - - conf->operclass.clear(); - return true; -} - -/* - * XXX should this be in a class? -- w00t - */ -bool DoType(ServerConfig* conf, const char*, char**, ValueList &values, int*) +void ConfigReaderThread::Run() { - const char* TypeName = values[0].GetString(); - const char* Classes = values[1].GetString(); - - conf->opertypes[TypeName] = strnewdup(Classes); - return true; + Config = new ServerConfig; + Config->Read(); + done = true; } -/* - * XXX should this be in a class? -- w00t - */ -bool DoClass(ServerConfig* conf, const char* tag, char**, ValueList &values, int*) +void ConfigReaderThread::Finish() { - const char* ClassName = values[0].GetString(); - const char* CommandList = values[1].GetString(); - const char* UModeList = values[2].GetString(); - const char* CModeList = values[3].GetString(); + ServerConfig* old = ServerInstance->Config; + ServerInstance->Logs->Log("CONFIG",DEBUG,"Switching to new configuration..."); + ServerInstance->Logs->CloseLogs(); + ServerInstance->Config = this->Config; + ServerInstance->Logs->OpenFileLogs(); + Config->Apply(old, TheUserUID); - for (const char* c = UModeList; *c; ++c) + if (Config->valid) { - if ((*c < 'A' || *c > 'z') && *c != '*') - { - throw CoreException("Character " + std::string(1, *c) + " is not a valid mode in "); - } - } - for (const char* c = CModeList; *c; ++c) - { - if ((*c < 'A' || *c > 'z') && *c != '*') - { - throw CoreException("Character " + std::string(1, *c) + " is not a valid mode in "); - } + /* + * Apply the changed configuration from the rehash. + * + * XXX: The order of these is IMPORTANT, do not reorder them without testing + * thoroughly!!! + */ + ServerInstance->XLines->CheckELines(); + ServerInstance->XLines->CheckELines(); + ServerInstance->XLines->ApplyLines(); + ServerInstance->Res->Rehash(); + ServerInstance->ResetMaxBans(); + Config->ApplyDisabledCommands(Config->DisabledCommands); + User* user = TheUserUID.empty() ? ServerInstance->FindNick(TheUserUID) : NULL; + FOREACH_MOD(I_OnRehash, OnRehash(user)); + ServerInstance->BuildISupport(); + + delete old; } - - conf->operclass[ClassName].commandlist = strnewdup(CommandList); - conf->operclass[ClassName].umodelist = strnewdup(UModeList); - conf->operclass[ClassName].cmodelist = strnewdup(CModeList); - return true; -} - -/* - * XXX should this be in a class? -- w00t - */ -bool DoneClassesAndTypes(ServerConfig*, const char*) -{ - return true; -} - - - -bool InitXLine(ServerConfig* conf, const char* tag) -{ - return true; -} - -bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) -{ - const char* reason = values[0].GetString(); - const char* ipmask = values[1].GetString(); - - ZLine* zl = new ZLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "", reason, ipmask); - if (!conf->GetInstance()->XLines->AddLine(zl, NULL)) - delete zl; - - return true; -} - -bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) -{ - const char* reason = values[0].GetString(); - const char* nick = values[1].GetString(); - - QLine* ql = new QLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "", reason, nick); - if (!conf->GetInstance()->XLines->AddLine(ql, NULL)) - delete ql; - - return true; -} - -bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) -{ - const char* reason = values[0].GetString(); - const char* host = values[1].GetString(); - - XLineManager* xlm = conf->GetInstance()->XLines; - - IdentHostPair ih = xlm->IdentSplit(host); - - KLine* kl = new KLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "", reason, ih.first.c_str(), ih.second.c_str()); - if (!xlm->AddLine(kl, NULL)) - delete kl; - return true; -} - -bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) -{ - const char* reason = values[0].GetString(); - const char* host = values[1].GetString(); - - XLineManager* xlm = conf->GetInstance()->XLines; - - IdentHostPair ih = xlm->IdentSplit(host); - - ELine* el = new ELine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "", reason, ih.first.c_str(), ih.second.c_str()); - if (!xlm->AddLine(el, NULL)) - delete el; - return true; -} - -// this should probably be moved to configreader, but atm it relies on CheckELines above. -bool DoneELine(ServerConfig* conf, const char* tag) -{ - for (std::vector::const_iterator u2 = conf->GetInstance()->Users->local_users.begin(); u2 != conf->GetInstance()->Users->local_users.end(); u2++) + else { - User* u = (User*)(*u2); - u->exempt = false; + // whoops, abort! + ServerInstance->Logs->CloseLogs(); + ServerInstance->Config = old; + ServerInstance->Logs->OpenFileLogs(); + delete this->Config; } - - conf->GetInstance()->XLines->CheckELines(); - return true; -} - -void ConfigReaderThread::Run() -{ - /* TODO: TheUser may be invalid by the time we get here! Check its validity, or pass a UID would be better */ - ServerInstance->Config->Read(do_bail, TheUser); - ServerInstance->Threads->Mutex(true); - this->SetExitFlag(); - ServerInstance->Threads->Mutex(false); } -