X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_denychans.cpp;h=6378ba2733c75b0f2aa23e283d31ec0896fd3a44;hb=90abe2cd475c8ca2e81626f565d173e9f56d1251;hp=ab92ae911094e6c0152b250fde7deaa007e06907;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp index ab92ae911..6378ba273 100644 --- a/src/modules/m_denychans.cpp +++ b/src/modules/m_denychans.cpp @@ -1,63 +1,73 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/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" -/* $ModDesc: Implements config tags which allow blocking of joins to channels */ +#include "inspircd.h" class ModuleDenyChannels : public Module { + ChanModeReference redirectmode; + public: - ModuleDenyChannels() { - Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 2); + ModuleDenyChannels() + : redirectmode(this, "redirect") + { } - virtual void OnRehash(User* user) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ConfigReader Conf; /* 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(), ServerInstance->Config->Limits.ChanMax)) + if (!ServerInstance->IsChannel(redirect)) { - if (user) - user->WriteServ("NOTICE %s :Invalid badchan redirect '%s'", user->nick.c_str(), redirect.c_str()); + if (status.srcuser) + status.srcuser->WriteNotice("Invalid badchan redirect '" + redirect + "'"); 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 (InspIRCd::Match(redirect, Conf.ReadValue("badchan","name",j))) + 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 (InspIRCd::Match(redirect, Conf.ReadValue("goodchan","name",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()); + if (status.srcuser) + status.srcuser->WriteNotice("Badchan " + name + " redirects to badchan " + redirect); throw ModuleException("Badchan redirect loop"); } } @@ -66,53 +76,50 @@ class ModuleDenyChannels : public Module } } - virtual ~ModuleDenyChannels() - { - } - - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR); } - virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { - ConfigReader Conf; - 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 (InspIRCd::Match(cname, Conf.ReadValue("badchan","name",j))) + if (InspIRCd::Match(cname, j->second->getString("name"))) { - if (IS_OPER(user) && Conf.ReadFlag("badchan","allowopers",j)) + if (user->IsOper() && j->second->getBool("allowopers")) { 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 (InspIRCd::Match(cname, Conf.ReadValue("goodchan", "name", i))) + if (InspIRCd::Match(cname, i->second->getString("name"))) { return MOD_RES_PASSTHRU; } } - if (ServerInstance->IsChannel(redirect.c_str(), ServerInstance->Config->Limits.ChanMax)) + if (ServerInstance->IsChannel(redirect)) { /* simple way to avoid potential loops: don't redirect to +L channels */ Channel *newchan = ServerInstance->FindChan(redirect); - if ((!newchan) || (!(newchan->IsModeSet('L')))) + if ((!newchan) || (!newchan->IsModeSet(redirectmode))) { - 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()); + user->WriteNumeric(926, "%s :Channel %s is forbidden, redirecting to %s: %s", cname.c_str(),cname.c_str(),redirect.c_str(), reason.c_str()); + Channel::JoinUser(user, redirect); return MOD_RES_DENY; } } - user->WriteNumeric(926, "%s %s :Channel %s is forbidden: %s",user->nick.c_str(),cname,cname,reason.c_str()); + user->WriteNumeric(926, "%s :Channel %s is forbidden: %s", cname.c_str(),cname.c_str(),reason.c_str()); return MOD_RES_DENY; } }