X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=b0106eb5edf465147a8efe13b16a49cbdb4b7f7c;hb=ed105d7fef72b5bb5f23e72fae40d6b4ffdcb5b8;hp=37153afdd945641f7826f1eb2e72bafaf3d23168;hpb=235b289194a6345475933612f7c28c993abf5390;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index 37153afdd..b0106eb5e 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -25,7 +25,7 @@ std::vector old_module_names, new_module_names, added_modules, remo ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance) { this->ClearStack(); - *TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0'; + *ServerName = *Network = *ServerDesc = *AdminName = '\0'; *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0'; *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0'; *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0'; @@ -57,6 +57,12 @@ Module* ServerConfig::GetIOHook(int port) return (x != IOHookModule.end() ? x->second : NULL); } +Module* ServerConfig::GetIOHook(InspSocket* is) +{ + std::map::iterator x = SocketIOHookModule.find(is); + return (x != SocketIOHookModule.end() ? x->second : NULL); +} + bool ServerConfig::AddIOHook(int port, Module* iomod) { if (!GetIOHook(port)) @@ -66,8 +72,23 @@ bool ServerConfig::AddIOHook(int port, Module* iomod) } else { - ModuleException err("Port already hooked by another module"); - throw(err); + throw ModuleException("Port already hooked by another module"); + return false; + } +} + +bool ServerConfig::AddIOHook(Module* iomod, InspSocket* is) +{ + if (!GetIOHook(is)) + { + ServerInstance->Log(DEBUG,"Hooked inspsocket %08x", is); + SocketIOHookModule[is] = iomod; + is->IsIOHooked = true; + return true; + } + else + { + throw ModuleException("InspSocket derived class already hooked by another module"); return false; } } @@ -83,6 +104,17 @@ bool ServerConfig::DelIOHook(int port) return false; } +bool ServerConfig::DelIOHook(InspSocket* is) +{ + std::map::iterator x = SocketIOHookModule.find(is); + if (x != SocketIOHookModule.end()) + { + SocketIOHookModule.erase(x); + return true; + } + return false; +} + bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) { int count = ConfValueEnum(this->config_data, tag); @@ -140,13 +172,6 @@ bool NoValidation(ServerConfig* conf, const char* tag, const char* value, ValueI return true; } -bool ValidateTempDir(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) -{ - if (!*(data.GetString())) - data.Set("/tmp"); - return true; -} - bool ValidateMaxTargets(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { if ((data.GetInteger() < 0) || (data.GetInteger() > 31)) @@ -222,7 +247,7 @@ bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, V if ((nameserver == "nameserver") && (!found_server)) { resolv >> nameserver; - data.Set(nameserver); + data.Set(nameserver.c_str()); found_server = true; conf->GetInstance()->Log(DEFAULT," set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str()); } @@ -256,7 +281,8 @@ bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value, if (!strchr(data.GetString(),'.')) { conf->GetInstance()->Log(DEFAULT,"WARNING: '%s' is not a fully-qualified domain name. Changed to '%s%c'",data.GetString(),data.GetString(),'.'); - data.Set(std::string(data.GetString()) + "."); + std::string moo = std::string(data.GetString()).append("."); + data.Set(moo.c_str()); } return true; } @@ -534,51 +560,50 @@ void ServerConfig::Read(bool bail, userrec* user) static char* Once[] = { "server", "admin", "files", "power", "options", NULL }; /* These tags can occur ONCE or not at all */ - static InitialConfig Values[] = { - {"options", "softlimit", &this->SoftLimit, DT_INTEGER, ValidateSoftLimit}, - {"options", "somaxconn", &this->MaxConn, DT_INTEGER, ValidateMaxConn}, - {"server", "name", &this->ServerName, DT_CHARPTR, ValidateServerName}, - {"server", "description", &this->ServerDesc, DT_CHARPTR, NoValidation}, - {"server", "network", &this->Network, DT_CHARPTR, NoValidation}, - {"admin", "name", &this->AdminName, DT_CHARPTR, NoValidation}, - {"admin", "email", &this->AdminEmail, DT_CHARPTR, NoValidation}, - {"admin", "nick", &this->AdminNick, DT_CHARPTR, NoValidation}, - {"files", "motd", &this->motd, DT_CHARPTR, ValidateMotd}, - {"files", "rules", &this->rules, DT_CHARPTR, ValidateRules}, - {"power", "diepass", &this->diepass, DT_CHARPTR, NoValidation}, - {"power", "pause", &this->DieDelay, DT_INTEGER, NoValidation}, - {"power", "restartpass", &this->restartpass, DT_CHARPTR, NoValidation}, - {"options", "prefixquit", &this->PrefixQuit, DT_CHARPTR, NoValidation}, - {"die", "value", &this->DieValue, DT_CHARPTR, NoValidation}, - {"options", "loglevel", &debug, DT_CHARPTR, ValidateLogLevel}, - {"options", "netbuffersize", &this->NetBufferSize, DT_INTEGER, ValidateNetBufferSize}, - {"options", "maxwho", &this->MaxWhoResults, DT_INTEGER, ValidateMaxWho}, - {"options", "allowhalfop", &this->AllowHalfop, DT_BOOLEAN, NoValidation}, - {"dns", "server", &this->DNSServer, DT_CHARPTR, ValidateDnsServer}, - {"dns", "timeout", &this->dns_timeout, DT_INTEGER, ValidateDnsTimeout}, - {"options", "moduledir", &this->ModPath, DT_CHARPTR, ValidateModPath}, - {"disabled", "commands", &this->DisabledCommands, DT_CHARPTR, NoValidation}, - {"options", "userstats", &this->UserStats, DT_CHARPTR, NoValidation}, - {"options", "customversion", &this->CustomVersion, DT_CHARPTR, NoValidation}, - {"options", "hidesplits", &this->HideSplits, DT_BOOLEAN, NoValidation}, - {"options", "hidebans", &this->HideBans, DT_BOOLEAN, NoValidation}, - {"options", "hidewhois", &this->HideWhoisServer, DT_CHARPTR, NoValidation}, - {"options", "operspywhois", &this->OperSpyWhois, DT_BOOLEAN, NoValidation}, - {"options", "tempdir", &this->TempDir, DT_CHARPTR, ValidateTempDir}, - {"options", "nouserdns", &this->NoUserDns, DT_BOOLEAN, NoValidation}, - {"options", "syntaxhints", &this->SyntaxHints, DT_BOOLEAN, NoValidation}, - {"options", "cyclehosts", &this->CycleHosts, DT_BOOLEAN, NoValidation}, - {"pid", "file", &this->PID, DT_CHARPTR, NoValidation}, - {"whowas", "groupsize", &this->WhoWasGroupSize, DT_INTEGER, NoValidation}, - {"whowas", "maxgroups", &this->WhoWasMaxGroups, DT_INTEGER, NoValidation}, - {"whowas", "maxkeep", &maxkeep, DT_CHARPTR, ValidateWhoWas}, + 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}, {NULL} }; /* These tags can occur multiple times, and therefore they have special code to read them * which is different to the code for reading the singular tags listed above. */ - static MultiConfig MultiValues[] = { + MultiConfig MultiValues[] = { {"connect", {"allow", "deny", "password", "timeout", "pingfreq", "flood", @@ -695,7 +720,7 @@ void ServerConfig::Read(bool bail, userrec* user) /* 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)) + 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. @@ -711,17 +736,32 @@ void ServerConfig::Read(bool bail, userrec* user) switch (Values[Index].datatype) { case DT_CHARPTR: - strlcpy((char*)Values[Index].val, vi.GetString(), MAXBUF); + { + ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + vcc->Set(vi.GetString(), strlen(vi.GetString())); + } break; case DT_INTEGER: - *((int*)Values[Index].val) = vi.GetInteger(); + { + int val = vi.GetInteger(); + ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val; + vci->Set(&val, sizeof(int)); + } break; case DT_BOOLEAN: - *((bool*)(Values[Index].val)) = vi.GetBool(); + { + bool val = vi.GetBool(); + ValueContainerBool* vcb = (ValueContainerBool*)Values[Index].val; + vcb->Set(&val, sizeof(bool)); + } break; default: + /* You don't want to know what happens if someones bad code sends us here. */ break; } + + /* We're done with this now */ + delete Values[Index].val; } /* Read the multiple-tag items (class tags, connect tags, etc) @@ -745,7 +785,6 @@ void ServerConfig::Read(bool bail, userrec* user) { char item[MAXBUF]; ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, item, MAXBUF); - ServerInstance->Log(DEBUG,"Data type DT_CHARPTR multi-item <%s:%s>[%d] = '%s'", MultiValues[Index].tag, MultiValues[Index].items[valuenum],tagnum, item); vl.push_back(ValueItem(item)); } break; @@ -753,22 +792,21 @@ void ServerConfig::Read(bool bail, userrec* user) { int item; ConfValueInteger(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, item); - ServerInstance->Log(DEBUG,"Data type DT_INTEGER multi-item <%s:%s>[%d] = '%d'", MultiValues[Index].tag, MultiValues[Index].items[valuenum],tagnum, item); vl.push_back(ValueItem(item)); } break; case DT_BOOLEAN: { bool item = ConfValueBool(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum); - ServerInstance->Log(DEBUG,"Data type DT_BOOLEAN multi-item <%s:%s>[%d] = '%d'", MultiValues[Index].tag, MultiValues[Index].items[valuenum],tagnum, item); vl.push_back(ValueItem(item)); } break; default: + /* Someone was smoking craq if we got here, and we're all gonna die. */ break; } } - ServerInstance->Log(DEBUG,"Call validation function for multi-value <%s>", MultiValues[Index].tag); + MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype); } @@ -800,6 +838,7 @@ void ServerConfig::Read(bool bail, userrec* user) } if (!removed_modules.empty()) + { for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) { if (ServerInstance->UnloadModule(removing->c_str())) @@ -817,23 +856,26 @@ void ServerConfig::Read(bool bail, userrec* user) user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError()); } } + } if (!added_modules.empty()) - for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - if (ServerInstance->LoadModule(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()); - - add++; - } - else + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - if (user) - user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError()); + if (ServerInstance->LoadModule(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()); + + add++; + } + else + { + if (user) + user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError()); + } } } @@ -1293,7 +1335,7 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in */ bool ServerConfig::ReadFile(file_cache &F, const char* fname) { - FILE* file; + FILE* file = NULL; char linebuf[MAXBUF]; F.clear(); @@ -1317,8 +1359,10 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname) { while (!feof(file)) { - fgets(linebuf, sizeof(linebuf), file); - linebuf[strlen(linebuf)-1] = 0; + if (fgets(linebuf, sizeof(linebuf), file)) + linebuf[strlen(linebuf)-1] = 0; + else + *linebuf = 0; if (!feof(file)) { @@ -1382,12 +1426,14 @@ bool ServerConfig::DirValid(const char* dirandfile) if (getcwd(buffer, MAXBUF ) == NULL ) return false; - chdir(work); + if (chdir(work) == -1) + return false; if (getcwd(otherdir, MAXBUF ) == NULL ) return false; - chdir(buffer); + if (chdir(buffer) == -1) + return false; size_t t = strlen(work); @@ -1434,12 +1480,15 @@ std::string ServerConfig::GetFullProgDir(char** argv, int argc) if (getcwd(buffer, MAXBUF) == NULL) return ""; - chdir(work); + if (chdir(work) == -1) + return ""; if (getcwd(otherdir, MAXBUF) == NULL) return ""; - chdir(buffer); + if (chdir(buffer) == -1) + return ""; + return otherdir; } @@ -1448,3 +1497,55 @@ InspIRCd* ServerConfig::GetInstance() return ServerInstance; } + +ValueItem::ValueItem(int value) +{ + std::stringstream n; + n << value; + v = n.str(); +} + +ValueItem::ValueItem(bool value) +{ + std::stringstream n; + n << value; + v = n.str(); +} + +ValueItem::ValueItem(char* value) +{ + v = value; +} + +void ValueItem::Set(char* value) +{ + v = value; +} + +void ValueItem::Set(const char* value) +{ + v = value; +} + +void ValueItem::Set(int value) +{ + std::stringstream n; + n << value; + v = n.str(); +} + +int ValueItem::GetInteger() +{ + return atoi(v.c_str()); +} + +char* ValueItem::GetString() +{ + return (char*)v.c_str(); +} + +bool ValueItem::GetBool() +{ + return (GetInteger() || v == "yes" || v == "true"); +} +