X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=05171ea60d605de4b093ccf0df8ec2d6d57f236f;hb=26cd5393c9308fabe73c41870f06f73a5b001cd7;hp=0c951055338ffee7f30816998497367128ffef69;hpb=35d20fbabe8babe761e938e4c9a65c47f303f81d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index 0c9510553..05171ea60 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -3,7 +3,7 @@ * +------------------------------------+ * * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -32,19 +32,8 @@ #include "commands/cmd_whowas.h" #include "modes/cmode_h.h" -std::vector old_module_names, new_module_names, added_modules, removed_modules; - -/* Needs forward declaration */ -bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data); -bool DoneELine(ServerConfig* conf, const char* tag); - -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; @@ -52,7 +41,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; @@ -60,13 +49,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(); } void ServerConfig::Update005() @@ -103,9 +85,9 @@ 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) +bool ServerConfig::CheckOnce(const char* tag) { - int count = ConfValueEnum(newconf, tag); + int count = ConfValueEnum(tag); if (count > 1) throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted."); @@ -114,17 +96,7 @@ bool ServerConfig::CheckOnce(const char* tag, ConfigDataHash &newconf) return true; } -bool NoValidation(ServerConfig*, const char*, const char*, ValueItem&) -{ - return true; -} - -bool DoneConfItem(ServerConfig* conf, const char* tag) -{ - return true; -} - -void ServerConfig::ValidateNoSpaces(const char* p, const std::string &tag, const std::string &val) +static void ValidateNoSpaces(const char* p, const std::string &tag, const std::string &val) { for (const char* ptr = p; *ptr; ++ptr) { @@ -137,7 +109,7 @@ void ServerConfig::ValidateNoSpaces(const char* p, const std::string &tag, const * 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 ValidateIP(const char* p, const std::string &tag, const std::string &val, bool wild) { int num_dots = 0; int num_seps = 0; @@ -194,7 +166,7 @@ void ServerConfig::ValidateIP(const char* p, const std::string &tag, const std:: } } -void ServerConfig::ValidateHostname(const char* p, const std::string &tag, const std::string &val) +static void ValidateHostname(const char* p, const std::string &tag, const std::string &val) { int num_dots = 0; if (*p) @@ -217,34 +189,36 @@ void ServerConfig::ValidateHostname(const char* p, const std::string &tag, const } } -bool ValidateMaxTargets(ServerConfig* conf, const char*, const char*, ValueItem &data) +// Specialized validators + +static bool ValidateMaxTargets(ServerConfig* conf, const char*, const char*, ValueItem &data) { - if ((data.GetInteger() < 0) || (data.GetInteger() > 31)) + if ((data.GetInteger() < 1) || (data.GetInteger() > 31)) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: value is greater than 31 or less than 0, set to 20."); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: value is greater than 31 or less than 1, set to 20."); data.Set(20); } return true; } -bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem &data) +static bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem &data) { - if ((data.GetInteger() < 1) || (data.GetInteger() > conf->GetInstance()->SE->GetMaxFds())) + if ((data.GetInteger() < 1) || (data.GetInteger() > ServerInstance->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()); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: value is greater than %d or less than 0, set to %d.",ServerInstance->SE->GetMaxFds(),ServerInstance->SE->GetMaxFds()); + data.Set(ServerInstance->SE->GetMaxFds()); } return true; } -bool ValidateMaxConn(ServerConfig* conf, const char*, const char*, ValueItem &data) +static 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!"); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: value may be higher than the system-defined SOMAXCONN value!"); return true; } -bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance) +bool ServerConfig::ApplyDisabledCommands(const std::string& data) { std::stringstream dcmds(data); std::string thiscmd; @@ -265,7 +239,7 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance) return true; } -bool ValidateDisabledUModes(ServerConfig* conf, const char*, const char*, ValueItem &data) +static bool ValidateDisabledUModes(ServerConfig* conf, const char*, const char*, ValueItem &data) { memset(conf->DisabledUModes, 0, sizeof(conf->DisabledUModes)); for (const unsigned char* p = (const unsigned char*)data.GetString(); *p; ++p) @@ -276,7 +250,7 @@ bool ValidateDisabledUModes(ServerConfig* conf, const char*, const char*, ValueI return true; } -bool ValidateDisabledCModes(ServerConfig* conf, const char*, const char*, ValueItem &data) +static bool ValidateDisabledCModes(ServerConfig* conf, const char*, const char*, ValueItem &data) { memset(conf->DisabledCModes, 0, sizeof(conf->DisabledCModes)); for (const unsigned char* p = (const unsigned char*)data.GetString(); *p; ++p) @@ -287,13 +261,17 @@ bool ValidateDisabledCModes(ServerConfig* conf, const char*, const char*, ValueI return true; } -bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &data) +#ifdef WINDOWS +// Note: the windows validator is in win32wrapper.cpp +bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &data); +#else +static bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &data) { if (!*(data.GetString())) { 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..."); + ServerInstance->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; @@ -306,98 +284,97 @@ bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem & 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()); + ServerInstance->Logs->Log("CONFIG",DEFAULT," set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str()); } } if (!found_server) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!"); + ServerInstance->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"); } } else { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!"); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!"); data.Set("127.0.0.1"); } } return true; } +#endif -bool ValidateServerName(ServerConfig* conf, const char*, const char*, ValueItem &data) +static bool ValidateServerName(ServerConfig* conf, const char*, const char*, ValueItem &data) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Validating server name"); + ServerInstance->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(), '.')) { - 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()); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: '%s' is not a fully-qualified domain name. Changed to '%s.'", + data.GetString(),data.GetString()); + std::string moo = data.GetValue(); + data.Set(moo.append(".")); } - conf->ValidateHostname(data.GetString(), "server", "name"); + ValidateHostname(data.GetString(), "server", "name"); return true; } -bool ValidateNetBufferSize(ServerConfig* conf, const char*, const char*, ValueItem &data) +static 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)) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240."); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240."); data.Set(10240); } return true; } -bool ValidateMaxWho(ServerConfig* conf, const char*, const char*, ValueItem &data) +static bool ValidateMaxWho(ServerConfig* conf, const char*, const char*, ValueItem &data) { if ((data.GetInteger() > 65535) || (data.GetInteger() < 1)) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT," size out of range, setting to default of 128."); - data.Set(128); + ServerInstance->Logs->Log("CONFIG",DEFAULT," size out of range, setting to default of 1024."); + data.Set(1024); } return true; } -bool ValidateHalfOp(ServerConfig* conf, const char*, const char*, ValueItem &data) +static bool ValidateHalfOp(ServerConfig* conf, const char*, const char*, ValueItem &data) { - ModeHandler* mh = conf->GetInstance()->Modes->FindMode('h', MODETYPE_CHANNEL); - if (data.GetBool() && !mh) - { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Enabling halfop mode."); - mh = new ModeChannelHalfOp(conf->GetInstance()); - conf->GetInstance()->Modes->AddMode(mh); - } - else if (!data.GetBool() && mh) - { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Disabling halfop mode."); - conf->GetInstance()->Modes->DelMode(mh); + ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL); + if (data.GetBool() && !mh) { + ServerInstance->Logs->Log("CONFIG", DEFAULT, "Enabling halfop mode."); + mh = new ModeChannelHalfOp; + ServerInstance->Modes->AddMode(mh); + } else if (!data.GetBool() && mh) { + ServerInstance->Logs->Log("CONFIG", DEFAULT, "Disabling halfop mode."); + ServerInstance->Modes->DelMode(mh); delete mh; } return true; } -bool ValidateMotd(ServerConfig* conf, const char*, const char*, ValueItem &data) +static 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* val, ValueItem &data) +static bool ValidateNotEmpty(ServerConfig*, const char* tag, const char* val, ValueItem &data) { - if (!*data.GetString()) + if (data.GetValue().empty()) throw CoreException(std::string("The value for <")+tag+":"+val+"> cannot be empty!"); return true; } -bool ValidateRules(ServerConfig* conf, const char*, const char*, ValueItem &data) +static 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) +static 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) @@ -405,7 +382,7 @@ bool ValidateModeLists(ServerConfig* conf, const char*, const char*, ValueItem & return true; } -bool ValidateExemptChanOps(ServerConfig* conf, const char*, const char*, ValueItem &data) +static 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) @@ -413,9 +390,9 @@ bool ValidateExemptChanOps(ServerConfig* conf, const char*, const char*, ValueIt return true; } -bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &data) +static bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &data) { - std::string v = data.GetString(); + const std::string& v = data.GetValue(); if (v == "ops") conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_OPS; @@ -429,25 +406,25 @@ bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &dat return true; } -bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem &data) +static bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem &data) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Validating server id"); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"Validating server id"); const char *sid = data.GetString(); - if (*sid && !conf->GetInstance()->IsSID(sid)) + if (*sid && !ServerInstance->IsSID(sid)) { 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."); } - strlcpy(conf->sid, sid, 5); + conf->sid = sid; return true; } -bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &data) +static bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &data) { - conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString()); + conf->WhoWasMaxKeep = ServerInstance->Duration(data.GetString()); if (conf->WhoWasGroupSize < 0) conf->WhoWasGroupSize = 0; @@ -458,629 +435,598 @@ bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &dat if (conf->WhoWasMaxKeep < 3600) { conf->WhoWasMaxKeep = 3600; - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: value less than 3600, setting to default 3600"); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: value less than 3600, setting to default 3600"); } - Command* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS"); - if (whowas_command) + Module* whowas = ServerInstance->Modules->Find("cmd_whowas.so"); + if (whowas) { - std::deque params; - whowas_command->HandleInternal(WHOWAS_PRUNE, params); + WhowasRequest(NULL, whowas, WhowasRequest::WHOWAS_PRUNE).Send(); } return true; } -/* Callback called before processing the first tag +/* Callback called to process a single tag */ -bool InitConnect(ServerConfig* conf, const char*) +static bool DoULine(ServerConfig* conf, const char*, const char**, ValueList &values, int*) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Reading connect classes... class list is:"); - - for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end() ; ) - { - ConnectClass* c = *i; - - /* - * only delete a class with refcount 0. - * this is needed to avoid trampling on a wild pointer (User::MyClass)! - * it's also the most simple way to do it, given that we're looking at threads.. - * -- w00t - */ - if (c->RefCount == 0) - { - 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 - } - else - { - /* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */ - c->SetDisabled(true); - i++; - } - } - - return true; -} - -/* Callback called to process a single tag - */ -bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) -{ - 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 sendq = values[5].GetInteger(); - int recvq = values[6].GetInteger(); - int localmax = values[7].GetInteger(); - int globalmax = values[8].GetInteger(); - int port = values[9].GetInteger(); - const char* name = values[10].GetString(); - const char* parent = values[11].GetString(); - int maxchans = values[12].GetInteger(); - unsigned long limit = values[13].GetInteger(); - const char* hashtype = values[14].GetString(); - - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Adding a connect class!"); - - ConnectClass *cc = NULL; - - if (*parent) - { - /* 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) - { - cc = *item; - conf->GetInstance()->Logs->Log("CONFIG",DEBUG,"Class: %s", cc->GetName().c_str()); - if (cc->GetName() == parent) - { - cc = new ConnectClass(name, cc); - cc->Update(timeout, *allow ? allow : deny, pingfreq, password, sendq, recvq, localmax, globalmax, maxchans, port, limit); - conf->Classes.push_back(cc); - break; - } - } - 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 - { - if (*allow) - { - /* 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)->GetDisabled()) - { - (*item)->Update(timeout, allow, pingfreq, password, sendq, recvq, localmax, globalmax, maxchans, port, limit); - return true; - } - } - cc = new ConnectClass(name, timeout, allow, pingfreq, password, hashtype, sendq, recvq, localmax, globalmax, maxchans); - cc->limit = limit; - cc->SetPort(port); - conf->Classes.push_back(cc); - } - 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)->GetDisabled()) - { - (*item)->Update(name, deny); - (*item)->SetPort(port); - return true; - } - } - cc = new ConnectClass(name, deny); - cc->SetPort(port); - conf->Classes.push_back(cc); - } - } - + 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 +/* Callback called to process a single tag */ -bool DoneConnect(ServerConfig *conf, const char*) +static bool DoMaxBans(ServerConfig* conf, const char*, const char**, ValueList &values, int*) { - conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Done adding connect classes!"); + const char* channel = values[0].GetString(); + int limit = values[1].GetInteger(); + conf->maxbans[channel] = limit; return true; } -/* Callback called before processing the first tag - */ -bool InitULine(ServerConfig* conf, const char*) +static bool DoZLine(ServerConfig* conf, const char* tag, const char** entries, ValueList &values, int* types) { - conf->ulines.clear(); + const char* reason = values[0].GetString(); + const char* ipmask = values[1].GetString(); + + ZLine* zl = new ZLine(ServerInstance->Time(), 0, "", reason, ipmask); + if (!ServerInstance->XLines->AddLine(zl, NULL)) + delete zl; + return true; } -/* Callback called to process a single tag - */ -bool DoULine(ServerConfig* conf, const char*, char**, ValueList &values, int*) +static bool DoQLine(ServerConfig* conf, const char* tag, const char** entries, ValueList &values, int* types) { - const char* server = values[0].GetString(); - const bool silent = values[1].GetBool(); - conf->ulines[server] = silent; + const char* reason = values[0].GetString(); + const char* nick = values[1].GetString(); + + QLine* ql = new QLine(ServerInstance->Time(), 0, "", reason, nick); + if (!ServerInstance->XLines->AddLine(ql, NULL)) + delete ql; + return true; } -/* Callback called when there are no more tags - */ -bool DoneULine(ServerConfig*, const char*) +static bool DoKLine(ServerConfig* conf, const char* tag, const char** entries, ValueList &values, int* types) { + const char* reason = values[0].GetString(); + const char* host = values[1].GetString(); + + XLineManager* xlm = ServerInstance->XLines; + + IdentHostPair ih = xlm->IdentSplit(host); + + KLine* kl = new KLine(ServerInstance->Time(), 0, "", reason, ih.first.c_str(), ih.second.c_str()); + if (!xlm->AddLine(kl, NULL)) + delete kl; return true; } -/* Callback called before processing the first tag - */ -bool InitModule(ServerConfig* conf, const char*) +static bool DoELine(ServerConfig* conf, const char* tag, const char** entries, ValueList &values, int* types) { - old_module_names = conf->GetInstance()->Modules->GetAllModuleNames(0); - new_module_names.clear(); - added_modules.clear(); - removed_modules.clear(); + const char* reason = values[0].GetString(); + const char* host = values[1].GetString(); + + XLineManager* xlm = ServerInstance->XLines; + + IdentHostPair ih = xlm->IdentSplit(host); + + ELine* el = new ELine(ServerInstance->Time(), 0, "", reason, ih.first.c_str(), ih.second.c_str()); + if (!xlm->AddLine(el, NULL)) + delete el; return true; } -/* Callback called to process a single tag - */ -bool DoModule(ServerConfig*, const char*, char**, ValueList &values, int*) +static bool DoType(ServerConfig* conf, const char*, const char**, ValueList &values, int*) { - const char* modname = values[0].GetString(); - new_module_names.push_back(modname); + const char* TypeName = values[0].GetString(); + const char* Classes = values[1].GetString(); + + conf->opertypes[TypeName] = std::string(Classes); return true; } -/* Callback called when there are no more tags - */ -bool DoneModule(ServerConfig*, const char*) +static bool DoClass(ServerConfig* conf, const char* tag, const char**, ValueList &values, int*) { - // 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; + const char* ClassName = values[0].GetString(); + const char* CommandList = values[1].GetString(); + const char* UModeList = values[2].GetString(); + const char* CModeList = values[3].GetString(); + const char *PrivsList = values[4].GetString(); - for (std::vector::iterator old = old_module_names.begin(); old != old_module_names.end(); old++) + for (const char* c = UModeList; *c; ++c) + { + if ((*c < 'A' || *c > 'z') && *c != '*') { - if (*old == *_new) - added = false; + throw CoreException("Character " + std::string(1, *c) + " is not a valid mode in "); } - - if (added) - added_modules.push_back(*_new); } - - for (std::vector::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++) + for (const char* c = CModeList; *c; ++c) { - bool removed = true; - for (std::vector::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++) + if ((*c < 'A' || *c > 'z') && *c != '*') { - if (*newm == *oldm) - removed = false; + throw CoreException("Character " + std::string(1, *c) + " is not a valid mode in "); } - - 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; + conf->operclass[ClassName].commandlist = CommandList; + conf->operclass[ClassName].umodelist = UModeList; + conf->operclass[ClassName].cmodelist = CModeList; + conf->operclass[ClassName].privs = PrivsList; return true; } -/* Callback called when there are no more tags. - */ -bool DoneMaxBans(ServerConfig*, const char*) +void ServerConfig::CrossCheckOperClassType() { - return true; + for (int i = 0; i < ConfValueEnum("type"); ++i) + { + char item[MAXBUF], classn[MAXBUF], classes[MAXBUF]; + std::string classname; + ConfValue("type", "classes", "", i, classes, MAXBUF, false); + irc::spacesepstream str(classes); + ConfValue("type", "name", "", i, item, MAXBUF, false); + while (str.GetToken(classname)) + { + std::string lost; + bool foundclass = false; + for (int j = 0; j < ConfValueEnum("class"); ++j) + { + ConfValue("class", "name", "", j, classn, MAXBUF, false); + if (!strcmp(classn, classname.c_str())) + { + foundclass = true; + break; + } + } + if (!foundclass) + { + char msg[MAXBUF]; + snprintf(msg, MAXBUF, " Warning: Oper type '%s' has a missing class named '%s', this does nothing!\n", + item, classname.c_str()); + throw CoreException(msg); + } + } + } } -void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, const std::string &useruid) +void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) { - ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file: %s", errormessage.c_str()); - if (bail) + typedef std::map ClassMap; + ClassMap oldBlocksByMask; + if (current) { - /* 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); + 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; + } } - else + + int block_count = ConfValueEnum("connect"); + ClassMap newBlocksByMask; + Classes.resize(block_count, NULL); + std::map names; + + bool try_again = true; + for(int tries=0; try_again && tries < block_count + 1; tries++) { - std::string errors = errormessage; - std::string::size_type start; - unsigned int prefixlen; - start = 0; - /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */ - if (!useruid.empty()) + try_again = false; + for(int i=0; i < block_count; i++) { - User* user = ServerInstance->FindNick(useruid); - if (user) + if (Classes[i]) + continue; + + ConnectClass* parent = NULL; + std::string parentName; + if (ConfValue("connect", "parent", i, parentName, false)) { - 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()) + std::map::iterator parentIter = names.find(parentName); + if (parentIter == names.end()) { - user->WriteServ("NOTICE %s :%s",user->nick.c_str(), errors.substr(start, 510 - prefixlen).c_str()); - start += 510 - prefixlen; + try_again = true; + // couldn't find parent this time. If it's the last time, we'll never find it. + if (tries == block_count) + throw CoreException("Could not find parent connect class \"" + parentName + "\" for connect block " + ConvToStr(i)); + continue; } + parent = Classes[parentIter->second]; } - } - else - { - ServerInstance->SNO->WriteToSnoMask('A', "There were errors in the configuration file:"); - while (start < errors.length()) + + std::string name; + if (ConfValue("connect", "name", i, name, false)) + { + if (names.find(name) != names.end()) + throw CoreException("Two connect classes with name \"" + name + "\" defined!"); + names[name] = i; + } + + std::string mask, typeMask; + char type; + + if (ConfValue("connect", "allow", i, mask, false)) + { + type = CC_ALLOW; + typeMask = 'a' + mask; + } + else if (ConfValue("connect", "deny", i, mask, false)) + { + type = CC_DENY; + typeMask = 'd' + mask; + } + else { - ServerInstance->SNO->WriteToSnoMask('A', errors.substr(start, 360)); - start += 360; + 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(type, mask, *parent) : + new ConnectClass(type, mask); + + if (!name.empty()) + me->name = name; + + std::string tmpv; + if (ConfValue("connect", "password", i, tmpv, false)) + me->pass= tmpv; + if (ConfValue("connect", "hash", i, tmpv, false)) + me->hash = tmpv; + if (ConfValue("connect", "timeout", i, tmpv, false)) + me->registration_timeout = atol(tmpv.c_str()); + if (ConfValue("connect", "pingfreq", i, tmpv, false)) + me->pingtime = atol(tmpv.c_str()); + if (ConfValue("connect", "sendq", i, tmpv, false)) + { + // attempt to guess a good hard/soft sendq from a single value + long value = atol(tmpv.c_str()); + if (value > 16384) + me->softsendqmax = value / 16; + else + me->softsendqmax = value; + me->hardsendqmax = value * 8; + } + if (ConfValue("connect", "softsendq", i, tmpv, false)) + me->softsendqmax = atol(tmpv.c_str()); + if (ConfValue("connect", "hardsendq", i, tmpv, false)) + me->hardsendqmax = atol(tmpv.c_str()); + if (ConfValue("connect", "recvq", i, tmpv, false)) + me->recvqmax = atol(tmpv.c_str()); + if (ConfValue("connect", "localmax", i, tmpv, false)) + me->maxlocal = atol(tmpv.c_str()); + if (ConfValue("connect", "globalmax", i, tmpv, false)) + me->maxglobal = atol(tmpv.c_str()); + if (ConfValue("connect", "port", i, tmpv, false)) + me->port = atol(tmpv.c_str()); + if (ConfValue("connect", "maxchans", i, tmpv, false)) + me->maxchans = atol(tmpv.c_str()); + if (ConfValue("connect", "limit", i, tmpv, false)) + me->limit = atol(tmpv.c_str()); + + 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; } } -void ServerConfig::Read(bool bail, const std::string &useruid) -{ - 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 */ - /* std::ostringstream::clear() does not clear the string itself, only the error flags. */ - this->errstr = new std::ostringstream(std::stringstream::in | std::stringstream::out); - - 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, ValidateHalfOp}, - {"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", "runasuser", "", new ValueContainerChar(this->SetUser), DT_CHARPTR, NoValidation}, - {"security", "runasgroup", "", new ValueContainerChar(this->SetGroup), DT_CHARPTR, 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}, - {"security", "restrictbannedusers", "1", new ValueContainerBool (&this->RestrictBannedUsers), 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", - "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_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", "privs", NULL}, - {"", "", "", "", "", NULL}, - {DT_NOSPACES, DT_CHARPTR, DT_CHARPTR, DT_CHARPTR, DT_CHARPTR}, - InitClasses, DoClass, DoneClassesAndTypes}, - - {NULL, - {NULL}, - {NULL}, - {0}, - NULL, NULL, NULL} - }; +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"}, +}; + +/* These tags can occur ONCE or not at all */ +static const InitialConfig Values[] = { + {"performance", "softlimit", "0", new ValueContainerUInt (&ServerConfig::SoftLimit), DT_INTEGER, ValidateSoftLimit}, + {"performance", "somaxconn", SOMAXCONN_S, new ValueContainerInt (&ServerConfig::MaxConn), DT_INTEGER, ValidateMaxConn}, + {"options", "moronbanner", "You're banned!", new ValueContainerString (&ServerConfig::MoronBanner), DT_CHARPTR, NULL}, + {"server", "name", "", new ValueContainerString (&ServerConfig::ServerName), DT_HOSTNAME, ValidateServerName}, + {"server", "description", "Configure Me", new ValueContainerString (&ServerConfig::ServerDesc), DT_CHARPTR, NULL}, + {"server", "network", "Network", new ValueContainerString (&ServerConfig::Network), DT_NOSPACES, NULL}, + {"server", "id", "", new ValueContainerString (&ServerConfig::sid), DT_CHARPTR, ValidateSID}, + {"admin", "name", "", new ValueContainerString (&ServerConfig::AdminName), DT_CHARPTR, NULL}, + {"admin", "email", "Mis@configu.red", new ValueContainerString (&ServerConfig::AdminEmail), DT_CHARPTR, NULL}, + {"admin", "nick", "Misconfigured", new ValueContainerString (&ServerConfig::AdminNick), DT_CHARPTR, NULL}, + {"files", "motd", "", new ValueContainerString (&ServerConfig::motd), DT_CHARPTR, ValidateMotd}, + {"files", "rules", "", new ValueContainerString (&ServerConfig::rules), DT_CHARPTR, ValidateRules}, + {"power", "diepass", "", new ValueContainerString (&ServerConfig::diepass), DT_CHARPTR, ValidateNotEmpty}, + {"power", "pause", "", new ValueContainerInt (&ServerConfig::DieDelay), DT_INTEGER, NULL}, + {"power", "hash", "", new ValueContainerString (&ServerConfig::powerhash), DT_CHARPTR, NULL}, + {"power", "restartpass", "", new ValueContainerString (&ServerConfig::restartpass), DT_CHARPTR, ValidateNotEmpty}, + {"options", "prefixquit", "", new ValueContainerString (&ServerConfig::PrefixQuit), DT_CHARPTR, NULL}, + {"options", "suffixquit", "", new ValueContainerString (&ServerConfig::SuffixQuit), DT_CHARPTR, NULL}, + {"options", "fixedquit", "", new ValueContainerString (&ServerConfig::FixedQuit), DT_CHARPTR, NULL}, + {"options", "prefixpart", "", new ValueContainerString (&ServerConfig::PrefixPart), DT_CHARPTR, NULL}, + {"options", "suffixpart", "", new ValueContainerString (&ServerConfig::SuffixPart), DT_CHARPTR, NULL}, + {"options", "fixedpart", "", new ValueContainerString (&ServerConfig::FixedPart), DT_CHARPTR, NULL}, + {"performance", "netbuffersize","10240", new ValueContainerInt (&ServerConfig::NetBufferSize), DT_INTEGER, ValidateNetBufferSize}, + {"performance", "maxwho", "1024", new ValueContainerInt (&ServerConfig::MaxWhoResults), DT_INTEGER, ValidateMaxWho}, + {"options", "allowhalfop", "0", new ValueContainerBool (&ServerConfig::AllowHalfop), DT_BOOLEAN, ValidateHalfOp}, + {"dns", "server", "", new ValueContainerString (&ServerConfig::DNSServer), DT_IPADDRESS,ValidateDnsServer}, + {"dns", "timeout", "5", new ValueContainerInt (&ServerConfig::dns_timeout), DT_INTEGER, NULL}, + {"options", "moduledir", MOD_PATH, new ValueContainerString (&ServerConfig::ModPath), DT_CHARPTR, NULL}, + {"disabled", "commands", "", new ValueContainerString (&ServerConfig::DisabledCommands), DT_CHARPTR, NULL}, + {"disabled", "usermodes", "", NULL, DT_NOTHING, ValidateDisabledUModes}, + {"disabled", "chanmodes", "", NULL, DT_NOTHING, ValidateDisabledCModes}, + {"disabled", "fakenonexistant", "0", new ValueContainerBool (&ServerConfig::DisabledDontExist), DT_BOOLEAN, NULL}, + + {"security", "runasuser", "", new ValueContainerString(&ServerConfig::SetUser), DT_CHARPTR, NULL}, + {"security", "runasgroup", "", new ValueContainerString(&ServerConfig::SetGroup), DT_CHARPTR, NULL}, + {"security", "userstats", "", new ValueContainerString (&ServerConfig::UserStats), DT_CHARPTR, NULL}, + {"security", "customversion","", new ValueContainerString (&ServerConfig::CustomVersion), DT_CHARPTR, NULL}, + {"security", "hidesplits", "0", new ValueContainerBool (&ServerConfig::HideSplits), DT_BOOLEAN, NULL}, + {"security", "hidebans", "0", new ValueContainerBool (&ServerConfig::HideBans), DT_BOOLEAN, NULL}, + {"security", "hidewhois", "", new ValueContainerString (&ServerConfig::HideWhoisServer), DT_NOSPACES, NULL}, + {"security", "hidekills", "", new ValueContainerString (&ServerConfig::HideKillsServer), DT_NOSPACES, NULL}, + {"security", "operspywhois", "0", new ValueContainerBool (&ServerConfig::OperSpyWhois), DT_BOOLEAN, NULL}, + {"security", "restrictbannedusers", "1", new ValueContainerBool (&ServerConfig::RestrictBannedUsers), DT_BOOLEAN, NULL}, + {"security", "genericoper", "0", new ValueContainerBool (&ServerConfig::GenericOper), DT_BOOLEAN, NULL}, + {"performance", "nouserdns", "0", new ValueContainerBool (&ServerConfig::NoUserDns), DT_BOOLEAN, NULL}, + {"options", "syntaxhints", "0", new ValueContainerBool (&ServerConfig::SyntaxHints), DT_BOOLEAN, NULL}, + {"options", "cyclehosts", "0", new ValueContainerBool (&ServerConfig::CycleHosts), DT_BOOLEAN, NULL}, + {"options", "ircumsgprefix","0", new ValueContainerBool (&ServerConfig::UndernetMsgPrefix), DT_BOOLEAN, NULL}, + {"security", "announceinvites", "1", NULL, DT_NOTHING, ValidateInvite}, + {"options", "hostintopic", "1", new ValueContainerBool (&ServerConfig::FullHostInTopic), DT_BOOLEAN, NULL}, + {"security", "hidemodes", "", NULL, DT_NOTHING, ValidateModeLists}, + {"options", "exemptchanops","", NULL, DT_NOTHING, ValidateExemptChanOps}, + {"security", "maxtargets", "20", new ValueContainerUInt (&ServerConfig::MaxTargets), DT_INTEGER, ValidateMaxTargets}, + {"options", "defaultmodes", "nt", new ValueContainerString (&ServerConfig::DefaultModes), DT_CHARPTR, NULL}, + {"pid", "file", "", new ValueContainerString (&ServerConfig::PID), DT_CHARPTR, NULL}, + {"whowas", "groupsize", "10", new ValueContainerInt (&ServerConfig::WhoWasGroupSize), DT_INTEGER, NULL}, + {"whowas", "maxgroups", "10240", new ValueContainerInt (&ServerConfig::WhoWasMaxGroups), DT_INTEGER, NULL}, + {"whowas", "maxkeep", "3600", NULL, DT_NOTHING, ValidateWhoWas}, + {"die", "value", "", new ValueContainerString (&ServerConfig::DieValue), DT_CHARPTR, NULL}, + {"channels", "users", "20", new ValueContainerUInt (&ServerConfig::MaxChans), DT_INTEGER, NULL}, + {"channels", "opers", "60", new ValueContainerUInt (&ServerConfig::OperMaxChans), DT_INTEGER, NULL}, + {"cidr", "ipv4clone", "32", new ValueContainerInt (&ServerConfig::c_ipv4_range), DT_INTEGER, NULL}, + {"cidr", "ipv6clone", "128", new ValueContainerInt (&ServerConfig::c_ipv6_range), DT_INTEGER, NULL}, + {"limits", "maxnick", "32", new ValueContainerLimit (&ServerLimits::NickMax), DT_LIMIT, NULL}, + {"limits", "maxchan", "64", new ValueContainerLimit (&ServerLimits::ChanMax), DT_LIMIT, NULL}, + {"limits", "maxmodes", "20", new ValueContainerLimit (&ServerLimits::MaxModes), DT_LIMIT, NULL}, + {"limits", "maxident", "11", new ValueContainerLimit (&ServerLimits::IdentMax), DT_LIMIT, NULL}, + {"limits", "maxquit", "255", new ValueContainerLimit (&ServerLimits::MaxQuit), DT_LIMIT, NULL}, + {"limits", "maxtopic", "307", new ValueContainerLimit (&ServerLimits::MaxTopic), DT_LIMIT, NULL}, + {"limits", "maxkick", "255", new ValueContainerLimit (&ServerLimits::MaxKick), DT_LIMIT, NULL}, + {"limits", "maxgecos", "128", new ValueContainerLimit (&ServerLimits::MaxGecos), DT_LIMIT, NULL}, + {"limits", "maxaway", "200", new ValueContainerLimit (&ServerLimits::MaxAway), DT_LIMIT, NULL}, + {"options", "invitebypassmodes", "1", new ValueContainerBool (&ServerConfig::InvBypassModes), DT_BOOLEAN, NULL}, +}; + +/* 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", + "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_NOSPACES, DT_NOSPACES, DT_INTEGER, DT_INTEGER, DT_CHARPTR}, + NULL,}, + + {"uline", + {"server", "silent", NULL}, + {"", "0", NULL}, + {DT_HOSTNAME, DT_BOOLEAN}, + DoULine}, + + {"banlist", + {"chan", "limit", NULL}, + {"", "", NULL}, + {DT_CHARPTR, DT_INTEGER}, + DoMaxBans}, + + {"module", + {"name", NULL}, + {"", NULL}, + {DT_CHARPTR}, + NULL}, + + {"badip", + {"reason", "ipmask", NULL}, + {"No reason", "", NULL}, + {DT_CHARPTR, DT_IPADDRESS|DT_ALLOW_WILD}, + DoZLine}, + + {"badnick", + {"reason", "nick", NULL}, + {"No reason", "", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + DoQLine}, + + {"badhost", + {"reason", "host", NULL}, + {"No reason", "", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + DoKLine}, + + {"exception", + {"reason", "host", NULL}, + {"No reason", "", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + DoELine}, + + {"type", + {"name", "classes", NULL}, + {"", "", NULL}, + {DT_NOSPACES, DT_CHARPTR}, + DoType}, + + {"class", + {"name", "commands", "usermodes", "chanmodes", "privs", NULL}, + {"", "", "", "", "", NULL}, + {DT_NOSPACES, DT_CHARPTR, DT_CHARPTR, DT_CHARPTR, DT_CHARPTR}, + DoClass}, +}; + +/* These tags MUST occur and must ONLY occur once in the config file */ +static const char* Once[] = { "server", "admin", "files", "power", "options" }; + +// 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 */ - /* 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)) + if (!this->DoInclude(ServerInstance->ConfigFileName, true)) { - ReportConfigError(errstr->str(), bail, useruid); - delete errstr; + valid = false; return; } +} - delete errstr; +void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) +{ + 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; Once[Index]; Index++) - if (!CheckOnce(Once[Index], newconfig)) - return; + for (int Index = 0; Index * sizeof(*Once) < sizeof(Once); Index++) + CheckOnce(Once[Index]); - for (int Index = 0; ChangedConfig[Index].tag; Index++) + for (int Index = 0; Index * sizeof(Deprecated) < sizeof(ChangedConfig); Index++) { char item[MAXBUF]; *item = 0; - if (ConfValue(newconfig, ChangedConfig[Index].tag, ChangedConfig[Index].value, "", 0, item, MAXBUF, true) || *item) + if (ConfValue(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); } /* 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) + for (int Index = 0; Index * sizeof(*Values) < sizeof(Values); ++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) - { - delete Values[Index].val; - continue; - } - ConfValue(newconfig, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines); + ConfValue(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)) + if (Values[Index].validation_function && !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->Lock(); 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); + ValueContainerString* vcc = (ValueContainerString*)Values[Index].val; + ValidateNoSpaces(vi.GetString(), Values[Index].tag, Values[Index].value); + vcc->Set(this, vi.GetValue()); } 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); + ValueContainerString* vcc = (ValueContainerString*)Values[Index].val; + ValidateHostname(vi.GetString(), Values[Index].tag, Values[Index].value); + vcc->Set(this, vi.GetValue()); } 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); + ValueContainerString* vcc = (ValueContainerString*)Values[Index].val; + ValidateIP(vi.GetString(), Values[Index].tag, Values[Index].value, allow_wild); + vcc->Set(this, vi.GetValue()); } break; case DT_CHANNEL: { - ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + ValueContainerString* vcc = (ValueContainerString*)Values[Index].val; if (*(vi.GetString()) && !ServerInstance->IsChannel(vi.GetString(), MAXBUF)) { - ServerInstance->Threads->Unlock(); 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); + vcc->Set(this, vi.GetValue()); } 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); + ValueContainerString* vcs = dynamic_cast(Values[Index].val); + if (vcs) + vcs->Set(this, vi.GetValue()); } break; case DT_INTEGER: { int val = vi.GetInteger(); ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val; - vci->Set(&val, sizeof(int)); + vci->Set(this, val); + } + break; + case DT_LIMIT: + { + int val = vi.GetInteger(); + ValueContainerLimit* vci = (ValueContainerLimit*)Values[Index].val; + vci->Set(this, val); } break; case DT_BOOLEAN: { bool val = vi.GetBool(); ValueContainerBool* vcb = (ValueContainerBool*)Values[Index].val; - vcb->Set(&val, sizeof(bool)); + vcb->Set(this, val); } 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->Unlock(); } /* 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) + for (int Index = 0; Index * sizeof(MultiConfig) < sizeof(MultiValues); ++Index) { - ServerInstance->Threads->Lock(); - MultiValues[Index].init_function(this, MultiValues[Index].tag); - ServerInstance->Threads->Unlock(); - - int number_of_tags = ConfValueEnum(newconfig, MultiValues[Index].tag); + int number_of_tags = ConfValueEnum(MultiValues[Index].tag); for (int tagnum = 0; tagnum < number_of_tags; ++tagnum) { @@ -1093,93 +1039,78 @@ void ServerConfig::Read(bool bail, const std::string &useruid) dt &= ~DT_ALLOW_NEWLINE; dt &= ~DT_ALLOW_WILD; - ServerInstance->Threads->Lock(); - /* We catch and rethrow any exception here just so we can free our mutex - */ - try + switch (dt) { - switch (dt) + case DT_NOSPACES: { - 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); + char item[MAXBUF]; + if (ConfValue(MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) vl.push_back(ValueItem(item)); - } - break; - default: - /* Someone was smoking craq if we got here, and we're all gonna die. */ - break; + else + vl.push_back(ValueItem("")); + ValidateNoSpaces(vl[vl.size()-1].GetString(), MultiValues[Index].tag, MultiValues[Index].items[valuenum]); } + break; + case DT_HOSTNAME: + { + char item[MAXBUF]; + if (ConfValue(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("")); + ValidateHostname(vl[vl.size()-1].GetString(), MultiValues[Index].tag, MultiValues[Index].items[valuenum]); + } + break; + case DT_IPADDRESS: + { + char item[MAXBUF]; + if (ConfValue(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("")); + ValidateIP(vl[vl.size()-1].GetString(), MultiValues[Index].tag, MultiValues[Index].items[valuenum], allow_wild); + } + break; + case DT_CHANNEL: + { + char item[MAXBUF]; + if (ConfValue(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(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(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(MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum); + vl.push_back(ValueItem(item)); + } + break; } - catch (CoreException &e) - { - ServerInstance->Threads->Unlock(); - throw e; - } - ServerInstance->Threads->Unlock(); } - MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype); + if (MultiValues[Index].validation_function) + MultiValues[Index].validation_function(this, MultiValues[Index].tag, 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) @@ -1187,172 +1118,160 @@ void ServerConfig::Read(bool bail, const std::string &useruid) */ Limits.Finalise(); + // Handle special items + CrossCheckOperClassType(); + CrossCheckConnectBlocks(old); } - catch (CoreException &ce) { - ReportConfigError(ce.GetReason(), bail, useruid); - return; + errstr << ce.GetReason(); + valid = false; } - ServerInstance->Threads->Lock(); - for (int i = 0; i < ConfValueEnum(newconfig, "type"); ++i) + // 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) { - 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)) + 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()) { - 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) + 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++) { - if (!useruid.empty()) - { - User* user = ServerInstance->FindNick(useruid); - 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()); - } + 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; } } } - /* If we succeeded, set the ircd config to the new one */ - this->config_data = newconfig; - - ServerInstance->Threads->Unlock(); + User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid); - // write once here, to try it out and make sure its ok - ServerInstance->WritePID(this->PID); + valid = errstr.str().empty(); + if (!valid) + ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file:"); - /* If we're rehashing, let's load any new modules, and unload old ones - */ - if (!bail) + while (errstr.good()) { - int found_ports = 0; - FailedPortList pl; - ServerInstance->BindPorts(false, found_ports, pl); - - if (pl.size() && !useruid.empty()) + std::string line; + getline(errstr, line, '\n'); + if (!line.empty()) { - ServerInstance->Threads->Lock(); - User* user = ServerInstance->FindNick(useruid); if (user) - { - 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->Unlock(); + user->WriteServ("NOTICE %s :*** %s", user->nick.c_str(), line.c_str()); + else + ServerInstance->SNO->WriteGlobalSno('a', line); } - ServerInstance->Threads->Lock(); - if (!removed_modules.empty()) + if (!old) { - 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()); + // Starting up, so print it out so it's seen. XXX this is a bit of a hack. + printf("%s\n", line.c_str()); + } + } - if (!useruid.empty()) - { - User* user = ServerInstance->FindNick(useruid); - 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->WriteToSnoMask('A', "Module %s successfully unloaded.", removing->c_str()); + errstr.clear(); + errstr.str(std::string()); - rem++; - } - else - { - if (!useruid.empty()) - { - User* user = ServerInstance->FindNick(useruid); - 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->WriteToSnoMask('A', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str()); - } - } + /* No old configuration -> initial boot, nothing more to do here */ + if (!old) + { + if (!valid) + { + ServerInstance->Exit(EXIT_STATUS_CONFIG); } - 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 (!useruid.empty()) - { - User* user = ServerInstance->FindNick(useruid); - 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->WriteToSnoMask('A', "Module %s successfully loaded.", adding->c_str()); + return; + } - add++; - } - else - { - if (!useruid.empty()) - { - User* user = ServerInstance->FindNick(useruid); - 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->WriteToSnoMask('A', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str()); - } - } + // If there were errors processing configuration, don't touch modules. + if (!valid) + return; + + ApplyModules(user); +} + +void ServerConfig::ApplyModules(User* user) +{ + const std::vector v = ServerInstance->Modules->GetAllModuleNames(0); + std::vector added_modules; + std::set removed_modules(v.begin(), v.end()); + + int new_module_count = ConfValueEnum("module"); + for(int i=0; i < new_module_count; i++) + { + std::string name; + if (ConfValue("module", "name", i, name, false)) + { + // 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); } - ServerInstance->Threads->Unlock(); + } + + for (std::set::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) + { + // Don't remove cmd_*.so, just remove m_*.so + if (removing->c_str()[0] == 'c') + continue; + 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()); + else + ServerInstance->SNO->WriteToSnoMask('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->WriteToSnoMask('a', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str()); + } } - if (!bail) + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - if (!useruid.empty()) + if (ServerInstance->Modules->Load(adding->c_str())) { - User* user = ServerInstance->FindNick(useruid); + ServerInstance->SNO->WriteToSnoMask('a', "*** REHASH LOADED MODULE: %s",adding->c_str()); if (user) - user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str()); + user->WriteNumeric(RPL_LOADEDMODULE, "%s %s :Module %s successfully loaded.",user->nick.c_str(), adding->c_str(), adding->c_str()); + else + ServerInstance->SNO->WriteToSnoMask('a', "Module %s successfully loaded.", adding->c_str()); } else - ServerInstance->SNO->WriteToSnoMask('A', "*** Successfully rehashed server."); + { + 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->WriteToSnoMask('a', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str()); + } } + if (user) + user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str()); + else + ServerInstance->SNO->WriteToSnoMask('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; @@ -1372,7 +1291,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; } @@ -1380,7 +1299,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; } } @@ -1401,7 +1320,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; } @@ -1457,7 +1376,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; } } @@ -1467,7 +1386,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; } @@ -1477,7 +1396,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; } } @@ -1485,12 +1404,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; } } @@ -1501,12 +1420,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; } } @@ -1514,11 +1433,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; } } } @@ -1528,7 +1447,7 @@ 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; /* @@ -1536,7 +1455,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil * 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; @@ -1546,7 +1465,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* fil } 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; } } @@ -1556,7 +1475,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; } @@ -1564,12 +1483,12 @@ 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; @@ -1596,7 +1515,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; } } @@ -1624,7 +1543,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; } } @@ -1653,7 +1572,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)) @@ -1687,13 +1606,22 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, const std::string &filename 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; } @@ -1714,23 +1642,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::pair (tagname, results)); 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; } @@ -1740,7 +1668,7 @@ 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; @@ -1761,7 +1689,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st } else { - errorstream << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl; + errstr << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl; return false; } } @@ -1771,39 +1699,39 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st if (conf) { - ret = LoadConf(target, conf, newfile, errorstream); + ret = LoadConf(conf, newfile, 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) +bool ServerConfig::ConfValue(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); + return ConfValue(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) +bool ServerConfig::ConfValue(const char* tag, const char* var, const char* default_value, int index, char* result, int length, bool allow_linefeeds) { std::string value; - bool r = ConfValue(target, std::string(tag), std::string(var), std::string(default_value), index, value, allow_linefeeds); + bool r = ConfValue(std::string(tag), std::string(var), std::string(default_value), index, value, allow_linefeeds); strlcpy(result, value.c_str(), length); return r; } -bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, std::string &result, bool allow_linefeeds) +bool ServerConfig::ConfValue(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); + return ConfValue(tag, var, "", index, result, allow_linefeeds); } -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 ServerConfig::ConfValue(const std::string &tag, const std::string &var, const std::string &default_value, int index, std::string &result, bool allow_linefeeds) { ConfigDataHash::size_type pos = index; - if (pos < target.count(tag)) + if (pos < config_data.count(tag)) { - ConfigDataHash::iterator iter = target.find(tag); + ConfigDataHash::iterator iter = config_data.find(tag); for(int i = 0; i < index; i++) iter++; @@ -1843,26 +1771,26 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con return false; } -bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, int index, int &result) +bool ServerConfig::ConfValueInteger(const char* tag, const char* var, int index, int &result) { - return ConfValueInteger(target, std::string(tag), std::string(var), "", index, result); + return ConfValueInteger(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) +bool ServerConfig::ConfValueInteger(const char* tag, const char* var, const char* default_value, int index, int &result) { - return ConfValueInteger(target, std::string(tag), std::string(var), std::string(default_value), index, result); + return ConfValueInteger(std::string(tag), std::string(var), std::string(default_value), index, result); } -bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, int &result) +bool ServerConfig::ConfValueInteger(const std::string &tag, const std::string &var, int index, int &result) { - return ConfValueInteger(target, tag, var, "", index, result); + return ConfValueInteger(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) +bool ServerConfig::ConfValueInteger(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); + bool r = ConfValue(tag, var, default_value, index, value); stream.str(value); if(!(stream >> result)) return false; @@ -1906,52 +1834,52 @@ bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &t } -bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, int index) +bool ServerConfig::ConfValueBool(const char* tag, const char* var, int index) { - return ConfValueBool(target, std::string(tag), std::string(var), "", index); + return ConfValueBool(std::string(tag), std::string(var), "", index); } -bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index) +bool ServerConfig::ConfValueBool(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); + return ConfValueBool(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) +bool ServerConfig::ConfValueBool(const std::string &tag, const std::string &var, int index) { - return ConfValueBool(target, tag, var, "", index); + return ConfValueBool(tag, var, "", index); } -bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index) +bool ServerConfig::ConfValueBool(const std::string &tag, const std::string &var, const std::string &default_value, int index) { std::string result; - if(!ConfValue(target, tag, var, default_value, index, result)) + if(!ConfValue(tag, var, default_value, index, result)) return false; return ((result == "yes") || (result == "true") || (result == "1")); } -int ServerConfig::ConfValueEnum(ConfigDataHash &target, const char* tag) +int ServerConfig::ConfValueEnum(const char* tag) { - return target.count(tag); + return config_data.count(tag); } -int ServerConfig::ConfValueEnum(ConfigDataHash &target, const std::string &tag) +int ServerConfig::ConfValueEnum(const std::string &tag) { - return target.count(tag); + return config_data.count(tag); } -int ServerConfig::ConfVarEnum(ConfigDataHash &target, const char* tag, int index) +int ServerConfig::ConfVarEnum(const char* tag, int index) { - return ConfVarEnum(target, std::string(tag), index); + return ConfVarEnum(std::string(tag), index); } -int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, int index) +int ServerConfig::ConfVarEnum(const std::string &tag, int index) { ConfigDataHash::size_type pos = index; - if (pos < target.count(tag)) + if (pos < config_data.count(tag)) { - ConfigDataHash::const_iterator iter = target.find(tag); + ConfigDataHash::const_iterator iter = config_data.find(tag); for(int i = 0; i < index; i++) iter++; @@ -2037,72 +1965,14 @@ 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]; @@ -2138,11 +2008,6 @@ std::string ServerConfig::GetFullProgDir() return "/"; } -InspIRCd* ServerConfig::GetInstance() -{ - return ServerInstance; -} - std::string ServerConfig::GetSID() { return sid; @@ -2162,12 +2027,7 @@ ValueItem::ValueItem(bool value) v = n.str(); } -ValueItem::ValueItem(const char* value) -{ - v = value; -} - -void ValueItem::Set(const char* value) +void ValueItem::Set(const std::string& value) { v = value; } @@ -2186,9 +2046,9 @@ int ValueItem::GetInteger() return atoi(v.c_str()); } -char* ValueItem::GetString() +const char* ValueItem::GetString() const { - return (char*)v.c_str(); + return v.c_str(); } bool ValueItem::GetBool() @@ -2197,181 +2057,48 @@ bool ValueItem::GetBool() } - - -/* - * 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; - if (n->second.privs) - delete[] n->second.privs; - } - } - - 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(); - const char *PrivsList = values[4].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); - conf->operclass[ClassName].privs = strnewdup(PrivsList); - 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() -{ - ServerInstance->Config->Read(do_bail, TheUserUID); - ServerInstance->Threads->Lock(); - this->SetExitFlag(); - ServerInstance->Threads->Unlock(); }