X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=c93e37e1fc35f8a649e873af09cba4c481df5b02;hb=f5c631ef8641db6455bed23c02e5a39f63f7d6d0;hp=6157b4d4b7249370bc306d1cdceaa50f62de0604;hpb=bf6724c049ba0f156544c49aab2008d6280e5ffa;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index 6157b4d4b..c93e37e1f 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2010 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -11,62 +11,23 @@ * --------------------------------------------------- */ -/* $Core */ -/* $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: conf/inspircd.conf.example $(CONPATH) */ -/* $CopyInstall: conf/modules.conf.example $(CONPATH) */ -/* $CopyInstall: conf/opers.conf.example $(CONPATH) */ -/* $CopyInstall: conf/links.conf.example $(CONPATH) */ -/* $CopyInstall: .gdbargs $(BASE) */ - #include "inspircd.h" #include #include "xline.h" #include "exitcodes.h" #include "commands/cmd_whowas.h" -#include "modes/cmode_h.h" - -static void ReqRead(ServerConfig* src, const std::string& tag, const std::string& key, std::string& dest) -{ - ConfigTag* t = src->ConfValue(tag); - if (!t || !t->readString(key, dest)) - throw CoreException("You must specify a value for <" + tag + ":" + key + ">"); -} - -/** Represents a deprecated configuration tag. - */ -struct Deprecated -{ - /** Tag name - */ - const char* tag; - /** Tag value - */ - const char* value; - /** Reason for deprecation - */ - const char* reason; -}; +#include "configparser.h" ServerConfig::ServerConfig() { WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0; - log_file = NULL; - NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = UndernetMsgPrefix = false; - CycleHosts = writelog = AllowHalfop = InvBypassModes = true; - dns_timeout = DieDelay = 5; + RawLog = NoUserDns = OperSpyWhois = HideBans = HideSplits = UndernetMsgPrefix = false; + WildcardIPv6 = CycleHosts = InvBypassModes = true; + dns_timeout = 5; MaxTargets = 20; NetBufferSize = 10240; SoftLimit = ServerInstance->SE->GetMaxFds(); MaxConn = SOMAXCONN; - MaxWhoResults = 0; - debugging = 0; MaxChans = 20; OperMaxChans = 30; c_ipv4_range = 32; @@ -76,28 +37,29 @@ ServerConfig::ServerConfig() void ServerConfig::Update005() { std::stringstream out(data005); + std::vector data; std::string token; + while (out >> token) + data.push_back(token); + sort(data.begin(), data.end()); + std::string line5; - int token_counter = 0; isupport.clear(); - while (out >> token) + for(unsigned int i=0; i < data.size(); i++) { + token = data[i]; line5 = line5 + token + " "; - token_counter++; - if (token_counter >= 13) + if (i % 13 == 12) { - char buf[MAXBUF]; - snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str()); - isupport.push_back(buf); + line5.append(":are supported by this server"); + isupport.push_back(line5); line5.clear(); - token_counter = 0; } } if (!line5.empty()) { - char buf[MAXBUF]; - snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str()); - isupport.push_back(buf); + line5.append(":are supported by this server"); + isupport.push_back(line5); } } @@ -118,72 +80,12 @@ static void range(T& value, V min, V max, V def, const char* msg) value = def; } -bool ServerConfig::CheckOnce(const char* tag) -{ - if (!ConfValue(tag)) - throw CoreException("You have not defined a <"+std::string(tag)+"> tag, this is required."); - if (ConfValue(tag, 1)) - throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted."); - return true; -} -/* 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. - */ static void ValidIP(const std::string& ip, const std::string& key) { - const char* p = ip.c_str(); - int num_dots = 0; - int num_seps = 0; - int not_numbers = false; - int not_hex = false; - - if (*p) - { - if (*p == '.') - throw CoreException("The value of "+key+" is not an IP address"); - - for (const char* ptr = p; *ptr; ++ptr) - { - 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 "+key+" is not an IP address"); - case '.': - num_dots++; - break; - case ':': - num_seps++; - break; - } - } - - if (num_dots > 3) - throw CoreException("The value of "+key+" is an IPv4 address with too many fields!"); - - if (num_seps > 8) - throw CoreException("The value of "+key+" is an IPv6 address with too many fields!"); - - if (num_seps == 0 && num_dots < 3) - throw CoreException("The value of "+key+" looks to be a malformed IPv4 address"); - - if (num_seps == 0 && num_dots == 3 && not_numbers) - throw CoreException("The value of "+key+" contains non-numeric characters in an IPv4 address"); - - if (num_seps != 0 && not_hex) - throw CoreException("The value of "+key+" contains non-hexdecimal characters in an IPv6 address"); - - if (num_seps != 0 && num_dots != 3 && num_dots != 0) - throw CoreException("The value of "+key+" is a malformed IPv6 4in6 address"); - } + irc::sockets::sockaddrs dummy; + if (!irc::sockets::aptosa(ip, 0, dummy)) + throw CoreException("The value of "+key+" is not an IP address"); } static void ValidHost(const std::string& p, const std::string& msg) @@ -206,8 +108,6 @@ static void ValidHost(const std::string& p, const std::string& msg) throw CoreException("The value of "+msg+" is not a valid hostname"); } -// Specialized validators - bool ServerConfig::ApplyDisabledCommands(const std::string& data) { std::stringstream dcmds(data); @@ -231,15 +131,12 @@ bool ServerConfig::ApplyDisabledCommands(const std::string& data) #ifdef WINDOWS // Note: the windows validator is in win32wrapper.cpp -void ValidateDnsServer(std::string& server); +void FindDNS(std::string& server); #else -static void ValidateDnsServer(std::string& server) +static void FindDNS(std::string& server) { if (!server.empty()) - { - ValidIP(server, ""); return; - } // attempt to look up their nameserver from /etc/resolv.conf ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: not defined, attempting to find working server in /etc/resolv.conf..."); @@ -251,8 +148,11 @@ static void ValidateDnsServer(std::string& server) if (server == "nameserver") { resolv >> server; - ServerInstance->Logs->Log("CONFIG",DEFAULT," set to '%s' as first resolver in /etc/resolv.conf.",server.c_str()); - return; + if (server.find_first_not_of("0123456789.") == std::string::npos) + { + ServerInstance->Logs->Log("CONFIG",DEFAULT," set to '%s' as first resolver in /etc/resolv.conf.",server.c_str()); + return; + } } } @@ -263,14 +163,13 @@ static void ValidateDnsServer(std::string& server) static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::string& key, XLineFactory* make) { - for(int i=0;; ++i) + ConfigTagList tags = conf->ConfTags(tag); + for(ConfigIter i = tags.first; i != tags.second; ++i) { - ConfigTag* ctag = conf->ConfValue(tag, i); - if (!ctag) - break; + ConfigTag* ctag = i->second; std::string mask; if (!ctag->readString(key, mask)) - throw CoreException("<"+tag+":"+key+"> missing"); + throw CoreException("<"+tag+":"+key+"> missing at " + ctag->getTagLocation()); std::string reason = ctag->getString("reason", ""); XLine* xl = make->Generate(ServerInstance->Time(), 0, "", reason, mask); if (!ServerInstance->XLines->AddLine(xl, NULL)) @@ -278,37 +177,72 @@ static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::str } } +typedef std::map LocalIndex; void ServerConfig::CrossCheckOperClassType() { - for (int i = 0;; ++i) + LocalIndex operclass; + ConfigTagList tags = ConfTags("class"); + for(ConfigIter i = tags.first; i != tags.second; ++i) { - ConfigTag* tag = ConfValue("class", i); - if (!tag) - break; + ConfigTag* tag = i->second; std::string name = tag->getString("name"); if (name.empty()) - throw CoreException(" is required for all tags"); + throw CoreException(" missing from tag at " + tag->getTagLocation()); + if (operclass.find(name) != operclass.end()) + throw CoreException("Duplicate class block with name " + name + " at " + tag->getTagLocation()); operclass[name] = tag; } - for (int i = 0;; ++i) + tags = ConfTags("type"); + for(ConfigIter i = tags.first; i != tags.second; ++i) { - ConfigTag* tag = ConfValue("type", i); - if (!tag) - break; - + ConfigTag* tag = i->second; std::string name = tag->getString("name"); if (name.empty()) - throw CoreException(" is required for all tags"); - opertypes[name] = tag; + throw CoreException(" is missing from tag at " + tag->getTagLocation()); + if (!ServerInstance->IsNick(name.c_str(), Limits.NickMax)) + throw CoreException(" is invalid (value '" + name + "')"); + if (oper_blocks.find(" " + name) != oper_blocks.end()) + throw CoreException("Duplicate type block with name " + name + " at " + tag->getTagLocation()); + + OperInfo* ifo = new OperInfo; + oper_blocks[" " + name] = ifo; + ifo->name = name; + ifo->type_block = tag; std::string classname; irc::spacesepstream str(tag->getString("classes")); while (str.GetToken(classname)) { - if (operclass.find(classname) == operclass.end()) + LocalIndex::iterator cls = operclass.find(classname); + if (cls == operclass.end()) throw CoreException("Oper type " + name + " has missing class " + classname); + ifo->class_blocks.push_back(cls->second); } } + + tags = ConfTags("oper"); + for(ConfigIter i = tags.first; i != tags.second; ++i) + { + ConfigTag* tag = i->second; + + std::string name = tag->getString("name"); + if (name.empty()) + throw CoreException(" missing from tag at " + tag->getTagLocation()); + + std::string type = tag->getString("type"); + OperIndex::iterator tblk = oper_blocks.find(" " + type); + if (tblk == oper_blocks.end()) + throw CoreException("Oper block " + name + " has missing type " + type); + if (oper_blocks.find(name) != oper_blocks.end()) + throw CoreException("Duplicate oper block with name " + name); + + OperInfo* ifo = new OperInfo; + ifo->name = type; + ifo->oper_block = tag; + ifo->type_block = tblk->second->type_block; + ifo->class_blocks.assign(tblk->second->class_blocks.begin(), tblk->second->class_blocks.end()); + oper_blocks[name] = ifo; + } } void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) @@ -320,26 +254,42 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) 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; + if (c->name.substr(0, 8) != "unnamed-") + { + oldBlocksByMask["n" + c->name] = c; + } + else if (c->type == CC_ALLOW || c->type == CC_DENY) + { + std::string typeMask = (c->type == CC_ALLOW) ? "a" : "d"; + typeMask += c->host; + oldBlocksByMask[typeMask] = c; + } } } - ClassMap newBlocksByMask; + int blk_count = config_data.count("connect"); + if (blk_count == 0) + { + // No connect blocks found; make a trivial default block + std::vector* items; + ConfigTag* tag = ConfigTag::create("connect", "", 0, items); + items->push_back(std::make_pair("allow", "*")); + config_data.insert(std::make_pair("connect", tag)); + blk_count = 1; + } + + Classes.resize(blk_count); std::map names; bool try_again = true; for(int tries=0; try_again; tries++) { try_again = false; - for(unsigned int i=0;; i++) + ConfigTagList tags = ConfTags("connect"); + int i=0; + for(ConfigIter it = tags.first; it != tags.second; ++it, ++i) { - ConfigTag* tag = ConfValue("connect", i); - if (!tag) - break; - if (Classes.size() <= i) - Classes.resize(i+1); + ConfigTag* tag = it->second; if (Classes[i]) continue; @@ -352,21 +302,14 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) { try_again = true; // couldn't find parent this time. If it's the last time, we'll never find it. - if (tries == 50) - throw CoreException("Could not find parent connect class \"" + parentName + "\" for connect block " + ConvToStr(i)); + if (tries >= blk_count) + throw CoreException("Could not find parent connect class \"" + parentName + "\" for connect block at " + tag->getTagLocation()); continue; } parent = Classes[parentIter->second]; } std::string name = tag->getString("name"); - if (!name.empty()) - { - if (names.find(name) != names.end()) - throw CoreException("Two connect classes with name \"" + name + "\" defined!"); - names[name] = i; - } - std::string mask, typeMask; char type; @@ -380,23 +323,36 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) type = CC_DENY; typeMask = 'd' + mask; } + else if (!name.empty()) + { + type = CC_NAMED; + mask = name; + typeMask = 'n' + mask; + } + else + { + throw CoreException("Connect class must have allow, deny, or name specified at " + tag->getTagLocation()); + } + + if (name.empty()) + { + name = "unnamed-" + ConvToStr(i); + } else { - throw CoreException("Connect class must have an allow or deny mask (#" + ConvToStr(i) + ")"); + typeMask = 'n' + name; } - ClassMap::iterator dupMask = newBlocksByMask.find(typeMask); - if (dupMask != newBlocksByMask.end()) - throw CoreException("Two connect classes cannot have the same mask (" + mask + ")"); + + if (names.find(name) != names.end()) + throw CoreException("Two connect classes with name \"" + name + "\" defined!"); + names[name] = i; ConnectClass* me = parent ? - new ConnectClass(type, mask, *parent) : - new ConnectClass(type, mask); + new ConnectClass(tag, type, mask, *parent) : + new ConnectClass(tag, type, mask); - if (!name.empty()) - me->name = name; + me->name = name; - tag->readString("password", me->pass); - tag->readString("hash", me->hash); me->registration_timeout = tag->getInt("timeout", me->registration_timeout); me->pingtime = tag->getInt("pingfreq", me->pingtime); std::string sendq; @@ -413,9 +369,11 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) me->softsendqmax = tag->getInt("softsendq", me->softsendqmax); me->hardsendqmax = tag->getInt("hardsendq", me->hardsendqmax); me->recvqmax = tag->getInt("recvq", me->recvqmax); + me->penaltythreshold = tag->getInt("threshold", me->penaltythreshold); + me->commandrate = tag->getInt("commandrate", me->commandrate); + me->fakelag = tag->getBool("fakelag", me->fakelag); me->maxlocal = tag->getInt("localmax", me->maxlocal); me->maxglobal = tag->getInt("globalmax", me->maxglobal); - me->port = tag->getInt("port", me->port); me->maxchans = tag->getInt("maxchans", me->maxchans); me->limit = tag->getInt("limit", me->limit); @@ -428,12 +386,26 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) delete me; me = old; } - newBlocksByMask[typeMask] = me; Classes[i] = me; } } } +/** Represents a deprecated configuration tag. + */ +struct Deprecated +{ + /** Tag name + */ + const char* tag; + /** Tag value + */ + const char* value; + /** Reason for deprecation + */ + const char* reason; +}; + static const Deprecated ChangedConfig[] = { {"options", "hidelinks", "has been moved to as of 1.2a3"}, {"options", "hidewhois", "has been moved to as of 1.2a3"}, @@ -453,19 +425,32 @@ static const Deprecated ChangedConfig[] = { {"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"}, + {"die", "value", "you need to reread your config"}, }; void ServerConfig::Fill() { - ReqRead(this, "server", "name", ServerName); - ReqRead(this, "power", "diepass", diepass); - ReqRead(this, "power", "restartpass", restartpass); - ConfigTag* options = ConfValue("options"); ConfigTag* security = ConfValue("security"); + if (sid.empty()) + { + ServerName = ConfValue("server")->getString("name"); + sid = ConfValue("server")->getString("id"); + ValidHost(ServerName, ""); + if (!sid.empty() && !ServerInstance->IsSID(sid)) + throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter."); + } + else + { + if (ServerName != ConfValue("server")->getString("name")) + throw CoreException("You must restart to change the server name or SID"); + std::string nsid = ConfValue("server")->getString("id"); + if (!nsid.empty() && nsid != sid) + throw CoreException("You must restart to change the server name or SID"); + } + diepass = ConfValue("power")->getString("diepass"); + restartpass = ConfValue("power")->getString("restartpass"); powerhash = ConfValue("power")->getString("hash"); - DieDelay = ConfValue("power")->getInt("pause"); PrefixQuit = options->getString("prefixquit"); SuffixQuit = options->getString("suffixquit"); FixedQuit = options->getString("fixedquit"); @@ -477,91 +462,95 @@ void ServerConfig::Fill() MoronBanner = options->getString("moronbanner", "You're banned!"); ServerDesc = ConfValue("server")->getString("description", "Configure Me"); Network = ConfValue("server")->getString("network", "Network"); - sid = ConfValue("server")->getString("id", ""); AdminName = ConfValue("admin")->getString("name", ""); AdminEmail = ConfValue("admin")->getString("email", "null@example.com"); AdminNick = ConfValue("admin")->getString("nick", "admin"); - ModPath = options->getString("moduledir", MOD_PATH); + ModPath = ConfValue("path")->getString("moduledir", MOD_PATH); NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240); - MaxWhoResults = ConfValue("performance")->getInt("maxwho", 1024); - DNSServer = ConfValue("dns")->getString("server"); dns_timeout = ConfValue("dns")->getInt("timeout", 5); DisabledCommands = ConfValue("disabled")->getString("commands", ""); DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant"); - SetUser = security->getString("runasuser"); - SetGroup = security->getString("runasgroup"); UserStats = security->getString("userstats"); - CustomVersion = security->getString("customversion"); + CustomVersion = security->getString("customversion", Network + " IRCd"); HideSplits = security->getBool("hidesplits"); HideBans = security->getBool("hidebans"); HideWhoisServer = security->getString("hidewhois"); HideKillsServer = security->getString("hidekills"); OperSpyWhois = security->getBool("operspywhois"); - RestrictBannedUsers = security->getBool("restrictbannedusers"); + RestrictBannedUsers = security->getBool("restrictbannedusers", true); GenericOper = security->getBool("genericoper"); NoUserDns = ConfValue("performance")->getBool("nouserdns"); SyntaxHints = options->getBool("syntaxhints"); CycleHosts = options->getBool("cyclehosts"); + CycleHostsFromUser = options->getBool("cyclehostsfromuser"); UndernetMsgPrefix = options->getBool("ircumsgprefix"); FullHostInTopic = options->getBool("hostintopic"); - MaxTargets = security->getInt("maxtargets"); - DefaultModes = options->getString("defaultmodes"); + MaxTargets = security->getInt("maxtargets", 20); + DefaultModes = options->getString("defaultmodes", "nt"); PID = ConfValue("pid")->getString("file"); WhoWasGroupSize = ConfValue("whowas")->getInt("groupsize"); WhoWasMaxGroups = ConfValue("whowas")->getInt("maxgroups"); WhoWasMaxKeep = ServerInstance->Duration(ConfValue("whowas")->getString("maxkeep")); - DieValue = ConfValue("die")->getString("value"); - MaxChans = ConfValue("channels")->getInt("users"); - OperMaxChans = ConfValue("channels")->getInt("opers"); - c_ipv4_range = ConfValue("cidr")->getInt("ipv4clone"); - c_ipv6_range = ConfValue("cidr")->getInt("ipv6clone"); - Limits.NickMax = ConfValue("limits")->getInt("maxnick"); - Limits.ChanMax = ConfValue("limits")->getInt("maxchan"); - Limits.MaxModes = ConfValue("limits")->getInt("maxmodes"); - Limits.IdentMax = ConfValue("limits")->getInt("maxident"); - Limits.MaxQuit = ConfValue("limits")->getInt("maxquit"); - Limits.MaxTopic = ConfValue("limits")->getInt("maxtopic"); - Limits.MaxKick = ConfValue("limits")->getInt("maxkick"); - Limits.MaxGecos = ConfValue("limits")->getInt("maxgecos"); - Limits.MaxAway = ConfValue("limits")->getInt("maxaway"); - InvBypassModes = options->getBool("invitebypassmodes"); - - ReadFile(MOTD, ConfValue("files")->getString("motd")); - ReadFile(RULES, ConfValue("files")->getString("rules")); - ValidateDnsServer(DNSServer); + MaxChans = ConfValue("channels")->getInt("users", 20); + OperMaxChans = ConfValue("channels")->getInt("opers", 60); + c_ipv4_range = ConfValue("cidr")->getInt("ipv4clone", 32); + c_ipv6_range = ConfValue("cidr")->getInt("ipv6clone", 128); + Limits.NickMax = ConfValue("limits")->getInt("maxnick", 32); + Limits.ChanMax = ConfValue("limits")->getInt("maxchan", 64); + Limits.MaxModes = ConfValue("limits")->getInt("maxmodes", 20); + Limits.IdentMax = ConfValue("limits")->getInt("maxident", 11); + Limits.MaxQuit = ConfValue("limits")->getInt("maxquit", 255); + Limits.MaxTopic = ConfValue("limits")->getInt("maxtopic", 307); + Limits.MaxKick = ConfValue("limits")->getInt("maxkick", 255); + Limits.MaxGecos = ConfValue("limits")->getInt("maxgecos", 128); + Limits.MaxAway = ConfValue("limits")->getInt("maxaway", 200); + InvBypassModes = options->getBool("invitebypassmodes", true); range(SoftLimit, 10, ServerInstance->SE->GetMaxFds(), ServerInstance->SE->GetMaxFds(), ""); range(MaxConn, 0, SOMAXCONN, SOMAXCONN, ""); range(MaxTargets, 1, 31, 20, ""); range(NetBufferSize, 1024, 65534, 10240, ""); - range(MaxWhoResults, 1, 65535, 1024, ""); range(WhoWasGroupSize, 0, 10000, 10, ""); range(WhoWasMaxGroups, 0, 1000000, 10240, ""); range(WhoWasMaxKeep, 3600, INT_MAX, 3600, ""); - ValidHost(ServerName, ""); - if (!sid.empty() && !ServerInstance->IsSID(sid)) - throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter."); - - for (int i = 0;; ++i) + ValidIP(DNSServer, ""); + + std::string defbind = options->getString("defaultbind"); + if (assign(defbind) == "ipv4") { - ConfigTag* tag = ConfValue("uline", i); - if (!tag) - break; + WildcardIPv6 = false; + } + else if (assign(defbind) == "ipv6") + { + WildcardIPv6 = true; + } + else + { + WildcardIPv6 = true; + int socktest = socket(AF_INET6, SOCK_STREAM, 0); + if (socktest < 0) + WildcardIPv6 = false; + else + close(socktest); + } + ConfigTagList tags = ConfTags("uline"); + for(ConfigIter i = tags.first; i != tags.second; ++i) + { + ConfigTag* tag = i->second; std::string server; if (!tag->readString("server", server)) - throw CoreException(" tag missing server"); + throw CoreException(" tag missing server at " + tag->getTagLocation()); ulines[assign(server)] = tag->getBool("silent"); } - for(int i=0;; ++i) + tags = ConfTags("banlist"); + for(ConfigIter i = tags.first; i != tags.second; ++i) { - ConfigTag* tag = ConfValue("banlist", i); - if (!tag) - break; + ConfigTag* tag = i->second; std::string chan; if (!tag->readString("chan", chan)) - throw CoreException(" tag missing chan"); + throw CoreException(" tag missing chan at " + tag->getTagLocation()); maxbans[chan] = tag->getInt("limit"); } @@ -587,7 +576,7 @@ void ServerConfig::Fill() memset(HideModeLists, 0, sizeof(HideModeLists)); for (const unsigned char* p = (const unsigned char*)ConfValue("security")->getString("hidemodes").c_str(); *p; ++p) HideModeLists[*p] = true; - + std::string v = security->getString("announceinvites"); if (v == "ops") @@ -599,62 +588,55 @@ void ServerConfig::Fill() else AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE; - bool AllowHalfOp = options->getBool("allowhalfop"); - ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL); - if (AllowHalfOp && !mh) { - ServerInstance->Logs->Log("CONFIG", DEFAULT, "Enabling halfop mode."); - mh = new ModeChannelHalfOp; - ServerInstance->Modes->AddMode(mh); - } else if (!AllowHalfOp && mh) { - ServerInstance->Logs->Log("CONFIG", DEFAULT, "Disabling halfop mode."); - ServerInstance->Modes->DelMode(mh); - delete mh; - } - - Module* whowas = ServerInstance->Modules->Find("cmd_whowas.so"); - if (whowas) - WhowasRequest(NULL, whowas, WhowasRequest::WHOWAS_PRUNE).Send(); Limits.Finalise(); - } -/* These tags MUST occur and must ONLY occur once in the config file */ -static const char* const 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 */ - if (!this->DoInclude(ServerInstance->ConfigFileName, true)) + ParseStack stack(this); + try + { + valid = stack.ParseFile(ServerInstance->ConfigFileName, 0); + } + catch (CoreException& err) { valid = false; - return; + errstr << err.GetReason(); + } + if (valid) + { + DNSServer = ConfValue("dns")->getString("server"); + FindDNS(DNSServer); } } 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(); + if (old) + { + /* + * These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername. + */ + this->ServerName = old->ServerName; + this->sid = old->sid; + this->cmdline = old->cmdline; + } /* The stuff in here may throw CoreException, be sure we're in a position to catch it. */ try { - /* Check we dont have more than one of singular tags, or any of them missing - */ - for (int Index = 0; Index * sizeof(*Once) < sizeof(Once); Index++) - CheckOnce(Once[Index]); - for (int Index = 0; Index * sizeof(Deprecated) < sizeof(ChangedConfig); Index++) { std::string dummy; if (ConfValue(ChangedConfig[Index].tag)->readString(ChangedConfig[Index].value, dummy, true)) - throw CoreException(std::string("Your configuration contains a deprecated value: <") + ChangedConfig[Index].tag + ":" + ChangedConfig[Index].value + "> - " + ChangedConfig[Index].reason); + errstr << "Your configuration contains a deprecated value: <" + << ChangedConfig[Index].tag << ":" << ChangedConfig[Index].value << "> - " << ChangedConfig[Index].reason + << " (at " << ConfValue(ChangedConfig[Index].tag)->getTagLocation() << ")\n"; } Fill(); @@ -666,23 +648,17 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) catch (CoreException &ce) { errstr << ce.GetReason(); - valid = false; } // 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. - */ + // Check errors before dealing with failed binds, since continuing on failed bind is wanted in some circumstances. + valid = errstr.str().empty(); + if (old) { - 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. + // On first run, ports are bound later on FailedPortList pl; ServerInstance->BindPorts(pl); if (pl.size()) @@ -701,7 +677,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid); - valid = errstr.str().empty(); if (!valid) ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file:"); @@ -743,19 +718,26 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) return; ApplyModules(user); + + if (user) + user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str()); + ServerInstance->SNO->WriteGlobalSno('a', "*** Successfully rehashed server."); } void ServerConfig::ApplyModules(User* user) { + Module* whowas = ServerInstance->Modules->Find("cmd_whowas.so"); + if (whowas) + WhowasRequest(NULL, whowas, WhowasRequest::WHOWAS_PRUNE).Send(); + const std::vector v = ServerInstance->Modules->GetAllModuleNames(0); std::vector added_modules; std::set removed_modules(v.begin(), v.end()); - for(int i=0; ; i++) + ConfigTagList tags = ConfTags("module"); + for(ConfigIter i = tags.first; i != tags.second; ++i) { - ConfigTag* tag = ConfValue("module", i); - if (!tag) - break; + ConfigTag* tag = i->second; std::string name; if (tag->readString("name", name)) { @@ -766,6 +748,9 @@ void ServerConfig::ApplyModules(User* user) } } + if (ConfValue("options")->getBool("allowhalfop") && removed_modules.erase("m_halfop.so") == 0) + added_modules.push_back("m_halfop.so"); + for (std::set::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) { // Don't remove cmd_*.so, just remove m_*.so @@ -808,402 +793,6 @@ void ServerConfig::ApplyModules(User* user) ServerInstance->SNO->WriteGlobalSno('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->WriteGlobalSno('a', "*** Successfully rehashed server."); -} - -bool ServerConfig::LoadConf(FILE* &conf, const char* filename, bool allowexeinc) -{ - std::string line; - char ch; - long linenumber = 1; - long last_successful_parse = 1; - bool in_tag; - bool in_quote; - bool in_comment; - int character_count = 0; - - in_tag = false; - in_quote = false; - in_comment = false; - - ServerInstance->Logs->Log("CONFIG", DEBUG, "Reading %s", filename); - - /* Check if the file open failed first */ - if (!conf) - { - errstr << "LoadConf: Couldn't open config file: " << filename << std::endl; - return false; - } - - for (unsigned int t = 0; t < include_stack.size(); t++) - { - if (std::string(filename) == include_stack[t]) - { - errstr << "File " << filename << " is included recursively (looped inclusion)." << std::endl; - return false; - } - } - - /* It's not already included, add it to the list of files we've loaded */ - include_stack.push_back(filename); - - /* Start reading characters... */ - while ((ch = fgetc(conf)) != EOF) - { - /* - * 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')) - { - errstr << "File " << filename << " cannot be read, as it is encoded in braindead UTF-16. Save your file as plain ASCII!" << std::endl; - return false; - } - - /* - * Here we try and get individual tags on separate lines, - * this would be so easy if we just made people format - * their config files like that, but they don't so... - * We check for a '<' and then know the line is over when - * we get a '>' not inside quotes. If we find two '<' and - * no '>' then die with an error. - */ - - if ((ch == '#') && !in_quote) - in_comment = true; - - switch (ch) - { - case '\n': - if (in_quote) - line += '\n'; - linenumber++; - case '\r': - if (!in_quote) - in_comment = false; - case '\0': - continue; - case '\t': - ch = ' '; - } - - if(in_comment) - continue; - - /* XXX: Added by Brain, May 1st 2006 - Escaping of characters. - * Note that this WILL NOT usually allow insertion of newlines, - * because a newline is two characters long. Use it primarily to - * insert the " symbol. - * - * Note that this also involves a further check when parsing the line, - * which can be found below. - */ - if ((ch == '\\') && (in_quote) && (in_tag)) - { - line += ch; - char real_character; - if (!feof(conf)) - { - real_character = fgetc(conf); - if (real_character == 'n') - real_character = '\n'; - line += real_character; - continue; - } - else - { - errstr << "End of file after a \\, what did you want to escape?: " << filename << ":" << linenumber << std::endl; - return false; - } - } - - if (ch != '\r') - line += ch; - - if ((ch != '<') && (!in_tag) && (!in_comment) && (ch > ' ') && (ch != 9)) - { - errstr << "You have stray characters beyond the tag which starts at " << filename << ":" << last_successful_parse << std::endl; - return false; - } - - if (ch == '<') - { - if (in_tag) - { - if (!in_quote) - { - 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; - } - } - else - { - if (in_quote) - { - 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 - { - // errstr << "Opening new config tag on line " << linenumber << std::endl; - in_tag = true; - } - } - } - else if (ch == '"') - { - if (in_tag) - { - if (in_quote) - { - // errstr << "Closing quote in config tag on line " << linenumber << std::endl; - in_quote = false; - } - else - { - // errstr << "Opening quote in config tag on line " << linenumber << std::endl; - in_quote = true; - } - } - else - { - if (in_quote) - { - errstr << "The tag immediately after the one at " << filename << ":" << last_successful_parse << " has a missing closing \" symbol. Please check this." << std::endl; - } - else - { - errstr << "You have opened a quote (\") beyond the tag at " << filename << ":" << last_successful_parse << " without opening a new tag. Please check this." << std::endl; - } - } - } - else if (ch == '>') - { - if (!in_quote) - { - if (in_tag) - { - // errstr << "Closing config tag on line " << linenumber << std::endl; - in_tag = false; - - /* - * If this finds an then ParseLine can simply call - * LoadConf() and load the included config into the same ConfigDataHash - */ - long bl = linenumber; - if (!this->ParseLine(filename, line, linenumber, allowexeinc)) - return false; - last_successful_parse = linenumber; - - linenumber = bl; - - line.clear(); - } - else - { - errstr << "You forgot to close the tag which comes immediately after the one at " << filename << ":" << last_successful_parse << std::endl; - 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) - { - 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; - } - - return true; -} - - -bool ServerConfig::LoadConf(FILE* &conf, const std::string &filename, bool allowexeinc) -{ - return this->LoadConf(conf, filename.c_str(), allowexeinc); -} - -bool ServerConfig::ParseLine(const std::string &filename, std::string &line, long &linenumber, bool allowexeinc) -{ - std::string tagname; - std::string current_key; - std::string current_value; - reference result; - char last_char = 0; - bool got_key; - bool in_quote; - - got_key = in_quote = false; - - for(std::string::iterator c = line.begin(); c != line.end(); c++) - { - if (!result) - { - /* We don't know the tag name yet. */ - - if (*c != ' ') - { - if (*c != '<') - { - if ((*c >= 'a' && *c <= 'z') || (*c >= 'A' && *c <='Z') || (*c >= '0' && *c <= '9') || *c == '_') - tagname += *c; - else - { - errstr << "Invalid character in value name of tag: '" << *c << "' in value '" << tagname << "' in filename: " << filename << ":" << linenumber << std::endl; - return false; - } - } - } - else - { - /* We got to a space, we should have the tagname now. */ - if(tagname.length()) - { - result = new ConfigTag(tagname); - } - } - } - else - { - /* We have the tag name */ - if (!got_key) - { - /* We're still reading the key name */ - if ((*c != '=') && (*c != '>')) - { - if (*c != ' ') - { - if ((*c >= 'a' && *c <= 'z') || (*c >= 'A' && *c <='Z') || (*c >= '0' && *c <= '9') || *c == '_') - current_key += *c; - else - { - errstr << "Invalid character in key: '" << *c << "' in key '" << current_key << "' in filename: " << filename << ":" << linenumber << std::endl; - return false; - } - } - } - else - { - /* We got an '=', end of the key name. */ - got_key = true; - } - } - else - { - /* We have the key name, now we're looking for quotes and the value */ - - /* Correctly handle escaped characters here. - * See the XXX'ed section above. - */ - if ((*c == '\\') && (in_quote)) - { - c++; - if (*c == 'n') - current_value += '\n'; - else - current_value += *c; - continue; - } - else if ((*c == '\\') && (!in_quote)) - { - 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)) - { - /* Got a 'real' \n, treat it as part of the value */ - current_value += '\n'; - continue; - } - else if ((*c == '\r') && (in_quote)) - { - /* Got a \r, drop it */ - continue; - } - - if (*c == '"') - { - if (!in_quote) - { - /* We're not already in a quote. */ - in_quote = true; - } - else - { - /* Leaving the quotes, we have the current value */ - result->items.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(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(current_value)) - return false; - } - - current_key.clear(); - current_value.clear(); - } - } - else - { - if (in_quote) - { - last_char = *c; - current_value += *c; - } - } - } - } - } - - /* Finished parsing the tag, add it to the config hash */ - config_data.insert(std::make_pair(tagname, result)); - - return true; -} - -bool ServerConfig::DoPipe(const std::string &file) -{ - FILE* conf = popen(file.c_str(), "r"); - bool ret = false; - - if (conf) - { - ret = LoadConf(conf, file.c_str(), false); - pclose(conf); - } - else - errstr << "Couldn't execute: " << file << std::endl; - - return ret; } bool ServerConfig::StartsWithWindowsDriveLetter(const std::string &path) @@ -1211,142 +800,22 @@ bool ServerConfig::StartsWithWindowsDriveLetter(const std::string &path) return (path.length() > 2 && isalpha(path[0]) && path[1] == ':'); } -bool ServerConfig::DoInclude(const std::string &file, bool allowexeinc) +ConfigTag* ServerConfig::ConfValue(const std::string &tag) { - FILE* conf = fopen(file.c_str(), "r"); - bool ret = false; - - if (conf) - { - ret = LoadConf(conf, file, allowexeinc); - fclose(conf); - } - else - errstr << "Couldn't open config file: " << file << std::endl; - - return ret; -} - -ConfigTag* ServerConfig::ConfValue(const std::string &tag, int offset) -{ - ConfigDataHash::size_type pos = offset; - if (pos >= config_data.count(tag)) + ConfigTagList found = config_data.equal_range(tag); + if (found.first == found.second) return NULL; - - ConfigDataHash::iterator iter = config_data.find(tag); - - for(int i = 0; i < offset; i++) - iter++; - - return iter->second; -} - -bool ConfigTag::readString(const std::string& key, std::string& value, bool allow_lf) -{ - if (!this) - return false; - for(std::vector::iterator j = items.begin(); j != items.end(); ++j) - { - if(j->first != key) - continue; - value = j->second; - if (!allow_lf && (value.find('\n') != std::string::npos)) - { - ServerInstance->Logs->Log("CONFIG",DEFAULT, "Value of <" + tag + ":" + key + "> contains a linefeed, and linefeeds in this value are not permitted -- stripped to spaces."); - for (std::string::iterator n = value.begin(); n != value.end(); n++) - if (*n == '\n') - *n = ' '; - } - return true; - } - return false; -} - -std::string ConfigTag::getString(const std::string& key, const std::string& def) -{ - std::string res = def; - if (this) - readString(key, res); - return res; -} - -long ConfigTag::getInt(const std::string &key, long def) -{ - std::string result; - if(!this || !readString(key, result)) - return def; - - const char* res_cstr = result.c_str(); - char* res_tail = NULL; - long res = strtol(res_cstr, &res_tail, 0); - if (res_tail == res_cstr) - return def; - switch (toupper(*res_tail)) - { - case 'K': - res= res* 1024; - break; - case 'M': - res= res* 1024 * 1024; - break; - case 'G': - res= res* 1024 * 1024 * 1024; - break; - } - return res; -} - -double ConfigTag::getFloat(const std::string &key, double def) -{ - std::string result; - if (!readString(key, result)) - return def; - return strtod(result.c_str(), NULL); + ConfigTag* rv = found.first->second; + found.first++; + if (found.first != found.second) + ServerInstance->Logs->Log("CONFIG",DEFAULT, "Multiple <" + tag + "> tags found; only first will be used " + "(first at " + rv->getTagLocation() + "; second at " + found.first->second->getTagLocation() + ")"); + return rv; } -bool ConfigTag::getBool(const std::string &key, bool def) +ConfigTagList ServerConfig::ConfTags(const std::string& tag) { - std::string result; - if(!readString(key, result)) - return def; - - return (result == "yes" || result == "true" || result == "1" || result == "on"); -} - -/** Read the contents of a file located by `fname' into a file_cache pointed at by `F'. - */ -bool ServerConfig::ReadFile(file_cache &F, const std::string& fname) -{ - if (fname.empty()) - return false; - - FILE* file = NULL; - char linebuf[MAXBUF]; - - F.clear(); - - if (!FileExists(fname.c_str())) - return false; - file = fopen(fname.c_str(), "r"); - - if (file) - { - while (!feof(file)) - { - if (fgets(linebuf, sizeof(linebuf), file)) - linebuf[strlen(linebuf)-1] = 0; - else - *linebuf = 0; - - F.push_back(*linebuf ? linebuf : " "); - } - - fclose(file); - } - else - return false; - - return true; + return config_data.equal_range(tag); } bool ServerConfig::FileExists(const char* file) @@ -1375,7 +844,6 @@ const char* ServerConfig::CleanFilename(const char* name) return (p != name ? ++p : p); } - std::string ServerConfig::GetSID() { return sid; @@ -1383,7 +851,6 @@ std::string ServerConfig::GetSID() void ConfigReaderThread::Run() { - Config = new ServerConfig; Config->Read(); done = true; } @@ -1392,9 +859,7 @@ void ConfigReaderThread::Finish() { 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); if (Config->valid) @@ -1411,18 +876,21 @@ void ConfigReaderThread::Finish() ServerInstance->Res->Rehash(); ServerInstance->ResetMaxBans(); Config->ApplyDisabledCommands(Config->DisabledCommands); - User* user = TheUserUID.empty() ? ServerInstance->FindNick(TheUserUID) : NULL; + User* user = ServerInstance->FindNick(TheUserUID); FOREACH_MOD(I_OnRehash, OnRehash(user)); ServerInstance->BuildISupport(); - delete old; + ServerInstance->Logs->CloseLogs(); + ServerInstance->Logs->OpenFileLogs(); + + if (Config->RawLog) + ServerInstance->Users->ServerNoticeAll("*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded."); + + Config = old; } else { // whoops, abort! - ServerInstance->Logs->CloseLogs(); ServerInstance->Config = old; - ServerInstance->Logs->OpenFileLogs(); - delete this->Config; } }