X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=00c191d26a74c30cebe3143662d4f5696160d63c;hb=2dfc384cde46ba63ed7c2f4420712596096123ca;hp=a746644c20d5b5d82952cad55865582814faef12;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index a746644c2..00c191d26 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * 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. @@ -12,9 +12,6 @@ */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" /* $ModDesc: Provides channel mode +L (limit redirection) */ @@ -25,7 +22,7 @@ class Redirect : public ModeHandler 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) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { if (channel->IsModeSet('L')) return std::make_pair(true, channel->GetModeParameter('L')); @@ -33,111 +30,101 @@ class Redirect : public ModeHandler 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) + 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); } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) { if (adding) { - chanrec* c = NULL; + Channel* c = NULL; - if (!ServerInstance->IsChannel(parameter.c_str())) + if (IS_LOCAL(source) && !ServerInstance->IsChannel(parameter.c_str(), ServerInstance->Config->Limits.ChanMax)) { - source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str()); + source->WriteNumeric(403, "%s %s :Invalid channel name", source->nick.c_str(), parameter.c_str()); parameter.clear(); return MODEACTION_DENY; } c = ServerInstance->FindChan(parameter); - if (c) + if (!c && !IS_OPER(source)) { - /* 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.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; - } - } - } - } + 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; } - channel->SetMode('L', true); - channel->SetModeParam('L', parameter.c_str(), true); + if (c && c->GetStatus(source) < STATUS_OP && !IS_OPER(source)) + { + 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; + } + + /* + * 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->SetMode('L', parameter); return MODEACTION_ALLOW; } else { if (channel->IsModeSet('L')) { - channel->SetMode('L', false); + channel->SetMode('L', ""); return MODEACTION_ALLOW; } } return MODEACTION_DENY; - + } }; class ModuleRedirect : public Module { - + Redirect* re; - + public: - + ModuleRedirect(InspIRCd* Me) : Module(Me) { - + re = new Redirect(ServerInstance); - if (!ServerInstance->AddMode(re, 'L')) + if (!ServerInstance->Modes->AddMode(re)) throw ModuleException("Could not add new modes!"); - } - - void Implements(char* List) - { - List[I_OnUserPreJoin] = 1; + Implementation eventlist[] = { I_OnUserPreJoin }; + ServerInstance->Modules->Attach(eventlist, this, 1); } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) + + virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { if (chan) { - if (chan->IsModeSet('L') && chan->limit) + if (chan->IsModeSet('L') && chan->modes[CM_LIMIT]) { - if (chan->GetUserCounter() >= chan->limit) + if (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) { std::string channel = chan->GetModeParameter('L'); /* sometimes broken ulines can make circular or chained +L, avoid this */ - chanrec* destchan = NULL; + 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()); + 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->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, "", ServerInstance->Time(true)); + 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; } } @@ -148,12 +135,12 @@ class ModuleRedirect : public Module virtual ~ModuleRedirect() { ServerInstance->Modes->DelMode(re); - DELETE(re); + delete re; } - + virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } };