X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=9dc8aa5b72c8e0ba31a152f1a0cb9eeade722f14;hb=ccd95e668a3bcbd26c4cd2984cdd8809347f9815;hp=77011c72f42b6285d3731b8218f17648fd37bf8e;hpb=3b48134eef499aab8912f9ddfd41c18f6cd61d61;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index 77011c72f..9dc8aa5b7 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -2,91 +2,137 @@ * | 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-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/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); + } + + bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel) + { + /* When TS is equal, the alphabetically later one wins */ + return (their_param < our_param); } - 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) { - if ((modechar == 'L') && (type == MT_CHANNEL)) + if (adding) { - if (mode_on) + Channel* c = NULL; + + if (!ServerInstance->IsChannel(parameter.c_str())) { - std::string ChanToJoin = params[0]; - chanrec* c = Srv->FindChannel(ChanToJoin); - if (c) + source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str()); + parameter.clear(); + return MODEACTION_DENY; + } + + c = ServerInstance->FindChan(parameter); + if (c) + { + /* Fix by brain: Dont let a channel be linked to *itself* either */ + if (IS_LOCAL(source)) { - if (c->IsCustomModeSet('L')) + if ((c == channel) || (c->IsModeSet('L'))) { - WriteServ(user->fd,"690 %s :Circular redirection, mode +L to %s not allowed.",user->nick,params[0].c_str()); - return 0; + 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.clear(); + 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; + } + } } } } - return 1; + + channel->SetMode('L', true); + channel->SetModeParam('L', parameter.c_str(), true); + return MODEACTION_ALLOW; } - return 0; + else + { + if (channel->IsModeSet('L')) + { + channel->SetMode('L', false); + 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 + " "; - } - if (temp2.length()) - output = temp2.substr(0,temp2.length()-1); - } +class ModuleRedirect : public Module +{ + + Redirect* re; + + public: + + ModuleRedirect(InspIRCd* Me) + : Module(Me) + { + + re = new Redirect(ServerInstance); + 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(userrec* user, chanrec* chan, const char* cname) + + virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) { if (chan) { - if (chan->IsCustomModeSet('L')) + if (chan->IsModeSet('L') && chan->limit) { - if (Srv->CountUsers(chan) >= chan->limit) + if (chan->GetUserCounter() >= chan->limit) { 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->WriteServ("470 %s :%s is full, but has a circular redirect (+L), not following redirection to %s", user->nick, cname, channel.c_str()); + return 1; + } + + 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()); + Channel::JoinUser(ServerInstance, user, channel.c_str(), false, "", false, ServerInstance->Time()); return 1; } } @@ -96,42 +142,14 @@ class ModuleRedirect : public Module virtual ~ModuleRedirect() { - delete Srv; + ServerInstance->Modes->DelMode(re); + delete re; } virtual Version GetVersion() { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - - virtual void OnUserConnect(userrec* user) - { - } - }; - -class ModuleRedirectFactory : public ModuleFactory -{ - public: - ModuleRedirectFactory() - { - } - - ~ModuleRedirectFactory() - { - } - - virtual Module * CreateModule() - { - return new ModuleRedirect; - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleRedirectFactory; -} - +MODULE_INIT(ModuleRedirect)