X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_noctcp.cpp;h=5407ffb9d254bd9daa6c41de2f32a825fdee2dbd;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=8d597d1b8e3d43f8d9d013f37b560dc30fd6e837;hpb=740b09e2aee345c6fde199986d8eab6e0db224e3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 8d597d1b8..c73f8308e 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -1,124 +1,101 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * ---------------------------------------------------
+ * 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 <stdio.h>
-#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 NoCTCPUser : public SimpleUserModeHandler
+{
+public:
+	NoCTCPUser(Module* Creator)
+		: SimpleUserModeHandler(Creator, "u_noctcp", 'T')
+	{
+		if (!ServerInstance->Config->ConfValue("noctcp")->getBool("enableumode"))
+			DisableAutoRegister();
+	}
+};
 
 class ModuleNoCTCP : public Module
 {
-	Server *Srv;
-	
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler nc;
+	NoCTCPUser ncu;
+
  public:
- 
 	ModuleNoCTCP()
+		: exemptionprov(this)
+		, nc(this, "noctcp", 'C')
+		, ncu(this)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('C',MT_CHANNEL,false,0,0);
 	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text)
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		if (target_type == TYPE_CHANNEL)
-		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('C'))
-			{
-				if ((text.length()) && (text[0] == '\1'))
-				{
-					if (strncmp(text.c_str(),"\1ACTION ",8))
-					{
-						WriteServ(user->fd,"492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
-						return 1;
-					}
-				}
-			}
-		}
-		return 0;
+		return Version("Provides user mode +T and channel mode +C to block CTCPs", VF_VENDOR);
 	}
-	
-	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 (!IS_LOCAL(user))
+			return MOD_RES_PASSTHRU;
+
+		std::string ctcpname;
+		if (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION"))
+			return MOD_RES_PASSTHRU;
+
+		if (target.type == MessageTarget::TYPE_CHANNEL)
 		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('C'))
+			if (user->HasPrivPermission("channels/ignore-noctcp"))
+				return MOD_RES_PASSTHRU;
+
+			Channel* c = target.Get<Channel>();
+			ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp");
+			if (res == MOD_RES_ALLOW)
+				return MOD_RES_PASSTHRU;
+
+			if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet(nc)))
 			{
-				if ((text.length()) && (text[0] == '\1'))
-				{
-					if (strncmp(text.c_str(),"\1ACTION ",8))
-					{
-						WriteServ(user->fd,"492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
-						return 1;
-					}
-				}
+				user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C is set)");
+				return MOD_RES_DENY;
 			}
 		}
-		return 0;
-	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		// check if this is our mode character...
-		if ((modechar == 'C') && (type == MT_CHANNEL))
-  		{
-			return 1;
-		}
-		else
+		else if (target.type == MessageTarget::TYPE_USER)
 		{
-			return 0;
-		}
-	}
+			if (user->HasPrivPermission("users/ignore-noctcp"))
+				return MOD_RES_PASSTHRU;
 
-	virtual ~ModuleNoCTCP()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
+			User* u = target.Get<User>();
+			if (u->IsModeSet(ncu))
+			{
+				user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T is set)");
+				return MOD_RES_DENY;
+			}
+		}
+		return MOD_RES_PASSTHRU;
 	}
-};
 
-
-class ModuleNoCTCPFactory : public ModuleFactory
-{
- public:
-	ModuleNoCTCPFactory()
-	{
-	}
-	
-	~ModuleNoCTCPFactory()
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
+		tokens["EXTBAN"].push_back('C');
 	}
-	
-	virtual Module * CreateModule()
-	{
-		return new ModuleNoCTCP;
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoCTCPFactory;
-}
-
+MODULE_INIT(ModuleNoCTCP)