X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=b5d999f1d2e543ec519fa3de82b62c808ef085ea;hb=84083a73e80734e39892f44411549d2381654c95;hp=e05a788745843d2031ce27c6d7280e307e09a2c8;hpb=8ffa149aa186d81b8c5017bb3f7e82d483da8898;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index e05a78874..b5d999f1d 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -6,14 +6,22 @@ * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ +/* $Core: libIRCDconfigreader */ +/* $CopyInstall: conf/inspircd.quotes.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.rules.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.motd.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.helpop-full.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.helpop.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.censor.example $(CONPATH) */ +/* $CopyInstall: conf/inspircd.filter.example $(CONPATH) */ +/* $CopyInstall: docs/inspircd.conf.example $(CONPATH) */ + #include "inspircd.h" -#include "configreader.h" -#include #include #include "xline.h" #include "exitcodes.h" @@ -21,6 +29,10 @@ 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) { this->ClearStack(); @@ -37,12 +49,13 @@ ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance) NetBufferSize = 10240; SoftLimit = MAXCLIENTS; MaxConn = SOMAXCONN; - MaxWhoResults = 100; + MaxWhoResults = 0; debugging = 0; MaxChans = 20; OperMaxChans = 30; LogLevel = DEFAULT; maxbans.clear(); + DNSServerValidator = &ValidateDnsServer; } void ServerConfig::ClearStack() @@ -56,9 +69,9 @@ Module* ServerConfig::GetIOHook(int port) return (x != IOHookModule.end() ? x->second : NULL); } -Module* ServerConfig::GetIOHook(InspSocket* is) +Module* ServerConfig::GetIOHook(BufferedSocket* is) { - std::map::iterator x = SocketIOHookModule.find(is); + std::map::iterator x = SocketIOHookModule.find(is); return (x != SocketIOHookModule.end() ? x->second : NULL); } @@ -76,7 +89,7 @@ bool ServerConfig::AddIOHook(int port, Module* iomod) } } -bool ServerConfig::AddIOHook(Module* iomod, InspSocket* is) +bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is) { if (!GetIOHook(is)) { @@ -86,7 +99,7 @@ bool ServerConfig::AddIOHook(Module* iomod, InspSocket* is) } else { - throw ModuleException("InspSocket derived class already hooked by another module"); + throw ModuleException("BufferedSocket derived class already hooked by another module"); return false; } } @@ -102,9 +115,9 @@ bool ServerConfig::DelIOHook(int port) return false; } -bool ServerConfig::DelIOHook(InspSocket* is) +bool ServerConfig::DelIOHook(BufferedSocket* is) { - std::map::iterator x = SocketIOHookModule.find(is); + std::map::iterator x = SocketIOHookModule.find(is); if (x != SocketIOHookModule.end()) { SocketIOHookModule.erase(x); @@ -129,7 +142,7 @@ void ServerConfig::Update005() char buf[MAXBUF]; snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str()); isupport.push_back(buf); - line5 = ""; + line5.clear(); token_counter = 0; } } @@ -141,13 +154,13 @@ void ServerConfig::Update005() } } -void ServerConfig::Send005(userrec* user) +void ServerConfig::Send005(User* user) { for (std::vector::iterator line = ServerInstance->Config->isupport.begin(); line != ServerInstance->Config->isupport.end(); line++) user->WriteServ("005 %s %s", user->nick, line->c_str()); } -bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) +bool ServerConfig::CheckOnce(char* tag) { int count = ConfValueEnum(this->config_data, tag); @@ -164,12 +177,110 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) return true; } -bool NoValidation(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool NoValidation(ServerConfig*, const char*, const char*, ValueItem&) +{ + return true; +} + +bool DoneConfItem(ServerConfig* conf, const char* tag) { return true; } -bool ValidateMaxTargets(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +void ServerConfig::ValidateNoSpaces(const char* p, const std::string &tag, const std::string &val) +{ + for (const char* ptr = p; *ptr; ++ptr) + { + if (*ptr == ' ') + throw CoreException("The value of <"+tag+":"+val+"> cannot contain spaces"); + } +} + +/* NOTE: Before anyone asks why we're not using inet_pton for this, it is because inet_pton and friends do not return so much detail, + * even in strerror(errno). They just return 'yes' or 'no' to an address without such detail as to whats WRONG with the address. + * Because ircd users arent as technical as they used to be (;)) we are going to give more of a useful error message. + */ +void ServerConfig::ValidateIP(const char* p, const std::string &tag, const std::string &val, bool wild) +{ + int num_dots = 0; + int num_seps = 0; + int not_numbers = false; + int not_hex = false; + + if (*p) + { + if (*p == '.') + throw CoreException("The value of <"+tag+":"+val+"> is not an IP address"); + + for (const char* ptr = p; *ptr; ++ptr) + { + if (wild && (*ptr == '*' || *ptr == '?' || *ptr == '/')) + continue; + + if (*ptr != ':' && *ptr != '.') + { + if (*ptr < '0' || *ptr > '9') + not_numbers = true; + if ((*ptr < '0' || *ptr > '9') && (toupper(*ptr) < 'A' || toupper(*ptr) > 'F')) + not_hex = true; + } + switch (*ptr) + { + case ' ': + throw CoreException("The value of <"+tag+":"+val+"> is not an IP address"); + case '.': + num_dots++; + break; + case ':': + num_seps++; + break; + } + } + + if (num_dots > 3) + throw CoreException("The value of <"+tag+":"+val+"> is an IPv4 address with too many fields!"); + + if (num_seps > 8) + throw CoreException("The value of <"+tag+":"+val+"> is an IPv6 address with too many fields!"); + + if (num_seps == 0 && num_dots < 3 && !wild) + throw CoreException("The value of <"+tag+":"+val+"> looks to be a malformed IPv4 address"); + + if (num_seps == 0 && num_dots == 3 && not_numbers) + throw CoreException("The value of <"+tag+":"+val+"> contains non-numeric characters in an IPv4 address"); + + if (num_seps != 0 && not_hex) + throw CoreException("The value of <"+tag+":"+val+"> contains non-hexdecimal characters in an IPv6 address"); + + if (num_seps != 0 && num_dots != 3 && num_dots != 0 && !wild) + throw CoreException("The value of <"+tag+":"+val+"> is a malformed IPv6 4in6 address"); + } +} + +void ServerConfig::ValidateHostname(const char* p, const std::string &tag, const std::string &val) +{ + int num_dots = 0; + if (*p) + { + if (*p == '.') + throw CoreException("The value of <"+tag+":"+val+"> is not a valid hostname"); + for (const char* ptr = p; *ptr; ++ptr) + { + switch (*ptr) + { + case ' ': + throw CoreException("The value of <"+tag+":"+val+"> is not a valid hostname"); + case '.': + num_dots++; + break; + } + } + if (num_dots == 0) + throw CoreException("The value of <"+tag+":"+val+"> is not a valid hostname"); + } +} + +bool ValidateMaxTargets(ServerConfig* conf, const char*, const char*, ValueItem &data) { if ((data.GetInteger() < 0) || (data.GetInteger() > 31)) { @@ -179,7 +290,7 @@ bool ValidateMaxTargets(ServerConfig* conf, const char* tag, const char* value, return true; } -bool ValidateSoftLimit(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem &data) { if ((data.GetInteger() < 1) || (data.GetInteger() > MAXCLIENTS)) { @@ -189,7 +300,7 @@ bool ValidateSoftLimit(ServerConfig* conf, const char* tag, const char* value, V return true; } -bool ValidateMaxConn(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateMaxConn(ServerConfig* conf, const char*, const char*, ValueItem &data) { if (data.GetInteger() > SOMAXCONN) conf->GetInstance()->Log(DEFAULT,"WARNING: value may be higher than the system-defined SOMAXCONN value!"); @@ -202,13 +313,13 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance) std::string thiscmd; /* Enable everything first */ - for (command_table::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++) + for (Commandable::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++) x->second->Disable(false); /* Now disable all the ones which the user wants disabled */ while (dcmds >> thiscmd) { - command_table::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd); + Commandable::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd); if (cm != ServerInstance->Parser->cmdlist.end()) { cm->second->Disable(true); @@ -217,17 +328,11 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance) return true; } -bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &data) { if (!*(data.GetString())) { std::string nameserver; -#ifdef WINDOWS - conf->GetInstance()->Log(DEFAULT,"WARNING: not defined, attempting to find working server in the registry..."); - nameserver = FindNameServerWin(); - data.Set(nameserver.c_str()); - conf->GetInstance()->Log(DEFAULT," set to '%s' as first active resolver in registry.", nameserver.c_str()); -#else // attempt to look up their nameserver from /etc/resolv.conf conf->GetInstance()->Log(DEFAULT,"WARNING: not defined, attempting to find working server in /etc/resolv.conf..."); ifstream resolv("/etc/resolv.conf"); @@ -257,18 +362,17 @@ bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, V conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!"); data.Set("127.0.0.1"); } -#endif } return true; } -bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateServerName(ServerConfig* conf, const char*, const char*, ValueItem &data) { /* If we already have a servername, and they changed it, we should throw an exception. */ if ((strcasecmp(conf->ServerName, data.GetString())) && (*conf->ServerName)) { throw CoreException("Configuration error: You cannot change your servername at runtime! Please restart your server for this change to be applied."); - /* XXX: We don't actually reach this return of course... */ + /* We don't actually reach this return of course... */ return false; } if (!strchr(data.GetString(),'.')) @@ -280,7 +384,7 @@ bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value, return true; } -bool ValidateNetBufferSize(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateNetBufferSize(ServerConfig* conf, const char*, const char*, ValueItem &data) { if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1024)) { @@ -290,17 +394,17 @@ bool ValidateNetBufferSize(ServerConfig* conf, const char* tag, const char* valu return true; } -bool ValidateMaxWho(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateMaxWho(ServerConfig* conf, const char*, const char*, ValueItem &data) { - if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1)) + if ((data.GetInteger() > 65535) || (data.GetInteger() < 1)) { - conf->GetInstance()->Log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128."); + conf->GetInstance()->Log(DEFAULT," size out of range, setting to default of 128."); data.Set(128); } return true; } -bool ValidateLogLevel(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateLogLevel(ServerConfig* conf, const char*, const char*, ValueItem &data) { std::string dbg = data.GetString(); conf->LogLevel = DEFAULT; @@ -321,26 +425,26 @@ bool ValidateLogLevel(ServerConfig* conf, const char* tag, const char* value, Va return true; } -bool ValidateMotd(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateMotd(ServerConfig* conf, const char*, const char*, ValueItem &data) { conf->ReadFile(conf->MOTD, data.GetString()); return true; } -bool ValidateNotEmpty(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateNotEmpty(ServerConfig*, const char* tag, const char*, ValueItem &data) { if (!*data.GetString()) throw CoreException(std::string("The value for ")+tag+" cannot be empty!"); return true; } -bool ValidateRules(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateRules(ServerConfig* conf, const char*, const char*, ValueItem &data) { conf->ReadFile(conf->RULES, data.GetString()); return true; } -bool ValidateModeLists(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateModeLists(ServerConfig* conf, const char*, const char*, ValueItem &data) { memset(conf->HideModeLists, 0, 256); for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x) @@ -348,7 +452,7 @@ bool ValidateModeLists(ServerConfig* conf, const char* tag, const char* value, V return true; } -bool ValidateExemptChanOps(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateExemptChanOps(ServerConfig* conf, const char*, const char*, ValueItem &data) { memset(conf->ExemptChanOps, 0, 256); for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x) @@ -356,7 +460,29 @@ bool ValidateExemptChanOps(ServerConfig* conf, const char* tag, const char* valu return true; } -bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &data) +{ + std::string v = data.GetString(); + + if (v == "ops") + conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_OPS; + else if (v == "all") + conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_ALL; + else if (v == "dynamic") + conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_DYNAMIC; + else + conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE; + + return true; +} + +bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem &data) +{ +// std::string sid = data.GetString(); + return true; +} + +bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &data) { conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString()); @@ -372,7 +498,7 @@ bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, Valu conf->GetInstance()->Log(DEFAULT,"WARNING: value less than 3600, setting to default 3600"); } - command_t* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS"); + Command* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS"); if (whowas_command) { std::deque params; @@ -384,16 +510,47 @@ bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, Valu /* Callback called before processing the first tag */ -bool InitConnect(ServerConfig* conf, const char* tag) +bool InitConnect(ServerConfig* conf, const char*) { conf->GetInstance()->Log(DEFAULT,"Reading connect classes..."); - conf->Classes.clear(); + + for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end(); i++) + { + ConnectClass *c = *i; + + conf->GetInstance()->Log(DEBUG, "Address of class is %p", c); + } + + for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end() ; ) + { + ConnectClass* c = *i; + + /* only delete a class with refcount 0 */ + if (c->RefCount == 0) + { + conf->GetInstance()->Log(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* tag, char** entries, ValueList &values, int* types) +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. */ @@ -407,16 +564,66 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &v int recvq = values[8].GetInteger(); int localmax = values[9].GetInteger(); int globalmax = values[10].GetInteger(); + int port = values[11].GetInteger(); + const char* name = values[12].GetString(); + const char* parent = values[13].GetString(); + int maxchans = values[14].GetInteger(); + unsigned long limit = values[15].GetInteger(); + + /* + * duplicates check: Now we don't delete all connect classes on rehash, we need to ensure we don't add dupes. + * easier said than done, but for now we'll just disallow anything with a duplicate host or name. -- w00t + */ + for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item) + { + ConnectClass* c = *item; + if ((*name && (c->GetName() == name)) || (*allow && (c->GetHost() == allow)) || (*deny && (c->GetHost() == deny))) + { + /* reenable class so users can be shoved into it :P */ + c->SetDisabled(false); + conf->GetInstance()->Log(DEFAULT, "Not adding class, it already exists!"); + return true; + } + } - if (*allow) + conf->GetInstance()->Log(DEFAULT,"Adding a connect class!"); + + if (*parent) { - ConnectClass c(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax); - conf->Classes.push_back(c); + /* 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) + { + ConnectClass* c = *item; + conf->GetInstance()->Log(DEBUG,"Class: %s", c->GetName().c_str()); + if (c->GetName() == parent) + { + ConnectClass* newclass = new ConnectClass(name, c); + newclass->Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit); + conf->Classes.push_back(newclass); + 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 { - ConnectClass c(deny); - conf->Classes.push_back(c); + if (*allow) + { + ConnectClass* c = new ConnectClass(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans); + c->limit = limit; + c->SetPort(port); + conf->Classes.push_back(c); + } + else + { + ConnectClass* c = new ConnectClass(name, deny); + c->SetPort(port); + conf->Classes.push_back(c); + } } return true; @@ -424,14 +631,15 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &v /* Callback called when there are no more tags */ -bool DoneConnect(ServerConfig* conf, const char* tag) +bool DoneConnect(ServerConfig *conf, const char*) { + conf->GetInstance()->Log(DEFAULT, "Done adding connect classes!"); return true; } /* Callback called before processing the first tag */ -bool InitULine(ServerConfig* conf, const char* tag) +bool InitULine(ServerConfig* conf, const char*) { conf->ulines.clear(); return true; @@ -439,7 +647,7 @@ bool InitULine(ServerConfig* conf, const char* tag) /* Callback called to process a single tag */ -bool DoULine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) +bool DoULine(ServerConfig* conf, const char*, char**, ValueList &values, int*) { const char* server = values[0].GetString(); const bool silent = values[1].GetBool(); @@ -449,29 +657,25 @@ bool DoULine(ServerConfig* conf, const char* tag, char** entries, ValueList &val /* Callback called when there are no more tags */ -bool DoneULine(ServerConfig* conf, const char* tag) +bool DoneULine(ServerConfig*, const char*) { return true; } /* Callback called before processing the first tag */ -bool InitModule(ServerConfig* conf, const char* tag) +bool InitModule(ServerConfig* conf, const char*) { - old_module_names.clear(); + old_module_names = conf->GetInstance()->Modules->GetAllModuleNames(0); new_module_names.clear(); added_modules.clear(); removed_modules.clear(); - for (std::vector::iterator t = conf->module_names.begin(); t != conf->module_names.end(); t++) - { - old_module_names.push_back(*t); - } return true; } /* Callback called to process a single tag */ -bool DoModule(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) +bool DoModule(ServerConfig*, const char*, char**, ValueList &values, int*) { const char* modname = values[0].GetString(); new_module_names.push_back(modname); @@ -480,7 +684,7 @@ bool DoModule(ServerConfig* conf, const char* tag, char** entries, ValueList &va /* Callback called when there are no more tags */ -bool DoneModule(ServerConfig* conf, const char* tag) +bool DoneModule(ServerConfig*, const char*) { // now create a list of new modules that are due to be loaded // and a seperate list of modules which are due to be unloaded @@ -515,7 +719,7 @@ bool DoneModule(ServerConfig* conf, const char* tag) /* Callback called before processing the first tag */ -bool InitMaxBans(ServerConfig* conf, const char* tag) +bool InitMaxBans(ServerConfig* conf, const char*) { conf->maxbans.clear(); return true; @@ -523,7 +727,7 @@ bool InitMaxBans(ServerConfig* conf, const char* tag) /* Callback called to process a single tag */ -bool DoMaxBans(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) +bool DoMaxBans(ServerConfig* conf, const char*, char**, ValueList &values, int*) { const char* channel = values[0].GetString(); int limit = values[1].GetInteger(); @@ -533,19 +737,19 @@ bool DoMaxBans(ServerConfig* conf, const char* tag, char** entries, ValueList &v /* Callback called when there are no more tags. */ -bool DoneMaxBans(ServerConfig* conf, const char* tag) +bool DoneMaxBans(ServerConfig*, const char*) { return true; } -void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, userrec* user) +void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, User* user) { ServerInstance->Log(DEFAULT, "There were errors in your configuration file: %s", errormessage.c_str()); if (bail) { /* Unneeded because of the ServerInstance->Log() aboive? */ printf("There were errors in your configuration:\n%s\n\n",errormessage.c_str()); - InspIRCd::Exit(EXIT_STATUS_CONFIG); + ServerInstance->Exit(EXIT_STATUS_CONFIG); } else { @@ -577,68 +781,76 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, } } -void ServerConfig::Read(bool bail, userrec* user) +void ServerConfig::Read(bool bail, User* user, int pass) { + int rem = 0, add = 0; /* Number of modules added, number of modules removed */ + static char debug[MAXBUF]; /* Temporary buffer for debugging value */ 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 */ - int rem = 0, add = 0; /* Number of modules added, number of modules removed */ - std::ostringstream errstr; /* String stream containing the error output */ + static char announceinvites[MAXBUF]; /* options:announceinvites setting */ + errstr.clear(); /* These tags MUST occur and must ONLY occur once in the config file */ static char* Once[] = { "server", "admin", "files", "power", "options", NULL }; /* These tags can occur ONCE or not at all */ InitialConfig Values[] = { - {"options", "softlimit", MAXCLIENTS_S, new ValueContainerUInt (&this->SoftLimit), DT_INTEGER, ValidateSoftLimit}, - {"options", "somaxconn", SOMAXCONN_S, new ValueContainerInt (&this->MaxConn), DT_INTEGER, ValidateMaxConn}, - {"server", "name", "", new ValueContainerChar (this->ServerName), DT_CHARPTR, ValidateServerName}, - {"server", "description", "Configure Me", new ValueContainerChar (this->ServerDesc), DT_CHARPTR, NoValidation}, - {"server", "network", "Network", new ValueContainerChar (this->Network), DT_CHARPTR, NoValidation}, - {"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", "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", "loglevel", "default", new ValueContainerChar (debug), DT_CHARPTR, ValidateLogLevel}, - {"options", "netbuffersize","10240", new ValueContainerInt (&this->NetBufferSize), DT_INTEGER, ValidateNetBufferSize}, - {"options", "maxwho", "128", new ValueContainerInt (&this->MaxWhoResults), DT_INTEGER, ValidateMaxWho}, - {"options", "allowhalfop", "0", new ValueContainerBool (&this->AllowHalfop), DT_BOOLEAN, NoValidation}, - {"dns", "server", "", new ValueContainerChar (this->DNSServer), DT_CHARPTR, ValidateDnsServer}, - {"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}, - {"options", "userstats", "", new ValueContainerChar (this->UserStats), DT_CHARPTR, NoValidation}, - {"options", "customversion","", new ValueContainerChar (this->CustomVersion), DT_CHARPTR, NoValidation}, - {"options", "hidesplits", "0", new ValueContainerBool (&this->HideSplits), DT_BOOLEAN, NoValidation}, - {"options", "hidebans", "0", new ValueContainerBool (&this->HideBans), DT_BOOLEAN, NoValidation}, - {"options", "hidewhois", "", new ValueContainerChar (this->HideWhoisServer), DT_CHARPTR, NoValidation}, - {"options", "hidekills", "", new ValueContainerChar (this->HideKillsServer), DT_CHARPTR, NoValidation}, - {"options", "operspywhois", "0", new ValueContainerBool (&this->OperSpyWhois), DT_BOOLEAN, NoValidation}, - {"options", "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}, - {"options", "announceinvites", "1", new ValueContainerBool (&this->AnnounceInvites), DT_BOOLEAN, NoValidation}, - {"options", "hostintopic", "1", new ValueContainerBool (&this->FullHostInTopic), DT_BOOLEAN, NoValidation}, - {"options", "hidemodes", "", new ValueContainerChar (hidemodes), DT_CHARPTR, ValidateModeLists}, - {"options", "exemptchanops","", new ValueContainerChar (exemptchanops), DT_CHARPTR, ValidateExemptChanOps}, - {"options", "defaultmodes", "", 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}, - {NULL} + {"options", "softlimit", MAXCLIENTS_S, new ValueContainerUInt (&this->SoftLimit), DT_INTEGER, ValidateSoftLimit}, + {"options", "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, 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, 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", "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}, + {"options", "loglevel", "default", new ValueContainerChar (debug), DT_CHARPTR, ValidateLogLevel}, + {"options", "netbuffersize","10240", new ValueContainerInt (&this->NetBufferSize), DT_INTEGER, ValidateNetBufferSize}, + {"options", "maxwho", "128", new ValueContainerInt (&this->MaxWhoResults), DT_INTEGER, ValidateMaxWho}, + {"options", "allowhalfop", "0", new ValueContainerBool (&this->AllowHalfop), DT_BOOLEAN, NoValidation}, + {"dns", "server", "", new ValueContainerChar (this->DNSServer), DT_IPADDRESS,DNSServerValidator}, + {"dns", "timeout", "5", new ValueContainerInt (&this->dns_timeout), DT_INTEGER, NoValidation}, + {"options", "moduledir", MOD_PATH, new ValueContainerChar (this->ModPath), DT_CHARPTR, NoValidation}, + {"disabled", "commands", "", new ValueContainerChar (this->DisabledCommands), DT_CHARPTR, NoValidation}, + {"options", "userstats", "", new ValueContainerChar (this->UserStats), DT_CHARPTR, NoValidation}, + {"options", "customversion","", new ValueContainerChar (this->CustomVersion), DT_CHARPTR, NoValidation}, + {"options", "hidesplits", "0", new ValueContainerBool (&this->HideSplits), DT_BOOLEAN, NoValidation}, + {"options", "hidebans", "0", new ValueContainerBool (&this->HideBans), DT_BOOLEAN, NoValidation}, + {"options", "hidewhois", "", new ValueContainerChar (this->HideWhoisServer), DT_NOSPACES, NoValidation}, + {"options", "hidekills", "", new ValueContainerChar (this->HideKillsServer), DT_NOSPACES, NoValidation}, + {"options", "operspywhois", "0", new ValueContainerBool (&this->OperSpyWhois), DT_BOOLEAN, NoValidation}, + {"options", "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}, + {"options", "announceinvites", "1", new ValueContainerChar (announceinvites), DT_CHARPTR, ValidateInvite}, + {"options", "hostintopic", "1", new ValueContainerBool (&this->FullHostInTopic), DT_BOOLEAN, NoValidation}, + {"options", "hidemodes", "", new ValueContainerChar (hidemodes), DT_CHARPTR, ValidateModeLists}, + {"options", "exemptchanops","", new ValueContainerChar (exemptchanops), DT_CHARPTR, ValidateExemptChanOps}, + {"options", "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}, + {NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation} }; /* These tags can occur multiple times, and therefore they have special code to read them @@ -649,18 +861,23 @@ void ServerConfig::Read(bool bail, userrec* user) {"connect", {"allow", "deny", "password", "timeout", "pingfreq", "flood", "threshold", "sendq", "recvq", "localmax", "globalmax", "port", + "name", "parent", "maxchans", "limit", NULL}, {"", "", "", "", "120", "", "", "", "", "3", "3", "0", + "", "", "0", "0", NULL}, - {DT_CHARPTR, DT_CHARPTR, DT_CHARPTR, DT_INTEGER, DT_INTEGER, DT_INTEGER, - DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER}, + {DT_IPADDRESS|DT_ALLOW_WILD, + DT_IPADDRESS|DT_ALLOW_WILD, + DT_CHARPTR, DT_INTEGER, DT_INTEGER, DT_INTEGER, + DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, + DT_NOSPACES, DT_NOSPACES, DT_INTEGER, DT_INTEGER}, InitConnect, DoConnect, DoneConnect}, {"uline", {"server", "silent", NULL}, {"", "0", NULL}, - {DT_CHARPTR, DT_BOOLEAN}, + {DT_HOSTNAME, DT_BOOLEAN}, InitULine,DoULine,DoneULine}, {"banlist", @@ -678,50 +895,52 @@ void ServerConfig::Read(bool bail, userrec* user) {"badip", {"reason", "ipmask", NULL}, {"No reason", "", NULL}, - {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoZLine, DoneZLine}, + {DT_CHARPTR, DT_IPADDRESS|DT_ALLOW_WILD}, + InitXLine, DoZLine, DoneConfItem}, {"badnick", {"reason", "nick", NULL}, {"No reason", "", NULL}, {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoQLine, DoneQLine}, - + InitXLine, DoQLine, DoneConfItem}, + {"badhost", {"reason", "host", NULL}, {"No reason", "", NULL}, {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoKLine, DoneKLine}, + InitXLine, DoKLine, DoneConfItem}, {"exception", {"reason", "host", NULL}, {"No reason", "", NULL}, {DT_CHARPTR, DT_CHARPTR}, InitXLine, DoELine, DoneELine}, - + {"type", {"name", "classes", NULL}, {"", "", NULL}, - {DT_CHARPTR, DT_CHARPTR}, + {DT_NOSPACES, DT_CHARPTR}, InitTypes, DoType, DoneClassesAndTypes}, {"class", {"name", "commands", NULL}, {"", "", NULL}, - {DT_CHARPTR, DT_CHARPTR}, + {DT_NOSPACES, DT_CHARPTR}, InitClasses, DoClass, DoneClassesAndTypes}, - - {NULL} + + {NULL, + {NULL}, + {NULL}, + {0}, + NULL, NULL, NULL} }; - include_stack.clear(); - /* 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 */ - ConfigDataHash newconfig; + newconfig.clear(); - if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr)) + if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr, pass)) { /* If we succeeded, set the ircd config to the new one */ this->config_data = newconfig; @@ -735,29 +954,54 @@ void ServerConfig::Read(bool bail, userrec* user) /* 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], bail, user)) - return; - /* Read the values of all the tags which occur once or not at all, and call their callbacks. */ for (int Index = 0; Values[Index].tag; Index++) { char item[MAXBUF]; int dt = Values[Index].datatype; - bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0); + bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0); + bool allow_wild = ((dt & DT_ALLOW_WILD) > 0); dt &= ~DT_ALLOW_NEWLINE; + dt &= ~DT_ALLOW_WILD; ConfValue(this->config_data, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines); ValueItem vi(item); - + if (!Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi)) throw CoreException("One or more values in your configuration file failed to validate. Please see your ircd.log for more information."); - + switch (Values[Index].datatype) { + case DT_NOSPACES: + { + ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + this->ValidateNoSpaces(vi.GetString(), Values[Index].tag, Values[Index].value); + vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); + } + break; + case DT_HOSTNAME: + { + ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + this->ValidateHostname(vi.GetString(), Values[Index].tag, Values[Index].value); + vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); + } + break; + case DT_IPADDRESS: + { + ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + this->ValidateIP(vi.GetString(), Values[Index].tag, Values[Index].value, allow_wild); + vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); + } + break; + case DT_CHANNEL: + { + ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + if (*(vi.GetString()) && !ServerInstance->IsChannel(vi.GetString())) + throw CoreException("The value of <"+std::string(Values[Index].tag)+":"+Values[Index].value+"> is not a valid channel name"); + vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); + } + break; case DT_CHARPTR: { ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; @@ -783,7 +1027,6 @@ void ServerConfig::Read(bool bail, userrec* user) /* 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; } @@ -805,10 +1048,53 @@ void ServerConfig::Read(bool bail, userrec* user) { int dt = MultiValues[Index].datatype[valuenum]; bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0); + bool allow_wild = ((dt & DT_ALLOW_WILD) > 0); dt &= ~DT_ALLOW_NEWLINE; + dt &= ~DT_ALLOW_WILD; switch (dt) { + case DT_NOSPACES: + { + char item[MAXBUF]; + if (ConfValue(this->config_data, 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(this->config_data, 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(this->config_data, 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(this->config_data, 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())) + 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]; @@ -838,11 +1124,9 @@ void ServerConfig::Read(bool bail, userrec* user) break; } } - - MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype); + MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype); } - - MultiValues[Index].finish_function(this, MultiValues[Index].tag); + MultiValues[Index].finish_function(this, MultiValues[Index].tag); } } @@ -853,6 +1137,44 @@ void ServerConfig::Read(bool bail, userrec* user) return; } + /** XXX END PASS **/ + ServerInstance->Log(DEBUG,"End config pass %d", pass); + + if (pass == 0) + { + /* FIRST PASS: Set up commands, load modules. + * We cannot gaurantee that all config is correct + * at this point + */ + + if (pass == 0) + { + ServerInstance->Log(DEBUG, "Downloading configuration"); + + TotalDownloaded = 0; + FileErrors = 0; + } + + if (!ServerInstance->Res) + ServerInstance->Res = new DNS(ServerInstance); + /** Note: This is safe, the method checks for user == NULL */ + ServerInstance->Parser->SetupCommandTable(user); + ServerInstance->Modules->LoadAll(); + } + else + { + /* SECOND PASS: Call modules to read configs, finalize + * stuff. Check that we have at least the required number + * of whichever items. This is no longer done first. + */ + ConfigReader* n = new ConfigReader(ServerInstance); + FOREACH_MOD(I_OnReadConfig,OnReadConfig(this, n)); + + for (int Index = 0; Once[Index]; Index++) + if (!CheckOnce(Once[Index])) + return; + } + // write once here, to try it out and make sure its ok ServerInstance->WritePID(this->PID); @@ -866,7 +1188,7 @@ void ServerConfig::Read(bool bail, userrec* user) FailedPortList pl; ServerInstance->BindPorts(false, found_ports, pl); - if (pl.size()) + if (pl.size() && user) { user->WriteServ("NOTICE %s :*** Not all your client ports could be bound.", user->nick); user->WriteServ("NOTICE %s :*** The following port(s) failed to bind:", user->nick); @@ -876,98 +1198,220 @@ void ServerConfig::Read(bool bail, userrec* user) user->WriteServ("NOTICE %s :*** %d. IP: %s Port: %lu", user->nick, j, i->first.empty() ? "" : i->first.c_str(), (unsigned long)i->second); } } + } - if (!removed_modules.empty()) + if (!removed_modules.empty()) + { + for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) { - for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) + if (ServerInstance->Modules->Unload(removing->c_str())) { - if (ServerInstance->UnloadModule(removing->c_str())) - { - ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str()); - - if (user) - user->WriteServ("973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str()); - - rem++; - } - else - { - if (user) - user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError()); - } + ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str()); + if (user) + user->WriteServ("973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str()); + rem++; + } + else + { + if (user) + user->WriteServ("972 %s %s :%s",user->nick, removing->c_str(), ServerInstance->Modules->LastError().c_str()); } } + } - if (!added_modules.empty()) + if (!added_modules.empty()) + { + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) + /* Skip over modules that are aleready loaded for some reason */ + if (ServerInstance->Modules->Find(*adding)) + continue; + + if (bail) + printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n", adding->c_str()); + + if (ServerInstance->Modules->Load(adding->c_str())) { - if (ServerInstance->LoadModule(adding->c_str())) - { - ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str()); + ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str()); + if (user) + user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str()); - if (user) - user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str()); + add++; + } + else + { + if (user) + user->WriteServ("974 %s %s :%s",user->nick, adding->c_str(), ServerInstance->Modules->LastError().c_str()); - add++; - } - else + if (bail) { - if (user) - user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError()); + printf_c("\n[\033[1;31m*\033[0m] %s\n\n", ServerInstance->Modules->LastError().c_str()); + ServerInstance->Exit(EXIT_STATUS_MODULE); } } } - - ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size()); } + ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size()); + if (user) user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick); else ServerInstance->WriteOpers("*** Successfully rehashed server."); } -bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream) +/* XXX: This can and will block! */ +void ServerConfig::DoDownloads() +{ + ServerInstance->Log(DEBUG,"In DoDownloads()"); + + /* Reads all local files into the IncludedFiles map, then initiates sockets for the remote ones */ + for (std::map::iterator x = IncludedFiles.begin(); x != IncludedFiles.end(); ++x) + { + if (CompletedFiles.find(x->first) != CompletedFiles.end()) + continue; + + ServerInstance->Log(DEBUG,"StartDownloads File: %s", x->first.c_str()); + + std::string file = x->first; + if ((file[0] == '/') || (file.substr(0, 7) == "file://")) + { + /* For file:// schema files, we use std::ifstream which is a derivative of std::istream. + * For all other file schemas, we use a std::stringstream. + */ + + /* Add our own ifstream */ + std::ifstream* conf = new std::ifstream(file.c_str()); + if (!conf->fail()) + { + ServerInstance->Log(DEBUG,"file:// schema file %s loaded OK", file.c_str()); + delete x->second; + x->second = conf; + } + else + { + delete x->second; + x->second = NULL; + FileErrors++; + } + TotalDownloaded++; + } + else + { + /* Modules handle these */ + ServerInstance->Log(DEBUG,"Module-handled schema for %s", x->first.c_str()); + + /* For now, error it */ + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnDownloadFile, OnDownloadFile(file, x->second)); + if (MOD_RESULT == 0) + { + /* No module claimed this file */ + TotalDownloaded++; + FileErrors++; + delete x->second; + x->second = NULL; + } + else + { + /* Search new file here for more includes to parse */ + } + } + CompletedFiles[x->first] = true; + } +} + +bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass, std::istream *scan_for_includes_only) { - std::ifstream conf(filename); std::string line; + std::istream* conf = NULL; char ch; long linenumber; bool in_tag; bool in_quote; bool in_comment; + int character_count = 0; linenumber = 1; in_tag = false; in_quote = false; in_comment = false; - /* Check if the file open failed first */ - if (!conf) + if (scan_for_includes_only) { - errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl; - return false; + ServerInstance->Log(DEBUG,"scan_for_includes_only set"); + conf = scan_for_includes_only; } - /* Fix the chmod of the file to restrict it to the current user and group */ - chmod(filename,0600); - - for (unsigned int t = 0; t < include_stack.size(); t++) + if (std::string(filename) == CONFIG_FILE) { - if (std::string(filename) == include_stack[t]) + if (!scan_for_includes_only) { - errorstream << "File " << filename << " is included recursively (looped inclusion)." << std::endl; - return false; + conf = new std::ifstream(filename); + if (conf->fail()) + { + errorstream << "File " << filename << " could not be opened." << std::endl; + return false; + } + } + } + else + { + std::map::iterator x = IncludedFiles.find(filename); + if (x == IncludedFiles.end()) + { + if (pass == 0) + { + ServerInstance->Log(DEBUG,"Push include file %s onto map", filename); + /* First pass, we insert the file into a map, and just return true */ + IncludedFiles.insert(std::make_pair(filename,new std::stringstream)); + return true; + } + else + { + /* Second pass, look for the file in the map */ + ServerInstance->Log(DEBUG,"We are in the second pass, and %s is not in the map!", filename); + errorstream << "File " << filename << " could not be opened." << std::endl; + return false; + } + } + else + { + if (!scan_for_includes_only) + { + if (x->second) + conf = IncludedFiles.find(filename)->second; + else + { + errorstream << "File " << filename << " could not be opened." << std::endl; + return false; + } + } } } - /* It's not already included, add it to the list of files we've loaded */ - include_stack.push_back(filename); + ServerInstance->Log(DEBUG,"Start to read conf %s %08lx", filename, conf); /* Start reading characters... */ - while(conf.get(ch)) + while (conf->get(ch)) { + + /* + * Fix for moronic windows issue spotted by Adremelech. + * Some windows editors save text files as utf-16, which is + * a total pain in the ass to parse. Users should save in the + * right config format! If we ever see a file where the first + * byte is 0xFF or 0xFE, or the second is 0xFF or 0xFE, then + * this is most likely a utf-16 file. Bail out and insult user. + */ + 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; + if (!scan_for_includes_only) + delete conf; + return false; + } + /* * Here we try and get individual tags on separate lines, * this would be so easy if we just made people format @@ -977,16 +1421,10 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o * no '>' then die with an error. */ - if((ch == '#') && !in_quote) + if ((ch == '#') && !in_quote) in_comment = true; - /*if(((ch == '\n') || (ch == '\r')) && in_quote) - { - errorstream << "Got a newline within a quoted section, this is probably a typo: " << filename << ":" << linenumber << std::endl; - return false; - }*/ - - switch(ch) + switch (ch) { case '\n': if (in_quote) @@ -1016,7 +1454,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o { line += ch; char real_character; - if (conf.get(real_character)) + if (conf->get(real_character)) { if (real_character == 'n') real_character = '\n'; @@ -1026,6 +1464,8 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o else { errorstream << "End of file after a \\, what did you want to escape?: " << filename << ":" << linenumber << std::endl; + if (!scan_for_includes_only) + delete conf; return false; } } @@ -1033,21 +1473,25 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o if (ch != '\r') line += ch; - if(ch == '<') + if (ch == '<') { - if(in_tag) + if (in_tag) { - if(!in_quote) + if (!in_quote) { errorstream << "Got another opening < when the first one wasn't closed: " << filename << ":" << linenumber << std::endl; + if (!scan_for_includes_only) + delete conf; return false; } } else { - if(in_quote) + if (in_quote) { errorstream << "We're in a quote but outside a tag, interesting. " << filename << ":" << linenumber << std::endl; + if (!scan_for_includes_only) + delete conf; return false; } else @@ -1057,11 +1501,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o } } } - else if(ch == '"') + else if (ch == '"') { - if(in_tag) + if (in_tag) { - if(in_quote) + if (in_quote) { // errorstream << "Closing quote in config tag on line " << linenumber << std::endl; in_quote = false; @@ -1074,7 +1518,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o } else { - if(in_quote) + if (in_quote) { errorstream << "Found a (closing) \" outside a tag: " << filename << ":" << linenumber << std::endl; } @@ -1084,11 +1528,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o } } } - else if(ch == '>') + else if (ch == '>') { - if(!in_quote) + if (!in_quote) { - if(in_tag) + if (in_tag) { // errorstream << "Closing config tag on line " << linenumber << std::endl; in_tag = false; @@ -1098,29 +1542,44 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o * LoadConf() and load the included config into the same ConfigDataHash */ - if(!this->ParseLine(target, line, linenumber, errorstream)) + if (!this->ParseLine(target, line, linenumber, errorstream, pass, scan_for_includes_only)) + { + if (!scan_for_includes_only) + delete conf; return false; + } line.clear(); } else { errorstream << "Got a closing > when we weren't inside a tag: " << filename << ":" << linenumber << std::endl; + if (!scan_for_includes_only) + delete conf; return false; } } } } + /* 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 \ + is a newline missing from the end of the file: " << filename << ":" << linenumber << std::endl; + } + + if (!scan_for_includes_only) + delete conf; return true; } -bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream) +bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only) { - return this->LoadConf(target, filename.c_str(), errorstream); + return this->LoadConf(target, filename.c_str(), errorstream, pass, scan_for_includs_only); } -bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long linenumber, std::ostringstream &errorstream) +bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only) { std::string tagname; std::string current_key; @@ -1132,17 +1591,15 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin got_name = got_key = in_quote = false; - //std::cout << "ParseLine(data, '" << line << "', " << linenumber << ", stream)" << std::endl; - for(std::string::iterator c = line.begin(); c != line.end(); c++) { - if(!got_name) + if (!got_name) { /* We don't know the tag name yet. */ - if(*c != ' ') + if (*c != ' ') { - if(*c != '<') + if (*c != '<') { tagname += *c; } @@ -1195,6 +1652,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin { /* Got a 'real' \n, treat it as part of the value */ current_value += '\n'; + linenumber++; continue; } else if ((*c == '\r') && (in_quote)) @@ -1211,16 +1669,17 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin else { /* Leaving quotes, we have the value */ - results.push_back(KeyVal(current_key, current_value)); + if (!scan_for_includes_only) + results.push_back(KeyVal(current_key, current_value)); // std::cout << "<" << tagname << ":" << current_key << "> " << current_value << std::endl; in_quote = false; got_key = false; - if((tagname == "include") && (current_key == "file")) - { - if(!this->DoInclude(target, current_value, errorstream)) + if ((tagname == "include") && (current_key == "file")) + { + if (!this->DoInclude(target, current_value, errorstream, pass, scan_for_includes_only)) return false; } @@ -1230,7 +1689,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin } else { - if(in_quote) + if (in_quote) { current_value += *c; } @@ -1240,12 +1699,13 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin } /* Finished parsing the tag, add it to the config hash */ - target.insert(std::pair (tagname, results)); + if (!scan_for_includes_only) + target.insert(std::pair (tagname, results)); return true; } -bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream) +bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only) { std::string confpath; std::string newfile; @@ -1254,15 +1714,10 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st confpath = ServerInstance->ConfigFileName; newfile = file; - for (std::string::iterator c = newfile.begin(); c != newfile.end(); c++) - { - if (*c == '\\') - { - *c = '/'; - } - } + std::replace(newfile.begin(),newfile.end(),'\\','/'); + std::replace(confpath.begin(),confpath.end(),'\\','/'); - if (file[0] != '/') + if ((newfile[0] != '/') && (newfile.find("://") == std::string::npos)) { if((pos = confpath.rfind("/")) != std::string::npos) { @@ -1271,12 +1726,12 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st } else { - errorstream << "Couldn't get config path from: " << confpath << std::endl; + errorstream << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl; return false; } } - return LoadConf(target, newfile, errorstream); + return LoadConf(target, newfile, errorstream, pass, scan_for_includes_only); } bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds) @@ -1300,7 +1755,7 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con 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) { ConfigDataHash::size_type pos = index; - if((pos >= 0) && (pos < target.count(tag))) + if (pos < target.count(tag)) { ConfigDataHash::iterator iter = target.find(tag); @@ -1448,7 +1903,7 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in { ConfigDataHash::size_type pos = index; - if((pos >= 0) && (pos < target.count(tag))) + if (pos < target.count(tag)) { ConfigDataHash::const_iterator iter = target.find(tag); @@ -1473,19 +1928,20 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname) F.clear(); - if (*fname != '/') + if ((*fname != '/') && (*fname != '\\')) { std::string::size_type pos; std::string confpath = ServerInstance->ConfigFileName; - if((pos = confpath.rfind("/")) != std::string::npos) - { - /* Leaves us with just the path */ - std::string newfile = confpath.substr(0, pos) + std::string("/") + fname; - if (!FileExists(newfile.c_str())) - return false; - file = fopen(newfile.c_str(), "r"); + std::string newfile = fname; - } + if ((pos = confpath.rfind("/")) != std::string::npos) + newfile = confpath.substr(0, pos) + std::string("/") + fname; + else if ((pos = confpath.rfind("\\")) != std::string::npos) + newfile = confpath.substr(0, pos) + std::string("\\") + fname; + + if (!FileExists(newfile.c_str())) + return false; + file = fopen(newfile.c_str(), "r"); } else { @@ -1539,7 +1995,7 @@ bool ServerConfig::FileExists(const char* file) char* ServerConfig::CleanFilename(char* name) { char* p = name + strlen(name); - while ((p != name) && (*p != '/')) p--; + while ((p != name) && (*p != '/') && (*p != '\\')) p--; return (p != name ? ++p : p); } @@ -1604,7 +2060,18 @@ bool ServerConfig::DirValid(const char* dirandfile) std::string ServerConfig::GetFullProgDir() { char buffer[PATH_MAX+1]; - +#ifdef WINDOWS + /* Windows has specific api calls to get the exe path that never fail. + * For once, windows has something of use, compared to the POSIX code + * for this, this is positively neato. + */ + if (GetModuleFileName(NULL, buffer, MAX_PATH)) + { + std::string fullpath = buffer; + std::string::size_type n = fullpath.rfind("\\inspircd.exe"); + return std::string(fullpath, 0, n); + } +#else // Get the current working directory if (getcwd(buffer, PATH_MAX)) { @@ -1621,7 +2088,7 @@ std::string ServerConfig::GetFullProgDir() std::string::size_type n = fullpath.rfind("/inspircd"); return std::string(fullpath, 0, n); } - +#endif return "/"; } @@ -1630,6 +2097,10 @@ InspIRCd* ServerConfig::GetInstance() return ServerInstance; } +std::string ServerConfig::GetSID() +{ + return sid; +} ValueItem::ValueItem(int value) { @@ -1684,3 +2155,147 @@ bool ValueItem::GetBool() return (GetInteger() || v == "yes" || v == "true"); } + + + +/* + * XXX should this be in a class? -- w00t + */ +bool InitTypes(ServerConfig* conf, const char*) +{ + if (conf->opertypes.size()) + { + for (opertype_t::iterator n = conf->opertypes.begin(); n != conf->opertypes.end(); n++) + { + if (n->second) + delete[] n->second; + } + } + + conf->opertypes.clear(); + return true; +} + +/* + * XXX should this be in a class? -- w00t + */ +bool InitClasses(ServerConfig* conf, const char*) +{ + if (conf->operclass.size()) + { + for (operclass_t::iterator n = conf->operclass.begin(); n != conf->operclass.end(); n++) + { + if (n->second) + delete[] n->second; + } + } + + conf->operclass.clear(); + return true; +} + +/* + * XXX should this be in a class? -- w00t + */ +bool DoType(ServerConfig* conf, const char*, char**, ValueList &values, int*) +{ + const char* TypeName = values[0].GetString(); + const char* Classes = values[1].GetString(); + + conf->opertypes[TypeName] = strnewdup(Classes); + return true; +} + +/* + * XXX should this be in a class? -- w00t + */ +bool DoClass(ServerConfig* conf, const char*, char**, ValueList &values, int*) +{ + const char* ClassName = values[0].GetString(); + const char* CommandList = values[1].GetString(); + + conf->operclass[ClassName] = strnewdup(CommandList); + 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()->local_users.begin(); u2 != conf->GetInstance()->local_users.end(); u2++) + { + User* u = (User*)(*u2); + u->exempt = false; + } + + conf->GetInstance()->XLines->CheckELines(); + return true; +}