From 71ad7b2cd22ace30dae3506a39858c804e7f1895 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 25 Dec 2020 03:42:11 +0000
Subject: Replace spaces with underscores when checking for class bans.

---
 src/modules/m_classban.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/modules/m_classban.cpp')

diff --git a/src/modules/m_classban.cpp b/src/modules/m_classban.cpp
index 89cbf0efe..b2cbb1e59 100644
--- a/src/modules/m_classban.cpp
+++ b/src/modules/m_classban.cpp
@@ -22,14 +22,28 @@
 
 class ModuleClassBan : public Module
 {
+ private:
+	std::string space;
+	std::string underscore;
+
  public:
+	ModuleClassBan()
+		: space(" ")
+		, underscore("_")
+	{
+	}
+
 	ModResult OnCheckBan(User* user, Channel* c, const std::string& mask) CXX11_OVERRIDE
 	{
 		LocalUser* localUser = IS_LOCAL(user);
 		if ((localUser) && (mask.length() > 2) && (mask[0] == 'n') && (mask[1] == ':'))
 		{
-			if (InspIRCd::Match(localUser->GetClass()->name, mask.substr(2)))
+			// Replace spaces with underscores as they're prohibited in mode parameters.
+			std::string classname(localUser->GetClass()->name);
+			stdalgo::string::replace_all(classname, space, underscore);
+			if (InspIRCd::Match(classname, mask.substr(2)))
 				return MOD_RES_DENY;
+
 		}
 		return MOD_RES_PASSTHRU;
 	}
-- 
cgit v1.3.1-10-gc9f91