X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=2e25925410d6ef67d03f2a80b9b9da3da1d8999d;hb=26fecc0bf2c72b9a0dea09c92ed89f78181f39f6;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..2e2592541 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" /* $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; @@ -38,12 +48,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 @@ -85,9 +96,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,7 +131,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)) { @@ -124,15 +139,15 @@ class BanRedirect : public ModeWatcher return false; } - Channel *c = ServerInstance->FindChan(mask[CHAN].c_str()); + 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(),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 (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(),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,14 +161,15 @@ 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 */ - redirects->push_back(BanRedirectEntry(mask[CHAN].c_str(), param.c_str())); + redirects->push_back(BanRedirectEntry(mask[CHAN], param)); /* Now it does */ param.append(mask[CHAN]); @@ -161,7 +177,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 +191,7 @@ class BanRedirect : public ModeWatcher if(redirects->empty()) { - delete redirects; - channel->Shrink("banredirects"); + extItem.unset(channel); } break; @@ -195,33 +211,25 @@ 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() { - OnCleanup(TYPE_CHANNEL, chan); + if(!ServerInstance->Modes->AddModeWatcher(&re)) + throw ModuleException("Could not add mode watcher"); + + 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) @@ -229,11 +237,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 +263,17 @@ 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 ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { - ExceptionModule = ServerInstance->Modules->Find("m_banexception.so"); - } - - virtual int 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 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 +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); @@ -303,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; @@ -313,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()); + user->WriteNumeric(470, "%s %s %s :You are banned from this channel, so you are automatically transferred 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); - } - - void Prioritize() - { - 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); } };