From: Peter Powell <petpow@saberuk.com>
Date: Fri, 16 Jun 2017 17:08:40 +0000 (+0100)
Subject: Fix exempting CTCP ACTIONs in m_blockcaps and m_noctcp.
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=b105e9366b0d8fc3b6ee41942cc2a3518e24bc21;p=user%2Fhenk%2Fcode%2Finspircd.git

Fix exempting CTCP ACTIONs in m_blockcaps and m_noctcp.

Previously we assumed that CTCP ACTIONs matched "\1ACTION ". This
is incorrect because "\1ACTION\1" and "\1ACTION" are valid CTCPs.
---

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 200693699..7146ee068 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -67,7 +67,7 @@ public:
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
-			if ((!IS_LOCAL(user)) || (text.length() < minlen))
+			if ((!IS_LOCAL(user)) || (text.length() < minlen) || (text == "\1ACTION\1") || (text == "\1ACTION"))
 				return MOD_RES_PASSTHRU;
 
 			Channel* c = (Channel*)dest;
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 1dd6fe34a..c934a05c6 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -67,7 +67,7 @@ class ModuleNoCTCP : public Module
 		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
 			Channel* c = (Channel*)dest;
-			if ((text.empty()) || (text[0] != '\001') || (!strncmp(text.c_str(),"\1ACTION ",8)))
+			if ((text.empty()) || (text[0] != '\001') || (!strncmp(text.c_str(),"\1ACTION ", 8)) || (text == "\1ACTION\1") || (text == "\1ACTION"))
 				return MOD_RES_PASSTHRU;
 
 			ModResult res = ServerInstance->OnCheckExemption(user,c,"noctcp");