X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=1b9e361bf408dc12fd0697f354323388941a3545;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=421d8ade64707d506da989a290fcad872c4c26d8;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 421d8ade6..1b9e361bf 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -75,6 +75,9 @@ class BanRedirect : public ModeWatcher
 			if (param.length() >= 2 && param[1] == ':')
 				return true;
 
+			if (param.find('#') == std::string::npos)
+				return true;
+
 			if(adding && (channel->bans.size() > static_cast<unsigned>(maxbans)))
 			{
 				source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick.c_str(), channel->name.c_str(), channel->name.c_str(), maxbans);
@@ -119,6 +122,14 @@ class BanRedirect : public ModeWatcher
 				mask[NICK].swap(mask[IDENT]);
 			}
 
+			if (!mask[NICK].empty() && mask[IDENT].empty() && mask[HOST].empty())
+			{
+				if (mask[NICK].find('.') != std::string::npos || mask[NICK].find(':') != std::string::npos)
+				{
+					mask[NICK].swap(mask[HOST]);
+				}
+			}
+
 			for(int i = 0; i < 3; i++)
 			{
 				if(mask[i].empty())
@@ -139,7 +150,7 @@ class BanRedirect : public ModeWatcher
 						return false;
 					}
 
-					Channel *c = ServerInstance->FindChan(mask[CHAN].c_str());
+					Channel *c = ServerInstance->FindChan(mask[CHAN]);
 					if (!c)
 					{
 						source->WriteNumeric(690, "%s :Target channel %s must exist to be set as a redirect.",source->nick.c_str(),mask[CHAN].c_str());
@@ -169,7 +180,7 @@ class BanRedirect : public ModeWatcher
 					}
 
 					/* Here 'param' doesn't have the channel on it yet */
-					redirects->push_back(BanRedirectEntry(mask[CHAN].c_str(), param.c_str()));
+					redirects->push_back(BanRedirectEntry(mask[CHAN], param));
 
 					/* Now it does */
 					param.append(mask[CHAN]);
@@ -227,16 +238,9 @@ class ModuleBanRedirect : public Module
 		if(!ServerInstance->Modes->AddModeWatcher(&re))
 			throw ModuleException("Could not add mode watcher");
 
-		OnRehash(NULL);
-
-		ServerInstance->Extensions.Register(&re.extItem);
-		Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete };
-		ServerInstance->Modules->Attach(list, this, 3);
-	}
-
-	virtual void OnChannelDelete(Channel* chan)
-	{
-		OnCleanup(TYPE_CHANNEL, chan);
+		ServerInstance->Modules->AddService(re.extItem);
+		Implementation list[] = { I_OnUserPreJoin };
+		ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
 	}
 
 	virtual void OnCleanup(int target_type, void* item)
@@ -274,19 +278,8 @@ class ModuleBanRedirect : public Module
 		}
 	}
 
-	virtual void OnRehash(User* user)
-	{
-	}
-
 	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
-		/* This prevents recursion when a user sets multiple ban redirects in a chain
-		 * (thanks Potter)
-		 */
-		if (nofollow)
-			return MOD_RES_PASSTHRU;
-
-		/* Return 1 to prevent the join, 0 to allow it */
 		if (chan)
 		{
 			BanRedirectList* redirects = re.extItem.get(chan);
@@ -314,6 +307,16 @@ class ModuleBanRedirect : public Module
 				{
 					if(InspIRCd::Match(user->GetFullRealHost(), redir->banmask) || InspIRCd::Match(user->GetFullHost(), redir->banmask) || InspIRCd::MatchCIDR(ipmask, redir->banmask))
 					{
+						/* This prevents recursion when a user sets multiple ban redirects in a chain
+						 * (thanks Potter)
+						 *
+						 * If we're here and nofollow is true then we're already redirecting this user
+						 * and there's a redirecting ban set on this channel that matches him, too.
+						 * Deny both joins.
+						 */
+						if (nofollow)
+							return MOD_RES_DENY;
+
 						/* tell them they're banned and are being transferred */
 						Channel* destchan = ServerInstance->FindChan(redir->targetchan);
 						std::string destlimit;
@@ -329,7 +332,7 @@ class ModuleBanRedirect : public Module
 						else
 						{
 							user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str());
-							user->WriteNumeric(470, "%s %s %s :You are banned from this channel, so you are automatically transfered to the redirected channel.", user->nick.c_str(), chan->name.c_str(), redir->targetchan.c_str());
+							user->WriteNumeric(470, "%s %s %s :You are banned from this channel, so you are automatically transferred to the redirected channel.", user->nick.c_str(), chan->name.c_str(), redir->targetchan.c_str());
 							nofollow = true;
 							Channel::JoinUser(user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time());
 							nofollow = false;
@@ -353,12 +356,6 @@ class ModuleBanRedirect : public Module
 	{
 		return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR);
 	}
-
-	void Prioritize()
-	{
-		Module* banex = ServerInstance->Modules->Find("m_banexception.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_BEFORE, &banex);
-	}
 };
 
 MODULE_INIT(ModuleBanRedirect)