-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ * Copyright (C) 2018 Chris Novakovic <chrisnovakovic@users.noreply.github.com>
+ * Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ * Copyright (C) 2012-2014, 2016-2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007-2008 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
- * 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/>.
*/
-#ifndef INSPIRCD_CONFIGREADER
-#define INSPIRCD_CONFIGREADER
+
+#pragma once
#include <sstream>
#include <string>
#include "modules.h"
#include "socketengine.h"
#include "socket.h"
+#include "token_list.h"
-/* Required forward definitions */
-class ServerConfig;
-class ServerLimits;
-class InspIRCd;
-class BufferedSocket;
-
-/** A cached text file stored with its contents as lines
- */
-typedef std::vector<std::string> file_cache;
-
-/** A configuration key and value pair
- */
-typedef std::pair<std::string, std::string> KeyVal;
-
-struct CoreExport ConfigTag : public refcountbase
+/** Structure representing a single \<tag> in config */
+class CoreExport ConfigTag : public refcountbase
{
+ ConfigItems items;
+ public:
const std::string tag;
const std::string src_name;
const int src_line;
- std::vector<KeyVal> items;
-
- ConfigTag(const std::string& Tag, const std::string& file, int line)
- : tag(Tag), src_name(file), src_line(line) {}
- std::string getString(const std::string& key, const std::string& def = "");
- long getInt(const std::string& key, long def = 0);
- double getFloat(const std::string& key, double def = 0);
+ /** Get the value of an option, using def if it does not exist */
+ std::string getString(const std::string& key, const std::string& def, const TR1NS::function<bool(const std::string&)>& validator);
+ /** Get the value of an option, using def if it does not exist */
+ std::string getString(const std::string& key, const std::string& def = "", size_t minlen = 0, size_t maxlen = UINT32_MAX);
+ /** Get the value of an option, using def if it does not exist */
+ long getInt(const std::string& key, long def, long min = LONG_MIN, long max = LONG_MAX);
+ /** Get the value of an option, using def if it does not exist */
+ unsigned long getUInt(const std::string& key, unsigned long def, unsigned long min = 0, unsigned long max = ULONG_MAX);
+ /** Get the value of an option, using def if it does not exist */
+ double getFloat(const std::string& key, double def, double min = DBL_MIN, double max = DBL_MAX);
+ /** Get the value of an option, using def if it does not exist */
bool getBool(const std::string& key, bool def = false);
+ /** Get the value in seconds of a duration that is in the user-friendly "1h2m3s" format,
+ * using a default value if it does not exist or is out of bounds.
+ * @param key The config key name
+ * @param def Default value (optional)
+ * @param min Minimum acceptable value (optional)
+ * @param max Maximum acceptable value (optional)
+ * @return The duration in seconds
+ */
+ unsigned long getDuration(const std::string& key, unsigned long def, unsigned long min = 0, unsigned long max = ULONG_MAX);
+
+ /** Get the value of an option
+ * @param key The option to get
+ * @param value The location to store the value (unmodified if does not exist)
+ * @param allow_newline Allow newlines in the option (normally replaced with spaces)
+ * @return true if the option exists
+ */
bool readString(const std::string& key, std::string& value, bool allow_newline = false);
std::string getTagLocation();
-};
-/** An entire config file, built up of KeyValLists
- */
-typedef std::multimap<std::string, reference<ConfigTag> > ConfigDataHash;
+ inline const ConfigItems& getItems() const { return items; }
-typedef std::map<std::string, reference<ConfigTag> > TagIndex;
+ /** Create a new ConfigTag, giving access to the private ConfigItems item list */
+ static ConfigTag* create(const std::string& Tag, const std::string& file, int line, ConfigItems*& Items);
+ private:
+ ConfigTag(const std::string& Tag, const std::string& file, int line);
+};
/** Defines the server's length limits on various length-limited
* items such as topics, nicknames, channel names etc.
class ServerLimits
{
public:
+ /** Maximum line length */
+ size_t MaxLine;
/** Maximum nickname length */
size_t NickMax;
/** Maximum channel length */
size_t MaxTopic;
/** Maximum kick message length */
size_t MaxKick;
- /** Maximum GECOS (real name) length */
- size_t MaxGecos;
+ /** Maximum real name length */
+ size_t MaxReal;
/** Maximum away message length */
size_t MaxAway;
+ /** Maximum hostname length */
+ size_t MaxHost;
- /** Creating the class initialises it to the defaults
- * as in 1.1's ./configure script. Reading other values
- * from the config will change these values.
+ /** Read all limits from a config tag. Limits which aren't specified in the tag are set to a default value.
+ * @param tag Configuration tag to read the limits from
*/
- ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12), MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200)
- {
- }
+ ServerLimits(ConfigTag* tag);
- /** Finalises the settings by adding one. This allows for them to be used as-is
- * without a 'value+1' when using the std::string assignment methods etc.
- */
- void Finalise()
- {
- NickMax++;
- ChanMax++;
- IdentMax++;
- MaxQuit++;
- MaxTopic++;
- MaxKick++;
- MaxGecos++;
- MaxAway++;
- }
+ /** Maximum length of a n!u\@h mask */
+ size_t GetMaxMask() const { return NickMax + 1 + IdentMax + 1 + MaxHost; }
};
-/** This class holds the bulk of the runtime configuration for the ircd.
- * It allows for reading new config values, accessing configuration files,
- * and storage of the configuration data needed to run the ircd, such as
- * the servername, connect classes, /ADMIN data, MOTDs and filenames etc.
- */
-class CoreExport ServerConfig : public classbase
+struct CommandLineConf
{
- private:
- void CrossCheckOperClassType();
- void CrossCheckConnectBlocks(ServerConfig* current);
-
- public:
- /** Error stream, contains error output from any failed configuration parsing.
- */
- std::stringstream errstr;
-
- /** True if this configuration is valid enough to run with */
- bool valid;
-
- /** Used to indicate who we announce invites to on a channel */
- enum InviteAnnounceState { INVITE_ANNOUNCE_NONE, INVITE_ANNOUNCE_ALL, INVITE_ANNOUNCE_OPS, INVITE_ANNOUNCE_DYNAMIC };
-
- /** Not used any more as it is named, can probably be removed or renamed.
+ /** If this value is true, the owner of the
+ * server specified -nofork on the command
+ * line, causing the daemon to stay in the
+ * foreground.
*/
- int DoDownloads();
+ bool nofork;
- /** This holds all the information in the config file,
- * it's indexed by tag name to a vector of key/values.
+ /** If this value if true then all log
+ * messages will be output, regardless of
+ * the level given in the config file.
+ * This is set with the -debug commandline
+ * option.
*/
- ConfigDataHash config_data;
+ bool forcedebug;
- /** Length limits, see definition of ServerLimits class
+ /** If this is true then log output will be
+ * written to the logfile. This is the default.
+ * If you put -nolog on the commandline then
+ * the logfile will not be written.
+ * This is meant to be used in conjunction with
+ * -debug for debugging without filling up the
+ * hard disk.
*/
- ServerLimits Limits;
+ bool writelog;
- /** Clones CIDR range for ipv4 (0-32)
- * Defaults to 32 (checks clones on all IPs seperately)
+ /** If this is true, a PID file will be written
+ * to the file given in the "file" variable of
+ * the \<pid> tag in the config file. This is
+ * the default.
+ * Passing --nopid as a command line argument
+ * sets this to false; in this case, a PID file
+ * will not be written, even the default PID
+ * file that is usually written when the \<pid>
+ * tag is not defined in the config file.
*/
- int c_ipv4_range;
+ bool writepid;
- /** Clones CIDR range for ipv6 (0-128)
- * Defaults to 128 (checks on all IPs seperately)
- */
- int c_ipv6_range;
+ /* Whether the --runasroot option was specified at boot. */
+ bool runasroot;
- /** Max number of WhoWas entries per user.
- */
- int WhoWasGroupSize;
+ /** Saved argc from startup. */
+ int argc;
- /** Max number of cumulative user-entries in WhoWas.
- * When max reached and added to, push out oldest entry FIFO style.
- */
- int WhoWasMaxGroups;
+ /** Saved argv from startup. */
+ char** argv;
+};
- /** Max seconds a user is kept in WhoWas before being pruned.
- */
- int WhoWasMaxKeep;
+class CoreExport OperInfo : public refcountbase
+{
+ public:
+ TokenList AllowedOperCommands;
+ TokenList AllowedPrivs;
- /** Both for set(g|u)id.
- */
- std::string SetUser;
- std::string SetGroup;
+ /** Allowed user modes from oper classes. */
+ std::bitset<64> AllowedUserModes;
- /** Holds the server name of the local server
- * as defined by the administrator.
- */
- std::string ServerName;
+ /** Allowed channel modes from oper classes. */
+ std::bitset<64> AllowedChanModes;
- /** Notice to give to users when they are Xlined
- */
- std::string MoronBanner;
+ /** Allowed snomasks from oper classes. */
+ std::bitset<64> AllowedSnomasks;
- /* Holds the network name the local server
- * belongs to. This is an arbitary field defined
- * by the administrator.
- */
- std::string Network;
+ /** \<oper> block used for this oper-up. May be NULL. */
+ reference<ConfigTag> oper_block;
+ /** \<type> block used for this oper-up. Valid for local users, may be NULL on remote */
+ reference<ConfigTag> type_block;
+ /** \<class> blocks referenced from the \<type> block. These define individual permissions */
+ std::vector<reference<ConfigTag> > class_blocks;
+ /** Name of the oper type; i.e. the one shown in WHOIS */
+ std::string name;
- /** Holds the description of the local server
- * as defined by the administrator.
+ /** Creates a new OperInfo with the specified oper type name.
+ * @param Name The name of the oper type.
*/
- std::string ServerDesc;
+ OperInfo(const std::string& Name);
- /** Holds the admin's name, for output in
- * the /ADMIN command.
- */
- std::string AdminName;
+ /** Get a configuration item, searching in the oper, type, and class blocks (in that order) */
+ std::string getConfig(const std::string& key);
+ void init();
+};
- /** Holds the email address of the admin,
- * for output in the /ADMIN command.
- */
- std::string AdminEmail;
+/** This class holds the bulk of the runtime configuration for the ircd.
+ * It allows for reading new config values, accessing configuration files,
+ * and storage of the configuration data needed to run the ircd, such as
+ * the servername, connect classes, /ADMIN data, MOTDs and filenames etc.
+ */
+class CoreExport ServerConfig
+{
+ private:
+ void CrossCheckOperClassType();
+ void CrossCheckConnectBlocks(ServerConfig* current);
- /** Holds the admin's nickname, for output
- * in the /ADMIN command
- */
- std::string AdminNick;
+ public:
+ /** How to treat a user in a channel who is banned. */
+ enum BannedUserTreatment
+ {
+ /** Don't treat a banned user any different to normal. */
+ BUT_NORMAL,
- /** The admin-configured /DIE password
- */
- std::string diepass;
+ /** Restrict the actions of a banned user. */
+ BUT_RESTRICT_SILENT,
- /** The admin-configured /RESTART password
- */
- std::string restartpass;
+ /** Restrict the actions of a banned user and notify them of their treatment. */
+ BUT_RESTRICT_NOTIFY
+ };
- /** The hash method for *BOTH* the die and restart passwords.
- */
- std::string powerhash;
+ class ServerPaths
+ {
+ public:
+ /** Config path */
+ std::string Config;
- /** The pathname and filename of the message of the
- * day file, as defined by the administrator.
- */
- std::string motd;
+ /** Data path */
+ std::string Data;
- /** The pathname and filename of the rules file,
- * as defined by the administrator.
- */
- std::string rules;
+ /** Log path */
+ std::string Log;
- /** The quit prefix in use, or an empty string
- */
- std::string PrefixQuit;
+ /** Module path */
+ std::string Module;
- /** The quit suffix in use, or an empty string
- */
- std::string SuffixQuit;
+ /** Runtime path */
+ std::string Runtime;
- /** The fixed quit message in use, or an empty string
- */
- std::string FixedQuit;
+ ServerPaths(ConfigTag* tag);
- /** The part prefix in use, or an empty string
- */
- std::string PrefixPart;
+ std::string PrependConfig(const std::string& fn) const { return FileSystem::ExpandPath(Config, fn); }
+ std::string PrependData(const std::string& fn) const { return FileSystem::ExpandPath(Data, fn); }
+ std::string PrependLog(const std::string& fn) const { return FileSystem::ExpandPath(Log, fn); }
+ std::string PrependModule(const std::string& fn) const { return FileSystem::ExpandPath(Module, fn); }
+ std::string PrependRuntime(const std::string& fn) const { return FileSystem::ExpandPath(Runtime, fn); }
+ };
- /** The part suffix in use, or an empty string
+ /** Holds a complete list of all connect blocks
*/
- std::string SuffixPart;
+ typedef std::vector<reference<ConnectClass> > ClassVector;
- /** The fixed part message in use, or an empty string
+ /** Index of valid oper blocks and types
*/
- std::string FixedPart;
+ typedef insp::flat_map<std::string, reference<OperInfo> > OperIndex;
- /** The last string found within a <die> tag, or
- * an empty string.
+ /** Get a configuration tag by name. If one or more tags are present then the first is returned.
+ * @param tag The name of the tag to get.
+ * @returns Either a tag from the config or EmptyTag.
*/
- std::string DieValue;
+ ConfigTag* ConfValue(const std::string& tag);
- /** The DNS server to use for DNS queries
+ /** Get a list of configuration tags by name.
+ * @param tag The name of the tags to get.
+ * @returns Either a list of tags from the config or an empty ConfigTagList.
*/
- std::string DNSServer;
+ ConfigTagList ConfTags(const std::string& tag);
- /** Pretend disabled commands don't exist.
- */
- bool DisabledDontExist;
+ /** An empty configuration tag. */
+ ConfigTag* EmptyTag;
- /** This variable contains a space-seperated list
- * of commands which are disabled by the
- * administrator of the server for non-opers.
+ /** Error stream, contains error output from any failed configuration parsing.
*/
- std::string DisabledCommands;
+ std::stringstream errstr;
- /** This variable identifies which usermodes have been diabled.
- */
+ /** True if this configuration is valid enough to run with */
+ bool valid;
- char DisabledUModes[64];
+ /** Bind to IPv6 by default */
+ bool WildcardIPv6;
- /** This variable identifies which chanmodes have been disabled.
+ /** This holds all the information in the config file,
+ * it's indexed by tag name to a vector of key/values.
*/
- char DisabledCModes[64];
+ ConfigDataHash config_data;
- /** The full path to the modules directory.
- * This is either set at compile time, or
- * overridden in the configuration file via
- * the <options> tag.
+ /** This holds all extra files that have been read in the configuration
+ * (for example, MOTD and RULES files are stored here)
*/
- std::string ModPath;
+ ConfigFileCache Files;
- /** The file handle of the logfile. If this
- * value is NULL, the log file is not open,
- * probably due to a permissions error on
- * startup (this should not happen in normal
- * operation!).
+ /** Length limits, see definition of ServerLimits class
*/
- FILE *log_file;
+ ServerLimits Limits;
- /** If this value is true, the owner of the
- * server specified -nofork on the command
- * line, causing the daemon to stay in the
- * foreground.
- */
- bool nofork;
+ /** Locations of various types of file (config, module, etc). */
+ ServerPaths Paths;
- /** If this value if true then all log
- * messages will be output, regardless of
- * the level given in the config file.
- * This is set with the -debug commandline
- * option.
+ /** Configuration parsed from the command line.
*/
- bool forcedebug;
+ CommandLineConf cmdline;
- /** If this is true then log output will be
- * written to the logfile. This is the default.
- * If you put -nolog on the commandline then
- * the logfile will not be written.
- * This is meant to be used in conjunction with
- * -debug for debugging without filling up the
- * hard disk.
+ /** Clones CIDR range for ipv4 (0-32)
+ * Defaults to 32 (checks clones on all IPs separately)
*/
- bool writelog;
+ unsigned char c_ipv4_range;
- /** If set to true, then all opers on this server are
- * shown with a generic 'is an IRC operator' line rather
- * than the oper type. Oper types are still used internally.
+ /** Clones CIDR range for ipv6 (0-128)
+ * Defaults to 128 (checks on all IPs separately)
*/
- bool GenericOper;
+ unsigned char c_ipv6_range;
- /** If this value is true, banned users (+b, not extbans) will not be able to change nick
- * if banned on any channel, nor to message them.
+ /** Holds the server name of the local server
+ * as defined by the administrator.
*/
- bool RestrictBannedUsers;
+ std::string ServerName;
- /** If this value is true, halfops have been
- * enabled in the configuration file.
+ /** Notice to give to users when they are banned by an XLine
*/
- bool AllowHalfop;
+ std::string XLineMessage;
- /** If this is set to true, then mode lists (e.g
- * MODE #chan b) are hidden from unprivileged
- * users.
+ /* Holds the network name the local server
+ * belongs to. This is an arbitrary field defined
+ * by the administrator.
*/
- bool HideModeLists[256];
+ std::string Network;
- /** The number of seconds the DNS subsystem
- * will wait before timing out any request.
+ /** Holds the description of the local server
+ * as defined by the administrator.
*/
- int dns_timeout;
+ std::string ServerDesc;
+
+ /** How to treat a user in a channel who is banned. */
+ BannedUserTreatment RestrictBannedUsers;
/** The size of the read() buffer in the user
* handling code, used to read data into a user's
*/
int MaxConn;
+ /** If we should check for clones during CheckClass() in AddUser()
+ * Setting this to false allows to not trigger on maxclones for users
+ * that may belong to another class after DNS-lookup is complete.
+ * It does, however, make the server spend more time on users we may potentially not want.
+ */
+ bool CCOnConnect;
+
/** The soft limit value assigned to the irc server.
* The IRC server will not allow more than this
* number of local users.
*/
unsigned int MaxTargets;
- /** The maximum number of /WHO results allowed
- * in any single /WHO command.
- */
- int MaxWhoResults;
+ /** The number of seconds that the server clock can skip by before server operators are warned. */
+ time_t TimeSkipWarn;
- /** True if the DEBUG loglevel is selected.
- */
- int debugging;
-
- /** How many seconds to wait before exiting
- * the program when /DIE is correctly issued.
- */
- int DieDelay;
-
- /** True if we're going to hide netsplits as *.net *.split for non-opers
- */
- bool HideSplits;
-
- /** True if we're going to hide ban reasons for non-opers (e.g. G-Lines,
- * K-Lines, Z-Lines)
+ /** True if we're going to hide ban reasons for non-opers (e.g. G-lines,
+ * K-lines, Z-lines)
*/
bool HideBans;
- /** Announce invites to the channel with a server notice
- */
- InviteAnnounceState AnnounceInvites;
-
- /** If this is enabled then operators will
- * see invisible (+i) channels in /whois.
- */
- bool OperSpyWhois;
-
- /** Set to a non-empty string to obfuscate the server name of users in WHOIS
- */
- std::string HideWhoisServer;
-
- /** Set to a non empty string to obfuscate nicknames prepended to a KILL.
- */
- std::string HideKillsServer;
+ /** True if raw I/O is being logged */
+ bool RawLog;
- /** The MOTD file, cached in a file_cache type.
- */
- file_cache MOTD;
-
- /** The RULES file, cached in a file_cache type.
- */
- file_cache RULES;
+ /** Set to a non-empty string to obfuscate server names. */
+ std::string HideServer;
/** The full pathname and filename of the PID
* file as defined in the configuration.
*/
ClassVector Classes;
- /** The 005 tokens of this server (ISUPPORT)
- * populated/repopulated upon loading or unloading
- * modules.
- */
- std::string data005;
-
- /** isupport strings
- */
- std::vector<std::string> isupport;
-
- /** STATS characters in this list are available
- * only to operators.
- */
- std::string UserStats;
-
- /** The path and filename of the ircd.log file
- */
- std::string logpath;
-
/** Default channel modes
*/
std::string DefaultModes;
*/
std::string CustomVersion;
- /** List of u-lined servers
- */
- std::map<irc::string, bool> ulines;
-
- /** Max banlist sizes for channels (the std::string is a glob)
- */
- std::map<std::string, int> maxbans;
-
- /** Directory where the inspircd binary resides
- */
- std::string MyDir;
-
- /** If set to true, no user DNS lookups are to be performed
- */
- bool NoUserDns;
-
/** If set to true, provide syntax hints for unknown commands
*/
bool SyntaxHints;
- /** If set to true, users appear to quit then rejoin when their hosts change.
- * This keeps clients synchronized properly.
- */
- bool CycleHosts;
-
- /** If set to true, prefixed channel NOTICEs and PRIVMSGs will have the prefix
- * added to the outgoing text for undernet style msg prefixing.
+ /** The name of the casemapping method used by this server.
*/
- bool UndernetMsgPrefix;
+ std::string CaseMapping;
- /** If set to true, the full nick!user@host will be shown in the TOPIC command
+ /** If set to true, the full nick!user\@host will be shown in the TOPIC command
* for who set the topic last. If false, only the nick is shown.
*/
bool FullHostInTopic;
- /** All oper type definitions from the config file
+ /** Oper blocks keyed by their name
*/
- TagIndex opertypes;
+ OperIndex oper_blocks;
- /** All oper class definitions from the config file
+ /** Oper types keyed by their name
*/
- TagIndex operclass;
-
- /** Saved argv from startup
- */
- char** argv;
+ OperIndex OperTypes;
- /** Saved argc from startup
- */
- int argc;
-
- /** Max channels per user
+ /** Default value for <connect:maxchans>, deprecated in 3.0
*/
unsigned int MaxChans;
- /** Oper max channels per user
+ /** Default value for <oper:maxchans>, deprecated in 3.0
*/
unsigned int OperMaxChans;
*/
std::string sid;
- /** True if we have been told to run the testsuite from the commandline,
- * rather than entering the mainloop.
- */
- bool TestSuite;
-
/** Construct a new ServerConfig
*/
ServerConfig();
+ ~ServerConfig();
+
/** Get server ID as string with required leading zeroes
*/
- std::string GetSID();
+ const std::string& GetSID() const { return sid; }
- /** Update the 005 vector
- */
- void Update005();
+ /** Retrieves the server name which should be shown to users. */
+ const std::string& GetServerName() const { return HideServer.empty() ? ServerName : HideServer; }
- /** Send the 005 numerics (ISUPPORT) to a user
- */
- void Send005(User* user);
+ /** Retrieves the server description which should be shown to users. */
+ const std::string& GetServerDesc() const { return HideServer.empty() ? ServerDesc : HideServer; }
/** Read the entire configuration into memory
* and initialize this class. All other methods
void Fill();
- /** Read a file into a file_cache object
- */
- bool ReadFile(file_cache &F, const std::string& fname);
-
- /* Returns true if the given string starts with a windows drive letter
+ /** Escapes a value for storage in a configuration key.
+ * @param str The string to escape.
+ * @param xml Are we using the XML config format?
*/
- bool StartsWithWindowsDriveLetter(const std::string &path);
+ static std::string Escape(const std::string& str, bool xml = true);
- /** Load 'filename' into 'target', with the new config parser everything is parsed into
- * tag/key/value at load-time rather than at read-value time.
+ /** If this value is true, snotices will not stack when repeats are sent
*/
- bool LoadConf(FILE* &conf, const char* filename, bool allowexeinc);
+ bool NoSnoticeStack;
+};
- /** Load 'filename' into 'target', with the new config parser everything is parsed into
- * tag/key/value at load-time rather than at read-value time.
- */
- bool LoadConf(FILE* &conf, const std::string &filename, bool allowexeinc);
+/** The background thread for config reading, so that reading from executable includes
+ * does not block.
+ */
+class CoreExport ConfigReaderThread : public Thread
+{
+ ServerConfig* Config;
+ volatile bool done;
+ public:
+ const std::string TheUserUID;
+ ConfigReaderThread(const std::string &useruid)
+ : Config(new ServerConfig), done(false), TheUserUID(useruid)
+ {
+ }
- ConfigTag* ConfValue(const std::string& tag, int offset = 0);
+ virtual ~ConfigReaderThread()
+ {
+ delete Config;
+ }
- bool ApplyDisabledCommands(const std::string& data);
+ void Run() CXX11_OVERRIDE;
+ /** Run in the main thread to apply the configuration */
+ void Finish();
+ bool IsDone() { return done; }
+};
- /** Clean a filename, stripping the directories (and drives) from string.
- * @param name Directory to tidy
- * @return The cleaned filename
- */
- static const char* CleanFilename(const char* name);
+/** Represents the status of a config load. */
+class CoreExport ConfigStatus
+{
+ public:
+ /** Whether this is the initial config load. */
+ bool const initial;
- /** Check if a file exists.
- * @param file The full path to a file
- * @return True if the file exists and is readable.
- */
- static bool FileExists(const char* file);
+ /** The user who initiated the config load or NULL if not initiated by a user. */
+ User* const srcuser;
- /** If this value is true, invites will bypass more than just +i
+ /** Initializes a new instance of the ConfigStatus class.
+ * @param user The user who initiated the config load or NULL if not initiated by a user.
+ * @param isinitial Whether this is the initial config load.
*/
- bool InvBypassModes;
-
+ ConfigStatus(User* user = NULL, bool isinitial = false)
+ : initial(isinitial)
+ , srcuser(user)
+ {
+ }
};
-#endif
projects / user / henk / code / inspircd.git / blobdiff