X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=c5dc35fe371b52fc1881a6686716b3fdc2c52772;hb=c7795d6b93297ec5d1ce5d9d998a42aec575502e;hp=0db05a7c3d503a6fb581f1e2997569c75605da66;hpb=e5c42c2a136440942148d03abdc8db71e080e988;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 0db05a7c3..c5dc35fe3 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -1,94 +1,86 @@
-#include <stdio.h>
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2017, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2018 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Shawn Smith <ShawnSmith0828@gmail.com>
+ *   Copyright (C) 2012 DjSlash <djslash@djslash.org>
+ *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +c */
+#include "inspircd.h"
+#include "modules/exemption.h"
 
 class ModuleBlockColor : public Module
 {
-	Server *Srv;
-	
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler bc;
  public:
- 
+
 	ModuleBlockColor()
+		: exemptionprov(this)
+		, bc(this, "blockcolor", 'c')
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
 	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text)
+
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		if (target_type == TYPE_CHANNEL)
-		{
-			chanrec* c = (chanrec*)dest;
-			char ctext[MAXBUF];
-			snprintf(ctext,MAXBUF,"%s",text.c_str());
-			if (c->IsCustomModeSet('c'))
-			{
-				if (strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31))
-				{
-					WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-					return 1;
-				}
-			}
-		}
-		return 0;
+		tokens["EXTBAN"].push_back('c');
 	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		if (target_type == TYPE_CHANNEL)
+		if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			chanrec* c = (chanrec*)dest;
-			char ctext[MAXBUF];
-			snprintf(ctext,MAXBUF,"%s",text.c_str());
-			if (c->IsCustomModeSet('c'))
+			Channel* c = target.Get<Channel>();
+
+			ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor");
+			if (res == MOD_RES_ALLOW)
+				return MOD_RES_PASSTHRU;
+
+			bool modeset = c->IsModeSet(bc);
+			if (!c->GetExtBanStatus(user, 'c').check(!modeset))
 			{
-				if (strchr(ctext,'\2')) || (strchr(ctext,'\3')) || (strchr(ctext,31))
+				for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++)
 				{
-					WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-					return 1;
+					// Block all control codes except \001 for CTCP
+					if ((*i >= 0) && (*i < 32) && (*i != 1))
+					{
+						if (modeset)
+							user->WriteNumeric(Numerics::CannotSendTo(c, "messages containing formatting characters", &bc));
+						else
+							user->WriteNumeric(Numerics::CannotSendTo(c, "messages containing formatting characters", 'c', "nocolor"));
+						return MOD_RES_DENY;
+					}
 				}
 			}
 		}
-		return 0;
-	}
-	
-	virtual ~ModuleBlockColor()
-	{
-		delete Srv;
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
-	}
-};
-
 
-class ModuleBlockColorFactory : public ModuleFactory
-{
- public:
-	ModuleBlockColorFactory()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Adds channel mode c (blockcolor) which allows channels to block messages which contain IRC formatting codes.",VF_VENDOR);
 	}
-	
-	~ModuleBlockColorFactory()
-	{
-	}
-	
-	virtual Module * CreateModule()
-	{
-		return new ModuleBlockColor;
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBlockColorFactory;
-}
-
+MODULE_INIT(ModuleBlockColor)