#include "inspircd.h"
#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;
{
this->ClearStack();
*ServerName = *Network = *ServerDesc = *AdminName = '\0';
- *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
+ *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = *FixedQuit = '\0';
*CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
- *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
+ *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = *SuffixQuit = '\0';
WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
log_file = NULL;
NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = UndernetMsgPrefix = false;
MaxConn = SOMAXCONN;
MaxWhoResults = 100;
debugging = 0;
+ MaxChans = 20;
+ OperMaxChans = 30;
LogLevel = DEFAULT;
maxbans.clear();
}
{
if (!GetIOHook(is))
{
- ServerInstance->Log(DEBUG,"Hooked inspsocket %08x", is);
SocketIOHookModule[is] = iomod;
is->IsIOHooked = true;
return true;
token_counter = 0;
}
}
- char buf[MAXBUF];
- snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str());
- isupport.push_back(buf);
+ if (!line5.empty())
+ {
+ char buf[MAXBUF];
+ snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str());
+ isupport.push_back(buf);
+ }
}
void ServerConfig::Send005(userrec* user)
bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
{
int count = ConfValueEnum(this->config_data, tag);
-
+
if (count > 1)
{
- if (bail)
- {
- printf("There were errors in your configuration:\nYou have more than one <%s> tag, this is not permitted.\n",tag);
- InspIRCd::Exit(EXIT_STATUS_CONFIG);
- }
- else
- {
- if (user)
- {
- user->WriteServ("There were errors in your configuration:");
- user->WriteServ("You have more than one <%s> tag, this is not permitted.\n",tag);
- }
- else
- {
- ServerInstance->WriteOpers("There were errors in the configuration file:");
- ServerInstance->WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag);
- }
- }
+ throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted.");
return false;
}
if (count < 1)
{
- if (bail)
- {
- printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag);
- InspIRCd::Exit(EXIT_STATUS_CONFIG);
- }
- else
- {
- if (user)
- {
- user->WriteServ("There were errors in your configuration:");
- user->WriteServ("You have not defined a <%s> tag, this is required.",tag);
- }
- else
- {
- ServerInstance->WriteOpers("There were errors in the configuration file:");
- ServerInstance->WriteOpers("You have not defined a <%s> tag, this is required.",tag);
- }
- }
+ throw CoreException("You have not defined a <"+std::string(tag)+"> tag, this is required.");
return false;
}
return true;
bool NoValidation(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
{
- conf->GetInstance()->Log(DEBUG,"No validation for <%s:%s>",tag,value);
return true;
}
nspace::hash_map<std::string,command_t*>::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
if (cm != ServerInstance->Parser->cmdlist.end())
{
- ServerInstance->Log(DEBUG,"Disabling command '%s'",cm->second->command.c_str());
cm->second->Disable(true);
}
}
bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
{
+ /* If we already have a servername, and they changed it, we should throw an exception. */
+ if ((strcasecmp(conf->ServerName, data.GetString())) && (*conf->ServerName))
+ {
+ throw CoreException("Configuration error: You cannot change your servername at runtime! Please restart your server for this change to be applied.");
+ /* XXX: We don't actually reach this return of course... */
+ return false;
+ }
if (!strchr(data.GetString(),'.'))
{
conf->GetInstance()->Log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",data.GetString(),data.GetString(),'.');
conf->WhoWasMaxKeep = 3600;
conf->GetInstance()->Log(DEFAULT,"WARNING: <whowas:maxkeep> value less than 3600, setting to default 3600");
}
- conf->GetInstance()->Log(DEBUG,"whowas:groupsize:%d maxgroups:%d maxkeep:%d",conf->WhoWasGroupSize,conf->WhoWasMaxGroups,conf->WhoWasMaxKeep);
- irc::whowas::PruneWhoWas(conf->GetInstance(), conf->GetInstance()->Time());
+
+ command_t* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS");
+ if (whowas_command)
+ {
+ std::deque<classbase*> params;
+ whowas_command->HandleInternal(WHOWAS_PRUNE, params);
+ }
+
return true;
}
*/
bool DoneConnect(ServerConfig* conf, const char* tag)
{
- conf->GetInstance()->Log(DEBUG,"DoneConnect called for tag: %s",tag);
return true;
}
bool DoULine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
{
const char* server = values[0].GetString();
- conf->GetInstance()->Log(DEBUG,"Read ULINE '%s'",server);
conf->ulines.push_back(server);
return true;
}
unsigned int prefixlen;
start = 0;
/* ":ServerInstance->Config->ServerName NOTICE user->nick :" */
- prefixlen = strlen(this->ServerName) + strlen(user->nick) + 11;
if (user)
{
+ prefixlen = strlen(this->ServerName) + strlen(user->nick) + 11;
user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick);
while (start < errors.length())
{
{
static char debug[MAXBUF]; /* Temporary buffer for debugging value */
static char maxkeep[MAXBUF]; /* Temporary buffer for WhoWasMaxKeep value */
- static char somax[MAXBUF]; /* Temporary buffer for SOMAXCONN default */
int rem = 0, add = 0; /* Number of modules added, number of modules removed */
std::ostringstream errstr; /* String stream containing the error output */
{"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", "Miss Configured", new ValueContainerChar (this->AdminName), 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, NoValidation},
+ {"power", "diepass", "", new ValueContainerChar (this->diepass), DT_CHARPTR, NoValidation},
{"power", "pause", "", new ValueContainerInt (&this->DieDelay), DT_INTEGER, NoValidation},
{"power", "restartpass", "", new ValueContainerChar (this->restartpass), DT_CHARPTR, NoValidation},
{"options", "prefixquit", "", new ValueContainerChar (this->PrefixQuit), DT_CHARPTR, NoValidation},
+ {"options", "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", "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},
{"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}
};
{"connect",
{"allow", "deny", "password", "timeout", "pingfreq", "flood",
"threshold", "sendq", "recvq", "localmax", "globalmax", NULL},
- {"", "", "", "", "", "",
- "", "", "", "", "", NULL},
+ {"", "", "", "", "120", "",
+ "", "", "", "3", "3", NULL},
{DT_CHARPTR, DT_CHARPTR, DT_CHARPTR, DT_INTEGER, DT_INTEGER, DT_INTEGER,
DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER},
InitConnect, DoConnect, DoneConnect},
{"reason", "ipmask", NULL},
{"No reason", "", NULL},
{DT_CHARPTR, DT_CHARPTR},
- InitXLine, DoZLine, DoneXLine},
+ InitXLine, DoZLine, DoneZLine},
{"badnick",
{"reason", "nick", NULL},
{"No reason", "", NULL},
{DT_CHARPTR, DT_CHARPTR},
- InitXLine, DoQLine, DoneXLine},
+ InitXLine, DoQLine, DoneQLine},
{"badhost",
{"reason", "host", NULL},
{"No reason", "", NULL},
{DT_CHARPTR, DT_CHARPTR},
- InitXLine, DoKLine, DoneXLine},
+ InitXLine, DoKLine, DoneKLine},
{"exception",
{"reason", "host", NULL},
{"No reason", "", NULL},
{DT_CHARPTR, DT_CHARPTR},
- InitXLine, DoELine, DoneXLine},
+ InitXLine, DoELine, DoneELine},
{"type",
{"name", "classes", NULL},
include_stack.clear();
/* Load and parse the config file, if there are any errors then explode */
-
+
/* Make a copy here so if it fails then we can carry on running with an unaffected config */
ConfigDataHash newconfig;
-
- if (this->LoadConf(newconfig, CONFIG_FILE, errstr))
+
+ if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr))
{
/* If we succeeded, set the ircd config to the new one */
- this->config_data = newconfig;
+ this->config_data = newconfig;
}
else
{
ConfValue(this->config_data, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines);
ValueItem vi(item);
- Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi);
+ if (!Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi))
+ throw CoreException("One or more values in your configuration file failed to validate. Please see your ircd.log for more information.");
switch (Values[Index].datatype)
{
/* 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;
}
break;
}
}
-
+
MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype);
}
-
+
MultiValues[Index].finish_function(this, MultiValues[Index].tag);
}
if (ServerInstance->LoadModule(adding->c_str()))
{
ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
-
+
if (user)
user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
-
+
add++;
}
else
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());
}
+
+ if (user)
+ user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick);
+ else
+ ServerInstance->WriteOpers("*** Successfully rehashed server.");
}
bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream)
bool in_tag;
bool in_quote;
bool in_comment;
-
+
linenumber = 1;
in_tag = false;
in_quote = false;
in_comment = false;
-
+
/* Check if the file open failed first */
if (!conf)
{
errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl;
return false;
}
-
+
/* Fix the chmod of the file to restrict it to the current user and group */
chmod(filename,0600);
-
+
for (unsigned int t = 0; t < include_stack.size(); t++)
{
if (std::string(filename) == include_stack[t])
return false;
}
}
-
+
/* It's not already included, add it to the list of files we've loaded */
include_stack.push_back(filename);
-
- /* Start reading characters... */
+
+ /* Start reading characters... */
while(conf.get(ch))
{
/*
* we get a '>' not inside quotes. If we find two '<' and
* no '>' then die with an error.
*/
-
+
if((ch == '#') && !in_quote)
in_comment = true;
-
+
/*if(((ch == '\n') || (ch == '\r')) && in_quote)
{
errorstream << "Got a newline within a quoted section, this is probably a typo: " << filename << ":" << linenumber << std::endl;
return false;
}*/
-
+
switch(ch)
{
case '\n':
if (in_quote)
- {
- ServerInstance->Log(DEBUG, "Got \\n inside value");
line += '\n';
- }
linenumber++;
case '\r':
if (!in_quote)
case '\t':
ch = ' ';
}
-
+
if(in_comment)
continue;
if ((ch == '\\') && (in_quote) && (in_tag))
{
line += ch;
- ServerInstance->Log(DEBUG,"Escape sequence in config line.");
char real_character;
if (conf.get(real_character))
{
- ServerInstance->Log(DEBUG,"Escaping %c", real_character);
if (real_character == 'n')
real_character = '\n';
line += real_character;
if (ch != '\r')
line += ch;
-
+
if(ch == '<')
{
if(in_tag)
* 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))
return false;
-
+
line.clear();
}
else
}
}
}
-
+
return true;
}
bool got_name;
bool got_key;
bool in_quote;
-
+
got_name = got_key = in_quote = false;
//std::cout << "ParseLine(data, '" << line << "', " << linenumber << ", stream)" << std::endl;
-
+
for(std::string::iterator c = line.begin(); c != line.end(); c++)
{
if(!got_name)
{
/* We don't know the tag name yet. */
-
+
if(*c != ' ')
{
if(*c != '<')
results.push_back(KeyVal(current_key, current_value));
// std::cout << "<" << tagname << ":" << current_key << "> " << current_value << std::endl;
-
+
in_quote = false;
got_key = false;
-
+
if((tagname == "include") && (current_key == "file"))
{
if(!this->DoInclude(target, current_value, errorstream))
return false;
}
-
+
current_key.clear();
current_value.clear();
}
}
}
}
-
+
/* Finished parsing the tag, add it to the config hash */
target.insert(std::pair<std::string, KeyValList > (tagname, results));
-
+
return true;
}
std::string confpath;
std::string newfile;
std::string::size_type pos;
-
- confpath = CONFIG_FILE;
+
+ confpath = ServerInstance->ConfigFileName;
newfile = file;
-
+
for (std::string::iterator c = newfile.begin(); c != newfile.end(); c++)
{
if (*c == '\\')
if (file[0] != '/')
{
- if((pos = confpath.find("/inspircd.conf")) != std::string::npos)
+ if((pos = confpath.rfind("/")) != std::string::npos)
{
/* Leaves us with just the path */
newfile = confpath.substr(0, pos) + std::string("/") + newfile;
return false;
}
}
-
+
return LoadConf(target, newfile, errorstream);
}
if (!default_value.empty())
{
result = default_value;
- ServerInstance->Log(DEBUG, "No config option for '%s' in tag <%s> using default: %s", var.c_str(), tag.c_str(), default_value.c_str());
return true;
}
}
if (!default_value.empty())
{
result = default_value;
- ServerInstance->Log(DEBUG, "No <%s:%s> tags in config file using default: %s", tag.c_str(), var.c_str(), default_value.c_str());
return true;
}
- ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str());
- }
- else
- {
- ServerInstance->Log(DEBUG, "ConfValue got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
}
return false;
}
-
+
bool ServerConfig::ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, int index, int &result)
{
return ConfValueInteger(target, std::string(tag), std::string(var), "", index, result);
stream.str(value);
if(!(stream >> result))
return false;
+ else
+ {
+ if (!value.empty())
+ {
+ if (value.substr(0,2) == "0x")
+ {
+ char* endptr;
+
+ value.erase(0,2);
+ result = strtol(value.c_str(), &endptr, 16);
+
+ /* No digits found */
+ if (endptr == value.c_str())
+ return false;
+ }
+ else
+ {
+ char denominator = *(value.end() - 1);
+ switch (toupper(denominator))
+ {
+ case 'K':
+ /* Kilobytes -> bytes */
+ result = result * 1024;
+ break;
+ case 'M':
+ /* Megabytes -> bytes */
+ result = result * 1024 * 1024;
+ break;
+ case 'G':
+ /* Gigabytes -> bytes */
+ result = result * 1024 * 1024 * 1024;
+ break;
+ }
+ }
+ }
+ }
return r;
}
-
+
bool ServerConfig::ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, int index)
{
return ConfValueBool(target, std::string(tag), std::string(var), "", index);
std::string result;
if(!ConfValue(target, tag, var, default_value, index, result))
return false;
-
+
return ((result == "yes") || (result == "true") || (result == "1"));
}
-
+
int ServerConfig::ConfValueEnum(ConfigDataHash &target, const char* tag)
{
return target.count(tag);
{
return target.count(tag);
}
-
+
int ServerConfig::ConfVarEnum(ConfigDataHash &target, const char* tag, int index)
{
return ConfVarEnum(target, std::string(tag), index);
int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, int index)
{
ConfigDataHash::size_type pos = index;
-
+
if((pos >= 0) && (pos < target.count(tag)))
{
ConfigDataHash::const_iterator iter = target.find(tag);
-
+
for(int i = 0; i < index; i++)
iter++;
-
+
return iter->second.size();
}
- else if(pos == 0)
- {
- ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str());
- }
- else
- {
- ServerInstance->Log(DEBUG, "ConfVarEnum got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
- }
-
+
return 0;
}
*/
bool ServerConfig::ReadFile(file_cache &F, const char* fname)
{
+ if (!fname || !*fname)
+ return false;
+
FILE* file = NULL;
char linebuf[MAXBUF];
F.clear();
-
+
if (*fname != '/')
{
std::string::size_type pos;
- std::string confpath = CONFIG_FILE;
- if((pos = confpath.find("/inspircd.conf")) != std::string::npos)
+ std::string confpath = ServerInstance->ConfigFileName;
+ if((pos = confpath.rfind("/")) != std::string::npos)
{
/* Leaves us with just the path */
std::string newfile = confpath.substr(0, pos) + std::string("/") + fname;
+ if (!FileExists(newfile.c_str()))
+ return false;
file = fopen(newfile.c_str(), "r");
-
+
}
}
else
+ {
+ if (!FileExists(fname))
+ return false;
file = fopen(fname, "r");
+ }
if (file)
{
bool ServerConfig::FileExists(const char* file)
{
+ struct stat sb;
+ if (stat(file, &sb) == -1)
+ return false;
+
+ if ((sb.st_mode & S_IFDIR) > 0)
+ return false;
+
FILE *input;
if ((input = fopen (file, "r")) == NULL)
- {
return false;
- }
else
{
fclose(input);
bool ServerConfig::DirValid(const char* dirandfile)
{
- char work[MAXBUF];
- char buffer[MAXBUF];
- char otherdir[MAXBUF];
+ char work[1024];
+ char buffer[1024];
+ char otherdir[1024];
int p;
- strlcpy(work, dirandfile, MAXBUF);
+ strlcpy(work, dirandfile, 1024);
p = strlen(work);
// we just want the dir
}
// Get the current working directory
- if (getcwd(buffer, MAXBUF ) == NULL )
+ if (getcwd(buffer, 1024 ) == NULL )
return false;
if (chdir(work) == -1)
return false;
- if (getcwd(otherdir, MAXBUF ) == NULL )
+ if (getcwd(otherdir, 1024 ) == NULL )
return false;
if (chdir(buffer) == -1)
std::string ServerConfig::GetFullProgDir(char** argv, int argc)
{
- char work[MAXBUF];
- char buffer[MAXBUF];
- char otherdir[MAXBUF];
+ char work[1024];
+ char buffer[1024];
+ char otherdir[1024];
int p;
- strlcpy(work,argv[0],MAXBUF);
+ strlcpy(work,argv[0],1024);
p = strlen(work);
// we just want the dir
}
// Get the current working directory
- if (getcwd(buffer, MAXBUF) == NULL)
+ if (getcwd(buffer, 1024) == NULL)
return "";
if (chdir(work) == -1)
return "";
- if (getcwd(otherdir, MAXBUF) == NULL)
+ if (getcwd(otherdir, 1024) == NULL)
return "";
if (chdir(buffer) == -1)
projects / user / henk / code / inspircd.git / blobdiff