X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=cf0174cc600e1e49148fbd74ed9c27bae0c3d281;hb=7c197db72eab03321e4f3e847054e13126520504;hp=7b4fe81de80f2b7bf60fc821d5c2870e8ea1bdbe;hpb=740b09e2aee345c6fde199986d8eab6e0db224e3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index 7b4fe81de..cf0174cc6 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -2,91 +2,159 @@ * | 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-2007 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(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) { - Srv = new Server; - Srv->AddExtendedMode('L',MT_CHANNEL,false,1,0); - } + /* 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(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - if ((modechar == 'L') && (type == MT_CHANNEL)) + if (adding) { - if (mode_on) + chanrec* c = NULL; + + if (!ServerInstance->IsChannel(parameter.c_str())) + { + source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str()); + parameter = ""; + return MODEACTION_DENY; + } + + c = ServerInstance->FindChan(parameter); + if (c) { - std::string ChanToJoin = params[0]; - chanrec* c = Srv->FindChannel(ChanToJoin); - 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'))) + { + 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 { - WriteServ(user->fd,"690 %s :Circular redirection, mode +L to %s not allowed.",user->nick,params[0].c_str()); - return 0; + 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; + } +}; + +class ModuleRedirect : public Module +{ + + Redirect* re; - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) + public: + + ModuleRedirect(InspIRCd* Me) + : Module::Module(Me) + { + + re = new Redirect(ServerInstance); + if (!ServerInstance->AddMode(re, 'L')) + throw ModuleException("Could not add new modes!"); + } + + void Implements(char* List) + { + List[I_OnUserPreJoin] = 1; + } + + virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { if (chan) { - if (chan->IsCustomModeSet('L')) + if (chan->IsModeSet('L') && chan->limit) { - if (chan->limit >= Srv->CountUsers(chan)) + 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 */ + chanrec* 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()); + chanrec::JoinUser(ServerInstance, user, channel.c_str(), false); return 1; } } } + return 0; } virtual ~ModuleRedirect() { - delete Srv; + ServerInstance->Modes->DelMode(re); + DELETE(re); } virtual Version GetVersion() { - return Version(1,0,0,0); + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - - virtual void OnUserConnect(userrec* user) - { - } - }; @@ -101,9 +169,9 @@ class ModuleRedirectFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(InspIRCd* Me) { - return new ModuleRedirect; + return new ModuleRedirect(Me); } };