X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=a88324fe2cc9dac19548248e7e25038c1ff63feb;hb=3624c137a6db85eaab0372550c9dca79d6d21e55;hp=a589d5c71df0c7cd6f3653e2bec95e0e5dfe8c3e;hpb=fcafba14c5408360ec725ed1649ede75b7ae52c1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index a589d5c71..a88324fe2 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -1,26 +1,36 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007, 2009 Robin Burchell + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Craig Edwards + * Copyright (C) 2007 Oliver Lupton * - * 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" -#include "u_listmode.h" +#include "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; @@ -33,17 +43,20 @@ class BanRedirectEntry : public classbase }; typedef std::vector BanRedirectList; -typedef std::deque StringDeque; class BanRedirect : public ModeWatcher { + ModeReference ban; public: - BanRedirect(InspIRCd* Instance) - : ModeWatcher(Instance, 'b', MODETYPE_CHANNEL) + SimpleExtItem extItem; + BanRedirect(Module* parent) + : ModeWatcher(parent, "ban", MODETYPE_CHANNEL) + , ban(parent, "ban") + , 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) { /* nick!ident@host -> nick!ident@host * nick!ident@host#chan -> nick!ident@host#chan @@ -52,21 +65,23 @@ class BanRedirect : public ModeWatcher * nick#chan -> nick!*@*#chan */ - if(channel && (type == MODETYPE_CHANNEL) && param.length()) + if ((channel) && !param.empty()) { BanRedirectList* redirects; std::string mask[4]; enum { NICK, IDENT, HOST, CHAN } current = NICK; std::string::iterator start_pos = param.begin(); - long maxbans = channel->GetMaxBans(); if (param.length() >= 2 && param[1] == ':') return true; - if(adding && (channel->bans.size() > static_cast(maxbans))) + ListModeBase* banlm = static_cast(*ban); + unsigned int maxbans = banlm->GetLimit(channel); + ListModeBase::ModeList* list = banlm->GetList(channel); + if ((list) && (adding) && (maxbans <= list->size())) { - source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick.c_str(), channel->name.c_str(), channel->name.c_str(), maxbans); + source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %u)", source->nick.c_str(), channel->name.c_str(), channel->name.c_str(), maxbans); return false; } @@ -85,9 +100,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; } } @@ -116,64 +135,76 @@ class BanRedirect : public ModeWatcher if(mask[CHAN].length()) { - if(!IS_LOCAL(source) || ServerInstance->IsChannel(mask[CHAN].c_str(), ServerInstance->Config->Limits.ChanMax)) + if (adding && IS_LOCAL(source)) { + if (!ServerInstance->IsChannel(mask[CHAN])) + { + 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]); + 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 (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; + } + 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], param)); - /* 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]); } } } @@ -184,48 +215,35 @@ 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; - 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); - } - virtual void OnChannelDelete(Channel* chan) + + void init() CXX11_OVERRIDE { - OnCleanup(TYPE_CHANNEL, chan); + ServerInstance->Modes->AddModeWatcher(&re); + ServerInstance->Modules->AddService(re.extItem); + Implementation list[] = { I_OnUserPreJoin }; + ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation)); } - virtual void OnCleanup(int target_type, void* item) + void OnCleanup(int target_type, void* item) CXX11_OVERRIDE { 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); - StringDeque stackresult; - std::vector mode_junk; - mode_junk.push_back(chan->name); + irc::modestacker modestack(false); for(BanRedirectList::iterator i = redirects->begin(); i != redirects->end(); i++) { @@ -238,41 +256,24 @@ class ModuleBanRedirect : public Module modestack.Push('b', i->banmask); } - while(modestack.GetStackedLine(stackresult)) + std::vector stackresult; + stackresult.push_back(chan->name); + while (modestack.GetStackedLine(stackresult)) { - for(StringDeque::size_type i = 0; i < stackresult.size(); i++) - { - mode_junk.push_back(stackresult[i]); - } - - ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient); + ServerInstance->Modes->Process(stackresult, ServerInstance->FakeClient, ModeParser::MODE_LOCALONLY); + stackresult.erase(stackresult.begin() + 1, stackresult.end()); } - - delete redirects; - chan->Shrink("banredirects"); } } } - virtual void OnRehash(User* user, const std::string ¶m) - { - ExceptionModule = ServerInstance->Modules->Find("m_banexception.so"); - } - - virtual int 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 { - /* This prevents recursion when a user sets multiple ban redirects in a chain - * (thanks Potter) - */ - if (nofollow) - return 0; - - /* 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 */ @@ -280,12 +281,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); @@ -295,6 +296,16 @@ class ModuleBanRedirect : public Module { if(InspIRCd::Match(user->GetFullRealHost(), redir->banmask) || InspIRCd::Match(user->GetFullHost(), redir->banmask) || InspIRCd::MatchCIDR(ipmask, redir->banmask)) { + /* This prevents recursion when a user sets multiple ban redirects in a chain + * (thanks Potter) + * + * If we're here and nofollow is true then we're already redirecting this user + * and there's a redirecting ban set on this channel that matches him, too. + * Deny both joins. + */ + if (nofollow) + return MOD_RES_DENY; + /* tell them they're banned and are being transferred */ Channel* destchan = ServerInstance->FindChan(redir->targetchan); std::string destlimit; @@ -305,39 +316,34 @@ 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); nofollow = false; - return 1; + return MOD_RES_DENY; } } } } } - return 0; - } - - virtual ~ModuleBanRedirect() - { - ServerInstance->Modes->DelModeWatcher(re); - delete re; + return MOD_RES_PASSTHRU; } - virtual Version GetVersion() + ~ModuleBanRedirect() { - return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION); + /* XXX is this the best place to do this? */ + if (!ServerInstance->Modes->DelModeWatcher(&re)) + ServerInstance->Logs->Log("m_banredirect.so", LOG_DEBUG, "Failed to delete modewatcher!"); } - void Prioritize() + Version GetVersion() CXX11_OVERRIDE { - Module* banex = ServerInstance->Modules->Find("m_banexception.so"); - ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_BEFORE, &banex); + return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR); } };