X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=ec5ac661e89c224463c251d9d2b6b20196231ab0;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=34df89ae3f398103317ee312f87ab55b2fad926e;hpb=934a3f296f087ae35fb072ede04b0ffdfd695b71;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 34df89ae3..ec5ac661e 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,124 +1,173 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2007 Robin Burchell + * Copyright (C) 2006 John Brooks + * Copyright (C) 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" +#include "modules/invite.h" + +enum +{ + // From RFC 2182. + ERR_UNAVAILRESOURCE = 437 +}; + + +class KickRejoinData +{ + struct KickedUser + { + std::string uuid; + time_t expire; + + KickedUser(User* user, unsigned int Delay) + : uuid(user->uuid) + , expire(ServerInstance->Time() + Delay) + { + } + }; -/* $ModDesc: Provides channel mode +J (delay rejoin after kick) */ + typedef std::vector KickedList; -typedef std::map delaylist; + mutable KickedList kicked; + + public: + const unsigned int delay; + + KickRejoinData(unsigned int Delay) : delay(Delay) { } + + bool canjoin(LocalUser* user) const + { + for (KickedList::iterator i = kicked.begin(); i != kicked.end(); ) + { + KickedUser& rec = *i; + if (rec.expire > ServerInstance->Time()) + { + if (rec.uuid == user->uuid) + return false; + ++i; + } + else + { + // Expired record, remove. + stdalgo::vector::swaperase(kicked, i); + if (kicked.empty()) + break; + } + } + return true; + } + + void add(User* user) + { + // One user can be in the list multiple times if the user gets kicked, force joins + // (skipping OnUserPreJoin) and gets kicked again, but that's okay because canjoin() + // works correctly in this case as well + kicked.push_back(KickedUser(user, delay)); + } +}; /** Handles channel mode +J */ -class KickRejoin : public ParamChannelModeHandler +class KickRejoin : public ParamMode > { + const unsigned int max; public: - SimpleExtItem ext; - KickRejoin(Module* Creator) : ParamChannelModeHandler(Creator, "kicknorejoin", 'J'), ext("norejoinusers", Creator) { } + KickRejoin(Module* Creator) + : ParamMode >(Creator, "kicknorejoin", 'J') + , max(60) + { + } - bool ParamValidate(std::string& parameter) + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE { - int v = atoi(parameter.c_str()); + unsigned int v = ConvToNum(parameter); if (v <= 0) - return false; - parameter = ConvToStr(v); - return true; + { + source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter)); + return MODEACTION_DENY; + } + + if (IS_LOCAL(source) && v > max) + v = max; + + ext.set(channel, new KickRejoinData(v)); + return MODEACTION_ALLOW; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + void SerializeParam(Channel* chan, const KickRejoinData* krd, std::string& out) { - ModeAction rv = ParamChannelModeHandler::OnModeChange(source, dest, channel, parameter, adding); - if (rv == MODEACTION_ALLOW && !adding) - ext.unset(channel); - return rv; + out.append(ConvToStr(krd->delay)); + } + + std::string GetModuleSettings() const + { + return ConvToStr(max); } }; class ModuleKickNoRejoin : public Module { KickRejoin kr; + Invite::API invapi; public: - ModuleKickNoRejoin() : kr(this) + , invapi(this) { - if (!ServerInstance->Modes->AddMode(&kr)) - throw ModuleException("Could not add new modes!"); - ServerInstance->Extensions.Register(&kr.ext); - Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick }; - ServerInstance->Modules->Attach(eventlist, this, 2); } - ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { if (chan) { - delaylist* dl = kr.ext.get(chan); - if (dl) + const KickRejoinData* data = kr.ext.get(chan); + if ((data) && !invapi->IsInvited(user, chan) && (!data->canjoin(user))) { - std::vector itemstoremove; - - for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++) - { - if (iter->second > ServerInstance->Time()) - { - if (iter->first == user) - { - user->WriteNumeric(ERR_DELAYREJOIN, "%s %s :You must wait %s seconds after being kicked to rejoin (+J)", - user->nick.c_str(), chan->name.c_str(), chan->GetModeParameter(&kr).c_str()); - return MOD_RES_DENY; - } - } - else - { - // Expired record, remove. - itemstoremove.push_back(iter->first); - } - } - - for (unsigned int i = 0; i < itemstoremove.size(); i++) - dl->erase(itemstoremove[i]); - - if (!dl->size()) - kr.ext.unset(chan); + user->WriteNumeric(ERR_UNAVAILRESOURCE, chan, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J is set)", data->delay)); + return MOD_RES_DENY; } } return MOD_RES_PASSTHRU; } - void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE { - if (memb->chan->IsModeSet(&kr) && (source != memb->user)) + if ((!IS_LOCAL(memb->user)) || (source == memb->user)) + return; + + KickRejoinData* data = kr.ext.get(memb->chan); + if (data) { - delaylist* dl = kr.ext.get(memb->chan); - if (!dl) - { - dl = new delaylist; - kr.ext.set(memb->chan, dl); - } - (*dl)[memb->user] = ServerInstance->Time() + atoi(memb->chan->GetModeParameter(&kr).c_str()); + data->add(memb->user); } } - ~ModuleKickNoRejoin() + Version GetVersion() CXX11_OVERRIDE { - } - - Version GetVersion() - { - return Version("Channel mode to delay rejoin after kick", VF_VENDOR); + return Version("Provides channel mode +J, delays rejoins after kicks", VF_VENDOR | VF_COMMON, kr.GetModuleSettings()); } }; - MODULE_INIT(ModuleKickNoRejoin)