X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=26d6b162b9ec7009daae11c3f8645eeb4df5c6b7;hb=09186df9f8c0d4f699b5abb4325d7dd583a8a0b1;hp=8e66060b8b258c03015a60087eda1f1e1ef95a98;hpb=d2a71fd3447c8bac65cc26077e2b9fc3fb0b28a7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index 8e66060b8..26d6b162b 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -1,69 +1,71 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2012 Shawn Smith + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2004, 2006 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 . */ + #include "inspircd.h" -/* $ModDesc: Provides channel mode +L (limit redirection) */ +/* $ModDesc: Provides channel mode +L (limit redirection) and usermode +L (no forced redirection) */ /** Handle channel mode +L */ class Redirect : public ModeHandler { public: - Redirect(InspIRCd* Instance) : ModeHandler(Instance, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { } - - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) - { - if (channel->IsModeSet('L')) - return std::make_pair(true, channel->GetModeParameter('L')); - else - return std::make_pair(false, parameter); - } + Redirect(Module* Creator) : ModeHandler(Creator, "redirect", 'L', PARAM_SETONLY, MODETYPE_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(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { - Channel* c = NULL; - - if (IS_LOCAL(source) && !ServerInstance->IsChannel(parameter.c_str(), ServerInstance->Config->Limits.ChanMax)) + if (IS_LOCAL(source)) { - source->WriteNumeric(403, "%s %s :Invalid channel name", source->nick.c_str(), parameter.c_str()); - parameter.clear(); - return MODEACTION_DENY; + if (!ServerInstance->IsChannel(parameter.c_str(), ServerInstance->Config->Limits.ChanMax)) + { + 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 && !IS_OPER(source)) + if (IS_LOCAL(source) && !IS_OPER(source)) { - 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* 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->GetPrefixValue(source) < OP_VALUE) + { + 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; + } } - 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(); + if (channel->GetModeParameter('L') == parameter) 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 @@ -85,32 +87,57 @@ class Redirect : public ModeHandler } }; +/** Handles usermode +L to stop forced redirection and print an error. +*/ +class AntiRedirect : public SimpleUserModeHandler +{ + public: + AntiRedirect(Module* Creator) : SimpleUserModeHandler(Creator, "antiredirect", 'L') {} +}; + class ModuleRedirect : public Module { - Redirect* re; + Redirect re; + AntiRedirect re_u; + bool UseUsermode; public: - ModuleRedirect(InspIRCd* Me) - : Module(Me) + ModuleRedirect() + : re(this), re_u(this) { + } + + void init() + { + /* Setting this here so it isn't changable by rehasing the config later. */ + UseUsermode = ServerInstance->Config->ConfValue("redirect")->getBool("antiredirect"); + + /* Channel mode */ + ServerInstance->Modules->AddService(re); + + /* Check to see if the usermode is enabled in the config */ + if (UseUsermode) + { + /* Log noting that this breaks compatability. */ + ServerInstance->Logs->Log("m_redirect", DEFAULT, "REDIRECT: Enabled usermode +L. This breaks linking with servers that do not have this enabled. This is disabled by default in the 2.0 branch but will be enabled in the next version."); + + /* Try to add the usermode */ + ServerInstance->Modules->AddService(re_u); + } - 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); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - - virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) + virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { if (chan) { - if (chan->IsModeSet('L') && chan->modes[CM_LIMIT]) + if (chan->IsModeSet('L') && chan->IsModeSet('l')) { - if (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) + if (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter('l'))) { std::string channel = chan->GetModeParameter('L'); @@ -120,27 +147,35 @@ class ModuleRedirect : public Module 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; + return MOD_RES_DENY; + } + /* We check the bool value here to make sure we have it enabled, if we don't then + usermode +L might be assigned to something else. */ + if (UseUsermode && user->IsModeSet('L')) + { + user->WriteNumeric(470, "%s %s %s :Force redirection stopped.", + user->nick.c_str(), cname, channel.c_str()); + return MOD_RES_DENY; + } + else + { + 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(user, channel.c_str(), false, "", false, ServerInstance->Time()); + return MOD_RES_DENY; } - - 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; } } } - return 0; + return MOD_RES_PASSTHRU; } virtual ~ModuleRedirect() { - ServerInstance->Modes->DelMode(re); - delete re; } virtual Version GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides channel mode +L (limit redirection) and user mode +L (no forced redirection)", VF_VENDOR); } };