X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_servprotect.cpp;h=7f0500fe5fedba18f5c9bc23bd18f55c100d6305;hb=f14271bdb80dd6af67cde4fb97df9716613a7177;hp=cb4f0e1af07524826da260de277446bcf6c2a643;hpb=007ce21b595a4bed48a7f4146946566dd6aa7a39;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index cb4f0e1af..7f0500fe5 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,12 +12,6 @@
  */
 
 #include "inspircd.h"
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 
 /* $ModDesc: Provides support for Austhex style +k / UnrealIRCD +S services mode */
 
@@ -30,6 +24,14 @@ class ServProtectMode : public ModeHandler
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
+		/* Because this returns MODEACTION_DENY all the time, there is only ONE
+		 * way to add this mode and that is at client introduction in the UID command,
+		 * as this calls OnModeChange for each mode but disregards the return values.
+		 * The mode cannot be manually added or removed, not even by a server or by a remote
+		 * user or uline, which prevents its (ab)use as a kiddie 'god mode' on such networks.
+		 * I'm sure if someone really wants to do that they can make a copy of this module
+		 * that does the job. It won't be me though!
+		 */
 		return MODEACTION_DENY;
 	}
 
@@ -38,30 +40,30 @@ class ServProtectMode : public ModeHandler
 
 class ModuleServProtectMode : public Module
 {
-	
+
 	ServProtectMode* bm;
  public:
 	ModuleServProtectMode(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		bm = new ServProtectMode(ServerInstance);
 		if (!ServerInstance->Modes->AddMode(bm))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhois, I_OnKill, I_OnWhoisLine, I_OnRawMode };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		Implementation eventlist[] = { I_OnWhois, I_OnKill, I_OnWhoisLine, I_OnRawMode, I_OnUserPreKick };
+		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
-	
+
 	virtual ~ModuleServProtectMode()
 	{
 		ServerInstance->Modes->DelMode(bm);
 		delete bm;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_COMMON,API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	virtual void OnWhois(User* src, User* dst)
@@ -74,18 +76,29 @@ class ModuleServProtectMode : public Module
 
 	virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt, bool servermode)
 	{
-		if (!servermode && (mode == 'o') && !adding && chan && IS_LOCAL(user) && !ServerInstance->ULine(user->server))
+		/* Check that the mode is not a server mode, it is being removed, the user making the change is local, there is a parameter,
+		 * and the user making the change is not a uline
+		 */
+		if (!servermode && !adding && chan && IS_LOCAL(user) && !param.empty() && !ServerInstance->ULine(user->server))
 		{
+			/* Check if the parameter is a valid nick/uuid
+			 */
 			User *u = ServerInstance->FindNick(param);
 			if (u)
 			{
-				if (u->IsModeSet('k'))
+				/* The target user has +k set on themselves, and you are trying to remove a privilege mode the user has set on themselves.
+				 * This includes any prefix permission mode, even those registered in other modules, e.g. +qaohv. Using ::ModeString()
+				 * here means that the number of modes is restricted to only modes the user has, limiting it to as short a loop as possible.
+				 */
+				if (u->IsModeSet('k') && ServerInstance->Modes->ModeString(u, chan, false).find(mode) != std::string::npos)
 				{
-					user->WriteNumeric(482, "%s %s :You are not permitted to deop %s services", user->nick.c_str(), chan->name.c_str(), ServerInstance->Config->Network);
+					/* BZZZT, Denied! */
+					user->WriteNumeric(482, "%s %s :You are not permitted to remove privileges from %s services", user->nick.c_str(), chan->name.c_str(), ServerInstance->Config->Network);
 					return ACR_DENY;
 				}
 			}
 		}
+		/* Mode allowed */
 		return 0;
 	}
 
@@ -103,6 +116,17 @@ class ModuleServProtectMode : public Module
 		return 0;
 	}
 
+	virtual int OnUserPreKick(User *src, User *dst, Channel *c, const std::string &reason)
+	{
+		if (dst->IsModeSet('k'))
+		{
+			src->WriteNumeric(484, "%s %s :You are not permitted to kick services", src->nick.c_str(), c->name.c_str());
+			return 1;
+		}
+
+		return 0;
+	}
+
 	virtual int OnWhoisLine(User* src, User* dst, int &numeric, std::string &text)
 	{
 		return ((src != dst) && (numeric == 319) && dst->IsModeSet('k'));