From 6f58f0e1d42697df37e52ae7bf58d5ea7e83bbb5 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 8 Nov 2022 21:42:26 +0000
Subject: Log when the uid/gid of config files might be wrong.

---
 src/configparser.cpp | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

(limited to 'src/configparser.cpp')

diff --git a/src/configparser.cpp b/src/configparser.cpp
index e4582f80d..ddd07c728 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -476,6 +476,28 @@ void ParseStack::DoInclude(ConfigTag* tag, int flags)
 	}
 }
 
+namespace
+{
+	void CheckOwnership(const std::string& path)
+	{
+		struct stat pathinfo;
+		if (stat(path.c_str(), &pathinfo))
+			return; // Will be handled when fopen fails.
+
+		if (getegid() != pathinfo.st_gid)
+		{
+			ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Possible configuration error: %s is owned by group %u but the server is running as group %u.",
+				path.c_str(), getegid(), pathinfo.st_gid);
+		}
+
+		if (geteuid() != pathinfo.st_uid)
+		{
+			ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Possible configuration error: %s is owned by user %u but the server is running as user %u.",
+				path.c_str(), geteuid(), pathinfo.st_uid);
+		}
+	}
+}
+
 void ParseStack::DoReadFile(const std::string& key, const std::string& name, int flags, bool exec)
 {
 	if (flags & FLAG_NO_INC)
@@ -483,7 +505,10 @@ void ParseStack::DoReadFile(const std::string& key, const std::string& name, int
 	if (exec && (flags & FLAG_NO_EXEC))
 		throw CoreException("Invalid <execfiles> tag in file included with noexec=\"yes\"");
 
-	std::string path = ServerInstance->Config->Paths.PrependConfig(name);
+	const std::string path = ServerInstance->Config->Paths.PrependConfig(name);
+	if (!exec)
+		CheckOwnership(path);
+
 	FileWrapper file(exec ? popen(name.c_str(), "r") : fopen(path.c_str(), "r"), exec);
 	if (!file)
 		throw CoreException("Could not read \"" + path + "\" for \"" + key + "\" file");
@@ -547,8 +572,10 @@ bool ParseStack::ParseFile(const std::string& path, int flags, const std::string
 	if (stdalgo::isin(reading, path))
 		throw CoreException((isexec ? "Executable " : "File ") + path + " is included recursively (looped inclusion)");
 
-	/* It's not already included, add it to the list of files we've loaded */
+	if (!isexec)
+		CheckOwnership(path);
 
+	/* It's not already included, add it to the list of files we've loaded */
 	FileWrapper file((isexec ? popen(path.c_str(), "r") : fopen(path.c_str(), "r")), isexec);
 	if (!file)
 	{
-- 
cgit v1.3.1-10-gc9f91


From 783c2a0d0628fe8fd4e9cdcfc2b92fe4ccf450e6 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Wed, 9 Nov 2022 16:10:44 +0000
Subject: Fix the previous commit on Windows.

---
 src/configparser.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/configparser.cpp')

diff --git a/src/configparser.cpp b/src/configparser.cpp
index ddd07c728..d0fa48ef8 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -480,6 +480,7 @@ namespace
 {
 	void CheckOwnership(const std::string& path)
 	{
+#ifndef _WIN32
 		struct stat pathinfo;
 		if (stat(path.c_str(), &pathinfo))
 			return; // Will be handled when fopen fails.
@@ -487,14 +488,15 @@ namespace
 		if (getegid() != pathinfo.st_gid)
 		{
 			ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Possible configuration error: %s is owned by group %u but the server is running as group %u.",
-				path.c_str(), getegid(), pathinfo.st_gid);
+				path.c_str(), pathinfo.st_gid, getegid());
 		}
 
 		if (geteuid() != pathinfo.st_uid)
 		{
 			ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Possible configuration error: %s is owned by user %u but the server is running as user %u.",
-				path.c_str(), geteuid(), pathinfo.st_uid);
+				path.c_str(), pathinfo.st_uid, geteuid());
 		}
+#endif
 	}
 }
 
-- 
cgit v1.3.1-10-gc9f91