X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=1ab3c3243d05bbf6f258b1c166c5fa66e6ed7abe;hb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;hp=c15452366241d781344044b798a2dac32fcc9702;hpb=683055a13b0cb5c41556eaafef99af27edf1e868;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index c15452366..1ab3c3243 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.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. @@ -17,10 +17,10 @@ /* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */ /* $ModDep: ../../include/u_listmode.h */ -/* Originally written by Om, January 2008 +/* Originally written by Om, January 2009 */ -class BanRedirectEntry : public classbase +class BanRedirectEntry { public: std::string targetchan; @@ -37,15 +37,14 @@ typedef std::deque StringDeque; class BanRedirect : public ModeWatcher { - private: - InspIRCd* Srv; public: - BanRedirect(InspIRCd* Instance) - : ModeWatcher(Instance, 'b', MODETYPE_CHANNEL), Srv(Instance) + 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 @@ -87,9 +86,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; } } @@ -118,64 +121,76 @@ class BanRedirect : public ModeWatcher if(mask[CHAN].length()) { - if(!IS_LOCAL(source) || Srv->IsChannel(mask[CHAN].c_str(), ServerInstance->Config->Limits.ChanMax)) + if (IS_LOCAL(source)) { + if (!ServerInstance->IsChannel(mask[CHAN].c_str(), ServerInstance->Config->Limits.ChanMax)) + { + source->WriteNumeric(403, "%s %s :Invalid channel name in redirection (%s)", source->nick.c_str(), channel->name.c_str(), mask[CHAN].c_str()); + return false; + } + + 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(),mask[CHAN].c_str()); + return false; + } + 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(), mask[CHAN].c_str()); + return false; + } + if (assign(channel->name) == mask[CHAN]) { source->WriteNumeric(690, "%s %s :You cannot set a ban redirection to the channel the ban is on", source->nick.c_str(), channel->name.c_str()); return false; } - else + } + + if(adding) + { + /* It's a properly valid redirecting ban, and we're adding it */ + redirects = extItem.get(channel); + if (!redirects) { - if(adding) - { - /* It's a properly valid redirecting ban, and we're adding it */ - if(!channel->GetExt("banredirects", redirects)) - { - redirects = new BanRedirectList; - channel->Extend("banredirects", redirects); - } + redirects = new BanRedirectList; + extItem.set(channel, redirects); + } - /* Here 'param' doesn't have the channel on it yet */ - redirects->push_back(BanRedirectEntry(mask[CHAN].c_str(), param.c_str())); + /* Here 'param' doesn't have the channel on it yet */ + redirects->push_back(BanRedirectEntry(mask[CHAN].c_str(), param.c_str())); - /* Now it does */ - param.append(mask[CHAN]); - } - else + /* Now it does */ + param.append(mask[CHAN]); + } + else + { + /* Removing a ban, if there's no extensible there are no redirecting bans and we're fine. */ + redirects = extItem.get(channel); + if (redirects) + { + /* But there were, so we need to remove the matching one if there is one */ + + for(BanRedirectList::iterator redir = redirects->begin(); redir != redirects->end(); redir++) { - /* Removing a ban, if there's no extensible there are no redirecting bans and we're fine. */ - if(channel->GetExt("banredirects", redirects)) + /* Ugly as fuck */ + if((irc::string(redir->targetchan.c_str()) == irc::string(mask[CHAN].c_str())) && (irc::string(redir->banmask.c_str()) == irc::string(param.c_str()))) { - /* But there were, so we need to remove the matching one if there is one */ + redirects->erase(redir); - for(BanRedirectList::iterator redir = redirects->begin(); redir != redirects->end(); redir++) + if(redirects->empty()) { - /* Ugly as fuck */ - if((irc::string(redir->targetchan.c_str()) == irc::string(mask[CHAN].c_str())) && (irc::string(redir->banmask.c_str()) == irc::string(param.c_str()))) - { - redirects->erase(redir); - - if(redirects->empty()) - { - delete redirects; - channel->Shrink("banredirects"); - } - - break; - } + extItem.unset(channel); } - } - /* Append the channel so the default +b handler can remove the entry too */ - param.append(mask[CHAN]); + break; + } } } - } - else - { - source->WriteNumeric(403, "%s %s :Invalid channel name in redirection (%s)", source->nick.c_str(), channel->name.c_str(), mask[CHAN].c_str()); - return false; + + /* Append the channel so the default +b handler can remove the entry too */ + param.append(mask[CHAN]); } } } @@ -186,28 +201,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) @@ -220,11 +231,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); @@ -242,39 +253,33 @@ class ModuleBanRedirect : public Module while(modestack.GetStackedLine(stackresult)) { - for(StringDeque::size_type i = 0; i < stackresult.size(); i++) - { - mode_junk.push_back(stackresult[i]); - } - + mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end()); 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 */ @@ -282,12 +287,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); @@ -307,39 +312,40 @@ 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_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 1; + return MOD_RES_DENY; } } } } } - return 0; + return MOD_RES_PASSTHRU; } virtual ~ModuleBanRedirect() { - ServerInstance->Modes->DelModeWatcher(re); - delete 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() { Module* banex = ServerInstance->Modules->Find("m_banexception.so"); - ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIO_BEFORE, &banex); + ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_BEFORE, &banex); } };