X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_denychans.cpp;h=ab92ae911094e6c0152b250fde7deaa007e06907;hb=9ebd9cba72056c5b36696e166826afb981f25ebb;hp=d345570c0ac8fe7cab9c992b2d4dc646f66ddf93;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index d345570c0..ab92ae911 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,64 +12,112 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Implements config tags which allow blocking of joins to channels */
 
 class ModuleDenyChannels : public Module
 {
- private:
-
-	
-	ConfigReader *Conf;
-
  public:
-	ModuleDenyChannels(InspIRCd* Me) : Module(Me)
-	{
-		
-		Conf = new ConfigReader(ServerInstance);
+	ModuleDenyChannels() 	{
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
-	
-	virtual void OnRehash(User* user, const std::string &param)
+
+	virtual void OnRehash(User* user)
 	{
-		DELETE(Conf);
-		Conf = new ConfigReader(ServerInstance);
+		ConfigReader Conf;
+		/* 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 (InspIRCd::Match(redirect, Conf.ReadValue("badchan","name",j)))
+					{
+						bool goodchan = false;
+						for (int k =0; k < Conf.Enumerate("goodchan"); k++)
+						{
+							if (InspIRCd::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()
 	{
-		DELETE(Conf);
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
-	}
 
-	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
-		for (int j =0; j < Conf->Enumerate("badchan"); j++)
+		ConfigReader Conf;
+		for (int j =0; j < Conf.Enumerate("badchan"); j++)
 		{
-			if (match(cname, Conf->ReadValue("badchan","name",j).c_str()))
+			if (InspIRCd::Match(cname, Conf.ReadValue("badchan","name",j)))
 			{
-				if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
+				if (IS_OPER(user) && Conf.ReadFlag("badchan","allowopers",j))
 				{
-					return 0;
+					return MOD_RES_PASSTHRU;
 				}
 				else
 				{
-					std::string reason = Conf->ReadValue("badchan","reason",j);
-					user->WriteServ("926 %s %s :Channel %s is forbidden: %s",user->nick,cname,cname,reason.c_str());
-					return 1;
+					std::string reason = Conf.ReadValue("badchan","reason",j);
+					std::string redirect = Conf.ReadValue("badchan","redirect",j);
+
+					for (int i = 0; i < Conf.Enumerate("goodchan"); i++)
+					{
+						if (InspIRCd::Match(cname, Conf.ReadValue("goodchan", "name", i)))
+						{
+							return MOD_RES_PASSTHRU;
+						}
+					}
+
+					if (ServerInstance->IsChannel(redirect.c_str(), ServerInstance->Config->Limits.ChanMax))
+					{
+						/* 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(user,redirect.c_str(),false,"",false,ServerInstance->Time());
+							return MOD_RES_DENY;
+						}
+					}
+
+					user->WriteNumeric(926, "%s %s :Channel %s is forbidden: %s",user->nick.c_str(),cname,cname,reason.c_str());
+					return MOD_RES_DENY;
 				}
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 };