X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=1a5a48b00607578722ffdacc1286f1aad6cf6165;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=b6b4062e2f75b3069f5a8b4319dceb4ac911c31d;hpb=c471b18d773369cfef99f9dc02ff15905599facc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index b6b4062e2..1a5a48b00 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -2,90 +2,125 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -#include -#include "users.h" -#include "channels.h" -#include "modules.h" +#include "inspircd.h" /* $ModDesc: Provides channel mode +L (limit redirection) */ - -class ModuleRedirect : public Module +/** Handle channel mode +L + */ +class Redirect : public ModeHandler { - Server *Srv; - public: - - ModuleRedirect() + Redirect(InspIRCd* Instance) : ModeHandler(Instance, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { } + + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { - Srv = new Server; - Srv->AddExtendedMode('L',MT_CHANNEL,false,1,0); + if (channel->IsModeSet('L')) + return std::make_pair(true, channel->GetModeParameter('L')); + else + return std::make_pair(false, parameter); } - - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool server) { - if ((modechar == 'L') && (type == MT_CHANNEL)) + if (adding) { - if (mode_on) + if (IS_LOCAL(source)) { - std::string ChanToJoin = params[0]; - chanrec* c = Srv->FindChannel(ChanToJoin); - if (c) + if (!ServerInstance->IsChannel(parameter.c_str(), ServerInstance->Config->Limits.ChanMax)) { - if (c->IsCustomModeSet('L')) - { - WriteServ(user->fd,"690 %s :Circular redirection, mode +L to %s not allowed.",user->nick,params[0].c_str()); - return 0; - } + source->WriteNumeric(403, "%s %s :Invalid channel name", source->nick.c_str(), parameter.c_str()); + parameter.clear(); + return MODEACTION_DENY; + } + } + + if (IS_LOCAL(source) && !IS_OPER(source) && !server) + { + Channel* c = ServerInstance->FindChan(parameter); + if (!c) + { + source->WriteNumeric(690, "%s :Target channel %s must exist to be set as a redirect.",source->nick.c_str(),parameter.c_str()); + parameter.clear(); + return MODEACTION_DENY; + } + else if (c->GetStatus(source) < STATUS_OP) + { + source->WriteNumeric(690, "%s :You must be opped on %s to set it as a redirect.",source->nick.c_str(),parameter.c_str()); + parameter.clear(); + return MODEACTION_DENY; } } - return 1; + + /* + * 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 + */ + channel->SetModeParam('L', parameter); + return MODEACTION_ALLOW; } - return 0; + else + { + if (channel->IsModeSet('L')) + { + channel->SetModeParam('L', ""); + return MODEACTION_ALLOW; + } + } + + return MODEACTION_DENY; + } +}; - virtual void On005Numeric(std::string &output) - { - std::stringstream line(output); - std::string temp1, temp2; - while (!line.eof()) - { - line >> temp1; - if (temp1.substr(0,10) == "CHANMODES=") - { - // By doing this we're *assuming* no other module has fucked up the CHANMODES= - // section of the 005 numeric. If they have, we're going DOWN in a blaze of glory, - // with a honking great EXCEPTION :) - temp1.insert(temp1.find(",")+1,"L"); - } - temp2 = temp2 + temp1 + " "; - } - output = temp2.substr(0,temp2.length()-1); - } - - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) +class ModuleRedirect : public Module +{ + + Redirect re; + + public: + + ModuleRedirect(InspIRCd* Me) + : Module(Me), re(Me) + { + + if (!ServerInstance->Modes->AddMode(&re)) + throw ModuleException("Could not add new modes!"); + Implementation eventlist[] = { I_OnUserPreJoin }; + ServerInstance->Modules->Attach(eventlist, this, 1); + } + + + virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { if (chan) { - if (chan->IsCustomModeSet('L')) + if (chan->IsModeSet('L') && chan->modes[CM_LIMIT]) { - if (chan->limit >= Srv->CountUsers(chan)) + if (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) { std::string channel = chan->GetModeParameter('L'); - WriteServ(user->fd,"470 %s :%s has become full, so you are automatically being transferred to the linked channel %s",user->nick,cname,channel.c_str()); - Srv->JoinUserToChannel(user,channel.c_str(),""); + + /* sometimes broken ulines can make circular or chained +L, avoid this */ + Channel* destchan = NULL; + destchan = ServerInstance->FindChan(channel); + if (destchan && destchan->IsModeSet('L')) + { + user->WriteNumeric(470, "%s %s * :You may not join this channel. A redirect is set, but you may not be redirected as it is a circular loop.", user->nick.c_str(), cname); + return 1; + } + + user->WriteNumeric(470, "%s %s %s :You may not join this channel, so you are automatically being transferred to the redirect channel.", user->nick.c_str(), cname, channel.c_str()); + Channel::JoinUser(ServerInstance, user, channel.c_str(), false, "", false, ServerInstance->Time()); return 1; } } @@ -95,42 +130,13 @@ class ModuleRedirect : public Module virtual ~ModuleRedirect() { - delete Srv; - } - - virtual Version GetVersion() - { - return Version(1,0,0,0); - } - - virtual void OnUserConnect(userrec* user) - { + ServerInstance->Modes->DelMode(&re); } -}; - - -class ModuleRedirectFactory : public ModuleFactory -{ - public: - ModuleRedirectFactory() - { - } - - ~ModuleRedirectFactory() - { - } - - virtual Module * CreateModule() + virtual Version GetVersion() { - return new ModuleRedirect; + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleRedirectFactory; -} - +MODULE_INIT(ModuleRedirect)