* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
+/* $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 "configreader.h"
-#include <sstream>
#include <fstream>
#include "xline.h"
#include "exitcodes.h"
#include "commands/cmd_whowas.h"
-
-std::vector<std::string> 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);
+#include "modes/cmode_h.h"
ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
{
- this->ClearStack();
- *ServerName = *Network = *ServerDesc = *AdminName = '\0';
+ *sid = *ServerName = *Network = *ServerDesc = *AdminName = '\0';
*HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = *FixedQuit = *HideKillsServer = '\0';
*DefaultModes = *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
- *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = *SuffixQuit = '\0';
+ *UserStats = *DisabledCommands = *SuffixQuit = '\0';
WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
log_file = NULL;
NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = UndernetMsgPrefix = false;
- CycleHosts = writelog = AllowHalfop = true;
+ CycleHosts = writelog = AllowHalfop = InvBypassModes = true;
dns_timeout = DieDelay = 5;
MaxTargets = 20;
NetBufferSize = 10240;
- SoftLimit = MAXCLIENTS;
+ SoftLimit = Instance->SE->GetMaxFds();
MaxConn = SOMAXCONN;
MaxWhoResults = 0;
debugging = 0;
MaxChans = 20;
OperMaxChans = 30;
- LogLevel = DEFAULT;
- maxbans.clear();
- DNSServerValidator = &ValidateDnsServer;
-}
-
-void ServerConfig::ClearStack()
-{
- include_stack.clear();
-}
-
-Module* ServerConfig::GetIOHook(int port)
-{
- std::map<int,Module*>::iterator x = IOHookModule.find(port);
- return (x != IOHookModule.end() ? x->second : NULL);
-}
-
-Module* ServerConfig::GetIOHook(InspSocket* is)
-{
- std::map<InspSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
- return (x != SocketIOHookModule.end() ? x->second : NULL);
-}
-
-bool ServerConfig::AddIOHook(int port, Module* iomod)
-{
- if (!GetIOHook(port))
- {
- IOHookModule[port] = iomod;
- return true;
- }
- else
- {
- throw ModuleException("Port already hooked by another module");
- return false;
- }
-}
-
-bool ServerConfig::AddIOHook(Module* iomod, InspSocket* is)
-{
- if (!GetIOHook(is))
- {
- SocketIOHookModule[is] = iomod;
- is->IsIOHooked = true;
- return true;
- }
- else
- {
- throw ModuleException("InspSocket derived class already hooked by another module");
- return false;
- }
-}
-
-bool ServerConfig::DelIOHook(int port)
-{
- std::map<int,Module*>::iterator x = IOHookModule.find(port);
- if (x != IOHookModule.end())
- {
- IOHookModule.erase(x);
- return true;
- }
- return false;
-}
-
-bool ServerConfig::DelIOHook(InspSocket* is)
-{
- std::map<InspSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
- if (x != SocketIOHookModule.end())
- {
- SocketIOHookModule.erase(x);
- return true;
- }
- return false;
+ c_ipv4_range = 32;
+ c_ipv6_range = 128;
}
void ServerConfig::Update005()
}
}
-void ServerConfig::Send005(userrec* user)
+void ServerConfig::Send005(User* user)
{
for (std::vector<std::string>::iterator line = ServerInstance->Config->isupport.begin(); line != ServerInstance->Config->isupport.end(); line++)
- user->WriteServ("005 %s %s", user->nick, line->c_str());
+ user->WriteNumeric(RPL_ISUPPORT, "%s %s", user->nick.c_str(), line->c_str());
}
-bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
+bool ServerConfig::CheckOnce(const char* tag)
{
- int count = ConfValueEnum(this->config_data, tag);
+ int count = ConfValueEnum(tag);
if (count > 1)
- {
throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted.");
- return false;
- }
if (count < 1)
- {
throw CoreException("You have not defined a <"+std::string(tag)+"> tag, this is required.");
- return false;
- }
return true;
}
-bool NoValidation(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static void ValidateNoSpaces(const char* p, const std::string &tag, const std::string &val)
{
- return true;
+ for (const char* ptr = p; *ptr; ++ptr)
+ {
+ if (*ptr == ' ')
+ throw CoreException("The value of <"+tag+":"+val+"> cannot contain spaces");
+ }
+}
+
+/* NOTE: Before anyone asks why we're not using inet_pton for this, it is because inet_pton and friends do not return so much detail,
+ * even in strerror(errno). They just return 'yes' or 'no' to an address without such detail as to whats WRONG with the address.
+ * Because ircd users arent as technical as they used to be (;)) we are going to give more of a useful error message.
+ */
+static void ValidateIP(const char* p, const std::string &tag, const std::string &val, bool wild)
+{
+ int num_dots = 0;
+ int num_seps = 0;
+ int not_numbers = false;
+ int not_hex = false;
+
+ if (*p)
+ {
+ if (*p == '.')
+ throw CoreException("The value of <"+tag+":"+val+"> is not an IP address");
+
+ for (const char* ptr = p; *ptr; ++ptr)
+ {
+ if (wild && (*ptr == '*' || *ptr == '?' || *ptr == '/'))
+ continue;
+
+ if (*ptr != ':' && *ptr != '.')
+ {
+ if (*ptr < '0' || *ptr > '9')
+ not_numbers = true;
+ if ((*ptr < '0' || *ptr > '9') && (toupper(*ptr) < 'A' || toupper(*ptr) > 'F'))
+ not_hex = true;
+ }
+ switch (*ptr)
+ {
+ case ' ':
+ throw CoreException("The value of <"+tag+":"+val+"> is not an IP address");
+ case '.':
+ num_dots++;
+ break;
+ case ':':
+ num_seps++;
+ break;
+ }
+ }
+
+ if (num_dots > 3)
+ throw CoreException("The value of <"+tag+":"+val+"> is an IPv4 address with too many fields!");
+
+ if (num_seps > 8)
+ throw CoreException("The value of <"+tag+":"+val+"> is an IPv6 address with too many fields!");
+
+ if (num_seps == 0 && num_dots < 3 && !wild)
+ throw CoreException("The value of <"+tag+":"+val+"> looks to be a malformed IPv4 address");
+
+ if (num_seps == 0 && num_dots == 3 && not_numbers)
+ throw CoreException("The value of <"+tag+":"+val+"> contains non-numeric characters in an IPv4 address");
+
+ if (num_seps != 0 && not_hex)
+ throw CoreException("The value of <"+tag+":"+val+"> contains non-hexdecimal characters in an IPv6 address");
+
+ if (num_seps != 0 && num_dots != 3 && num_dots != 0 && !wild)
+ throw CoreException("The value of <"+tag+":"+val+"> is a malformed IPv6 4in6 address");
+ }
}
-bool ValidateMaxTargets(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static void ValidateHostname(const char* p, const std::string &tag, const std::string &val)
{
- if ((data.GetInteger() < 0) || (data.GetInteger() > 31))
+ int num_dots = 0;
+ if (*p)
{
- conf->GetInstance()->Log(DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
+ if (*p == '.')
+ throw CoreException("The value of <"+tag+":"+val+"> is not a valid hostname");
+ for (const char* ptr = p; *ptr; ++ptr)
+ {
+ switch (*ptr)
+ {
+ case ' ':
+ throw CoreException("The value of <"+tag+":"+val+"> is not a valid hostname");
+ case '.':
+ num_dots++;
+ break;
+ }
+ }
+ if (num_dots == 0)
+ throw CoreException("The value of <"+tag+":"+val+"> is not a valid hostname");
+ }
+}
+
+// Specialized validators
+
+static bool ValidateMaxTargets(ServerConfig* conf, const char*, const char*, ValueItem &data)
+{
+ if ((data.GetInteger() < 1) || (data.GetInteger() > 31))
+ {
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <security:maxtargets> value is greater than 31 or less than 1, set to 20.");
data.Set(20);
}
return true;
}
-bool ValidateSoftLimit(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
- if ((data.GetInteger() < 1) || (data.GetInteger() > MAXCLIENTS))
+ if ((data.GetInteger() < 1) || (data.GetInteger() > conf->GetInstance()->SE->GetMaxFds()))
{
- conf->GetInstance()->Log(DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
- data.Set(MAXCLIENTS);
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <performance:softlimit> value is greater than %d or less than 0, set to %d.",conf->GetInstance()->SE->GetMaxFds(),conf->GetInstance()->SE->GetMaxFds());
+ data.Set(conf->GetInstance()->SE->GetMaxFds());
}
return true;
}
-bool ValidateMaxConn(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateMaxConn(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
if (data.GetInteger() > SOMAXCONN)
- conf->GetInstance()->Log(DEFAULT,"WARNING: <options:somaxconn> value may be higher than the system-defined SOMAXCONN value!");
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <performance:somaxconn> value may be higher than the system-defined SOMAXCONN value!");
return true;
}
-bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance)
+bool ServerConfig::ApplyDisabledCommands(const char* data)
{
std::stringstream dcmds(data);
std::string thiscmd;
/* Enable everything first */
- for (command_table::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
+ for (Commandtable::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
x->second->Disable(false);
/* Now disable all the ones which the user wants disabled */
while (dcmds >> thiscmd)
{
- command_table::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
+ Commandtable::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
if (cm != ServerInstance->Parser->cmdlist.end())
{
cm->second->Disable(true);
return true;
}
-bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateDisabledUModes(ServerConfig* conf, const char*, const char*, ValueItem &data)
+{
+ memset(conf->DisabledUModes, 0, sizeof(conf->DisabledUModes));
+ for (const unsigned char* p = (const unsigned char*)data.GetString(); *p; ++p)
+ {
+ if (*p < 'A' || *p > ('A' + 64)) throw CoreException(std::string("Invalid usermode ")+(char)*p+" was found.");
+ conf->DisabledUModes[*p - 'A'] = 1;
+ }
+ return true;
+}
+
+static bool ValidateDisabledCModes(ServerConfig* conf, const char*, const char*, ValueItem &data)
+{
+ memset(conf->DisabledCModes, 0, sizeof(conf->DisabledCModes));
+ for (const unsigned char* p = (const unsigned char*)data.GetString(); *p; ++p)
+ {
+ if (*p < 'A' || *p > ('A' + 64)) throw CoreException(std::string("Invalid chanmode ")+(char)*p+" was found.");
+ conf->DisabledCModes[*p - 'A'] = 1;
+ }
+ return true;
+}
+
+#ifdef WINDOWS
+// Note: the windows validator is in win32wrapper.cpp
+bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &data);
+#else
+static bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
if (!*(data.GetString()))
{
std::string nameserver;
// attempt to look up their nameserver from /etc/resolv.conf
- conf->GetInstance()->Log(DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
- ifstream resolv("/etc/resolv.conf");
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
+ std::ifstream resolv("/etc/resolv.conf");
bool found_server = false;
if (resolv.is_open())
resolv >> nameserver;
data.Set(nameserver.c_str());
found_server = true;
- conf->GetInstance()->Log(DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str());
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str());
}
}
if (!found_server)
{
- conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
data.Set("127.0.0.1");
}
}
else
{
- conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!");
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!");
data.Set("127.0.0.1");
}
}
return true;
}
+#endif
-bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateServerName(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Validating server name");
/* 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(),'.'))
+ if (!strchr(data.GetString(), '.'))
{
- conf->GetInstance()->Log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",data.GetString(),data.GetString(),'.');
- std::string moo = std::string(data.GetString()).append(".");
- data.Set(moo.c_str());
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s.'",
+ data.GetString(),data.GetString());
+ std::string moo = data.GetValue();
+ data.Set(moo.append("."));
}
+ ValidateHostname(data.GetString(), "server", "name");
return true;
}
-bool ValidateNetBufferSize(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateNetBufferSize(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
- if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1024))
+ // 65534 not 65535 because of null terminator
+ if ((!data.GetInteger()) || (data.GetInteger() > 65534) || (data.GetInteger() < 1024))
{
- conf->GetInstance()->Log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
data.Set(10240);
}
return true;
}
-bool ValidateMaxWho(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateMaxWho(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
if ((data.GetInteger() > 65535) || (data.GetInteger() < 1))
{
- conf->GetInstance()->Log(DEFAULT,"<options:maxwhoresults> size out of range, setting to default of 128.");
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"<performance:maxwho> size out of range, setting to default of 128.");
data.Set(128);
}
return true;
}
-bool ValidateLogLevel(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateHalfOp(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
- std::string dbg = data.GetString();
- conf->LogLevel = DEFAULT;
-
- if (dbg == "debug")
- conf->LogLevel = DEBUG;
- else if (dbg == "verbose")
- conf->LogLevel = VERBOSE;
- else if (dbg == "default")
- conf->LogLevel = DEFAULT;
- else if (dbg == "sparse")
- conf->LogLevel = SPARSE;
- else if (dbg == "none")
- conf->LogLevel = NONE;
-
- conf->debugging = (conf->LogLevel == DEBUG);
-
+ ModeHandler* mh = conf->GetInstance()->Modes->FindMode('h', MODETYPE_CHANNEL);
+ if (data.GetBool() && !mh) {
+ conf->GetInstance()->Logs->Log("CONFIG", DEFAULT, "Enabling halfop mode.");
+ mh = new ModeChannelHalfOp(conf->GetInstance());
+ conf->GetInstance()->Modes->AddMode(mh);
+ } else if (!data.GetBool() && mh) {
+ conf->GetInstance()->Logs->Log("CONFIG", DEFAULT, "Disabling halfop mode.");
+ conf->GetInstance()->Modes->DelMode(mh);
+ delete mh;
+ }
return true;
}
-bool ValidateMotd(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateMotd(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
conf->ReadFile(conf->MOTD, data.GetString());
return true;
}
-bool ValidateNotEmpty(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateNotEmpty(ServerConfig*, const char* tag, const char* val, ValueItem &data)
{
- if (!*data.GetString())
- throw CoreException(std::string("The value for ")+tag+" cannot be empty!");
+ if (data.GetValue().empty())
+ throw CoreException(std::string("The value for <")+tag+":"+val+"> cannot be empty!");
return true;
}
-bool ValidateRules(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateRules(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
conf->ReadFile(conf->RULES, data.GetString());
return true;
}
-bool ValidateModeLists(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateModeLists(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
- memset(conf->HideModeLists, 0, 256);
+ memset(conf->HideModeLists, 0, sizeof(conf->HideModeLists));
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)
+static bool ValidateExemptChanOps(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
- memset(conf->ExemptChanOps, 0, 256);
+ memset(conf->ExemptChanOps, 0, sizeof(conf->ExemptChanOps));
for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x)
conf->ExemptChanOps[*x] = true;
return true;
}
-bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+static bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &data)
+{
+ const std::string& v = data.GetValue();
+
+ 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;
+}
+
+static bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem &data)
+{
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Validating server id");
+
+ const char *sid = data.GetString();
+
+ if (*sid && !conf->GetInstance()->IsSID(sid))
+ {
+ throw CoreException(std::string(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.");
+ }
+
+ strlcpy(conf->sid, sid, 5);
+
+ return true;
+}
+
+static bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString());
if (conf->WhoWasMaxKeep < 3600)
{
conf->WhoWasMaxKeep = 3600;
- conf->GetInstance()->Log(DEFAULT,"WARNING: <whowas:maxkeep> value less than 3600, setting to default 3600");
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <whowas:maxkeep> value less than 3600, setting to default 3600");
}
- command_t* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS");
+ Command* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS");
if (whowas_command)
{
std::deque<classbase*> params;
return true;
}
-/* Callback called before processing the first <connect> tag
+/* Callback called to process a single <uline> tag
*/
-bool InitConnect(ServerConfig* conf, const char* tag)
+static bool DoULine(ServerConfig* conf, const char*, const char**, ValueList &values, int*)
{
- conf->GetInstance()->Log(DEFAULT,"Reading connect classes...");
- conf->Classes.clear();
- return true;
-}
-
-/* Callback called to process a single <connect> tag
- */
-bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
-{
- ConnectClass c;
- const char* allow = values[0].GetString(); /* Yeah, there are a lot of values. Live with it. */
- const char* deny = values[1].GetString();
- const char* password = values[2].GetString();
- int timeout = values[3].GetInteger();
- int pingfreq = values[4].GetInteger();
- int flood = values[5].GetInteger();
- int threshold = values[6].GetInteger();
- int sendq = values[7].GetInteger();
- 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 (*parent)
- {
- /* 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() == name)
- {
- 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(name) + "' which cannot be found.");
- }
- else
- {
- 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);
- }
- }
-
+ const char* server = values[0].GetString();
+ const bool silent = values[1].GetBool();
+ conf->ulines[server] = silent;
return true;
}
-/* Callback called when there are no more <connect> tags
+/* Callback called to process a single <banlist> tag
*/
-bool DoneConnect(ServerConfig* conf, const char* tag)
+static bool DoMaxBans(ServerConfig* conf, const char*, const char**, ValueList &values, int*)
{
+ const char* channel = values[0].GetString();
+ int limit = values[1].GetInteger();
+ conf->maxbans[channel] = limit;
return true;
}
-/* Callback called before processing the first <uline> tag
- */
-bool InitULine(ServerConfig* conf, const char* tag)
+static bool DoZLine(ServerConfig* conf, const char* tag, const char** entries, ValueList &values, int* types)
{
- conf->ulines.clear();
+ const char* reason = values[0].GetString();
+ const char* ipmask = values[1].GetString();
+
+ ZLine* zl = new ZLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, ipmask);
+ if (!conf->GetInstance()->XLines->AddLine(zl, NULL))
+ delete zl;
+
return true;
}
-/* Callback called to process a single <uline> tag
- */
-bool DoULine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+static bool DoQLine(ServerConfig* conf, const char* tag, const char** entries, ValueList &values, int* types)
{
- const char* server = values[0].GetString();
- const bool silent = values[1].GetBool();
- conf->ulines[server] = silent;
+ const char* reason = values[0].GetString();
+ const char* nick = values[1].GetString();
+
+ QLine* ql = new QLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, nick);
+ if (!conf->GetInstance()->XLines->AddLine(ql, NULL))
+ delete ql;
+
return true;
}
-/* Callback called when there are no more <uline> tags
- */
-bool DoneULine(ServerConfig* conf, const char* tag)
+static bool DoKLine(ServerConfig* conf, const char* tag, const char** entries, ValueList &values, int* types)
{
+ const char* reason = values[0].GetString();
+ const char* host = values[1].GetString();
+
+ XLineManager* xlm = conf->GetInstance()->XLines;
+
+ IdentHostPair ih = xlm->IdentSplit(host);
+
+ KLine* kl = new KLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, ih.first.c_str(), ih.second.c_str());
+ if (!xlm->AddLine(kl, NULL))
+ delete kl;
return true;
}
-/* Callback called before processing the first <module> tag
- */
-bool InitModule(ServerConfig* conf, const char* tag)
+static bool DoELine(ServerConfig* conf, const char* tag, const char** entries, ValueList &values, int* types)
{
- old_module_names.clear();
- new_module_names.clear();
- added_modules.clear();
- removed_modules.clear();
- for (std::vector<std::string>::iterator t = conf->module_names.begin(); t != conf->module_names.end(); t++)
- {
- old_module_names.push_back(*t);
- }
+ const char* reason = values[0].GetString();
+ const char* host = values[1].GetString();
+
+ XLineManager* xlm = conf->GetInstance()->XLines;
+
+ IdentHostPair ih = xlm->IdentSplit(host);
+
+ ELine* el = new ELine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, ih.first.c_str(), ih.second.c_str());
+ if (!xlm->AddLine(el, NULL))
+ delete el;
return true;
}
-/* Callback called to process a single <module> tag
- */
-bool DoModule(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+static bool DoType(ServerConfig* conf, const char*, const char**, ValueList &values, int*)
{
- const char* modname = values[0].GetString();
- new_module_names.push_back(modname);
+ const char* TypeName = values[0].GetString();
+ const char* Classes = values[1].GetString();
+
+ conf->opertypes[TypeName] = std::string(Classes);
return true;
}
-/* Callback called when there are no more <module> tags
- */
-bool DoneModule(ServerConfig* conf, const char* tag)
+static bool DoClass(ServerConfig* conf, const char* tag, const char**, ValueList &values, int*)
{
- // now create a list of new modules that are due to be loaded
- // and a seperate list of modules which are due to be unloaded
- for (std::vector<std::string>::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++)
- {
- bool added = true;
+ const char* ClassName = values[0].GetString();
+ const char* CommandList = values[1].GetString();
+ const char* UModeList = values[2].GetString();
+ const char* CModeList = values[3].GetString();
+ const char *PrivsList = values[4].GetString();
- for (std::vector<std::string>::iterator old = old_module_names.begin(); old != old_module_names.end(); old++)
+ for (const char* c = UModeList; *c; ++c)
+ {
+ if ((*c < 'A' || *c > 'z') && *c != '*')
{
- if (*old == *_new)
- added = false;
+ throw CoreException("Character " + std::string(1, *c) + " is not a valid mode in <class:usermodes>");
}
-
- if (added)
- added_modules.push_back(*_new);
}
-
- for (std::vector<std::string>::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++)
+ for (const char* c = CModeList; *c; ++c)
{
- bool removed = true;
- for (std::vector<std::string>::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++)
+ if ((*c < 'A' || *c > 'z') && *c != '*')
{
- if (*newm == *oldm)
- removed = false;
+ throw CoreException("Character " + std::string(1, *c) + " is not a valid mode in <class:chanmodes>");
}
-
- if (removed)
- removed_modules.push_back(*oldm);
}
- return true;
-}
-
-/* Callback called before processing the first <banlist> tag
- */
-bool InitMaxBans(ServerConfig* conf, const char* tag)
-{
- conf->maxbans.clear();
- return true;
-}
-/* Callback called to process a single <banlist> tag
- */
-bool DoMaxBans(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
-{
- const char* channel = values[0].GetString();
- int limit = values[1].GetInteger();
- conf->maxbans[channel] = limit;
+ conf->operclass[ClassName].commandlist = strnewdup(CommandList);
+ conf->operclass[ClassName].umodelist = strnewdup(UModeList);
+ conf->operclass[ClassName].cmodelist = strnewdup(CModeList);
+ conf->operclass[ClassName].privs = strnewdup(PrivsList);
return true;
}
-/* Callback called when there are no more <banlist> tags.
- */
-bool DoneMaxBans(ServerConfig* conf, const char* tag)
+void ServerConfig::CrossCheckOperClassType()
{
- return true;
+ for (int i = 0; i < ConfValueEnum("type"); ++i)
+ {
+ char item[MAXBUF], classn[MAXBUF], classes[MAXBUF];
+ std::string classname;
+ ConfValue("type", "classes", "", i, classes, MAXBUF, false);
+ irc::spacesepstream str(classes);
+ ConfValue("type", "name", "", i, item, MAXBUF, false);
+ while (str.GetToken(classname))
+ {
+ std::string lost;
+ bool foundclass = false;
+ for (int j = 0; j < ConfValueEnum("class"); ++j)
+ {
+ ConfValue("class", "name", "", j, classn, MAXBUF, false);
+ if (!strcmp(classn, classname.c_str()))
+ {
+ foundclass = true;
+ break;
+ }
+ }
+ if (!foundclass)
+ {
+ char msg[MAXBUF];
+ snprintf(msg, MAXBUF, " Warning: Oper type '%s' has a missing class named '%s', this does nothing!\n",
+ item, classname.c_str());
+ throw CoreException(msg);
+ }
+ }
+ }
}
-void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, userrec* user)
+void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
{
- ServerInstance->Log(DEFAULT, "There were errors in your configuration file: %s", errormessage.c_str());
- if (bail)
+ typedef std::map<std::string, ConnectClass*> ClassMap;
+ ClassMap oldBlocksByMask;
+ if (current)
{
- /* Unneeded because of the ServerInstance->Log() aboive? */
- printf("There were errors in your configuration:\n%s\n\n",errormessage.c_str());
- ServerInstance->Exit(EXIT_STATUS_CONFIG);
+ 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;
+ }
}
- else
+
+ int block_count = ConfValueEnum("connect");
+ ClassMap newBlocksByMask;
+ Classes.resize(block_count, NULL);
+ std::map<std::string, int> names;
+
+ bool try_again = true;
+ for(int tries=0; try_again && tries < block_count + 1; tries++)
{
- std::string errors = errormessage;
- std::string::size_type start;
- unsigned int prefixlen;
- start = 0;
- /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */
- if (user)
+ try_again = false;
+ for(int i=0; i < block_count; i++)
{
- 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())
+ if (Classes[i])
+ continue;
+
+ ConnectClass* parent = NULL;
+ std::string parentName;
+ if (ConfValue("connect", "parent", i, parentName, false))
{
- user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
- start += 510 - prefixlen;
+ std::map<std::string,int>::iterator parentIter = names.find(parentName);
+ if (parentIter == names.end())
+ {
+ try_again = true;
+ // couldn't find parent this time. If it's the last time, we'll never find it.
+ if (tries == block_count)
+ throw CoreException("Could not find parent connect class \"" + parentName + "\" for connect block " + ConvToStr(i));
+ continue;
+ }
+ parent = Classes[parentIter->second];
}
- }
- else
- {
- ServerInstance->WriteOpers("There were errors in the configuration file:");
- while (start < errors.length())
+
+ std::string name;
+ if (ConfValue("connect", "name", i, name, false))
+ {
+ if (names.find(name) != names.end())
+ throw CoreException("Two connect classes with name \"" + name + "\" defined!");
+ names[name] = i;
+ }
+
+ std::string mask, typeMask;
+ char type;
+
+ if (ConfValue("connect", "allow", i, mask, false))
+ {
+ type = CC_ALLOW;
+ typeMask = 'a' + mask;
+ }
+ else if (ConfValue("connect", "deny", i, mask, false))
{
- ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
- start += 360;
+ type = CC_DENY;
+ typeMask = 'd' + mask;
}
+ else
+ {
+ throw CoreException("Connect class must have an allow or deny mask (#" + ConvToStr(i) + ")");
+ }
+ ClassMap::iterator dupMask = newBlocksByMask.find(typeMask);
+ if (dupMask != newBlocksByMask.end())
+ throw CoreException("Two connect classes cannot have the same mask (" + mask + ")");
+
+ ConnectClass* me = parent ?
+ new ConnectClass(type, mask, *parent) :
+ new ConnectClass(type, mask);
+
+ if (!name.empty())
+ me->name = name;
+
+ std::string tmpv;
+ if (ConfValue("connect", "password", i, tmpv, false))
+ me->pass= tmpv;
+ if (ConfValue("connect", "hash", i, tmpv, false))
+ me->hash = tmpv;
+ if (ConfValue("connect", "timeout", i, tmpv, false))
+ me->registration_timeout = atol(tmpv.c_str());
+ if (ConfValue("connect", "pingfreq", i, tmpv, false))
+ me->pingtime = atol(tmpv.c_str());
+ if (ConfValue("connect", "sendq", i, tmpv, false))
+ me->sendqmax = atol(tmpv.c_str());
+ if (ConfValue("connect", "recvq", i, tmpv, false))
+ me->recvqmax = atol(tmpv.c_str());
+ if (ConfValue("connect", "localmax", i, tmpv, false))
+ me->maxlocal = atol(tmpv.c_str());
+ if (ConfValue("connect", "globalmax", i, tmpv, false))
+ me->maxglobal = atol(tmpv.c_str());
+ if (ConfValue("connect", "port", i, tmpv, false))
+ me->port = atol(tmpv.c_str());
+ if (ConfValue("connect", "maxchans", i, tmpv, false))
+ me->maxchans = atol(tmpv.c_str());
+ if (ConfValue("connect", "limit", i, tmpv, false))
+ me->limit = atol(tmpv.c_str());
+
+ ClassMap::iterator oldMask = oldBlocksByMask.find(typeMask);
+ if (oldMask != oldBlocksByMask.end())
+ {
+ oldBlocksByMask.erase(oldMask);
+ ConnectClass* old = oldMask->second;
+ old->Update(me);
+ delete me;
+ me = old;
+ }
+ newBlocksByMask[typeMask] = me;
+ Classes[i] = me;
}
- return;
}
-}
-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 */
- int rem = 0, add = 0; /* Number of modules added, number of modules removed */
- std::ostringstream errstr; /* String stream containing the error output */
-
- /* These tags MUST occur and must ONLY occur once in the config file */
- static char* Once[] = { "server", "admin", "files", "power", "options", NULL };
-
- /* These tags can occur ONCE or not at all */
- InitialConfig Values[] = {
- {"options", "softlimit", MAXCLIENTS_S, new ValueContainerUInt (&this->SoftLimit), DT_INTEGER, ValidateSoftLimit},
- {"options", "somaxconn", SOMAXCONN_S, new ValueContainerInt (&this->MaxConn), DT_INTEGER, ValidateMaxConn},
- {"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 ValueContainerBool (&this->AnnounceInvites), DT_BOOLEAN, NoValidation},
- {"options", "hostintopic", "1", new ValueContainerBool (&this->FullHostInTopic), DT_BOOLEAN, NoValidation},
- {"options", "hidemodes", "", new ValueContainerChar (hidemodes), DT_CHARPTR, ValidateModeLists},
- {"options", "exemptchanops","", new ValueContainerChar (exemptchanops), DT_CHARPTR, ValidateExemptChanOps},
- {"options", "defaultmodes", "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}
- };
-
- /* 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.
- */
- MultiConfig MultiValues[] = {
-
- {"connect",
- {"allow", "deny", "password", "timeout", "pingfreq", "flood",
- "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_CHARPTR, DT_CHARPTR, DT_INTEGER},
- InitConnect, DoConnect, DoneConnect},
-
- {"uline",
- {"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, DoneZLine},
-
- {"badnick",
- {"reason", "nick", NULL},
- {"No reason", "", NULL},
- {DT_CHARPTR, DT_CHARPTR},
- InitXLine, DoQLine, DoneQLine},
-
- {"badhost",
- {"reason", "host", NULL},
- {"No reason", "", NULL},
- {DT_CHARPTR, DT_CHARPTR},
- InitXLine, DoKLine, DoneKLine},
-
- {"exception",
- {"reason", "host", NULL},
- {"No reason", "", NULL},
- {DT_CHARPTR, DT_CHARPTR},
- 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},
-
- {NULL}
- };
+ for(ClassMap::iterator toRemove = oldBlocksByMask.begin(); toRemove != oldBlocksByMask.end(); toRemove++)
+ {
+ removed_classes.push_back(toRemove->second);
+ }
+}
- include_stack.clear();
+static const Deprecated ChangedConfig[] = {
+ {"options", "hidelinks", "has been moved to <security:hidelinks> as of 1.2a3"},
+ {"options", "hidewhois", "has been moved to <security:hidewhois> as of 1.2a3"},
+ {"options", "userstats", "has been moved to <security:userstats> as of 1.2a3"},
+ {"options", "customversion", "has been moved to <security:customversion> as of 1.2a3"},
+ {"options", "hidesplits", "has been moved to <security:hidesplits> as of 1.2a3"},
+ {"options", "hidebans", "has been moved to <security:hidebans> as of 1.2a3"},
+ {"options", "hidekills", "has been moved to <security:hidekills> as of 1.2a3"},
+ {"options", "operspywhois", "has been moved to <security:operspywhois> as of 1.2a3"},
+ {"options", "announceinvites", "has been moved to <security:announceinvites> as of 1.2a3"},
+ {"options", "hidemodes", "has been moved to <security:hidemodes> as of 1.2a3"},
+ {"options", "maxtargets", "has been moved to <security:maxtargets> as of 1.2a3"},
+ {"options", "nouserdns", "has been moved to <performance:nouserdns> as of 1.2a3"},
+ {"options", "maxwho", "has been moved to <performance:maxwho> as of 1.2a3"},
+ {"options", "softlimit", "has been moved to <performance:softlimit> as of 1.2a3"},
+ {"options", "somaxconn", "has been moved to <performance:somaxconn> as of 1.2a3"},
+ {"options", "netbuffersize", "has been moved to <performance:netbuffersize> as of 1.2a3"},
+ {"options", "maxwho", "has been moved to <performance:maxwho> as of 1.2a3"},
+ {"options", "loglevel", "1.2 does not use the loglevel value. Please define <log> tags instead."},
+ {"die", "value", "has always been deprecated"},
+};
+
+/* These tags can occur ONCE or not at all */
+static const InitialConfig Values[] = {
+ {"performance", "softlimit", "0", new ValueContainerUInt (&ServerConfig::SoftLimit), DT_INTEGER, ValidateSoftLimit},
+ {"performance", "somaxconn", SOMAXCONN_S, new ValueContainerInt (&ServerConfig::MaxConn), DT_INTEGER, ValidateMaxConn},
+ {"options", "moronbanner", "You're banned!", new ValueContainerChar (&ServerConfig::MoronBanner), DT_CHARPTR, NULL},
+ {"server", "name", "", new ValueContainerChar (&ServerConfig::ServerName), DT_HOSTNAME, ValidateServerName},
+ {"server", "description", "Configure Me", new ValueContainerChar (&ServerConfig::ServerDesc), DT_CHARPTR, NULL},
+ {"server", "network", "Network", new ValueContainerChar (&ServerConfig::Network), DT_NOSPACES, NULL},
+ {"server", "id", "", new ValueContainerChar (&ServerConfig::sid), DT_CHARPTR, ValidateSID},
+ {"admin", "name", "", new ValueContainerChar (&ServerConfig::AdminName), DT_CHARPTR, NULL},
+ {"admin", "email", "Mis@configu.red", new ValueContainerChar (&ServerConfig::AdminEmail), DT_CHARPTR, NULL},
+ {"admin", "nick", "Misconfigured", new ValueContainerChar (&ServerConfig::AdminNick), DT_CHARPTR, NULL},
+ {"files", "motd", "", new ValueContainerChar (&ServerConfig::motd), DT_CHARPTR, ValidateMotd},
+ {"files", "rules", "", new ValueContainerChar (&ServerConfig::rules), DT_CHARPTR, ValidateRules},
+ {"power", "diepass", "", new ValueContainerChar (&ServerConfig::diepass), DT_CHARPTR, ValidateNotEmpty},
+ {"power", "pause", "", new ValueContainerInt (&ServerConfig::DieDelay), DT_INTEGER, NULL},
+ {"power", "hash", "", new ValueContainerChar (&ServerConfig::powerhash), DT_CHARPTR, NULL},
+ {"power", "restartpass", "", new ValueContainerChar (&ServerConfig::restartpass), DT_CHARPTR, ValidateNotEmpty},
+ {"options", "prefixquit", "", new ValueContainerChar (&ServerConfig::PrefixQuit), DT_CHARPTR, NULL},
+ {"options", "suffixquit", "", new ValueContainerChar (&ServerConfig::SuffixQuit), DT_CHARPTR, NULL},
+ {"options", "fixedquit", "", new ValueContainerChar (&ServerConfig::FixedQuit), DT_CHARPTR, NULL},
+ {"options", "prefixpart", "", new ValueContainerChar (&ServerConfig::PrefixPart), DT_CHARPTR, NULL},
+ {"options", "suffixpart", "", new ValueContainerChar (&ServerConfig::SuffixPart), DT_CHARPTR, NULL},
+ {"options", "fixedpart", "", new ValueContainerChar (&ServerConfig::FixedPart), DT_CHARPTR, NULL},
+ {"performance", "netbuffersize","10240", new ValueContainerInt (&ServerConfig::NetBufferSize), DT_INTEGER, ValidateNetBufferSize},
+ {"performance", "maxwho", "128", new ValueContainerInt (&ServerConfig::MaxWhoResults), DT_INTEGER, ValidateMaxWho},
+ {"options", "allowhalfop", "0", new ValueContainerBool (&ServerConfig::AllowHalfop), DT_BOOLEAN, ValidateHalfOp},
+ {"dns", "server", "", new ValueContainerChar (&ServerConfig::DNSServer), DT_IPADDRESS,ValidateDnsServer},
+ {"dns", "timeout", "5", new ValueContainerInt (&ServerConfig::dns_timeout), DT_INTEGER, NULL},
+ {"options", "moduledir", MOD_PATH, new ValueContainerString (&ServerConfig::ModPath), DT_CHARPTR, NULL},
+ {"disabled", "commands", "", new ValueContainerChar (&ServerConfig::DisabledCommands), DT_CHARPTR, NULL},
+ {"disabled", "usermodes", "", NULL, DT_NOTHING, ValidateDisabledUModes},
+ {"disabled", "chanmodes", "", NULL, DT_NOTHING, ValidateDisabledCModes},
+ {"disabled", "fakenonexistant", "0", new ValueContainerBool (&ServerConfig::DisabledDontExist), DT_BOOLEAN, NULL},
+
+ {"security", "runasuser", "", new ValueContainerChar(&ServerConfig::SetUser), DT_CHARPTR, NULL},
+ {"security", "runasgroup", "", new ValueContainerChar(&ServerConfig::SetGroup), DT_CHARPTR, NULL},
+ {"security", "userstats", "", new ValueContainerChar (&ServerConfig::UserStats), DT_CHARPTR, NULL},
+ {"security", "customversion","", new ValueContainerChar (&ServerConfig::CustomVersion), DT_CHARPTR, NULL},
+ {"security", "hidesplits", "0", new ValueContainerBool (&ServerConfig::HideSplits), DT_BOOLEAN, NULL},
+ {"security", "hidebans", "0", new ValueContainerBool (&ServerConfig::HideBans), DT_BOOLEAN, NULL},
+ {"security", "hidewhois", "", new ValueContainerChar (&ServerConfig::HideWhoisServer), DT_NOSPACES, NULL},
+ {"security", "hidekills", "", new ValueContainerChar (&ServerConfig::HideKillsServer), DT_NOSPACES, NULL},
+ {"security", "operspywhois", "0", new ValueContainerBool (&ServerConfig::OperSpyWhois), DT_BOOLEAN, NULL},
+ {"security", "restrictbannedusers", "1", new ValueContainerBool (&ServerConfig::RestrictBannedUsers), DT_BOOLEAN, NULL},
+ {"security", "genericoper", "0", new ValueContainerBool (&ServerConfig::GenericOper), DT_BOOLEAN, NULL},
+ {"performance", "nouserdns", "0", new ValueContainerBool (&ServerConfig::NoUserDns), DT_BOOLEAN, NULL},
+ {"options", "syntaxhints", "0", new ValueContainerBool (&ServerConfig::SyntaxHints), DT_BOOLEAN, NULL},
+ {"options", "cyclehosts", "0", new ValueContainerBool (&ServerConfig::CycleHosts), DT_BOOLEAN, NULL},
+ {"options", "ircumsgprefix","0", new ValueContainerBool (&ServerConfig::UndernetMsgPrefix), DT_BOOLEAN, NULL},
+ {"security", "announceinvites", "1", NULL, DT_NOTHING, ValidateInvite},
+ {"options", "hostintopic", "1", new ValueContainerBool (&ServerConfig::FullHostInTopic), DT_BOOLEAN, NULL},
+ {"security", "hidemodes", "", NULL, DT_NOTHING, ValidateModeLists},
+ {"options", "exemptchanops","", NULL, DT_NOTHING, ValidateExemptChanOps},
+ {"security", "maxtargets", "20", new ValueContainerUInt (&ServerConfig::MaxTargets), DT_INTEGER, ValidateMaxTargets},
+ {"options", "defaultmodes", "nt", new ValueContainerChar (&ServerConfig::DefaultModes), DT_CHARPTR, NULL},
+ {"pid", "file", "", new ValueContainerString (&ServerConfig::PID), DT_CHARPTR, NULL},
+ {"whowas", "groupsize", "10", new ValueContainerInt (&ServerConfig::WhoWasGroupSize), DT_INTEGER, NULL},
+ {"whowas", "maxgroups", "10240", new ValueContainerInt (&ServerConfig::WhoWasMaxGroups), DT_INTEGER, NULL},
+ {"whowas", "maxkeep", "3600", NULL, DT_NOTHING, ValidateWhoWas},
+ {"die", "value", "", new ValueContainerChar (&ServerConfig::DieValue), DT_CHARPTR, NULL},
+ {"channels", "users", "20", new ValueContainerUInt (&ServerConfig::MaxChans), DT_INTEGER, NULL},
+ {"channels", "opers", "60", new ValueContainerUInt (&ServerConfig::OperMaxChans), DT_INTEGER, NULL},
+ {"cidr", "ipv4clone", "32", new ValueContainerInt (&ServerConfig::c_ipv4_range), DT_INTEGER, NULL},
+ {"cidr", "ipv6clone", "128", new ValueContainerInt (&ServerConfig::c_ipv6_range), DT_INTEGER, NULL},
+ {"limits", "maxnick", "32", new ValueContainerLimit (&ServerLimits::NickMax), DT_LIMIT, NULL},
+ {"limits", "maxchan", "64", new ValueContainerLimit (&ServerLimits::ChanMax), DT_LIMIT, NULL},
+ {"limits", "maxmodes", "20", new ValueContainerLimit (&ServerLimits::MaxModes), DT_LIMIT, NULL},
+ {"limits", "maxident", "11", new ValueContainerLimit (&ServerLimits::IdentMax), DT_LIMIT, NULL},
+ {"limits", "maxquit", "255", new ValueContainerLimit (&ServerLimits::MaxQuit), DT_LIMIT, NULL},
+ {"limits", "maxtopic", "307", new ValueContainerLimit (&ServerLimits::MaxTopic), DT_LIMIT, NULL},
+ {"limits", "maxkick", "255", new ValueContainerLimit (&ServerLimits::MaxKick), DT_LIMIT, NULL},
+ {"limits", "maxgecos", "128", new ValueContainerLimit (&ServerLimits::MaxGecos), DT_LIMIT, NULL},
+ {"limits", "maxaway", "200", new ValueContainerLimit (&ServerLimits::MaxAway), DT_LIMIT, NULL},
+ {"options", "invitebypassmodes", "1", new ValueContainerBool (&ServerConfig::InvBypassModes), DT_BOOLEAN, 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.
+ */
+MultiConfig MultiValues[] = {
+
+ {"connect",
+ {"allow", "deny", "password", "timeout", "pingfreq",
+ "sendq", "recvq", "localmax", "globalmax", "port",
+ "name", "parent", "maxchans", "limit", "hash",
+ NULL},
+ {"", "", "", "", "120",
+ "", "", "3", "3", "0",
+ "", "", "0", "0", "",
+ NULL},
+ {DT_IPADDRESS|DT_ALLOW_WILD, DT_IPADDRESS|DT_ALLOW_WILD, DT_CHARPTR, DT_INTEGER, DT_INTEGER,
+ DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER,
+ DT_NOSPACES, DT_NOSPACES, DT_INTEGER, DT_INTEGER, DT_CHARPTR},
+ NULL,},
+
+ {"uline",
+ {"server", "silent", NULL},
+ {"", "0", NULL},
+ {DT_HOSTNAME, DT_BOOLEAN},
+ DoULine},
+
+ {"banlist",
+ {"chan", "limit", NULL},
+ {"", "", NULL},
+ {DT_CHARPTR, DT_INTEGER},
+ DoMaxBans},
+
+ {"module",
+ {"name", NULL},
+ {"", NULL},
+ {DT_CHARPTR},
+ NULL},
+
+ {"badip",
+ {"reason", "ipmask", NULL},
+ {"No reason", "", NULL},
+ {DT_CHARPTR, DT_IPADDRESS|DT_ALLOW_WILD},
+ DoZLine},
+
+ {"badnick",
+ {"reason", "nick", NULL},
+ {"No reason", "", NULL},
+ {DT_CHARPTR, DT_CHARPTR},
+ DoQLine},
+
+ {"badhost",
+ {"reason", "host", NULL},
+ {"No reason", "", NULL},
+ {DT_CHARPTR, DT_CHARPTR},
+ DoKLine},
+
+ {"exception",
+ {"reason", "host", NULL},
+ {"No reason", "", NULL},
+ {DT_CHARPTR, DT_CHARPTR},
+ DoELine},
+
+ {"type",
+ {"name", "classes", NULL},
+ {"", "", NULL},
+ {DT_NOSPACES, DT_CHARPTR},
+ DoType},
+
+ {"class",
+ {"name", "commands", "usermodes", "chanmodes", "privs", NULL},
+ {"", "", "", "", "", NULL},
+ {DT_NOSPACES, DT_CHARPTR, DT_CHARPTR, DT_CHARPTR, DT_CHARPTR},
+ DoClass},
+};
+
+/* These tags MUST occur and must ONLY occur once in the config file */
+static const char* 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 */
- /* Make a copy here so if it fails then we can carry on running with an unaffected config */
- ConfigDataHash newconfig;
-
- if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr))
+ if (!this->DoInclude(ServerInstance->ConfigFileName))
{
- /* If we succeeded, set the ircd config to the new one */
- this->config_data = newconfig;
- }
- else
- {
- ReportConfigError(errstr.str(), bail, user);
+ valid = false;
return;
}
+}
+
+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();
/* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
try
{
/* Check we dont have more than one of singular tags, or any of them missing
*/
- for (int Index = 0; Once[Index]; Index++)
- if (!CheckOnce(Once[Index], bail, user))
- return;
+ for (int Index = 0; Index * sizeof(*Once) < sizeof(Once); Index++)
+ CheckOnce(Once[Index]);
+
+ for (int Index = 0; Index * sizeof(Deprecated) < sizeof(ChangedConfig); Index++)
+ {
+ char item[MAXBUF];
+ *item = 0;
+ if (ConfValue(ChangedConfig[Index].tag, ChangedConfig[Index].value, "", 0, item, MAXBUF, true) || *item)
+ throw CoreException(std::string("Your configuration contains a deprecated value: <") + ChangedConfig[Index].tag + ":" + ChangedConfig[Index].value + "> - " + ChangedConfig[Index].reason);
+ }
/* 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++)
+ for (int Index = 0; Index * sizeof(*Values) < sizeof(Values); ++Index)
{
char item[MAXBUF];
int dt = Values[Index].datatype;
- bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0);
+ bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0);
+ bool allow_wild = ((dt & DT_ALLOW_WILD) > 0);
dt &= ~DT_ALLOW_NEWLINE;
+ dt &= ~DT_ALLOW_WILD;
- ConfValue(this->config_data, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines);
+ ConfValue(Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines);
ValueItem vi(item);
- if (!Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi))
+ if (Values[Index].validation_function && !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)
+ switch (dt)
{
- case DT_CHARPTR:
+ case DT_NOSPACES:
+ {
+ ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
+ ValidateNoSpaces(vi.GetString(), Values[Index].tag, Values[Index].value);
+ vcc->Set(this, vi);
+ }
+ break;
+ case DT_HOSTNAME:
{
ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
- /* Make sure we also copy the null terminator */
- vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
+ ValidateHostname(vi.GetString(), Values[Index].tag, Values[Index].value);
+ vcc->Set(this, vi);
+ }
+ break;
+ case DT_IPADDRESS:
+ {
+ ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
+ ValidateIP(vi.GetString(), Values[Index].tag, Values[Index].value, allow_wild);
+ vcc->Set(this, vi);
+ }
+ break;
+ case DT_CHANNEL:
+ {
+ ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val;
+ if (*(vi.GetString()) && !ServerInstance->IsChannel(vi.GetString(), MAXBUF))
+ {
+ throw CoreException("The value of <"+std::string(Values[Index].tag)+":"+Values[Index].value+"> is not a valid channel name");
+ }
+ vcc->Set(this, vi);
+ }
+ break;
+ case DT_CHARPTR:
+ {
+ ValueContainerChar* vcc = dynamic_cast<ValueContainerChar*>(Values[Index].val);
+ if (vcc)
+ vcc->Set(this, vi);
+ ValueContainerString* vcs = dynamic_cast<ValueContainerString*>(Values[Index].val);
+ if (vcs)
+ vcs->Set(this, vi.GetValue());
}
break;
case DT_INTEGER:
{
int val = vi.GetInteger();
ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val;
- vci->Set(&val, sizeof(int));
+ vci->Set(this, val);
+ }
+ break;
+ case DT_LIMIT:
+ {
+ int val = vi.GetInteger();
+ ValueContainerLimit* vci = (ValueContainerLimit*)Values[Index].val;
+ vci->Set(this, val);
}
break;
case DT_BOOLEAN:
{
bool val = vi.GetBool();
ValueContainerBool* vcb = (ValueContainerBool*)Values[Index].val;
- vcb->Set(&val, sizeof(bool));
+ vcb->Set(this, val);
}
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)
* 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++)
+ for (int Index = 0; Index * sizeof(MultiConfig) < sizeof(MultiValues); ++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(MultiValues[Index].tag);
- for (int tagnum = 0; tagnum < number_of_tags; tagnum++)
+ for (int tagnum = 0; tagnum < number_of_tags; ++tagnum)
{
ValueList vl;
- for (int valuenum = 0; MultiValues[Index].items[valuenum]; valuenum++)
+ for (int valuenum = 0; (MultiValues[Index].items[valuenum]) && (valuenum < MAX_VALUES_PER_TAG); ++valuenum)
{
int dt = MultiValues[Index].datatype[valuenum];
bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0);
+ bool allow_wild = ((dt & DT_ALLOW_WILD) > 0);
dt &= ~DT_ALLOW_NEWLINE;
+ dt &= ~DT_ALLOW_WILD;
switch (dt)
{
+ case DT_NOSPACES:
+ {
+ char item[MAXBUF];
+ if (ConfValue(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(""));
+ ValidateNoSpaces(vl[vl.size()-1].GetString(), MultiValues[Index].tag, MultiValues[Index].items[valuenum]);
+ }
+ break;
+ case DT_HOSTNAME:
+ {
+ char item[MAXBUF];
+ if (ConfValue(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(""));
+ ValidateHostname(vl[vl.size()-1].GetString(), MultiValues[Index].tag, MultiValues[Index].items[valuenum]);
+ }
+ break;
+ case DT_IPADDRESS:
+ {
+ char item[MAXBUF];
+ if (ConfValue(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(""));
+ ValidateIP(vl[vl.size()-1].GetString(), MultiValues[Index].tag, MultiValues[Index].items[valuenum], allow_wild);
+ }
+ break;
+ case DT_CHANNEL:
+ {
+ char item[MAXBUF];
+ if (ConfValue(MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
+ vl.push_back(ValueItem(item));
+ else
+ vl.push_back(ValueItem(""));
+ if (!ServerInstance->IsChannel(vl[vl.size()-1].GetString(), MAXBUF))
+ throw CoreException("The value of <"+std::string(MultiValues[Index].tag)+":"+MultiValues[Index].items[valuenum]+"> number "+ConvToStr(tagnum + 1)+" is not a valid channel name");
+ }
+ break;
case DT_CHARPTR:
{
char item[MAXBUF];
- if (ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines))
+ if (ConfValue(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(""));
case DT_INTEGER:
{
int item = 0;
- if (ConfValueInteger(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item))
+ if (ConfValueInteger(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));
break;
case DT_BOOLEAN:
{
- bool item = ConfValueBool(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum);
+ bool item = ConfValueBool(MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum);
vl.push_back(ValueItem(item));
}
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);
+ if (MultiValues[Index].validation_function)
+ MultiValues[Index].validation_function(this, MultiValues[Index].tag, MultiValues[Index].items, vl, MultiValues[Index].datatype);
}
-
- MultiValues[Index].finish_function(this, MultiValues[Index].tag);
}
- }
+ /* Finalise the limits, increment them all by one so that we can just put assign(str, 0, val)
+ * rather than assign(str, 0, val + 1)
+ */
+ Limits.Finalise();
+ // Handle special items
+ CrossCheckOperClassType();
+ CrossCheckConnectBlocks(old);
+ }
catch (CoreException &ce)
{
- ReportConfigError(ce.GetReason(), bail, user);
- return;
+ errstr << ce.GetReason();
+ valid = false;
}
// write once here, to try it out and make sure its ok
ServerInstance->WritePID(this->PID);
- ServerInstance->Log(DEFAULT,"Done reading configuration file.");
+ FailedPortList pl;
+ ServerInstance->BindPorts(pl);
- /* If we're rehashing, let's load any new modules, and unload old ones
+ /*
+ * These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername.
*/
- if (!bail)
+ if (old)
+ {
+ memcpy(this->ServerName, old->ServerName, sizeof(this->ServerName));
+ memcpy(this->sid, old->sid, sizeof(this->sid));
+ }
+
+ if (pl.size())
{
- int found_ports = 0;
- FailedPortList pl;
- ServerInstance->BindPorts(false, found_ports, pl);
+ errstr << "Not all your client ports could be bound.\nThe following port(s) failed to bind:\n";
- if (pl.size() && user)
+ int j = 1;
+ for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
{
- 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);
- int j = 1;
- for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
- {
- user->WriteServ("NOTICE %s :*** %d. IP: %s Port: %lu", user->nick, j, i->first.empty() ? "<all>" : i->first.c_str(), (unsigned long)i->second);
- }
+ char buf[MAXBUF];
+ snprintf(buf, MAXBUF, "%d. Address: %s Reason: %s\n", j, i->first.empty() ? "<all>" : i->first.c_str(), i->second.c_str());
+ errstr << buf;
}
+ }
- if (!removed_modules.empty())
- {
- for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
- {
- if (ServerInstance->UnloadModule(removing->c_str()))
- {
- ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
+ User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid);
- if (user)
- user->WriteServ("973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
+ valid = errstr.str().empty();
+ if (!valid)
+ ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file:");
- rem++;
- }
- else
- {
- if (user)
- user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
- }
- }
+ while (errstr.good())
+ {
+ std::string line;
+ getline(errstr, line, '\n');
+ if (!line.empty())
+ {
+ if (user)
+ user->WriteServ("NOTICE %s :*** %s", user->nick.c_str(), line.c_str());
+ else
+ ServerInstance->SNO->WriteGlobalSno('a', line);
}
- if (!added_modules.empty())
+ if (!old)
{
- for (std::vector<std::string>::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());
+ // Starting up, so print it out so it's seen. XXX this is a bit of a hack.
+ printf("%s\n", line.c_str());
+ }
+ }
- if (user)
- user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
+ errstr.clear();
+ errstr.str(std::string());
- 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());
- }
- }
+ /* No old configuration -> initial boot, nothing more to do here */
+ if (!old)
+ {
+ if (!valid)
+ {
+ ServerInstance->Exit(EXIT_STATUS_CONFIG);
}
- 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());
+ return;
+ }
+
+ // If there were errors processing configuration, don't touch modules.
+ if (!valid)
+ return;
+
+ ApplyModules(user);
+ for (std::vector<ConnectClass*>::iterator i = removed_classes.begin(); i != removed_classes.end(); i++)
+ {
+ ConnectClass* c = *i;
+ if (0 == --c->RefCount)
+ delete c;
}
+}
- /** Note: This is safe, the method checks for user == NULL */
- ServerInstance->Parser->SetupCommandTable(user);
+void ServerConfig::ApplyModules(User* user)
+{
+ const std::vector<std::string> v = ServerInstance->Modules->GetAllModuleNames(0);
+ std::vector<std::string> added_modules;
+ std::set<std::string> removed_modules(v.begin(), v.end());
+
+ int new_module_count = ConfValueEnum("module");
+ for(int i=0; i < new_module_count; i++)
+ {
+ std::string name;
+ if (ConfValue("module", "name", i, name, false))
+ {
+ // if this module is already loaded, the erase will succeed, so we need do nothing
+ // otherwise, we need to add the module (which will be done later)
+ if (removed_modules.erase(name) == 0)
+ added_modules.push_back(name);
+ }
+ }
+
+ for (std::set<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
+ {
+ if (ServerInstance->Modules->Unload(removing->c_str()))
+ {
+ ServerInstance->SNO->WriteToSnoMask('a', "*** REHASH UNLOADED MODULE: %s",removing->c_str());
+
+ if (user)
+ user->WriteNumeric(RPL_UNLOADEDMODULE, "%s %s :Module %s successfully unloaded.",user->nick.c_str(), removing->c_str(), removing->c_str());
+ else
+ ServerInstance->SNO->WriteToSnoMask('a', "Module %s successfully unloaded.", removing->c_str());
+ }
+ else
+ {
+ if (user)
+ user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s %s :Failed to unload module %s: %s",user->nick.c_str(), removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError().c_str());
+ else
+ ServerInstance->SNO->WriteToSnoMask('a', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str());
+ }
+ }
+
+ for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
+ {
+ if (ServerInstance->Modules->Load(adding->c_str()))
+ {
+ ServerInstance->SNO->WriteToSnoMask('a', "*** REHASH LOADED MODULE: %s",adding->c_str());
+ if (user)
+ user->WriteNumeric(RPL_LOADEDMODULE, "%s %s :Module %s successfully loaded.",user->nick.c_str(), adding->c_str(), adding->c_str());
+ else
+ ServerInstance->SNO->WriteToSnoMask('a', "Module %s successfully loaded.", adding->c_str());
+ }
+ else
+ {
+ if (user)
+ user->WriteNumeric(ERR_CANTLOADMODULE, "%s %s :Failed to load module %s: %s",user->nick.c_str(), adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str());
+ else
+ ServerInstance->SNO->WriteToSnoMask('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);
+ user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str());
else
- ServerInstance->WriteOpers("*** Successfully rehashed server.");
+ ServerInstance->SNO->WriteToSnoMask('a', "*** Successfully rehashed server.");
}
-bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream)
+bool ServerConfig::LoadConf(FILE* &conf, const char* filename)
{
- std::ifstream conf(filename);
std::string line;
char ch;
- long linenumber;
+ long linenumber = 1;
+ long last_successful_parse = 1;
bool in_tag;
bool in_quote;
bool in_comment;
int character_count = 0;
- linenumber = 1;
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)
{
- errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl;
+ errstr << "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])
{
- errorstream << "File " << filename << " is included recursively (looped inclusion)." << std::endl;
+ errstr << "File " << filename << " is included recursively (looped inclusion)." << std::endl;
return false;
}
}
include_stack.push_back(filename);
/* Start reading characters... */
- while (conf.get(ch))
+ while ((ch = fgetc(conf)) != EOF)
{
-
/*
* Fix for moronic windows issue spotted by Adremelech.
* Some windows editors save text files as utf-16, which is
*/
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;
+ errstr << "File " << filename << " cannot be read, as it is encoded in braindead UTF-16. Save your file as plain ASCII!" << std::endl;
return false;
}
{
line += ch;
char real_character;
- if (conf.get(real_character))
+ if (!feof(conf))
{
+ real_character = fgetc(conf);
if (real_character == 'n')
real_character = '\n';
line += real_character;
}
else
{
- errorstream << "End of file after a \\, what did you want to escape?: " << filename << ":" << linenumber << std::endl;
+ 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)
{
- errorstream << "Got another opening < when the first one wasn't closed: " << filename << ":" << linenumber << std::endl;
+ 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;
}
}
{
if (in_quote)
{
- errorstream << "We're in a quote but outside a tag, interesting. " << filename << ":" << linenumber << std::endl;
+ 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
{
- // errorstream << "Opening new config tag on line " << linenumber << std::endl;
+ // errstr << "Opening new config tag on line " << linenumber << std::endl;
in_tag = true;
}
}
{
if (in_quote)
{
- // errorstream << "Closing quote in config tag on line " << linenumber << std::endl;
+ // errstr << "Closing quote in config tag on line " << linenumber << std::endl;
in_quote = false;
}
else
{
- // errorstream << "Opening quote in config tag on line " << linenumber << std::endl;
+ // errstr << "Opening quote in config tag on line " << linenumber << std::endl;
in_quote = true;
}
}
{
if (in_quote)
{
- errorstream << "Found a (closing) \" outside a tag: " << filename << ":" << linenumber << std::endl;
+ errstr << "The tag immediately after the one at " << filename << ":" << last_successful_parse << " has a missing closing \" symbol. Please check this." << std::endl;
}
else
{
- errorstream << "Found a (opening) \" outside a tag: " << filename << ":" << linenumber << std::endl;
+ errstr << "You have opened a quote (\") beyond the tag at " << filename << ":" << last_successful_parse << " without opening a new tag. Please check this." << std::endl;
}
}
}
{
if (in_tag)
{
- // errorstream << "Closing config tag on line " << linenumber << std::endl;
+ // errstr << "Closing config tag on line " << linenumber << std::endl;
in_tag = false;
/*
* If this finds an <include> then ParseLine can simply call
* LoadConf() and load the included config into the same ConfigDataHash
*/
-
- if (!this->ParseLine(target, line, linenumber, errorstream))
+ long bl = linenumber;
+ if (!this->ParseLine(filename, line, linenumber))
return false;
+ last_successful_parse = linenumber;
+
+ linenumber = bl;
line.clear();
}
else
{
- errorstream << "Got a closing > when we weren't inside a tag: " << filename << ":" << linenumber << std::endl;
+ 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)
{
- errorstream << "Reached end of file whilst still inside a quoted section or tag. This is most likely an error or there \
+ 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(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream)
+
+bool ServerConfig::LoadConf(FILE* &conf, const std::string &filename)
{
- return this->LoadConf(target, filename.c_str(), errorstream);
+ return this->LoadConf(conf, filename.c_str());
}
-bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream)
+bool ServerConfig::ParseLine(const std::string &filename, std::string &line, long &linenumber)
{
std::string tagname;
std::string current_key;
std::string current_value;
KeyValList results;
+ char last_char = 0;
bool got_name;
bool got_key;
bool in_quote;
{
if (*c != '<')
{
- tagname += *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
if (!got_key)
{
/* We're still reading the key name */
- if (*c != '=')
+ if ((*c != '=') && (*c != '>'))
{
if (*c != ' ')
{
- current_key += *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
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';
- linenumber++;
continue;
}
else if ((*c == '\r') && (in_quote))
+ {
/* Got a \r, drop it */
continue;
+ }
if (*c == '"')
{
}
else
{
- /* Leaving quotes, we have the value */
+ /* Leaving the quotes, we have the current value */
results.push_back(KeyVal(current_key, current_value));
// std::cout << "<" << tagname << ":" << current_key << "> " << current_value << std::endl;
if ((tagname == "include") && (current_key == "file"))
{
- if (!this->DoInclude(target, current_value, errorstream))
+ if (!this->DoInclude(current_value))
+ return false;
+ }
+ else if ((tagname == "include") && (current_key == "executable"))
+ {
+ /* Pipe an executable and use its stdout as config data */
+ if (!this->DoPipe(current_value))
return false;
}
{
if (in_quote)
{
+ last_char = *c;
current_value += *c;
}
}
}
/* Finished parsing the tag, add it to the config hash */
- target.insert(std::pair<std::string, KeyValList > (tagname, results));
+ config_data.insert(std::pair<std::string, KeyValList > (tagname, results));
return true;
}
-bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream)
+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());
+ pclose(conf);
+ }
+ else
+ errstr << "Couldn't execute: " << file << std::endl;
+
+ return ret;
+}
+
+bool ServerConfig::StartsWithWindowsDriveLetter(const std::string &path)
+{
+ return (path.length() > 2 && isalpha(path[0]) && path[1] == ':');
+}
+
+bool ServerConfig::DoInclude(const std::string &file)
{
std::string confpath;
std::string newfile;
confpath = ServerInstance->ConfigFileName;
newfile = file;
- for (std::string::iterator c = newfile.begin(); c != newfile.end(); c++)
- {
- if (*c == '\\')
- {
- *c = '/';
- }
- }
+ std::replace(newfile.begin(),newfile.end(),'\\','/');
+ std::replace(confpath.begin(),confpath.end(),'\\','/');
- if (file[0] != '/')
+ if ((newfile[0] != '/') && (!StartsWithWindowsDriveLetter(newfile)))
{
if((pos = confpath.rfind("/")) != std::string::npos)
{
}
else
{
- errorstream << "Couldn't get config path from: " << confpath << std::endl;
+ errstr << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl;
return false;
}
}
- return LoadConf(target, newfile, errorstream);
+ FILE* conf = fopen(newfile.c_str(), "r");
+ bool ret = false;
+
+ if (conf)
+ {
+ ret = LoadConf(conf, newfile);
+ fclose(conf);
+ }
+ else
+ errstr << "Couldn't open config file: " << file << std::endl;
+
+ return ret;
}
-bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds)
+bool ServerConfig::ConfValue(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);
+ return ConfValue(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)
+bool ServerConfig::ConfValue(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), std::string(default_value), index, value, allow_linefeeds);
+ bool r = ConfValue(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 allow_linefeeds)
+bool ServerConfig::ConfValue(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);
+ return ConfValue(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)
+bool ServerConfig::ConfValue(const std::string &tag, const std::string &var, const std::string &default_value, int index, std::string &result, bool allow_linefeeds)
{
ConfigDataHash::size_type pos = index;
- if((pos >= 0) && (pos < target.count(tag)))
+ if (pos < config_data.count(tag))
{
- ConfigDataHash::iterator iter = target.find(tag);
+ ConfigDataHash::iterator iter = config_data.find(tag);
for(int i = 0; i < index; i++)
iter++;
{
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.");
+ ServerInstance->Logs->Log("CONFIG",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 = ' ';
return true;
}
}
- else if(pos == 0)
+ else if (pos == 0)
{
if (!default_value.empty())
{
return false;
}
-bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, int index, int &result)
+bool ServerConfig::ConfValueInteger(const char* tag, const char* var, int index, int &result)
{
- return ConfValueInteger(target, std::string(tag), std::string(var), "", index, result);
+ return ConfValueInteger(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)
+bool ServerConfig::ConfValueInteger(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);
+ return ConfValueInteger(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)
+bool ServerConfig::ConfValueInteger(const std::string &tag, const std::string &var, int index, int &result)
{
- return ConfValueInteger(target, tag, var, "", index, result);
+ return ConfValueInteger(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)
+bool ServerConfig::ConfValueInteger(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, default_value, index, value);
+ bool r = ConfValue(tag, var, default_value, index, value);
stream.str(value);
if(!(stream >> result))
return false;
}
-bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, int index)
+bool ServerConfig::ConfValueBool(const char* tag, const char* var, int index)
{
- return ConfValueBool(target, std::string(tag), std::string(var), "", index);
+ return ConfValueBool(std::string(tag), std::string(var), "", index);
}
-bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index)
+bool ServerConfig::ConfValueBool(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);
+ return ConfValueBool(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)
+bool ServerConfig::ConfValueBool(const std::string &tag, const std::string &var, int index)
{
- return ConfValueBool(target, tag, var, "", index);
+ return ConfValueBool(tag, var, "", index);
}
-bool ServerConfig::ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index)
+bool ServerConfig::ConfValueBool(const std::string &tag, const std::string &var, const std::string &default_value, int index)
{
std::string result;
- if(!ConfValue(target, tag, var, default_value, index, result))
+ if(!ConfValue(tag, var, default_value, index, result))
return false;
return ((result == "yes") || (result == "true") || (result == "1"));
}
-int ServerConfig::ConfValueEnum(ConfigDataHash &target, const char* tag)
+int ServerConfig::ConfValueEnum(const char* tag)
{
- return target.count(tag);
+ return config_data.count(tag);
}
-int ServerConfig::ConfValueEnum(ConfigDataHash &target, const std::string &tag)
+int ServerConfig::ConfValueEnum(const std::string &tag)
{
- return target.count(tag);
+ return config_data.count(tag);
}
-int ServerConfig::ConfVarEnum(ConfigDataHash &target, const char* tag, int index)
+int ServerConfig::ConfVarEnum(const char* tag, int index)
{
- return ConfVarEnum(target, std::string(tag), index);
+ return ConfVarEnum(std::string(tag), index);
}
-int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, int index)
+int ServerConfig::ConfVarEnum(const std::string &tag, int index)
{
ConfigDataHash::size_type pos = index;
- if((pos >= 0) && (pos < target.count(tag)))
+ if (pos < config_data.count(tag))
{
- ConfigDataHash::const_iterator iter = target.find(tag);
+ ConfigDataHash::const_iterator iter = config_data.find(tag);
for(int i = 0; i < index; i++)
iter++;
F.clear();
- if ((*fname != '/') && (*fname != '\\'))
+ if ((*fname != '/') && (*fname != '\\') && (!StartsWithWindowsDriveLetter(fname)))
{
std::string::size_type pos;
std::string confpath = ServerInstance->ConfigFileName;
std::string newfile = fname;
- if ((pos = confpath.rfind("/")) != std::string::npos)
+ if (((pos = confpath.rfind("/"))) != std::string::npos)
newfile = confpath.substr(0, pos) + std::string("/") + fname;
- else if ((pos = confpath.rfind("\\")) != std::string::npos)
+ else if (((pos = confpath.rfind("\\"))) != std::string::npos)
newfile = confpath.substr(0, pos) + std::string("\\") + fname;
+ ServerInstance->Logs->Log("config", DEBUG, "Filename: %s", newfile.c_str());
+
if (!FileExists(newfile.c_str()))
return false;
file = fopen(newfile.c_str(), "r");
else
*linebuf = 0;
- if (!feof(file))
- {
- F.push_back(*linebuf ? linebuf : " ");
- }
+ F.push_back(*linebuf ? linebuf : " ");
}
fclose(file);
if ((sb.st_mode & S_IFDIR) > 0)
return false;
-
+
FILE *input;
if ((input = fopen (file, "r")) == NULL)
return false;
}
-bool ServerConfig::DirValid(const char* dirandfile)
-{
-#ifdef WINDOWS
- return true;
-#endif
-
- char work[1024];
- char buffer[1024];
- char otherdir[1024];
- int p;
-
- strlcpy(work, dirandfile, 1024);
- p = strlen(work);
-
- // we just want the dir
- while (*work)
- {
- if (work[p] == '/')
- {
- work[p] = '\0';
- break;
- }
-
- work[p--] = '\0';
- }
-
- // Get the current working directory
- if (getcwd(buffer, 1024 ) == NULL )
- return false;
-
- if (chdir(work) == -1)
- return false;
-
- if (getcwd(otherdir, 1024 ) == NULL )
- return false;
-
- if (chdir(buffer) == -1)
- return false;
-
- size_t t = strlen(work);
-
- if (strlen(otherdir) >= t)
- {
- otherdir[t] = '\0';
- if (!strcmp(otherdir,work))
- {
- return true;
- }
-
- return false;
- }
- else
- {
- return false;
- }
-}
-
std::string ServerConfig::GetFullProgDir()
{
- char buffer[PATH_MAX+1];
+ char buffer[PATH_MAX];
#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
return ServerInstance;
}
+std::string ServerConfig::GetSID()
+{
+ return sid;
+}
ValueItem::ValueItem(int value)
{
v = n.str();
}
-ValueItem::ValueItem(char* value)
-{
- v = value;
-}
-
-void ValueItem::Set(char* value)
-{
- v = value;
-}
-
-void ValueItem::Set(const char* value)
+void ValueItem::Set(const std::string& value)
{
v = value;
}
return atoi(v.c_str());
}
-char* ValueItem::GetString()
+const char* ValueItem::GetString() const
{
- return (char*)v.c_str();
+ return v.c_str();
}
bool ValueItem::GetBool()
return (GetInteger() || v == "yes" || v == "true");
}
+
+void ConfigReaderThread::Run()
+{
+ Config = new ServerConfig(ServerInstance);
+ Config->Read();
+ done = true;
+}
+
+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)
+ {
+ /*
+ * Apply the changed configuration from the rehash.
+ *
+ * XXX: The order of these is IMPORTANT, do not reorder them without testing
+ * thoroughly!!!
+ */
+ ServerInstance->XLines->CheckELines();
+ ServerInstance->XLines->CheckELines();
+ ServerInstance->XLines->ApplyLines();
+ ServerInstance->Res->Rehash();
+ ServerInstance->ResetMaxBans();
+ Config->ApplyDisabledCommands(Config->DisabledCommands);
+ User* user = TheUserUID.empty() ? ServerInstance->FindNick(TheUserUID) : NULL;
+ FOREACH_MOD_I(ServerInstance, I_OnRehash, OnRehash(user));
+ ServerInstance->BuildISupport();
+
+ delete old;
+ }
+ else
+ {
+ // whoops, abort!
+ ServerInstance->Logs->CloseLogs();
+ ServerInstance->Config = old;
+ ServerInstance->Logs->OpenFileLogs();
+ delete this->Config;
+ }
+}
+
+template<>
+void ValueContainer<char[MAXBUF]>::Set(ServerConfig* conf, ValueItem const& item)
+{
+ strlcpy(conf->*vptr, item.GetString(), MAXBUF);
+}