X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_denychans.cpp;h=39d9e0d34024103fc7caad894f8d295a59a592e7;hb=e2f1a61fc67500c4c101ff8a3f7847914298375e;hp=c73b183d990ebfaa6f3d96d4e45838ad9fdc530a;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp index c73b183d9..39d9e0d34 100644 --- a/src/modules/m_denychans.cpp +++ b/src/modules/m_denychans.cpp @@ -1,73 +1,74 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2005 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 "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) + void init() { - - Conf = new ConfigReader(ServerInstance); Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 2); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - - virtual void OnRehash(User* user, const std::string ¶m) + + virtual void OnRehash(User* user) { - delete Conf; - Conf = new ConfigReader(ServerInstance); /* check for redirect validity and loops/chains */ - for (int i =0; i < Conf->Enumerate("badchan"); i++) + ConfigTagList tags = ServerInstance->Config->ConfTags("badchan"); + for (ConfigIter i = tags.first; i != tags.second; ++i) { - std::string name = Conf->ReadValue("badchan","name",i); - std::string redirect = Conf->ReadValue("badchan","redirect",i); - + std::string name = i->second->getString("name"); + std::string redirect = i->second->getString("redirect"); + if (!redirect.empty()) { - - if (!ServerInstance->IsChannel(redirect.c_str())) + + if (!ServerInstance->IsChannel(redirect.c_str(), ServerInstance->Config->Limits.ChanMax)) { if (user) - user->WriteServ("Notice %s :Invalid badchan redirect '%s'", user->nick, redirect.c_str()); + 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++) + + for (ConfigIter j = tags.first; j != tags.second; ++j) { - if (match(redirect.c_str(), Conf->ReadValue("badchan","name",j).c_str())) + if (InspIRCd::Match(redirect, j->second->getString("name"))) { bool goodchan = false; - for (int k =0; k < Conf->Enumerate("goodchan"); k++) + ConfigTagList goodchans = ServerInstance->Config->ConfTags("goodchan"); + for (ConfigIter k = goodchans.first; k != goodchans.second; ++k) { - if (match(redirect.c_str(), Conf->ReadValue("goodchan","name",k).c_str())) + 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, name.c_str(), redirect.c_str()); + 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"); } } @@ -78,56 +79,57 @@ class ModuleDenyChannels : public Module 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); } - 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++) + ConfigTagList tags = ServerInstance->Config->ConfTags("badchan"); + for (ConfigIter j = tags.first; j != tags.second; ++j) { - if (match(cname, Conf->ReadValue("badchan","name",j).c_str())) + if (InspIRCd::Match(cname, j->second->getString("name"))) { - if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j)) + if (IS_OPER(user) && j->second->getBool("allowopers")) { - return 0; + return MOD_RES_PASSTHRU; } else { - std::string reason = Conf->ReadValue("badchan","reason",j); - std::string redirect = Conf->ReadValue("badchan","redirect",j); + std::string reason = j->second->getString("reason"); + std::string redirect = j->second->getString("redirect"); - for (int i = 0; i < Conf->Enumerate("goodchan"); i++) + ConfigTagList goodchans = ServerInstance->Config->ConfTags("goodchan"); + for (ConfigIter i = goodchans.first; i != goodchans.second; ++i) { - if (match(cname, Conf->ReadValue("goodchan", "name", i).c_str())) + if (InspIRCd::Match(cname, i->second->getString("name"))) { - return 0; + return MOD_RES_PASSTHRU; } } - - if (ServerInstance->IsChannel(redirect.c_str())) + + 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,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, 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,cname,cname,reason.c_str()); - return 1; + 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; } };