X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_denychans.cpp;h=e847f8c7cc5ed2ea536879ae23f4adadec422b7d;hb=7d7250484c352c13830e63ae41ee8faae40a9bd5;hp=eff6e64a4c28bd549a5af70234b7b5adffbda78e;hpb=ef9ab2301d8ee84dc9b68bcede435bc540d7243c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index eff6e64a4..e847f8c7c 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -36,6 +36,44 @@ class ModuleDenyChannels : public Module
 	{
 		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
+		/* check for redirect validity and loops/chains */
+		for (int i =0; i < Conf->Enumerate("badchan"); i++)
+		{
+			std::string name = Conf->ReadValue("badchan","name",i);
+			std::string redirect = Conf->ReadValue("badchan","redirect",i);
+			
+			if (!redirect.empty())
+			{
+			
+				if (!ServerInstance->IsChannel(redirect.c_str(), ServerInstance->Config->Limits.ChanMax))
+				{
+					if (user)
+						user->WriteServ("Notice %s :Invalid badchan redirect '%s'", user->nick.c_str(), redirect.c_str());
+					throw ModuleException("Invalid badchan redirect, not a channel");
+				}
+	
+				for (int j =0; j < Conf->Enumerate("badchan"); j++)
+				{
+					if (match(redirect, Conf->ReadValue("badchan","name",j)))
+					{
+						bool goodchan = false;
+						for (int k =0; k < Conf->Enumerate("goodchan"); k++)
+						{
+							if (match(redirect, Conf->ReadValue("goodchan","name",k)))
+								goodchan = true;
+						}
+	
+						if (!goodchan)
+						{
+							/* <badchan:redirect> is a badchan */
+							if (user)
+								user->WriteServ("NOTICE %s :Badchan %s redirects to badchan %s", user->nick.c_str(), name.c_str(), redirect.c_str());
+							throw ModuleException("Badchan redirect loop");
+						}
+					}
+				}
+			}
+		}
 	}
 
 	virtual ~ModuleDenyChannels()
@@ -45,15 +83,15 @@ class ModuleDenyChannels : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 
 
-	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
 		for (int j =0; j < Conf->Enumerate("badchan"); j++)
 		{
-			if (match(cname, Conf->ReadValue("badchan","name",j).c_str()))
+			if (match(cname, Conf->ReadValue("badchan","name",j)))
 			{
 				if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
 				{
@@ -64,22 +102,27 @@ class ModuleDenyChannels : public Module
 					std::string reason = Conf->ReadValue("badchan","reason",j);
 					std::string redirect = Conf->ReadValue("badchan","redirect",j);
 
-					for (int j = 0; j < Conf->Enumerate("goodchan"); j++)
+					for (int i = 0; i < Conf->Enumerate("goodchan"); i++)
 					{
-						if (match(cname, Conf->ReadValue("goodchan", "name", j).c_str()))
+						if (match(cname, Conf->ReadValue("goodchan", "name", i)))
 						{
 							return 0;
 						}
 					}
 					
-					if (ServerInstance->IsChannel(redirect.c_str()))
+					if (ServerInstance->IsChannel(redirect.c_str(), ServerInstance->Config->Limits.ChanMax))
 					{
-						user->WriteServ("926 %s %s :Channel %s is forbidden, redirecting to %s: %s",user->nick,cname,cname,redirect.c_str(), reason.c_str());
-						Channel::JoinUser(ServerInstance,user,redirect.c_str(),false,"",false,ServerInstance->Time(true));
-						return 1;
+						/* simple way to avoid potential loops: don't redirect to +L channels */
+						Channel *newchan = ServerInstance->FindChan(redirect);
+						if ((!newchan) || (!(newchan->IsModeSet('L'))))
+						{
+							user->WriteNumeric(926, "%s %s :Channel %s is forbidden, redirecting to %s: %s",user->nick.c_str(),cname,cname,redirect.c_str(), reason.c_str());
+							Channel::JoinUser(ServerInstance,user,redirect.c_str(),false,"",false,ServerInstance->Time());
+							return 1;
+						}
 					}
 
-					user->WriteServ("926 %s %s :Channel %s is forbidden: %s",user->nick,cname,cname,reason.c_str());
+					user->WriteNumeric(926, "%s %s :Channel %s is forbidden: %s",user->nick.c_str(),cname,cname,reason.c_str());
 					return 1;
 				}
 			}