X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_denychans.cpp;h=8d242edce4ac8feff5218050d4ad5222f8f94a5b;hb=0276e5138a8f886fe709ffed534aaf5ff826b5be;hp=4ea2e3d85120b44ddf896b865ce6cad56fbc5036;hpb=15314fa27a558a93f7aa7c1e32c6e4e9b4b4628b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 4ea2e3d85..8d242edce 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -2,23 +2,17 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
+#include "wildcard.h"
 
 /* $ModDesc: Implements config tags which allow blocking of joins to channels */
 
@@ -26,22 +20,62 @@ class ModuleDenyChannels : public Module
 {
  private:
 
-	Server *Srv;
+	
 	ConfigReader *Conf;
 
  public:
-	ModuleDenyChannels(Server* Me) : Module::Module(Me)
+	ModuleDenyChannels(InspIRCd* Me) : Module(Me)
 	{
-		Srv = Me;
-		Conf = new ConfigReader;
+		
+		Conf = new ConfigReader(ServerInstance);
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 	
-	virtual void OnRehash(std::string param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		delete Conf;
-		Conf = new ConfigReader;
-	}
+		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()))
+				{
+					if (user)
+						user->WriteServ("Notice %s :Invalid badchan redirect '%s'", user->nick, 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, name.c_str(), redirect.c_str());
+							throw ModuleException("Badchan redirect loop");
+						}
+					}
+				}
+			}
+		}
+	}
+
 	virtual ~ModuleDenyChannels()
 	{
 		delete Conf;
@@ -49,61 +83,52 @@ class ModuleDenyChannels : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
-	}
 
-        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
-        {
+	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++)
 		{
-			irc::string cn = Conf->ReadValue("badchan","name",j).c_str();
-			irc::string thischan = cname;
-			if (thischan == cn)
+			if (match(cname, Conf->ReadValue("badchan","name",j)))
 			{
-				if ((Conf->ReadFlag("badchan","allowopers",j)) && (strchr(user->modes,'o')))
+				if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
 				{
 					return 0;
 				}
 				else
 				{
 					std::string reason = Conf->ReadValue("badchan","reason",j);
-					WriteServ(user->fd,"926 %s %s :Channel %s is forbidden: %s",user->nick,cname,cname,reason.c_str());
+					std::string redirect = Conf->ReadValue("badchan","redirect",j);
+
+					for (int i = 0; i < Conf->Enumerate("goodchan"); i++)
+					{
+						if (match(cname, Conf->ReadValue("goodchan", "name", i)))
+						{
+							return 0;
+						}
+					}
+					
+					if (ServerInstance->IsChannel(redirect.c_str()))
+					{
+						/* 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,cname,cname,redirect.c_str(), reason.c_str());
+							Channel::JoinUser(ServerInstance,user,redirect.c_str(),false,"",false,ServerInstance->Time());
+							return 1;
+						}
+					}
+
+					user->WriteNumeric(926, "%s %s :Channel %s is forbidden: %s",user->nick,cname,cname,reason.c_str());
 					return 1;
 				}
 			}
 		}
 		return 0;
-        }
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleDenyChannelsFactory : public ModuleFactory
-{
- public:
-	ModuleDenyChannelsFactory()
-	{
 	}
-	
-	~ModuleDenyChannelsFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleDenyChannels(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleDenyChannelsFactory;
-}
-
+MODULE_INIT(ModuleDenyChannels)