X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=e14530a92c889750860043d1cb00ecf0bcc58910;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=bf5e10595c38b2c2925c8f71520f1adf81d9d800;hpb=164998f1e6e2cb885fb4d630ded29ed5191218c8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index bf5e10595..e14530a92 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,218 +1,177 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2018 A_D + * Copyright (C) 2014 Daniel Vassdal + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2012-2015 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2010 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 +J (delay rejoin after kick) */ +#include "inspircd.h" +#include "modules/invite.h" -inline int strtoint(const std::string &str) +enum { - std::istringstream ss(str); - int result; - ss >> result; - return result; -} + // From RFC 2182. + ERR_UNAVAILRESOURCE = 437 +}; -typedef std::map delaylist; -/** Handles channel mode +J - */ -class KickRejoin : public ModeHandler +class KickRejoinData { - public: - KickRejoin(InspIRCd* Instance) : ModeHandler(Instance, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { } - - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + struct KickedUser { - if (channel->IsModeSet('J')) - return std::make_pair(true, channel->GetModeParameter('J')); - else - return std::make_pair(false, parameter); - } + std::string uuid; + time_t expire; - 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) - { - if (!adding) + KickedUser(User* user, unsigned int Delay) + : uuid(user->uuid) + , expire(ServerInstance->Time() + Delay) { - // Taking the mode off, we need to clean up. - delaylist* dl; + } + }; - if (channel->GetExt("norejoinusers", dl)) - { - delete dl; - channel->Shrink("norejoinusers"); - } + typedef std::vector KickedList; - if (!channel->IsModeSet('J')) - { - return MODEACTION_DENY; - } - else - { - channel->SetMode('J', false); - return MODEACTION_ALLOW; - } - } - else if (atoi(parameter.c_str()) > 0) + 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(); ) { - if (!channel->IsModeSet('J')) + KickedUser& rec = *i; + if (rec.expire > ServerInstance->Time()) { - parameter = ConvToStr(atoi(parameter.c_str())); - channel->SetModeParam('J', parameter.c_str(), adding); - channel->SetMode('J', adding); - return MODEACTION_ALLOW; + if (rec.uuid == user->uuid) + return false; + ++i; } else { - std::string cur_param = channel->GetModeParameter('J'); - if (cur_param == parameter) - { - // mode params match, don't change mode - return MODEACTION_DENY; - } - else - { - // new mode param, replace old with new - parameter = ConvToStr(atoi(parameter.c_str())); - cur_param = ConvToStr(atoi(cur_param.c_str())); - if (parameter != "0") - { - channel->SetModeParam('J', cur_param.c_str(), false); - channel->SetModeParam('J', parameter.c_str(), adding); - return MODEACTION_ALLOW; - } - else - { - /* Fix to jamie's fix, dont allow +J 0 on the new value! */ - return MODEACTION_DENY; - } - } + // Expired record, remove. + stdalgo::vector::swaperase(kicked, i); + if (kicked.empty()) + break; } } - else - { - return MODEACTION_DENY; - } + 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)); } }; -class ModuleKickNoRejoin : public Module +/** Handles channel mode +J + */ +class KickRejoin : public ParamMode > { + const unsigned int max; + public: + KickRejoin(Module* Creator) + : ParamMode >(Creator, "kicknorejoin", 'J') + , max(60) + { + syntax = ""; + } - KickRejoin* kr; + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE + { + unsigned int v = ConvToNum(parameter); + if (v <= 0) + { + source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter)); + return MODEACTION_DENY; + } -public: + if (IS_LOCAL(source) && v > max) + v = max; + + ext.set(channel, new KickRejoinData(v)); + return MODEACTION_ALLOW; + } - ModuleKickNoRejoin(InspIRCd* Me) - : Module(Me) + void SerializeParam(Channel* chan, const KickRejoinData* krd, std::string& out) { + out.append(ConvToStr(krd->delay)); + } - kr = new KickRejoin(ServerInstance); - if (!ServerInstance->Modes->AddMode(kr)) - throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnUserPreJoin, I_OnUserKick }; - ServerInstance->Modules->Attach(eventlist, this, 4); + std::string GetModuleSettings() const + { + return ConvToStr(max); } +}; - virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) +class ModuleKickNoRejoin : public Module +{ + KickRejoin kr; + Invite::API invapi; + +public: + ModuleKickNoRejoin() + : kr(this) + , invapi(this) { - if (chan) - { - delaylist* dl; - if (chan->GetExt("norejoinusers", dl)) - { - 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('J').c_str()); - return 1; - } - } - 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()) - { - // Now it's empty.. - delete dl; - chan->Shrink("norejoinusers"); - } - } - } - return 0; } - virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { - if (chan->IsModeSet('J') && (source != user)) + if (chan) { - delaylist* dl; - if (!chan->GetExt("norejoinusers", dl)) + const KickRejoinData* data = kr.ext.get(chan); + if ((data) && !invapi->IsInvited(user, chan) && (!data->canjoin(user))) { - dl = new delaylist; - chan->Extend("norejoinusers", dl); + user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J is set)", data->delay)); + return MOD_RES_DENY; } - (*dl)[user] = ServerInstance->Time() + strtoint(chan->GetModeParameter('J')); } + return MOD_RES_PASSTHRU; } - virtual void OnChannelDelete(Channel* chan) + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE { - delaylist* dl; + if ((!IS_LOCAL(memb->user)) || (source == memb->user)) + return; - if (chan->GetExt("norejoinusers", dl)) + KickRejoinData* data = kr.ext.get(memb->chan); + if (data) { - delete dl; - chan->Shrink("norejoinusers"); + data->add(memb->user); } } - virtual void OnCleanup(int target_type, void* item) + Version GetVersion() CXX11_OVERRIDE { - if(target_type == TYPE_CHANNEL) - OnChannelDelete((Channel*)item); - } - - - virtual ~ModuleKickNoRejoin() - { - ServerInstance->Modes->DelMode(kr); - delete kr; - } - - virtual Version GetVersion() - { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Adds channel mode J (kicknorejoin) which prevents users from rejoining after being kicked from a channel.", VF_VENDOR | VF_COMMON, kr.GetModuleSettings()); } }; - MODULE_INIT(ModuleKickNoRejoin)