-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2006-2009 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
#include <fstream>
#include "xline.h"
#include "exitcodes.h"
#include "commands/cmd_whowas.h"
#include "configparser.h"
+#include <iostream>
+#ifdef _WIN32
+#include <Iphlpapi.h>
+#pragma comment(lib, "Iphlpapi.lib")
+#endif
ServerConfig::ServerConfig()
+ : NoSnoticeStack(false)
{
WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
- NoUserDns = OperSpyWhois = HideBans = HideSplits = UndernetMsgPrefix = false;
- CycleHosts = InvBypassModes = true;
+ RawLog = NoUserDns = HideBans = HideSplits = UndernetMsgPrefix = false;
+ WildcardIPv6 = CycleHosts = InvBypassModes = true;
dns_timeout = 5;
MaxTargets = 20;
NetBufferSize = 10240;
OperMaxChans = 30;
c_ipv4_range = 32;
c_ipv6_range = 128;
+
+ std::vector<KeyVal>* items;
+ EmptyTag = ConfigTag::create("empty", "<auto>", 0, items);
+}
+
+ServerConfig::~ServerConfig()
+{
+ delete EmptyTag;
}
void ServerConfig::Update005()
return true;
}
-#ifdef WINDOWS
-// Note: the windows validator is in win32wrapper.cpp
-void FindDNS(std::string& server);
-#else
static void FindDNS(std::string& server)
{
if (!server.empty())
return;
+#ifdef _WIN32
+ // attempt to look up their nameserver from the system
+ ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: <dns:server> not defined, attempting to find a working server in the system settings...");
+
+ PFIXED_INFO pFixedInfo;
+ DWORD dwBufferSize = sizeof(FIXED_INFO);
+ pFixedInfo = (PFIXED_INFO) HeapAlloc(GetProcessHeap(), 0, sizeof(FIXED_INFO));
+ if(pFixedInfo)
+ {
+ if (GetNetworkParams(pFixedInfo, &dwBufferSize) == ERROR_BUFFER_OVERFLOW) {
+ HeapFree(GetProcessHeap(), 0, pFixedInfo);
+ pFixedInfo = (PFIXED_INFO) HeapAlloc(GetProcessHeap(), 0, dwBufferSize);
+ }
+
+ if(pFixedInfo) {
+ if (GetNetworkParams(pFixedInfo, &dwBufferSize) == NO_ERROR)
+ server = pFixedInfo->DnsServerList.IpAddress.String;
+
+ HeapFree(GetProcessHeap(), 0, pFixedInfo);
+ }
+
+ if(!server.empty())
+ {
+ ServerInstance->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first active resolver in the system settings.", server.c_str());
+ return;
+ }
+ }
+
+ ServerInstance->Logs->Log("CONFIG",DEFAULT,"No viable nameserver found! Defaulting to nameserver '127.0.0.1'!");
+#else
// attempt to look up their nameserver from /etc/resolv.conf
ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
if (server == "nameserver")
{
resolv >> server;
- ServerInstance->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",server.c_str());
- return;
+ if (server.find_first_not_of("0123456789.") == std::string::npos)
+ {
+ ServerInstance->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",server.c_str());
+ return;
+ }
}
}
ServerInstance->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
+#endif
server = "127.0.0.1";
}
-#endif
static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::string& key, XLineFactory* make)
{
std::string name = tag->getString("name");
if (name.empty())
throw CoreException("<class:name> missing from tag at " + tag->getTagLocation());
+ if (operclass.find(name) != operclass.end())
+ throw CoreException("Duplicate class block with name " + name + " at " + tag->getTagLocation());
operclass[name] = tag;
}
tags = ConfTags("type");
std::string name = tag->getString("name");
if (name.empty())
throw CoreException("<type:name> is missing from tag at " + tag->getTagLocation());
-
if (!ServerInstance->IsNick(name.c_str(), Limits.NickMax))
throw CoreException("<type:name> is invalid (value '" + name + "')");
+ if (oper_blocks.find(" " + name) != oper_blocks.end())
+ throw CoreException("Duplicate type block with name " + name + " at " + tag->getTagLocation());
OperInfo* ifo = new OperInfo;
oper_blocks[" " + name] = ifo;
if (tblk == oper_blocks.end())
throw CoreException("Oper block " + name + " has missing type " + type);
if (oper_blocks.find(name) != oper_blocks.end())
- throw CoreException("Duplicate oper block with name " + name);
+ throw CoreException("Duplicate oper block with name " + name + " at " + tag->getTagLocation());
OperInfo* ifo = new OperInfo;
ifo->name = type;
throw CoreException("Two connect classes with name \"" + name + "\" defined!");
names[name] = i;
- ConnectClass* me = parent ?
+ ConnectClass* me = parent ?
new ConnectClass(tag, type, mask, *parent) :
new ConnectClass(tag, type, mask);
me->maxlocal = tag->getInt("localmax", me->maxlocal);
me->maxglobal = tag->getInt("globalmax", me->maxglobal);
me->maxchans = tag->getInt("maxchans", me->maxchans);
+ me->maxconnwarn = tag->getBool("maxconnwarn", me->maxconnwarn);
me->limit = tag->getInt("limit", me->limit);
ClassMap::iterator oldMask = oldBlocksByMask.find(typeMask);
{"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."},
+ {"options", "loglevel", "1.2+ does not use the loglevel value. Please define <log> tags instead."},
{"die", "value", "you need to reread your config"},
+ {"bind", "transport", "has been moved to <bind:ssl> as of 2.0a1"},
+ {"link", "transport", "has been moved to <link:ssl> as of 2.0a1"},
+ {"link", "autoconnect", "2.0+ does not use the autoconnect value. Please define <autoconnect> tags instead."},
};
void ServerConfig::Fill()
{
ConfigTag* options = ConfValue("options");
ConfigTag* security = ConfValue("security");
+ if (sid.empty())
+ {
+ ServerName = ConfValue("server")->getString("name");
+ sid = ConfValue("server")->getString("id");
+ ValidHost(ServerName, "<server:name>");
+ if (!sid.empty() && !ServerInstance->IsSID(sid))
+ throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
+ }
+ else
+ {
+ if (ServerName != ConfValue("server")->getString("name"))
+ throw CoreException("You must restart to change the server name or SID");
+ std::string nsid = ConfValue("server")->getString("id");
+ if (!nsid.empty() && nsid != sid)
+ throw CoreException("You must restart to change the server name or SID");
+ }
diepass = ConfValue("power")->getString("diepass");
restartpass = ConfValue("power")->getString("restartpass");
powerhash = ConfValue("power")->getString("hash");
SoftLimit = ConfValue("performance")->getInt("softlimit", ServerInstance->SE->GetMaxFds());
MaxConn = ConfValue("performance")->getInt("somaxconn", SOMAXCONN);
MoronBanner = options->getString("moronbanner", "You're banned!");
- ServerName = ConfValue("server")->getString("name");
ServerDesc = ConfValue("server")->getString("description", "Configure Me");
Network = ConfValue("server")->getString("network", "Network");
- sid = ConfValue("server")->getString("id", "");
AdminName = ConfValue("admin")->getString("name", "");
AdminEmail = ConfValue("admin")->getString("email", "null@example.com");
AdminNick = ConfValue("admin")->getString("nick", "admin");
DisabledCommands = ConfValue("disabled")->getString("commands", "");
DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant");
UserStats = security->getString("userstats");
- CustomVersion = security->getString("customversion");
+ CustomVersion = security->getString("customversion", Network + " IRCd");
HideSplits = security->getBool("hidesplits");
HideBans = security->getBool("hidebans");
HideWhoisServer = security->getString("hidewhois");
HideKillsServer = security->getString("hidekills");
- OperSpyWhois = security->getBool("operspywhois");
+ HideULineKills = security->getBool("hideulinekills");
RestrictBannedUsers = security->getBool("restrictbannedusers", true);
GenericOper = security->getBool("genericoper");
NoUserDns = ConfValue("performance")->getBool("nouserdns");
SyntaxHints = options->getBool("syntaxhints");
CycleHosts = options->getBool("cyclehosts");
+ CycleHostsFromUser = options->getBool("cyclehostsfromuser");
UndernetMsgPrefix = options->getBool("ircumsgprefix");
FullHostInTopic = options->getBool("hostintopic");
MaxTargets = security->getInt("maxtargets", 20);
WhoWasGroupSize = ConfValue("whowas")->getInt("groupsize");
WhoWasMaxGroups = ConfValue("whowas")->getInt("maxgroups");
WhoWasMaxKeep = ServerInstance->Duration(ConfValue("whowas")->getString("maxkeep"));
- DieValue = ConfValue("die")->getString("value");
MaxChans = ConfValue("channels")->getInt("users", 20);
OperMaxChans = ConfValue("channels")->getInt("opers", 60);
c_ipv4_range = ConfValue("cidr")->getInt("ipv4clone", 32);
Limits.MaxGecos = ConfValue("limits")->getInt("maxgecos", 128);
Limits.MaxAway = ConfValue("limits")->getInt("maxaway", 200);
InvBypassModes = options->getBool("invitebypassmodes", true);
+ NoSnoticeStack = options->getBool("nosnoticestack", false);
+ WelcomeNotice = options->getBool("welcomenotice", true);
range(SoftLimit, 10, ServerInstance->SE->GetMaxFds(), ServerInstance->SE->GetMaxFds(), "<performance:softlimit>");
- range(MaxConn, 0, SOMAXCONN, SOMAXCONN, "<performance:somaxconn>");
+ if (ConfValue("performance")->getBool("limitsomaxconn", true))
+ range(MaxConn, 0, SOMAXCONN, SOMAXCONN, "<performance:somaxconn>");
range(MaxTargets, 1, 31, 20, "<security:maxtargets>");
range(NetBufferSize, 1024, 65534, 10240, "<performance:netbuffersize>");
range(WhoWasGroupSize, 0, 10000, 10, "<whowas:groupsize>");
range(WhoWasMaxKeep, 3600, INT_MAX, 3600, "<whowas:maxkeep>");
ValidIP(DNSServer, "<dns:server>");
- ValidHost(ServerName, "<server:name>");
- if (!sid.empty() && !ServerInstance->IsSID(sid))
- throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
+ std::string defbind = options->getString("defaultbind");
+ if (assign(defbind) == "ipv4")
+ {
+ WildcardIPv6 = false;
+ }
+ else if (assign(defbind) == "ipv6")
+ {
+ WildcardIPv6 = true;
+ }
+ else
+ {
+ WildcardIPv6 = true;
+ int socktest = socket(AF_INET6, SOCK_STREAM, 0);
+ if (socktest < 0)
+ WildcardIPv6 = false;
+ else
+ ServerInstance->SE->Close(socktest);
+ }
ConfigTagList tags = ConfTags("uline");
for(ConfigIter i = tags.first; i != tags.second; ++i)
{
ReadXLine(this, "exception", "host", ServerInstance->XLines->GetFactory("E"));
memset(DisabledUModes, 0, sizeof(DisabledUModes));
- for (const unsigned char* p = (const unsigned char*)ConfValue("disabled")->getString("usermodes").c_str(); *p; ++p)
+ std::string modes = ConfValue("disabled")->getString("usermodes");
+ for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
{
- if (*p < 'A' || *p > ('A' + 64)) throw CoreException(std::string("Invalid usermode ")+(char)*p+" was found.");
+ // Complain when the character is not a-z or A-Z
+ if ((*p < 'A') || (*p > 'z') || ((*p < 'a') && (*p > 'Z')))
+ throw CoreException("Invalid usermode " + std::string(1, *p) + " was found.");
DisabledUModes[*p - 'A'] = 1;
}
memset(DisabledCModes, 0, sizeof(DisabledCModes));
- for (const unsigned char* p = (const unsigned char*)ConfValue("disabled")->getString("chanmodes").c_str(); *p; ++p)
+ modes = ConfValue("disabled")->getString("chanmodes");
+ for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
{
- if (*p < 'A' || *p > ('A' + 64)) throw CoreException(std::string("Invalid chanmode ")+(char)*p+" was found.");
+ if ((*p < 'A') || (*p > 'z') || ((*p < 'a') && (*p > 'Z')))
+ throw CoreException("Invalid chanmode " + std::string(1, *p) + " was found.");
DisabledCModes[*p - 'A'] = 1;
}
memset(HideModeLists, 0, sizeof(HideModeLists));
- for (const unsigned char* p = (const unsigned char*)ConfValue("security")->getString("hidemodes").c_str(); *p; ++p)
- HideModeLists[*p] = true;
+ modes = ConfValue("security")->getString("hidemodes");
+ for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
+ HideModeLists[(unsigned char) *p] = true;
std::string v = security->getString("announceinvites");
else
AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE;
- Limits.Finalise();
+ v = security->getString("operspywhois");
+ if (v == "splitmsg")
+ OperSpyWhois = SPYWHOIS_SPLITMSG;
+ else if (v == "on" || v == "yes")
+ OperSpyWhois = SPYWHOIS_SINGLEMSG;
+ else
+ OperSpyWhois = SPYWHOIS_NONE;
}
// WARNING: it is not safe to use most of the codebase in this function, as it
void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
{
valid = true;
+ if (old)
+ {
+ /*
+ * These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername.
+ */
+ this->ServerName = old->ServerName;
+ this->sid = old->sid;
+ this->cmdline = old->cmdline;
+ }
/* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
try
for (int Index = 0; Index * sizeof(Deprecated) < sizeof(ChangedConfig); Index++)
{
std::string dummy;
- if (ConfValue(ChangedConfig[Index].tag)->readString(ChangedConfig[Index].value, dummy, true))
- errstr << "Your configuration contains a deprecated value: <"
- << ChangedConfig[Index].tag << ":" << ChangedConfig[Index].value << "> - " << ChangedConfig[Index].reason
- << " (at " << ConfValue(ChangedConfig[Index].tag)->getTagLocation() << ")\n";
+ ConfigTagList tags = ConfTags(ChangedConfig[Index].tag);
+ for(ConfigIter i = tags.first; i != tags.second; ++i)
+ {
+ if (i->second->readString(ChangedConfig[Index].value, dummy, true))
+ errstr << "Your configuration contains a deprecated value: <"
+ << ChangedConfig[Index].tag << ":" << ChangedConfig[Index].value << "> - " << ChangedConfig[Index].reason
+ << " (at " << i->second->getTagLocation() << ")\n";
+ }
}
Fill();
errstr << ce.GetReason();
}
- // write once here, to try it out and make sure its ok
- ServerInstance->WritePID(this->PID);
-
// Check errors before dealing with failed binds, since continuing on failed bind is wanted in some circumstances.
valid = errstr.str().empty();
- /*
- * 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 (old)
- {
- this->ServerName = old->ServerName;
- this->sid = old->sid;
- this->cmdline = old->cmdline;
+ // write once here, to try it out and make sure its ok
+ if (valid)
+ ServerInstance->WritePID(this->PID);
- // Same for ports... they're bound later on first run.
+ if (old && valid)
+ {
+ // On first run, ports are bound later on
FailedPortList pl;
ServerInstance->BindPorts(pl);
if (pl.size())
User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid);
if (!valid)
+ {
ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file:");
+ Classes.clear();
+ }
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 (line.empty())
+ continue;
+ // On startup, print out to console (still attached at this point)
if (!old)
- {
- // Starting up, so print it out so it's seen. XXX this is a bit of a hack.
- printf("%s\n", line.c_str());
- }
+ std::cout << line << std::endl;
+ // If a user is rehashing, tell them directly
+ if (user)
+ user->SendText(":%s NOTICE %s :*** %s", ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), line.c_str());
+ // Also tell opers
+ ServerInstance->SNO->WriteGlobalSno('a', line);
}
errstr.clear();
errstr.str(std::string());
+ // Re-parse our MOTD and RULES files for colors -- Justasic
+ for (ClassVector::const_iterator it = this->Classes.begin(), it_end = this->Classes.end(); it != it_end; ++it)
+ {
+ ConfigTag *tag = (*it)->config;
+ // Make sure our connection class allows motd colors
+ if(!tag->getBool("allowmotdcolors"))
+ continue;
+
+ ConfigFileCache::iterator file = this->Files.find(tag->getString("motd", "motd"));
+ if (file != this->Files.end())
+ InspIRCd::ProcessColors(file->second);
+
+ file = this->Files.find(tag->getString("rules", "rules"));
+ if (file != this->Files.end())
+ InspIRCd::ProcessColors(file->second);
+ }
+
/* No old configuration -> initial boot, nothing more to do here */
if (!old)
{
return;
}
+
// If there were errors processing configuration, don't touch modules.
if (!valid)
return;
ApplyModules(user);
if (user)
- user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str());
+ user->SendText(":%s NOTICE %s :*** Successfully rehashed server.",
+ ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
ServerInstance->SNO->WriteGlobalSno('a', "*** Successfully rehashed server.");
}
ConfigTag* ServerConfig::ConfValue(const std::string &tag)
{
- ConfigDataHash::iterator iter = config_data.find(tag);
- if (iter == config_data.end())
- return NULL;
- return iter->second;
+ ConfigTagList found = config_data.equal_range(tag);
+ if (found.first == found.second)
+ return EmptyTag;
+ ConfigTag* rv = found.first->second;
+ found.first++;
+ if (found.first != found.second)
+ ServerInstance->Logs->Log("CONFIG",DEFAULT, "Multiple <" + tag + "> tags found; only first will be used "
+ "(first at " + rv->getTagLocation() + "; second at " + found.first->second->getTagLocation() + ")");
+ return rv;
}
ConfigTagList ServerConfig::ConfTags(const std::string& tag)
return (p != name ? ++p : p);
}
-std::string ServerConfig::GetSID()
+const std::string& ServerConfig::GetSID()
{
return sid;
}
{
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)
* XXX: The order of these is IMPORTANT, do not reorder them without testing
* thoroughly!!!
*/
- ServerInstance->XLines->CheckELines();
+ ServerInstance->Users->RehashCloneCounts();
ServerInstance->XLines->CheckELines();
ServerInstance->XLines->ApplyLines();
ServerInstance->Res->Rehash();
FOREACH_MOD(I_OnRehash, OnRehash(user));
ServerInstance->BuildISupport();
+ ServerInstance->Logs->CloseLogs();
+ ServerInstance->Logs->OpenFileLogs();
+
+ if (Config->RawLog && !old->RawLog)
+ ServerInstance->Users->ServerNoticeAll("*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
+
Config = old;
}
else
{
// whoops, abort!
- ServerInstance->Logs->CloseLogs();
ServerInstance->Config = old;
- ServerInstance->Logs->OpenFileLogs();
}
}
projects / user / henk / code / inspircd.git / blobdiff