X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=ec15db3a1d1fa3ab35c68290eb7f2ae63215a21a;hb=2b3394855d5adddb16285b905503d9ffe5a1d963;hp=0c5949e496a1f3599b8440c7035f00db937996e6;hpb=63483aa395ab48a15e7f3935f259bcbccb0e20cf;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index 0c5949e49..ec15db3a1 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -11,22 +11,24 @@ * --------------------------------------------------- */ -#include "configreader.h" -#include -#include #include "inspircd.h" +#include #include "xline.h" #include "exitcodes.h" +#include "commands/cmd_whowas.h" std::vector old_module_names, new_module_names, added_modules, removed_modules; +/* Needs forward declaration */ +bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data); + ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance) { this->ClearStack(); *ServerName = *Network = *ServerDesc = *AdminName = '\0'; - *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0'; - *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0'; - *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0'; + *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = *FixedQuit = *HideKillsServer = '\0'; + *DefaultModes = *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0'; + *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = *SuffixQuit = '\0'; WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0; log_file = NULL; NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = UndernetMsgPrefix = false; @@ -36,10 +38,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() @@ -77,7 +82,6 @@ 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; @@ -127,13 +131,16 @@ 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; } } - char buf[MAXBUF]; - snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str()); - isupport.push_back(buf); + if (!line5.empty()) + { + char buf[MAXBUF]; + snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str()); + isupport.push_back(buf); + } } void ServerConfig::Send005(userrec* user) @@ -145,49 +152,15 @@ void ServerConfig::Send005(userrec* user) bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) { int count = ConfValueEnum(this->config_data, tag); - + if (count > 1) { - if (bail) - { - printf("There were errors in your configuration:\nYou have more than one <%s> tag, this is not permitted.\n",tag); - InspIRCd::Exit(EXIT_STATUS_CONFIG); - } - else - { - if (user) - { - user->WriteServ("There were errors in your configuration:"); - user->WriteServ("You have more than one <%s> tag, this is not permitted.\n",tag); - } - else - { - ServerInstance->WriteOpers("There were errors in the configuration file:"); - ServerInstance->WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag); - } - } + throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted."); return false; } if (count < 1) { - if (bail) - { - printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag); - InspIRCd::Exit(EXIT_STATUS_CONFIG); - } - else - { - if (user) - { - user->WriteServ("There were errors in your configuration:"); - user->WriteServ("You have not defined a <%s> tag, this is required.",tag); - } - else - { - ServerInstance->WriteOpers("There were errors in the configuration file:"); - ServerInstance->WriteOpers("You have not defined a <%s> tag, this is required.",tag); - } - } + throw CoreException("You have not defined a <"+std::string(tag)+"> tag, this is required."); return false; } return true; @@ -195,7 +168,6 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) bool NoValidation(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - conf->GetInstance()->Log(DEBUG,"No validation for <%s:%s>",tag,value); return true; } @@ -223,15 +195,6 @@ bool ValidateMaxConn(ServerConfig* conf, const char* tag, const char* value, Val { if (data.GetInteger() > SOMAXCONN) conf->GetInstance()->Log(DEFAULT,"WARNING: value may be higher than the system-defined SOMAXCONN value!"); - if (!data.GetInteger()) - data.Set(SOMAXCONN); - return true; -} - -bool ValidateDnsTimeout(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) -{ - if (!data.GetInteger()) - data.Set(5); return true; } @@ -241,16 +204,15 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance) std::string thiscmd; /* Enable everything first */ - for (nspace::hash_map::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++) + for (command_table::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) { - nspace::hash_map::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd); + command_table::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd); if (cm != ServerInstance->Parser->cmdlist.end()) { - ServerInstance->Log(DEBUG,"Disabling command '%s'",cm->second->command.c_str()); cm->second->Disable(true); } } @@ -261,10 +223,10 @@ bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, V { if (!*(data.GetString())) { + std::string nameserver; // 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"); - std::string nameserver; bool found_server = false; if (resolv.is_open()) @@ -295,16 +257,15 @@ bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, V return true; } -bool ValidateModPath(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) -{ - if (!*(data.GetString())) - data.Set(MOD_PATH); - return true; -} - - bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value, 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... */ + return false; + } 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(),'.'); @@ -326,9 +287,9 @@ bool ValidateNetBufferSize(ServerConfig* conf, const char* tag, const char* valu bool ValidateMaxWho(ServerConfig* conf, const char* tag, const char* value, 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; @@ -361,12 +322,51 @@ bool ValidateMotd(ServerConfig* conf, const char* tag, const char* value, ValueI return true; } +bool ValidateNotEmpty(ServerConfig* conf, const char* tag, const char* value, 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) { conf->ReadFile(conf->RULES, data.GetString()); return true; } +bool ValidateModeLists(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +{ + memset(conf->HideModeLists, 0, 256); + for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x) + conf->HideModeLists[*x] = true; + return true; +} + +bool ValidateExemptChanOps(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +{ + memset(conf->ExemptChanOps, 0, 256); + for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x) + conf->ExemptChanOps[*x] = true; + return true; +} + +bool ValidateInvite(ServerConfig* conf, const char* tag, const char* value, 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 ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString()); @@ -382,8 +382,14 @@ bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, Valu conf->WhoWasMaxKeep = 3600; conf->GetInstance()->Log(DEFAULT,"WARNING: value less than 3600, setting to default 3600"); } - conf->GetInstance()->Log(DEBUG,"whowas:groupsize:%d maxgroups:%d maxkeep:%d",conf->WhoWasGroupSize,conf->WhoWasMaxGroups,conf->WhoWasMaxKeep); - irc::whowas::PruneWhoWas(conf->GetInstance(), conf->GetInstance()->Time()); + + command_t* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS"); + if (whowas_command) + { + std::deque params; + whowas_command->HandleInternal(WHOWAS_PRUNE, params); + } + return true; } @@ -412,16 +418,41 @@ 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(); - if (*allow) + 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 + */ + for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item) + { + if (item->GetName() == parent) + { + ConnectClass c(name, *item); + c.Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port); + conf->Classes.push_back(c); + } + } + 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(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans); + c.SetPort(port); + conf->Classes.push_back(c); + } + else + { + ConnectClass c(name, deny); + c.SetPort(port); + conf->Classes.push_back(c); + } } return true; @@ -431,7 +462,6 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &v */ bool DoneConnect(ServerConfig* conf, const char* tag) { - conf->GetInstance()->Log(DEBUG,"DoneConnect called for tag: %s",tag); return true; } @@ -448,8 +478,8 @@ bool InitULine(ServerConfig* conf, const char* tag) bool DoULine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { const char* server = values[0].GetString(); - conf->GetInstance()->Log(DEBUG,"Read ULINE '%s'",server); - conf->ulines.push_back(server); + const bool silent = values[1].GetBool(); + conf->ulines[server] = silent; return true; } @@ -551,7 +581,7 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool 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 { @@ -560,9 +590,9 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, unsigned int prefixlen; start = 0; /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */ - prefixlen = strlen(this->ServerName) + strlen(user->nick) + 11; if (user) { + prefixlen = strlen(this->ServerName) + strlen(user->nick) + 11; user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick); while (start < errors.length()) { @@ -587,6 +617,9 @@ void ServerConfig::Read(bool bail, userrec* user) { 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 */ + static char announceinvites[MAXBUF]; /* options:announceinvites setting */ int rem = 0, add = 0; /* Number of modules added, number of modules removed */ std::ostringstream errstr; /* String stream containing the error output */ @@ -595,43 +628,55 @@ 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}, - {"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}, + {"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_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, 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_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 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} }; @@ -642,53 +687,69 @@ void ServerConfig::Read(bool bail, userrec* user) {"connect", {"allow", "deny", "password", "timeout", "pingfreq", "flood", - "threshold", "sendq", "recvq", "localmax", "globalmax", NULL}, + "threshold", "sendq", "recvq", "localmax", "globalmax", "port", + "name", "parent", "maxchans", + NULL}, + {"", "", "", "", "120", "", + "", "", "", "3", "3", "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_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, + DT_CHARPTR, DT_CHARPTR, DT_INTEGER}, InitConnect, DoConnect, DoneConnect}, {"uline", - {"server", NULL}, - {DT_CHARPTR}, + {"server", "silent", NULL}, + {"", "0", NULL}, + {DT_CHARPTR, DT_BOOLEAN}, InitULine,DoULine,DoneULine}, {"banlist", {"chan", "limit", NULL}, + {"", "", NULL}, {DT_CHARPTR, DT_INTEGER}, InitMaxBans, DoMaxBans, DoneMaxBans}, {"module", {"name", NULL}, + {"", NULL}, {DT_CHARPTR}, InitModule, DoModule, DoneModule}, {"badip", {"reason", "ipmask", NULL}, + {"No reason", "", NULL}, {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoZLine, DoneXLine}, + InitXLine, DoZLine, DoneZLine}, {"badnick", {"reason", "nick", NULL}, + {"No reason", "", NULL}, {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoQLine, DoneXLine}, + InitXLine, DoQLine, DoneQLine}, {"badhost", {"reason", "host", NULL}, + {"No reason", "", NULL}, {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoKLine, DoneXLine}, + InitXLine, DoKLine, DoneKLine}, {"exception", {"reason", "host", NULL}, + {"No reason", "", NULL}, {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoELine, DoneXLine}, + InitXLine, DoELine, DoneELine}, {"type", {"name", "classes", NULL}, + {"", "", NULL}, {DT_CHARPTR, DT_CHARPTR}, InitTypes, DoType, DoneClassesAndTypes}, {"class", {"name", "commands", NULL}, + {"", "", NULL}, {DT_CHARPTR, DT_CHARPTR}, InitClasses, DoClass, DoneClassesAndTypes}, @@ -698,14 +759,14 @@ void ServerConfig::Read(bool bail, userrec* user) 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; - - if (this->LoadConf(newconfig, CONFIG_FILE, errstr)) + + if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr)) { /* If we succeeded, set the ircd config to the new one */ - this->config_data = newconfig; + this->config_data = newconfig; } else { @@ -734,14 +795,16 @@ void ServerConfig::Read(bool bail, userrec* user) 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); + 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_CHARPTR: { ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; - vcc->Set(vi.GetString(), strlen(vi.GetString())); + /* Make sure we also copy the null terminator */ + vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); } break; case DT_INTEGER: @@ -762,7 +825,7 @@ 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; } @@ -791,7 +854,7 @@ void ServerConfig::Read(bool bail, userrec* user) case DT_CHARPTR: { char item[MAXBUF]; - if (ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, item, MAXBUF, allow_newlines)) + 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("")); @@ -800,7 +863,7 @@ void ServerConfig::Read(bool bail, userrec* user) case DT_INTEGER: { int item = 0; - if (ConfValueInteger(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, item)) + if (ConfValueInteger(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item)) vl.push_back(ValueItem(item)); else vl.push_back(ValueItem(0)); @@ -808,7 +871,7 @@ void ServerConfig::Read(bool bail, userrec* user) break; case DT_BOOLEAN: { - bool item = ConfValueBool(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum); + bool item = ConfValueBool(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum); vl.push_back(ValueItem(item)); } break; @@ -817,10 +880,10 @@ 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].finish_function(this, MultiValues[Index].tag); } @@ -843,12 +906,12 @@ void ServerConfig::Read(bool bail, userrec* user) { int found_ports = 0; FailedPortList pl; - ServerInstance->stats->BoundPortCount = ServerInstance->BindPorts(false, found_ports, 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, found_ports - ServerInstance->stats->BoundPortCount != 1 ? "s" : ""); + user->WriteServ("NOTICE %s :*** The following port(s) failed to bind:", user->nick); int j = 1; for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++) { @@ -884,10 +947,10 @@ void ServerConfig::Read(bool bail, userrec* user) 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 @@ -900,6 +963,14 @@ void ServerConfig::Read(bool bail, userrec* user) 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()); } + + /** Note: This is safe, the method checks for user == NULL */ + ServerInstance->Parser->SetupCommandTable(user); + + 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) @@ -911,22 +982,23 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o 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) { errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl; return false; } - + /* 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) == include_stack[t]) @@ -935,13 +1007,28 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o 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(conf.get(ch)) + + /* Start reading characters... */ + 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; + return false; + } + /* * Here we try and get individual tags on separate lines, * this would be so easy if we just made people format @@ -950,24 +1037,15 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o * we get a '>' not inside quotes. If we find two '<' and * 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) - { - ServerInstance->Log(DEBUG, "Got \\n inside value"); line += '\n'; - } linenumber++; case '\r': if (!in_quote) @@ -977,7 +1055,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o case '\t': ch = ' '; } - + if(in_comment) continue; @@ -992,11 +1070,9 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o if ((ch == '\\') && (in_quote) && (in_tag)) { line += ch; - ServerInstance->Log(DEBUG,"Escape sequence in config line."); char real_character; if (conf.get(real_character)) { - ServerInstance->Log(DEBUG,"Escaping %c", real_character); if (real_character == 'n') real_character = '\n'; line += real_character; @@ -1011,12 +1087,12 @@ 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; return false; @@ -1024,7 +1100,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o } else { - if(in_quote) + if (in_quote) { errorstream << "We're in a quote but outside a tag, interesting. " << filename << ":" << linenumber << std::endl; return false; @@ -1036,11 +1112,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; @@ -1053,7 +1129,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; } @@ -1063,11 +1139,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; @@ -1076,10 +1152,10 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o * If this finds an then ParseLine can simply call * LoadConf() and load the included config into the same ConfigDataHash */ - - if(!this->ParseLine(target, line, linenumber, errorstream)) + + if (!this->ParseLine(target, line, linenumber, errorstream)) return false; - + line.clear(); } else @@ -1090,7 +1166,14 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o } } } - + + /* 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; + } + return true; } @@ -1099,7 +1182,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, return this->LoadConf(target, filename.c_str(), errorstream); } -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) { std::string tagname; std::string current_key; @@ -1108,20 +1191,18 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin bool got_name; bool got_key; bool in_quote; - + 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; } @@ -1174,6 +1255,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)) @@ -1193,23 +1275,23 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin 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 ((tagname == "include") && (current_key == "file")) { - if(!this->DoInclude(target, current_value, errorstream)) + if (!this->DoInclude(target, current_value, errorstream)) return false; } - + current_key.clear(); current_value.clear(); } } else { - if(in_quote) + if (in_quote) { current_value += *c; } @@ -1217,10 +1299,10 @@ 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)); - + return true; } @@ -1229,10 +1311,10 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st std::string confpath; std::string newfile; std::string::size_type pos; - - confpath = CONFIG_FILE; + + confpath = ServerInstance->ConfigFileName; newfile = file; - + for (std::string::iterator c = newfile.begin(); c != newfile.end(); c++) { if (*c == '\\') @@ -1243,7 +1325,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st if (file[0] != '/') { - if((pos = confpath.find("/inspircd.conf")) != std::string::npos) + if((pos = confpath.rfind("/")) != std::string::npos) { /* Leaves us with just the path */ newfile = confpath.substr(0, pos) + std::string("/") + newfile; @@ -1254,7 +1336,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st return false; } } - + return LoadConf(target, newfile, errorstream); } @@ -1304,55 +1386,110 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con } } } + if (!default_value.empty()) + { + result = default_value; + 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; } - + bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, int index, int &result) { - return ConfValueInteger(target, std::string(tag), std::string(var), index, result); + return ConfValueInteger(target, std::string(tag), std::string(var), "", index, result); +} + +bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, int &result) +{ + return ConfValueInteger(target, std::string(tag), std::string(var), std::string(default_value), index, result); } bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, int &result) +{ + return ConfValueInteger(target, tag, var, "", index, result); +} + +bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, int &result) { std::string value; std::istringstream stream; - bool r = ConfValue(target, tag, var, index, value); + bool r = ConfValue(target, tag, var, default_value, index, value); stream.str(value); if(!(stream >> result)) return false; + else + { + if (!value.empty()) + { + if (value.substr(0,2) == "0x") + { + char* endptr; + + value.erase(0,2); + result = strtol(value.c_str(), &endptr, 16); + + /* No digits found */ + if (endptr == value.c_str()) + return false; + } + else + { + char denominator = *(value.end() - 1); + switch (toupper(denominator)) + { + case 'K': + /* Kilobytes -> bytes */ + result = result * 1024; + break; + case 'M': + /* Megabytes -> bytes */ + result = result * 1024 * 1024; + break; + case 'G': + /* Gigabytes -> bytes */ + result = result * 1024 * 1024 * 1024; + break; + } + } + } + } return r; } - + + bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, int index) { - return ConfValueBool(target, std::string(tag), std::string(var), index); + return ConfValueBool(target, std::string(tag), std::string(var), "", index); +} + +bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index) +{ + return ConfValueBool(target, std::string(tag), std::string(var), std::string(default_value), index); } bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, int index) +{ + return ConfValueBool(target, tag, var, "", index); +} + +bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index) { std::string result; - if(!ConfValue(target, tag, var, index, result)) + if(!ConfValue(target, tag, var, default_value, index, result)) return false; - + return ((result == "yes") || (result == "true") || (result == "1")); } - + int ServerConfig::ConfValueEnum(ConfigDataHash &target, const char* tag) { return target.count(tag); @@ -1362,7 +1499,7 @@ int ServerConfig::ConfValueEnum(ConfigDataHash &target, const std::string &tag) { return target.count(tag); } - + int ServerConfig::ConfVarEnum(ConfigDataHash &target, const char* tag, int index) { return ConfVarEnum(target, std::string(tag), index); @@ -1371,25 +1508,17 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const char* tag, int index int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, int index) { ConfigDataHash::size_type pos = index; - + if((pos >= 0) && (pos < target.count(tag))) { ConfigDataHash::const_iterator iter = target.find(tag); - + for(int i = 0; i < index; i++) iter++; - + return iter->second.size(); } - else if(pos == 0) - { - ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str()); - } - else - { - ServerInstance->Log(DEBUG, "ConfVarEnum got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str()); - } - + return 0; } @@ -1397,25 +1526,35 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in */ bool ServerConfig::ReadFile(file_cache &F, const char* fname) { + if (!fname || !*fname) + return false; + FILE* file = NULL; char linebuf[MAXBUF]; F.clear(); - - if (*fname != '/') + + if ((*fname != '/') && (*fname != '\\')) { std::string::size_type pos; - std::string confpath = CONFIG_FILE; - if((pos = confpath.find("/inspircd.conf")) != std::string::npos) - { - /* Leaves us with just the path */ - std::string newfile = confpath.substr(0, pos) + std::string("/") + fname; - file = fopen(newfile.c_str(), "r"); - - } + std::string confpath = ServerInstance->ConfigFileName; + 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 + { + if (!FileExists(fname)) + return false; file = fopen(fname, "r"); + } if (file) { @@ -1442,11 +1581,16 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname) bool ServerConfig::FileExists(const char* file) { + struct stat sb; + if (stat(file, &sb) == -1) + return false; + + if ((sb.st_mode & S_IFDIR) > 0) + return false; + FILE *input; if ((input = fopen (file, "r")) == NULL) - { return false; - } else { fclose(input); @@ -1457,19 +1601,23 @@ 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); } bool ServerConfig::DirValid(const char* dirandfile) { - char work[MAXBUF]; - char buffer[MAXBUF]; - char otherdir[MAXBUF]; +#ifdef WINDOWS + return true; +#endif + + char work[1024]; + char buffer[1024]; + char otherdir[1024]; int p; - strlcpy(work, dirandfile, MAXBUF); + strlcpy(work, dirandfile, 1024); p = strlen(work); // we just want the dir @@ -1485,13 +1633,13 @@ bool ServerConfig::DirValid(const char* dirandfile) } // Get the current working directory - if (getcwd(buffer, MAXBUF ) == NULL ) + if (getcwd(buffer, 1024 ) == NULL ) return false; if (chdir(work) == -1) return false; - if (getcwd(otherdir, MAXBUF ) == NULL ) + if (getcwd(otherdir, 1024 ) == NULL ) return false; if (chdir(buffer) == -1) @@ -1502,7 +1650,6 @@ bool ServerConfig::DirValid(const char* dirandfile) if (strlen(otherdir) >= t) { otherdir[t] = '\0'; - if (!strcmp(otherdir,work)) { return true; @@ -1516,42 +1663,39 @@ bool ServerConfig::DirValid(const char* dirandfile) } } -std::string ServerConfig::GetFullProgDir(char** argv, int argc) +std::string ServerConfig::GetFullProgDir() { - char work[MAXBUF]; - char buffer[MAXBUF]; - char otherdir[MAXBUF]; - int p; - - strlcpy(work,argv[0],MAXBUF); - p = strlen(work); - - // we just want the dir - while (*work) + 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)) { - if (work[p] == '/') - { - work[p] = '\0'; - break; - } - - work[p--] = '\0'; + 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, MAXBUF) == NULL) - return ""; - - if (chdir(work) == -1) - return ""; - - if (getcwd(otherdir, MAXBUF) == NULL) - return ""; + if (getcwd(buffer, PATH_MAX)) + { + std::string remainder = this->argv[0]; - if (chdir(buffer) == -1) - return ""; + /* Does argv[0] start with /? its a full path, use it */ + if (remainder[0] == '/') + { + std::string::size_type n = remainder.rfind("/inspircd"); + return std::string(remainder, 0, n); + } - return otherdir; + std::string fullpath = std::string(buffer) + "/" + remainder; + std::string::size_type n = fullpath.rfind("/inspircd"); + return std::string(fullpath, 0, n); + } +#endif + return "/"; } InspIRCd* ServerConfig::GetInstance()