X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=0c52e01ce2f0e9ee352a6ac3ef3c7f88dc72b60c;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=54cba0ed714fc6f9855f54e0b7b0ff111755a74d;hpb=855f0d98e90a077f46b456e98ebb8a9b290488f6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index 54cba0ed7..0c52e01ce 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -1,178 +1,137 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2017 B00mX0r + * Copyright (C) 2013, 2017, 2019 Sadie Powell + * Copyright (C) 2012-2014, 2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012, 2014 Shawn Smith + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2004, 2006, 2010 Craig Edwards * - * --------------------------------------------------- + * 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 . */ -using namespace std; -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" -/* $ModDesc: Provides channel mode +L (limit redirection) */ - /** Handle channel mode +L */ -class Redirect : public ModeHandler +class Redirect : public ParamMode { public: - Redirect(InspIRCd* Instance) : ModeHandler(Instance, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { } - - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) - { - if (channel->IsModeSet('L')) - return std::make_pair(true, channel->GetModeParameter('L')); - else - return std::make_pair(false, parameter); - } - - bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) + Redirect(Module* Creator) + : ParamMode(Creator, "redirect", 'L') { - /* When TS is equal, the alphabetically later one wins */ - return (their_param < our_param); - } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + syntax = ""; + } + + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE { - if (adding) + if (IS_LOCAL(source)) { - chanrec* c = NULL; - - if (!ServerInstance->IsChannel(parameter.c_str())) + if (!ServerInstance->IsChannel(parameter)) { - source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str()); - parameter = ""; + source->WriteNumeric(Numerics::NoSuchChannel(parameter)); return MODEACTION_DENY; } + } - c = ServerInstance->FindChan(parameter); - if (c) + if (IS_LOCAL(source) && !source->IsOper()) + { + Channel* c = ServerInstance->FindChan(parameter); + if (!c) { - /* Fix by brain: Dont let a channel be linked to *itself* either */ - if (IS_LOCAL(source)) - { - if ((c == channel) || (c->IsModeSet('L'))) - { - source->WriteServ("690 %s :Circular or chained +L to %s not allowed (Channel already has +L). Pack of wild dogs has been unleashed.",source->nick,parameter.c_str()); - parameter = ""; - return MODEACTION_DENY; - } - else - { - for (chan_hash::const_iterator i = ServerInstance->chanlist.begin(); i != ServerInstance->chanlist.end(); i++) - { - if ((i->second != channel) && (i->second->IsModeSet('L')) && (irc::string(i->second->GetModeParameter('L').c_str()) == irc::string(channel->name))) - { - source->WriteServ("690 %s :Circular or chained +L to %s not allowed (Already forwarded here from %s). Angry monkeys dispatched.",source->nick,parameter.c_str(),i->second->name); - return MODEACTION_DENY; - } - } - } - } + source->WriteNumeric(690, InspIRCd::Format("Target channel %s must exist to be set as a redirect.", parameter.c_str())); + return MODEACTION_DENY; } - - channel->SetMode('L', true); - channel->SetModeParam('L', parameter.c_str(), true); - return MODEACTION_ALLOW; - } - else - { - if (channel->IsModeSet('L')) + else if (c->GetPrefixValue(source) < OP_VALUE) { - channel->SetMode('L', false); - return MODEACTION_ALLOW; + source->WriteNumeric(690, InspIRCd::Format("You must be opped on %s to set it as a redirect.", parameter.c_str())); + return MODEACTION_DENY; } } - return MODEACTION_DENY; - + /* + * We used to do some checking for circular +L here, but there is no real need for this any more especially as we + * now catch +L looping in PreJoin. Remove it, since O(n) logic makes me sad, and we catch it anyway. :) -- w00t + */ + ext.set(channel, parameter); + return MODEACTION_ALLOW; + } + + void SerializeParam(Channel* chan, const std::string* str, std::string& out) + { + out += *str; } }; class ModuleRedirect : public Module { - - Redirect* re; - + Redirect re; + SimpleUserModeHandler antiredirectmode; + ChanModeReference limitmode; + public: - - ModuleRedirect(InspIRCd* Me) - : Module::Module(Me) + ModuleRedirect() + : re(this) + , antiredirectmode(this, "antiredirect", 'L') + , limitmode(this, "limit") { - - re = new Redirect(ServerInstance); - ServerInstance->AddMode(re, 'L'); - } - - void Implements(char* List) - { - List[I_OnUserPreJoin] = 1; } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { if (chan) { - if (chan->IsModeSet('L') && chan->limit) + if (chan->IsModeSet(re) && chan->IsModeSet(limitmode)) { - if (chan->GetUserCounter() >= chan->limit) + if (chan->GetUserCounter() >= ConvToNum(chan->GetModeParameter(limitmode))) { - std::string channel = chan->GetModeParameter('L'); - user->WriteServ("470 %s :%s has become full, so you are automatically being transferred to the linked channel %s",user->nick,cname,channel.c_str()); - chanrec::JoinUser(ServerInstance, user, channel.c_str(), false); - return 1; + const std::string& channel = *re.ext.get(chan); + + /* sometimes broken ulines can make circular or chained +L, avoid this */ + Channel* destchan = ServerInstance->FindChan(channel); + if (destchan && destchan->IsModeSet(re)) + { + user->WriteNumeric(470, cname, '*', "You may not join this channel. A redirect is set, but you may not be redirected as it is a circular loop."); + return MOD_RES_DENY; + } + + if (user->IsModeSet(antiredirectmode)) + { + user->WriteNumeric(470, cname, channel, "Force redirection stopped."); + return MOD_RES_DENY; + } + else + { + user->WriteNumeric(470, cname, channel, "You may not join this channel, so you are automatically being transferred to the redirected channel."); + Channel::JoinUser(user, channel); + return MOD_RES_DENY; + } } } } - return 0; - } - - virtual ~ModuleRedirect() - { - ServerInstance->Modes->DelMode(re); - DELETE(re); + return MOD_RES_PASSTHRU; } - - virtual Version GetVersion() - { - return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); - } -}; - -class ModuleRedirectFactory : public ModuleFactory -{ - public: - ModuleRedirectFactory() + Version GetVersion() CXX11_OVERRIDE { + return Version("Allows users to be redirected to another channel when the user limit is reached.", VF_VENDOR); } - - ~ModuleRedirectFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleRedirect(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleRedirectFactory; -} - +MODULE_INIT(ModuleRedirect)