X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_denychans.cpp;h=39d9e0d34024103fc7caad894f8d295a59a592e7;hb=e2f1a61fc67500c4c101ff8a3f7847914298375e;hp=254cfdcc1e3eef8d7f75e181a92daf5b569786c8;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp index 254cfdcc1..39d9e0d34 100644 --- a/src/modules/m_denychans.cpp +++ b/src/modules/m_denychans.cpp @@ -1,110 +1,136 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2005 Craig Edwards * - * --------------------------------------------------- + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "hashcomp.h" -#include "helperfuncs.h" + #include "inspircd.h" /* $ModDesc: Implements config tags which allow blocking of joins to channels */ class ModuleDenyChannels : public Module { - private: - - Server *Srv; - ConfigReader *Conf; - public: - ModuleDenyChannels(Server* Me) : Module::Module(Me) + void init() { - Srv = Me; - Conf = new ConfigReader; + Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - - virtual void OnRehash(const std::string ¶m) + + virtual void OnRehash(User* user) { - DELETE(Conf); - Conf = new ConfigReader; + /* check for redirect validity and loops/chains */ + ConfigTagList tags = ServerInstance->Config->ConfTags("badchan"); + for (ConfigIter i = tags.first; i != tags.second; ++i) + { + std::string name = i->second->getString("name"); + std::string redirect = i->second->getString("redirect"); + + 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 (ConfigIter j = tags.first; j != tags.second; ++j) + { + if (InspIRCd::Match(redirect, j->second->getString("name"))) + { + bool goodchan = false; + ConfigTagList goodchans = ServerInstance->Config->ConfTags("goodchan"); + for (ConfigIter k = goodchans.first; k != goodchans.second; ++k) + { + if (InspIRCd::Match(redirect, k->second->getString("name"))) + goodchan = true; + } + + if (!goodchan) + { + /* 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,0,0,1,VF_VENDOR); + 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(userrec* user, chanrec* chan, const char* cname) + 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++) + ConfigTagList tags = ServerInstance->Config->ConfTags("badchan"); + for (ConfigIter j = tags.first; j != tags.second; ++j) { - irc::string cn = Conf->ReadValue("badchan","name",j).c_str(); - irc::string thischan = cname; - if (thischan == cn) + if (InspIRCd::Match(cname, j->second->getString("name"))) { - if ((Conf->ReadFlag("badchan","allowopers",j)) && *user->oper) + if (IS_OPER(user) && j->second->getBool("allowopers")) { - 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 = j->second->getString("reason"); + std::string redirect = j->second->getString("redirect"); + + ConfigTagList goodchans = ServerInstance->Config->ConfTags("goodchan"); + for (ConfigIter i = goodchans.first; i != goodchans.second; ++i) + { + if (InspIRCd::Match(cname, i->second->getString("name"))) + { + 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; } }; -// 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)