X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=cf6c278282509b2be1c6409330cce3c312cae26b;hb=b43fc66c17c2bef6dca66a966676b8128d5774ee;hp=9301bf4d5a7d216cf620bf0add4f0e2237267c12;hpb=97b48b5e01bb22074ef578bfd35cde3958fc3f53;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 9301bf4d5..cf6c27828 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -20,7 +20,7 @@ /* Originally written by Om, January 2009 */ -class BanRedirectEntry : public classbase +class BanRedirectEntry { public: std::string targetchan; @@ -38,12 +38,13 @@ typedef std::deque StringDeque; class BanRedirect : public ModeWatcher { public: - BanRedirect(InspIRCd* Instance) - : ModeWatcher(Instance, 'b', MODETYPE_CHANNEL) + SimpleExtItem extItem; + BanRedirect(Module* parent) : ModeWatcher(parent, 'b', MODETYPE_CHANNEL), + extItem("banredirect", parent) { } - bool BeforeMode(User* source, User* dest, Channel* channel, std::string ¶m, bool adding, ModeType type, bool) + bool BeforeMode(User* source, User* dest, Channel* channel, std::string ¶m, bool adding, ModeType type) { /* nick!ident@host -> nick!ident@host * nick!ident@host#chan -> nick!ident@host#chan @@ -127,12 +128,12 @@ class BanRedirect : public ModeWatcher Channel *c = ServerInstance->FindChan(mask[CHAN].c_str()); if (!c) { - source->WriteNumeric(690, "%s :Target channel %s must exist to be set as a redirect.",source->nick.c_str(),parameter.c_str()); + 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 (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(),parameter.c_str()); + 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; } @@ -146,10 +147,11 @@ class BanRedirect : public ModeWatcher if(adding) { /* It's a properly valid redirecting ban, and we're adding it */ - if(!channel->GetExt("banredirects", redirects)) + redirects = extItem.get(channel); + if (!redirects) { redirects = new BanRedirectList; - channel->Extend("banredirects", redirects); + extItem.set(channel, redirects); } /* Here 'param' doesn't have the channel on it yet */ @@ -161,7 +163,8 @@ class BanRedirect : public ModeWatcher else { /* Removing a ban, if there's no extensible there are no redirecting bans and we're fine. */ - if(channel->GetExt("banredirects", redirects)) + redirects = extItem.get(channel); + if (redirects) { /* But there were, so we need to remove the matching one if there is one */ @@ -174,8 +177,7 @@ class BanRedirect : public ModeWatcher if(redirects->empty()) { - delete redirects; - channel->Shrink("banredirects"); + extItem.unset(channel); } break; @@ -195,28 +197,24 @@ class BanRedirect : public ModeWatcher class ModuleBanRedirect : public Module { - BanRedirect* re; + BanRedirect re; bool nofollow; Module* ExceptionModule; public: - ModuleBanRedirect(InspIRCd* Me) - : Module(Me) + ModuleBanRedirect() + : re(this) { - re = new BanRedirect(Me); nofollow = false; - if(!ServerInstance->Modes->AddModeWatcher(re)) - { - delete re; + if(!ServerInstance->Modes->AddModeWatcher(&re)) throw ModuleException("Could not add mode watcher"); - } - - OnRehash(NULL, ""); - Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup }; - Me->Modules->Attach(list, this, 4); + OnRehash(NULL); + ServerInstance->Extensions.Register(&re.extItem); + Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete }; + ServerInstance->Modules->Attach(list, this, 3); } virtual void OnChannelDelete(Channel* chan) @@ -229,11 +227,11 @@ class ModuleBanRedirect : public Module if(target_type == TYPE_CHANNEL) { Channel* chan = static_cast(item); - BanRedirectList* redirects; + BanRedirectList* redirects = re.extItem.get(chan); - if(chan->GetExt("banredirects", redirects)) + if(redirects) { - irc::modestacker modestack(ServerInstance, false); + irc::modestacker modestack(false); StringDeque stackresult; std::vector mode_junk; mode_junk.push_back(chan->name); @@ -255,32 +253,29 @@ class ModuleBanRedirect : public Module ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient); mode_junk.erase(mode_junk.begin() + 1, mode_junk.end()); } - - delete redirects; - chan->Shrink("banredirects"); } } } - virtual void OnRehash(User* user, const std::string ¶m) + virtual void OnRehash(User* user) { ExceptionModule = ServerInstance->Modules->Find("m_banexception.so"); } - virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) + virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { /* This prevents recursion when a user sets multiple ban redirects in a chain * (thanks Potter) */ if (nofollow) - return 0; + return MOD_RES_PASSTHRU; /* Return 1 to prevent the join, 0 to allow it */ if (chan) { - BanRedirectList* redirects; + BanRedirectList* redirects = re.extItem.get(chan); - if(chan->GetExt("banredirects", redirects)) + if (redirects) { /* We actually had some ban redirects to check */ @@ -288,12 +283,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 0; + // they have a ban exception + return MOD_RES_PASSTHRU; } std::string ipmask(user->nick); @@ -313,33 +308,31 @@ 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 1; + return MOD_RES_ALLOW; } 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 1; + return MOD_RES_ALLOW; } } } } } - return 0; + return MOD_RES_PASSTHRU; } virtual ~ModuleBanRedirect() { - ServerInstance->Modes->DelModeWatcher(re); - delete re; } 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()