X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_banredirect.cpp;h=1ab3c3243d05bbf6f258b1c166c5fa66e6ed7abe;hb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;hp=dac9b9d43bad5e0bd96bdbb4072f92c7196d8ab5;hpb=db8cc20b73dd6c655697a556b9e8fe5b660f8d1d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index dac9b9d43..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-2007 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. @@ -11,13 +11,14 @@ * --------------------------------------------------- */ -#include "mode.h" -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" +#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 { @@ -32,36 +33,44 @@ class BanRedirectEntry }; typedef std::vector BanRedirectList; +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(userrec* source, userrec* dest, chanrec* channel, std::string ¶m, bool adding, ModeType type) + bool BeforeMode(User* source, User* dest, Channel* channel, std::string ¶m, bool adding, ModeType type) { - // Srv->Log(DEBUG, "BeforeMode(%s, %s, %s, %s, %s, %s)", ((source && source->nick) ? source->nick : "NULL"), ((dest && dest->nick) ? dest->nick : "NULL"), ((channel && channel->name) ? channel->name : "NULL"), param.c_str(), (adding ? "true" : "false"), ((type == MODETYPE_CHANNEL) ? "MODETYPE_CHANNEL" : "MODETYPE_USER")); - /* nick!ident@host -> nick!ident@host * nick!ident@host#chan -> nick!ident@host#chan * nick@host#chan -> nick!*@host#chan * nick!ident#chan -> nick!ident@*#chan * nick#chan -> nick!*@*#chan */ - + if(channel && (type == MODETYPE_CHANNEL) && param.length()) { 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))) + { + 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); + return false; + } + for(std::string::iterator curr = start_pos; curr != param.end(); curr++) { switch(*curr) @@ -77,18 +86,29 @@ 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; } } - + if(mask[current].empty()) { - mask[current].assign(start_pos, param.end()); + mask[current].assign(start_pos, param.end()); + } + + /* nick@host wants to be changed to *!nick@host rather than nick!*@host... */ + if(mask[NICK].length() && mask[HOST].length() && mask[IDENT].empty()) + { + /* std::string::swap() is fast - it runs in constant time */ + mask[NICK].swap(mask[IDENT]); } - + for(int i = 0; i < 3; i++) { if(mask[i].empty()) @@ -96,194 +116,237 @@ class BanRedirect : public ModeWatcher mask[i].assign("*"); } } - - param.assign(mask[NICK]).append("!").append(mask[IDENT]).append("@").append(mask[HOST]); - - Srv->Log(DEBUG, "mask[NICK] = '%s', mask[IDENT] = '%s', mask[HOST] = '%s', mask[CHAN] = '%s'", mask[NICK].c_str(), mask[IDENT].c_str(), mask[HOST].c_str(), mask[CHAN].c_str()); - + + param.assign(mask[NICK]).append(1, '!').append(mask[IDENT]).append(1, '@').append(mask[HOST]); + if(mask[CHAN].length()) { - if(Srv->IsChannel(mask[CHAN].c_str())) + if (IS_LOCAL(source)) { - if(irc::string(channel->name) == irc::string(mask[CHAN].c_str())) + if (!ServerInstance->IsChannel(mask[CHAN].c_str(), ServerInstance->Config->Limits.ChanMax)) { - source->WriteServ("690 %s %s :You cannot set a ban redirection to the channel the ban is on", source->nick, channel->name); + 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; } - else + + Channel *c = ServerInstance->FindChan(mask[CHAN].c_str()); + if (!c) { - 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); - } - - /* 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 + 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; + } + } + + if(adding) + { + /* It's a properly valid redirecting ban, and we're adding it */ + redirects = extItem.get(channel); + if (!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())); + + /* 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 */ - - for(BanRedirectList::iterator redir = redirects->begin(); redir != redirects->end(); redir++) + redirects->erase(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"); - } - - /* Append the channel so the default +b handler can remove the entry too */ - param.append(mask[CHAN]); - - break; - } + extItem.unset(channel); } + + break; } } } - } - else - { - source->WriteServ("403 %s %s :Invalid channel name in redirection (%s)", source->nick, channel->name, mask[CHAN].c_str()); - return false; + + /* Append the channel so the default +b handler can remove the entry too */ + param.append(mask[CHAN]); } } - - Srv->Log(DEBUG, "Changed param to: %s", param.c_str()); } - + return true; } }; class ModuleBanRedirect : public Module { - BanRedirect* re; - InspIRCd* Srv; - + BanRedirect re; + bool nofollow; + Module* ExceptionModule; + public: - ModuleBanRedirect(InspIRCd* Me) - : Module::Module(Me), Srv(Me) + ModuleBanRedirect() + : re(this) { - re = new BanRedirect(Me); - - if(!Srv->AddModeWatcher(re)) + nofollow = false; + + if(!ServerInstance->Modes->AddModeWatcher(&re)) throw ModuleException("Could not add mode watcher"); + + OnRehash(NULL); + + ServerInstance->Extensions.Register(&re.extItem); + Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete }; + ServerInstance->Modules->Attach(list, this, 3); } - - void Implements(char* List) - { - List[I_OnUserPreJoin] = List[I_OnChannelDelete] = List[I_OnCleanup] = 1; - } - - virtual void OnChannelDelete(chanrec* chan) + + virtual void OnChannelDelete(Channel* chan) { OnCleanup(TYPE_CHANNEL, chan); } - + virtual void OnCleanup(int target_type, void* item) { if(target_type == TYPE_CHANNEL) { - chanrec* chan = static_cast(item); - BanRedirectList* redirects; - - if(chan->GetExt("banredirects", redirects)) + Channel* chan = static_cast(item); + BanRedirectList* redirects = re.extItem.get(chan); + + if(redirects) { - delete redirects; - chan->Shrink("banredirects"); + irc::modestacker modestack(false); + StringDeque stackresult; + std::vector mode_junk; + mode_junk.push_back(chan->name); + + for(BanRedirectList::iterator i = redirects->begin(); i != redirects->end(); i++) + { + modestack.Push('b', i->targetchan.insert(0, i->banmask)); + } + + for(BanRedirectList::iterator i = redirects->begin(); i != redirects->end(); i++) + { + modestack.PushPlus(); + modestack.Push('b', i->banmask); + } + + while(modestack.GetStackedLine(stackresult)) + { + 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()); + } } } } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) + 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) + { + /* This prevents recursion when a user sets multiple ban redirects in a chain + * (thanks Potter) + */ + if (nofollow) + return MOD_RES_PASSTHRU; + /* Return 1 to prevent the join, 0 to allow it */ if (chan) { - BanRedirectList* redirects; - - if(chan->GetExt("banredirects", redirects)) + BanRedirectList* redirects = re.extItem.get(chan); + + if (redirects) { /* We actually had some ban redirects to check */ - - std::string ipmask(user->MakeHostIP()); - + + /* This was replaced with user->MakeHostIP() when I had a snprintf(), but MakeHostIP() doesn't seem to add the nick. + * Maybe we should have a GetFullIPHost() or something to match GetFullHost() and GetFullRealHost? + */ + + ModResult result; + FIRST_MOD_RESULT(OnCheckChannelBan, result, (user, chan)); + if (result == MOD_RES_ALLOW) + { + // they have a ban exception + return MOD_RES_PASSTHRU; + } + + std::string ipmask(user->nick); + ipmask.append(1, '!').append(user->MakeHostIP()); + for(BanRedirectList::iterator redir = redirects->begin(); redir != redirects->end(); redir++) { - if(Srv->MatchText(user->GetFullRealHost(), redir->banmask) || Srv->MatchText(user->GetFullHost(), redir->banmask) || Srv->MatchText(ipmask, redir->banmask)) + if(InspIRCd::Match(user->GetFullRealHost(), redir->banmask) || InspIRCd::Match(user->GetFullHost(), redir->banmask) || InspIRCd::MatchCIDR(ipmask, redir->banmask)) { /* tell them they're banned and are being transferred */ - Srv->Log(DEBUG, "%s matches ban on %s -- might transferred to %s", user->nick, chan->name, redir->targetchan.c_str()); - - chanrec* destchan = Srv->FindChan(redir->targetchan); - - if(destchan && Srv->FindModule("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit)) + Channel* destchan = ServerInstance->FindChan(redir->targetchan); + std::string destlimit; + + if (destchan) + destlimit = destchan->GetModeParameter('l'); + + if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && !destlimit.empty() && (destchan->GetUserCounter() >= atoi(destlimit.c_str()))) { - user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name); - return 1; + user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str()); + return MOD_RES_DENY; } else { - user->WriteServ("470 %s :You are banned from %s. You are being automatically redirected to %s", user->nick, chan->name, redir->targetchan.c_str()); - chanrec::JoinUser(Srv, user, redir->targetchan.c_str(), false); - return 1; + 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(user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time()); + nofollow = false; + return MOD_RES_DENY; } } } } } - return 0; + return MOD_RES_PASSTHRU; } virtual ~ModuleBanRedirect() { - Srv->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(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR); } -}; - -class ModuleBanRedirectFactory : public ModuleFactory -{ - public: - ModuleBanRedirectFactory() + void Prioritize() { + Module* banex = ServerInstance->Modules->Find("m_banexception.so"); + ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_BEFORE, &banex); } - - ~ModuleBanRedirectFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleBanRedirect(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleBanRedirectFactory; -} +MODULE_INIT(ModuleBanRedirect)