From 51a47e7d757df63370168ab5000d13ca9c349ecd Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Sun, 30 Jul 2017 17:34:05 +0100
Subject: Implement support for configurable casemapping & default to ASCII.

---
 src/modules/m_nationalchars.cpp      | 10 +++-------
 src/modules/m_spanningtree/capab.cpp | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 8e836c407..d03468de7 100644
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -218,7 +218,7 @@ bool lwbNickHandler::Call(const std::string& nick)
 class ModuleNationalChars : public Module
 {
 	lwbNickHandler myhandler;
-	std::string charset, casemapping;
+	std::string charset;
 	unsigned char m_additional[256], m_additionalUp[256], m_lower[256], m_upper[256];
 	caller1<bool, const std::string&> rememberer;
 	bool forcequit;
@@ -262,18 +262,14 @@ class ModuleNationalChars : public Module
 		ServerInstance->IsNick = &myhandler;
 	}
 
-	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
-	{
-		tokens["CASEMAPPING"] = casemapping;
-	}
-
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars");
 		charset = tag->getString("file");
-		casemapping = tag->getString("casemapping", FileSystem::GetFileName(charset));
+		std::string casemapping = tag->getString("casemapping", FileSystem::GetFileName(charset));
 		if (casemapping.find(' ') != std::string::npos)
 			throw ModuleException("<nationalchars:casemapping> must not contain any spaces!");
+		ServerInstance->Config->CaseMapping = casemapping;
 #if defined _WIN32
 		if (!FileSystem::StartsWithWindowsDriveLetter(charset))
 			charset.insert(0, "./locales/");
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index d22481518..7f9f9edb7 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -182,6 +182,7 @@ void TreeSocket::SendCapabilities(int phase)
 			" PREFIX="+ServerInstance->Modes->BuildPrefixes()+
 			" CHANMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)+
 			" USERMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_USER)+
+			" CASEMAPPING="+ServerInstance->Config->CaseMapping+
 			// XXX: Advertise the presence or absence of m_globops in CAPAB CAPABILITIES.
 			// Services want to know about it, and since m_globops was not marked as VF_(OPT)COMMON
 			// in 2.0, we advertise it here to not break linking to previous versions.
@@ -343,6 +344,24 @@ bool TreeSocket::Capab(const parameterlist &params)
 			if (this->capab->CapKeys.find("USERMODES")->second != ServerInstance->Modes->GiveModeList(MODETYPE_USER))
 				reason = "One or more of the user modes on the remote server are invalid on this server.";
 		}
+		else
+		{
+			// We default to rfc1459 here because if this key is not sent then
+			// the remote server is running the 2.0 protocol which uses rfc1459
+			// by default.
+			std::string casemapping = "rfc1459";
+			std::map<std::string, std::string>::iterator citer = this->capab->CapKeys.find("CASEMAPPING");
+			if (citer != this->capab->CapKeys.end())
+				casemapping = citer->second;
+
+			if (casemapping != ServerInstance->Config->CaseMapping)
+			{
+				reason = "The casemapping of the remote server differs to that of the local server."
+					" Local casemapping: " + ServerInstance->Config->CaseMapping +
+					" Remote casemapping: " + casemapping;
+			}
+
+		}
 
 		/* Challenge response, store their challenge for our password */
 		std::map<std::string,std::string>::iterator n = this->capab->CapKeys.find("CHALLENGE");
-- 
cgit v1.3.1-10-gc9f91