X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=1e61986e51c45d0f79bcabbe694b46dcf0735735;hb=f5c631ef8641db6455bed23c02e5a39f63f7d6d0;hp=da08d06fb485df031a3b3ceeb7b4b54f63961c80;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index da08d06fb..1e61986e5 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2010 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -15,12 +15,11 @@ #include "u_listmode.h" /* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */ -/* $ModDep: ../../include/u_listmode.h */ /* Originally written by Om, January 2009 */ -class BanRedirectEntry : public classbase +class BanRedirectEntry { public: std::string targetchan; @@ -39,7 +38,7 @@ class BanRedirect : public ModeWatcher { public: SimpleExtItem extItem; - BanRedirect(InspIRCd* Instance, Module* parent) : ModeWatcher(Instance, 'b', MODETYPE_CHANNEL), + BanRedirect(Module* parent) : ModeWatcher(parent, 'b', MODETYPE_CHANNEL), extItem("banredirect", parent) { } @@ -86,9 +85,13 @@ class BanRedirect : public ModeWatcher start_pos = curr+1; break; case '#': - mask[current].assign(start_pos, curr); - current = CHAN; - start_pos = curr; + /* bug #921: don't barf when redirecting to ## channels */ + if (current != CHAN) + { + mask[current].assign(start_pos, curr); + current = CHAN; + start_pos = curr; + } break; } } @@ -117,7 +120,7 @@ class BanRedirect : public ModeWatcher if(mask[CHAN].length()) { - if (IS_LOCAL(source)) + if (adding && IS_LOCAL(source)) { if (!ServerInstance->IsChannel(mask[CHAN].c_str(), ServerInstance->Config->Limits.ChanMax)) { @@ -131,7 +134,7 @@ class BanRedirect : public ModeWatcher source->WriteNumeric(690, "%s :Target channel %s must exist to be set as a redirect.",source->nick.c_str(),mask[CHAN].c_str()); return false; } - else if (c->GetStatus(source) < STATUS_OP) + else if (adding && c->GetPrefixValue(source) < OP_VALUE) { source->WriteNumeric(690, "%s :You must be opped on %s to set it as a redirect.",source->nick.c_str(), mask[CHAN].c_str()); return false; @@ -199,22 +202,25 @@ class ModuleBanRedirect : public Module { BanRedirect re; bool nofollow; - Module* ExceptionModule; public: - ModuleBanRedirect(InspIRCd* Me) - : Module(Me), re(Me, this) + ModuleBanRedirect() + : re(this) { nofollow = false; + } + + void init() + { if(!ServerInstance->Modes->AddModeWatcher(&re)) throw ModuleException("Could not add mode watcher"); OnRehash(NULL); - Extensible::Register(&re.extItem); - Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup }; - Me->Modules->Attach(list, this, 4); + ServerInstance->Extensions.Register(&re.extItem); + Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete }; + ServerInstance->Modules->Attach(list, this, 3); } virtual void OnChannelDelete(Channel* chan) @@ -231,7 +237,7 @@ class ModuleBanRedirect : public Module if(redirects) { - irc::modestacker modestack(ServerInstance, false); + irc::modestacker modestack(false); StringDeque stackresult; std::vector mode_junk; mode_junk.push_back(chan->name); @@ -259,7 +265,6 @@ class ModuleBanRedirect : public Module virtual void OnRehash(User* user) { - ExceptionModule = ServerInstance->Modules->Find("m_banexception.so"); } virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) @@ -283,12 +288,12 @@ class ModuleBanRedirect : public Module * Maybe we should have a GetFullIPHost() or something to match GetFullHost() and GetFullRealHost? */ - if (ExceptionModule) + ModResult result; + FIRST_MOD_RESULT(OnCheckChannelBan, result, (user, chan)); + if (result == MOD_RES_ALLOW) { - ListModeRequest n(this, ExceptionModule, user, chan); - /* Users with ban exceptions are allowed to join without being redirected */ - if (n.Send()) - return MOD_RES_PASSTHRU; + // they have a ban exception + return MOD_RES_PASSTHRU; } std::string ipmask(user->nick); @@ -308,16 +313,16 @@ class ModuleBanRedirect : public Module if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && !destlimit.empty() && (destchan->GetUserCounter() >= atoi(destlimit.c_str()))) { user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str()); - return MOD_RES_ALLOW; + return MOD_RES_DENY; } else { user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str()); user->WriteNumeric(470, "%s %s %s :You are banned from this channel, so you are automatically transfered to the redirected channel.", user->nick.c_str(), chan->name.c_str(), redir->targetchan.c_str()); nofollow = true; - Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time()); + Channel::JoinUser(user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time()); nofollow = false; - return MOD_RES_ALLOW; + return MOD_RES_DENY; } } } @@ -328,12 +333,14 @@ class ModuleBanRedirect : public Module virtual ~ModuleBanRedirect() { - ServerInstance->Modes->DelModeWatcher(&re); + /* XXX is this the best place to do this? */ + if (!ServerInstance->Modes->DelModeWatcher(&re)) + ServerInstance->Logs->Log("m_banredirect.so", DEBUG, "Failed to delete modewatcher!"); } virtual Version GetVersion() { - return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION); + return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR); } void Prioritize()