X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_denychans.cpp;h=ab92ae911094e6c0152b250fde7deaa007e06907;hb=9ebd9cba72056c5b36696e166826afb981f25ebb;hp=78e6cfea33e10c441c87f695a6c4336e6484f79c;hpb=29b51086b95c86f812ac35ed7d3333f060ba5a8c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp index 78e6cfea3..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-2008 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,62 +12,52 @@ */ #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 ¶m) + + 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++) + 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); - + 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 (!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 (int j =0; j < Conf.Enumerate("badchan"); j++) { - if (match(redirect.c_str(), Conf->ReadValue("badchan","name",j).c_str())) + if (InspIRCd::Match(redirect, Conf.ReadValue("badchan","name",j))) { bool goodchan = false; - for (int k =0; k < Conf->Enumerate("goodchan"); k++) + for (int k =0; k < Conf.Enumerate("goodchan"); k++) { - if (match(redirect.c_str(), Conf->ReadValue("goodchan","name",k).c_str())) + if (InspIRCd::Match(redirect, Conf.ReadValue("goodchan","name",k))) 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 +68,56 @@ 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++) + 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); - std::string redirect = Conf->ReadValue("badchan","redirect",j); + 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++) + for (int i = 0; i < Conf.Enumerate("goodchan"); i++) { - if (match(cname, Conf->ReadValue("goodchan", "name", i).c_str())) + if (InspIRCd::Match(cname, Conf.ReadValue("goodchan", "name", i))) { - 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->WriteServ("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->WriteServ("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; } };