X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=054d56a4b1d4be9238deb4e2103a0675c064e95f;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=af7201882fec19a5e1e990efac913bcacd1152b5;hpb=3039e0663f7e45a45e9574a6aa7463bbe77e849f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index af7201882..054d56a4b 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -22,6 +22,7 @@ class ModuleOverride : public Module
 {
 	
 	override_t overrides;
+	bool RequireKey;
 	bool NoisyOverride;
 	bool OverriddenMode;
 	int OverOps, OverDeops, OverVoices, OverDevoices, OverHalfops, OverDehalfops;
@@ -33,7 +34,7 @@ class ModuleOverride : public Module
 	{		
 		// read our config options (main config file)
 		OnRehash(NULL,"");
-		ServerInstance->SNO->EnableSnomask('O',"OVERRIDE");
+		ServerInstance->SNO->EnableSnomask('O', "OVERRIDE");
 		OverriddenMode = false;
 		OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
 		Implementation eventlist[] = { I_OnRehash, I_OnAccessCheck, I_On005Numeric, I_OnUserPreJoin, I_OnUserPreKick, I_OnPostCommand };
@@ -46,8 +47,11 @@ class ModuleOverride : public Module
 		ConfigReader* Conf = new ConfigReader(ServerInstance);
 		
 		// re-read our config options on a rehash
-		NoisyOverride = Conf->ReadFlag("override","noisy",0);
+		NoisyOverride = Conf->ReadFlag("override", "noisy", 0);
+		RequireKey = Conf->ReadFlag("override", "requirekey", 0);
+
 		overrides.clear();
+
 		for (int j =0; j < Conf->Enumerate("type"); j++)
 		{
 			std::string typen = Conf->ReadValue("type","name",j);
@@ -59,7 +63,7 @@ class ModuleOverride : public Module
 	}
 
 
-	virtual void OnPostCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, CmdResult result, const std::string &original_line)
+	virtual void OnPostCommand(const std::string &command, const std::vector<std::string> &parameters, User *user, CmdResult result, const std::string &original_line)
 	{
 		if ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS))
 		{
@@ -226,7 +230,7 @@ class ModuleOverride : public Module
 	
 	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
-		if (IS_OPER(user))
+		if (IS_LOCAL(user) && IS_OPER(user))
 		{
 			if (chan)
 			{
@@ -235,27 +239,47 @@ class ModuleOverride : public Module
 					irc::string x = chan->name;
 					if (!user->IsInvited(x))
 					{
-						/* XXX - Ugly cast for a parameter that isn't used? :< - Om */
+						if (RequireKey && keygiven != "override")
+						{
+							// Can't join normally -- must use a special key to bypass restrictions
+							user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick);
+							return 1;
+						}
+
 						if (NoisyOverride)
-							chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass invite-only", cname, user->nick);
-						ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname));
+							chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass invite-only", cname, user->nick);
+						ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used oper override to bypass +i on "+std::string(cname));
 					}
 					return -1;
 				}
 				
-				if ((*chan->key) && (CanOverride(user,"KEY")) && !strcasecmp(keygiven.c_str(), chan->key))
+				if ((*chan->key) && (CanOverride(user,"KEY")) && strcasecmp(keygiven.c_str(), chan->key))
 				{
+					if (RequireKey && keygiven != "override")
+					{
+						// Can't join normally -- must use a special key to bypass restrictions
+						user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick);
+						return 1;
+					}
+
 					if (NoisyOverride)
-						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass the channel key", cname, user->nick);
-					ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +k on "+std::string(cname));
+						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel key", cname, user->nick);
+					ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used oper override to bypass +k on "+std::string(cname));
 					return -1;
 				}
 					
 				if ((chan->limit > 0) && (chan->GetUserCounter() >=  chan->limit) && (CanOverride(user,"LIMIT")))
 				{
+					if (RequireKey && keygiven != "override")
+					{
+						// Can't join normally -- must use a special key to bypass restrictions
+						user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick);
+						return 1;
+					}
+
 					if (NoisyOverride)
-						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass the channel limit", cname, user->nick);
-					ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +l on "+std::string(cname));
+						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass the channel limit", cname, user->nick);
+					ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used oper override to bypass +l on "+std::string(cname));
 					return -1;
 				}
 
@@ -263,9 +287,16 @@ class ModuleOverride : public Module
 				{
 					if (chan->IsBanned(user))
 					{
+						if (RequireKey && keygiven != "override")
+						{
+							// Can't join normally -- must use a special key to bypass restrictions
+							user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick);
+							return 1;
+						}
+
 						if (NoisyOverride)
-							chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass channel ban", cname, user->nick);
-						ServerInstance->SNO->WriteToSnoMask('O',"%s used oper-override to bypass channel ban on %s", user->nick, cname);
+							chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper override to bypass channel ban", cname, user->nick);
+						ServerInstance->SNO->WriteToSnoMask('O',"%s used oper override to bypass channel ban on %s", user->nick, cname);
 					}
 					return -1;
 				}