X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=4ac41b1d5c17b0911b02b54be9158c30cb0f75ed;hb=047f09dd572b89223ff3798dc25c34fe4c4172b3;hp=24e76eb490e964cda6ca2783625f52b8be7f1fd2;hpb=daa206e243ef797a7199b4ee9927342f6a79b90a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index 24e76eb49..4ac41b1d5 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -16,6 +16,7 @@ #include #include "inspircd.h" #include "xline.h" +#include "exitcodes.h" std::vector old_module_names, new_module_names, added_modules, removed_modules; @@ -152,7 +153,7 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) if (bail) { printf("There were errors in your configuration:\nYou have more than one <%s> tag, this is not permitted.\n",tag); - InspIRCd::Exit(ERROR); + InspIRCd::Exit(EXIT_STATUS_CONFIG); } else { @@ -174,7 +175,7 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) if (bail) { printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag); - InspIRCd::Exit(ERROR); + InspIRCd::Exit(EXIT_STATUS_CONFIG); } else { @@ -416,45 +417,13 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &v if (*allow) { - c.host = allow; - c.type = CC_ALLOW; - c.pass = password; - c.registration_timeout = timeout; - c.pingtime = pingfreq; - c.flood = flood; - c.threshold = threshold; - c.sendqmax = sendq; - c.recvqmax = recvq; - c.maxlocal = localmax; - c.maxglobal = globalmax; - - - if (c.maxlocal == 0) - c.maxlocal = 3; - if (c.maxglobal == 0) - c.maxglobal = 3; - if (c.threshold == 0) - { - c.threshold = 1; - c.flood = 999; - conf->GetInstance()->Log(DEFAULT,"Warning: Connect allow line '%s' has no flood/threshold settings. Setting this tag to 999 lines in 1 second.",c.host.c_str()); - } - if (c.sendqmax == 0) - c.sendqmax = 262114; - if (c.recvqmax == 0) - c.recvqmax = 4096; - if (c.registration_timeout == 0) - c.registration_timeout = 90; - if (c.pingtime == 0) - c.pingtime = 120; + ConnectClass c(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax); conf->Classes.push_back(c); } else { - c.host = deny; - c.type = CC_DENY; + ConnectClass c(deny); conf->Classes.push_back(c); - conf->GetInstance()->Log(DEBUG,"Read connect class type DENY, host=%s",deny); } return true; @@ -577,6 +546,45 @@ bool DoneMaxBans(ServerConfig* conf, const char* tag) return true; } +void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, userrec* 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); + } + else + { + std::string errors = errormessage; + std::string::size_type start; + unsigned int prefixlen; + start = 0; + /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */ + prefixlen = strlen(this->ServerName) + strlen(user->nick) + 11; + if (user) + { + user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick); + while (start < errors.length()) + { + user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str()); + start += 510 - prefixlen; + } + } + else + { + ServerInstance->WriteOpers("There were errors in the configuration file:"); + while (start < errors.length()) + { + ServerInstance->WriteOpers(errors.substr(start, 360).c_str()); + start += 360; + } + } + return; + } +} + void ServerConfig::Read(bool bail, userrec* user) { static char debug[MAXBUF]; /* Temporary buffer for debugging value */ @@ -589,42 +597,43 @@ void ServerConfig::Read(bool bail, userrec* user) /* These tags can occur ONCE or not at all */ InitialConfig Values[] = { - {"options", "softlimit", new ValueContainerUInt (&this->SoftLimit), DT_INTEGER, ValidateSoftLimit}, - {"options", "somaxconn", new ValueContainerInt (&this->MaxConn), DT_INTEGER, ValidateMaxConn}, - {"server", "name", new ValueContainerChar (this->ServerName), DT_CHARPTR, ValidateServerName}, - {"server", "description", new ValueContainerChar (this->ServerDesc), DT_CHARPTR, NoValidation}, - {"server", "network", new ValueContainerChar (this->Network), DT_CHARPTR, NoValidation}, - {"admin", "name", new ValueContainerChar (this->AdminName), DT_CHARPTR, NoValidation}, - {"admin", "email", new ValueContainerChar (this->AdminEmail), DT_CHARPTR, NoValidation}, - {"admin", "nick", 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, NoValidation}, - {"power", "pause", new ValueContainerInt (&this->DieDelay), DT_INTEGER, NoValidation}, - {"power", "restartpass", new ValueContainerChar (this->restartpass), DT_CHARPTR, NoValidation}, - {"options", "prefixquit", new ValueContainerChar (this->PrefixQuit), DT_CHARPTR, NoValidation}, - {"options", "loglevel", new ValueContainerChar (debug), DT_CHARPTR, ValidateLogLevel}, - {"options", "netbuffersize", new ValueContainerInt (&this->NetBufferSize), DT_INTEGER, ValidateNetBufferSize}, - {"options", "maxwho", new ValueContainerInt (&this->MaxWhoResults), DT_INTEGER, ValidateMaxWho}, - {"options", "allowhalfop", new ValueContainerBool (&this->AllowHalfop), DT_BOOLEAN, NoValidation}, - {"dns", "server", new ValueContainerChar (this->DNSServer), DT_CHARPTR, ValidateDnsServer}, - {"dns", "timeout", new ValueContainerInt (&this->dns_timeout), DT_INTEGER, ValidateDnsTimeout}, - {"options", "moduledir", new ValueContainerChar (this->ModPath), DT_CHARPTR, ValidateModPath}, - {"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", new ValueContainerBool (&this->HideSplits), DT_BOOLEAN, NoValidation}, - {"options", "hidebans", new ValueContainerBool (&this->HideBans), DT_BOOLEAN, NoValidation}, - {"options", "hidewhois", new ValueContainerChar (this->HideWhoisServer), DT_CHARPTR, NoValidation}, - {"options", "operspywhois", new ValueContainerBool (&this->OperSpyWhois), DT_BOOLEAN, NoValidation}, - {"options", "nouserdns", new ValueContainerBool (&this->NoUserDns), DT_BOOLEAN, NoValidation}, - {"options", "syntaxhints", new ValueContainerBool (&this->SyntaxHints), DT_BOOLEAN, NoValidation}, - {"options", "cyclehosts", new ValueContainerBool (&this->CycleHosts), DT_BOOLEAN, NoValidation}, - {"pid", "file", new ValueContainerChar (this->PID), DT_CHARPTR, NoValidation}, - {"whowas", "groupsize", new ValueContainerInt (&this->WhoWasGroupSize), DT_INTEGER, NoValidation}, - {"whowas", "maxgroups", new ValueContainerInt (&this->WhoWasMaxGroups), DT_INTEGER, NoValidation}, - {"whowas", "maxkeep", new ValueContainerChar (maxkeep), DT_CHARPTR, ValidateWhoWas}, - {"die", "value", new ValueContainerChar (this->DieValue), DT_CHARPTR, NoValidation}, + {"options", "softlimit", "", new ValueContainerUInt (&this->SoftLimit), DT_INTEGER, ValidateSoftLimit}, + {"options", "somaxconn", "", new ValueContainerInt (&this->MaxConn), DT_INTEGER, ValidateMaxConn}, + {"server", "name", "", new ValueContainerChar (this->ServerName), DT_CHARPTR, ValidateServerName}, + {"server", "description", "", new ValueContainerChar (this->ServerDesc), DT_CHARPTR, NoValidation}, + {"server", "network", "", new ValueContainerChar (this->Network), DT_CHARPTR, NoValidation}, + {"admin", "name", "", new ValueContainerChar (this->AdminName), DT_CHARPTR, NoValidation}, + {"admin", "email", "", new ValueContainerChar (this->AdminEmail), DT_CHARPTR, NoValidation}, + {"admin", "nick", "", 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, NoValidation}, + {"power", "pause", "", new ValueContainerInt (&this->DieDelay), DT_INTEGER, NoValidation}, + {"power", "restartpass", "", new ValueContainerChar (this->restartpass), DT_CHARPTR, NoValidation}, + {"options", "prefixquit", "", new ValueContainerChar (this->PrefixQuit), DT_CHARPTR, NoValidation}, + {"options", "loglevel", "", new ValueContainerChar (debug), DT_CHARPTR, ValidateLogLevel}, + {"options", "netbuffersize","", new ValueContainerInt (&this->NetBufferSize), DT_INTEGER, ValidateNetBufferSize}, + {"options", "maxwho", "", new ValueContainerInt (&this->MaxWhoResults), DT_INTEGER, ValidateMaxWho}, + {"options", "allowhalfop", "", new ValueContainerBool (&this->AllowHalfop), DT_BOOLEAN, NoValidation}, + {"dns", "server", "", new ValueContainerChar (this->DNSServer), DT_CHARPTR, ValidateDnsServer}, + {"dns", "timeout", "", new ValueContainerInt (&this->dns_timeout), DT_INTEGER, ValidateDnsTimeout}, + {"options", "moduledir", "", new ValueContainerChar (this->ModPath), DT_CHARPTR, ValidateModPath}, + {"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", "", new ValueContainerBool (&this->HideSplits), DT_BOOLEAN, NoValidation}, + {"options", "hidebans", "", new ValueContainerBool (&this->HideBans), DT_BOOLEAN, NoValidation}, + {"options", "hidewhois", "", new ValueContainerChar (this->HideWhoisServer), DT_CHARPTR, NoValidation}, + {"options", "operspywhois", "", new ValueContainerBool (&this->OperSpyWhois), DT_BOOLEAN, NoValidation}, + {"options", "nouserdns", "", new ValueContainerBool (&this->NoUserDns), DT_BOOLEAN, NoValidation}, + {"options", "syntaxhints", "", new ValueContainerBool (&this->SyntaxHints), DT_BOOLEAN, NoValidation}, + {"options", "cyclehosts", "", new ValueContainerBool (&this->CycleHosts), DT_BOOLEAN, NoValidation}, + {"options", "ircumsgprefix","0", new ValueContainerBool (&this->UndernetMsgPrefix), DT_BOOLEAN, 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}, {NULL} }; @@ -702,143 +711,127 @@ void ServerConfig::Read(bool bail, userrec* user) } else { - ServerInstance->Log(DEFAULT, "There were errors in your configuration:\n%s", errstr.str().c_str()); - - if (bail) - { - /* Unneeded because of the ServerInstance->Log() aboive? */ - printf("There were errors in your configuration:\n%s",errstr.str().c_str()); - InspIRCd::Exit(ERROR); - } - else - { - std::string errors = errstr.str(); - std::string::size_type start; - unsigned int prefixlen; - - start = 0; - /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */ - prefixlen = strlen(this->ServerName) + strlen(user->nick) + 11; - - if (user) - { - user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick); - - while(start < errors.length()) - { - user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str()); - start += 510 - prefixlen; - } - } - else - { - ServerInstance->WriteOpers("There were errors in the configuration file:"); - - while(start < errors.length()) - { - ServerInstance->WriteOpers(errors.substr(start, 360).c_str()); - start += 360; - } - } - - return; - } + ReportConfigError(errstr.str(), bail, user); + return; } - /* 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++) + /* The stuff in here may throw CoreException, be sure we're in a position to catch it. */ + try { - char item[MAXBUF]; - ConfValue(this->config_data, Values[Index].tag, Values[Index].value, 0, item, MAXBUF); - ValueItem vi(item); - - Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi); + /* 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; - switch (Values[Index].datatype) + /* 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++) { - case DT_CHARPTR: + char item[MAXBUF]; + int dt = Values[Index].datatype; + bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0); + dt &= ~DT_ALLOW_NEWLINE; + + ConfValue(this->config_data, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines); + ValueItem vi(item); + + Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi); + + switch (Values[Index].datatype) + { + case DT_CHARPTR: { ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; vcc->Set(vi.GetString(), strlen(vi.GetString())); } - break; - case DT_INTEGER: + break; + case DT_INTEGER: { int val = vi.GetInteger(); ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val; vci->Set(&val, sizeof(int)); } - break; - case DT_BOOLEAN: + break; + case DT_BOOLEAN: { bool val = vi.GetBool(); ValueContainerBool* vcb = (ValueContainerBool*)Values[Index].val; vcb->Set(&val, sizeof(bool)); } - break; - default: - /* You don't want to know what happens if someones bad code sends us here. */ - break; + break; + default: + /* You don't want to know what happens if someones bad code sends us here. */ + break; + } + + /* We're done with this now */ + delete Values[Index].val; } - /* We're done with this now */ - delete Values[Index].val; - } - - /* Read the multiple-tag items (class tags, connect tags, etc) - * and call the callbacks associated with them. We have three - * callbacks for these, a 'start', 'item' and 'end' callback. - */ - for (int Index = 0; MultiValues[Index].tag; Index++) - { - MultiValues[Index].init_function(this, MultiValues[Index].tag); + /* Read the multiple-tag items (class tags, connect tags, etc) + * and call the callbacks associated with them. We have three + * callbacks for these, a 'start', 'item' and 'end' callback. + */ + for (int Index = 0; MultiValues[Index].tag; Index++) + { + MultiValues[Index].init_function(this, MultiValues[Index].tag); - int number_of_tags = ConfValueEnum(this->config_data, MultiValues[Index].tag); + int number_of_tags = ConfValueEnum(this->config_data, MultiValues[Index].tag); - for (int tagnum = 0; tagnum < number_of_tags; tagnum++) - { - ValueList vl; - for (int valuenum = 0; MultiValues[Index].items[valuenum]; valuenum++) + for (int tagnum = 0; tagnum < number_of_tags; tagnum++) { - switch (MultiValues[Index].datatype[valuenum]) + ValueList vl; + for (int valuenum = 0; MultiValues[Index].items[valuenum]; valuenum++) { - case DT_CHARPTR: + int dt = MultiValues[Index].datatype[valuenum]; + bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0); + dt &= ~DT_ALLOW_NEWLINE; + + switch (dt) + { + case DT_CHARPTR: { char item[MAXBUF]; - ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, item, MAXBUF); - vl.push_back(ValueItem(item)); + if (ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, item, MAXBUF, allow_newlines)) + vl.push_back(ValueItem(item)); + else + vl.push_back(ValueItem("")); } - break; - case DT_INTEGER: + break; + case DT_INTEGER: { - int item; - ConfValueInteger(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, item); - vl.push_back(ValueItem(item)); + int item = 0; + if (ConfValueInteger(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, item)) + vl.push_back(ValueItem(item)); + else + vl.push_back(ValueItem(0)); } - break; - case DT_BOOLEAN: + break; + case DT_BOOLEAN: { bool item = ConfValueBool(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum); vl.push_back(ValueItem(item)); } - break; - default: - /* Someone was smoking craq if we got here, and we're all gonna die. */ - break; + break; + default: + /* Someone was smoking craq if we got here, and we're all gonna die. */ + 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); + } + + catch (CoreException &ce) + { + ReportConfigError(ce.GetReason(), bail, user); + return; } // write once here, to try it out and make sure its ok @@ -1267,42 +1260,68 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st return LoadConf(target, newfile, errorstream); } -bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length) +bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds) +{ + return ConfValue(target, tag, var, "", index, result, length, allow_linefeeds); +} + +bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, char* result, int length, bool allow_linefeeds) { std::string value; - bool r = ConfValue(target, std::string(tag), std::string(var), index, value); + bool r = ConfValue(target, std::string(tag), std::string(var), std::string(default_value), index, value, allow_linefeeds); strlcpy(result, value.c_str(), length); return r; } -bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, std::string &result) +bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, std::string &result, bool allow_linefeeds) +{ + return ConfValue(target, tag, var, "", index, result, allow_linefeeds); +} + +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))) { - ConfigDataHash::const_iterator iter = target.find(tag); - + ConfigDataHash::iterator iter = target.find(tag); + for(int i = 0; i < index; i++) iter++; - - for(KeyValList::const_iterator j = iter->second.begin(); j != iter->second.end(); j++) + + for(KeyValList::iterator j = iter->second.begin(); j != iter->second.end(); j++) { if(j->first == var) { - result = j->second; - return true; + if ((!allow_linefeeds) && (j->second.find('\n') != std::string::npos)) + { + ServerInstance->Log(DEFAULT, "Value of <" + tag + ":" + var+ "> contains a linefeed, and linefeeds in this value are not permitted -- stripped to spaces."); + for (std::string::iterator n = j->second.begin(); n != j->second.end(); n++) + if (*n == '\n') + *n = ' '; + } + else + { + result = j->second; + return true; + } } } } else if(pos == 0) { + if (!default_value.empty()) + { + result = default_value; + ServerInstance->Log(DEBUG, "No <%s> tags in config file using default.", tag.c_str()); + return true; + } ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str()); } else { ServerInstance->Log(DEBUG, "ConfValue got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str()); } - + return false; } @@ -1581,6 +1600,8 @@ void ValueItem::Set(int value) int ValueItem::GetInteger() { + if (v.empty()) + return 0; return atoi(v.c_str()); }