X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigparser.cpp;h=b68c52cbba60703aab3d9d172de346cf7bf03849;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=abdf6f3de07e2f0cb58c3f989e750bd6704445e6;hpb=7530285740c2db1bc4457859b0d5f2436e0ed113;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configparser.cpp b/src/configparser.cpp
index abdf6f3de..b68c52cbb 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -1,6 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013-2014, 2016-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -30,7 +36,10 @@ enum ParseFlags
 	FLAG_NO_EXEC = 2,
 
 	// All includes are disabled.
-	FLAG_NO_INC = 4
+	FLAG_NO_INC = 4,
+
+	// &env.FOO; is disabled.
+	FLAG_NO_ENV = 8
 };
 
 // Represents the position within a config file.
@@ -152,12 +161,20 @@ struct Parser
 		}
 	}
 
+	bool wordchar(char ch)
+	{
+		return isalnum(ch)
+			|| ch == '-'
+			|| ch == '.'
+			|| ch == '_';
+	}
+
 	void nextword(std::string& rv)
 	{
 		int ch = next();
 		while (isspace(ch))
 			ch = next();
-		while (isalnum(ch) || ch == '_'|| ch == '-')
+		while (wordchar(ch))
 		{
 			rv.push_back(ch);
 			ch = next();
@@ -199,7 +216,7 @@ struct Parser
 				while (1)
 				{
 					ch = next();
-					if (isalnum(ch) || (varname.empty() && ch == '#'))
+					if (wordchar(ch) || (varname.empty() && ch == '#'))
 						varname.push_back(ch);
 					else if (ch == ';')
 						break;
@@ -227,6 +244,17 @@ struct Parser
 						throw CoreException("Invalid numeric character reference '&" + varname + ";'");
 					value.push_back(static_cast<char>(lvalue));
 				}
+				else if (varname.compare(0, 4, "env.") == 0)
+				{
+					if (flags & FLAG_NO_ENV)
+						throw CoreException("XML environment entity reference in file included with noenv=\"yes\"");
+
+					const char* envstr = getenv(varname.c_str() + 4);
+					if (!envstr)
+						throw CoreException("Undefined XML environment entity reference '&" + varname + ";'");
+
+					value.append(envstr);
+				}
 				else
 				{
 					insp::flat_map<std::string, std::string>::iterator var = stack.vars.find(varname);
@@ -394,9 +422,34 @@ void ParseStack::DoInclude(ConfigTag* tag, int flags)
 			flags |= FLAG_NO_INC;
 		if (tag->getBool("noexec", false))
 			flags |= FLAG_NO_EXEC;
+		if (tag->getBool("noenv", false))
+			flags |= FLAG_NO_ENV;
+
 		if (!ParseFile(ServerInstance->Config->Paths.PrependConfig(name), flags, mandatorytag))
 			throw CoreException("Included");
 	}
+	else if (tag->readString("directory", name))
+	{
+		if (tag->getBool("noinclude", false))
+			flags |= FLAG_NO_INC;
+		if (tag->getBool("noexec", false))
+			flags |= FLAG_NO_EXEC;
+		if (tag->getBool("noenv", false))
+			flags |= FLAG_NO_ENV;
+
+		const std::string includedir = ServerInstance->Config->Paths.PrependConfig(name);
+		std::vector<std::string> files;
+		if (!FileSystem::GetFileList(includedir, files, "*.conf"))
+			throw CoreException("Unable to read directory for include: " + includedir);
+
+		std::sort(files.begin(), files.end());
+		for (std::vector<std::string>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
+		{
+			const std::string path = includedir + '/' + *iter;
+			if (!ParseFile(path, flags, mandatorytag))
+				throw CoreException("Included");
+		}
+	}
 	else if (tag->readString("executable", name))
 	{
 		if (flags & FLAG_NO_EXEC)
@@ -405,6 +458,9 @@ void ParseStack::DoInclude(ConfigTag* tag, int flags)
 			flags |= FLAG_NO_INC;
 		if (tag->getBool("noexec", true))
 			flags |= FLAG_NO_EXEC;
+		if (tag->getBool("noenv", true))
+			flags |= FLAG_NO_ENV;
+
 		if (!ParseFile(name, flags, mandatorytag, true))
 			throw CoreException("Included");
 	}
@@ -638,9 +694,10 @@ bool ConfigTag::getBool(const std::string &key, bool def)
 	if(!readString(key, result))
 		return def;
 
-	if (result == "yes" || result == "true" || result == "1" || result == "on")
+	if (stdalgo::string::equalsci(result, "yes") || stdalgo::string::equalsci(result, "true") || stdalgo::string::equalsci(result, "on") || result == "1")
 		return true;
-	if (result == "no" || result == "false" || result == "0" || result == "off")
+
+	if (stdalgo::string::equalsci(result, "no") || stdalgo::string::equalsci(result, "false") || stdalgo::string::equalsci(result, "off") || result == "0")
 		return false;
 
 	ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Value of <" + tag + ":" + key + "> at " + getTagLocation() +