From e3939559e4496c520ec29ad16a5cab99efe7257e Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Sun, 2 Dec 2012 17:54:23 +0100 Subject: m_kicknorejoin Minor improvements - Ignore remote users - Remove expired items in one pass --- src/modules/m_kicknorejoin.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/modules/m_kicknorejoin.cpp') diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 836f92e6c..6d2d10c84 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -81,9 +81,7 @@ public: delaylist* dl = kr.ext.get(chan); if (dl) { - std::vector itemstoremove; - - for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++) + for (delaylist::iterator iter = dl->begin(); iter != dl->end(); ) { if (iter->second > ServerInstance->Time()) { @@ -94,17 +92,15 @@ public: user->nick.c_str(), chan->name.c_str(), modeparam.c_str()); return MOD_RES_DENY; } + ++iter; } else { // Expired record, remove. - itemstoremove.push_back(iter->first); + dl->erase(iter++); } } - for (unsigned int i = 0; i < itemstoremove.size(); i++) - dl->erase(itemstoremove[i]); - if (!dl->size()) kr.ext.unset(chan); } @@ -114,7 +110,7 @@ public: void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) { - if (memb->chan->IsModeSet(&kr) && (source != memb->user)) + if (memb->chan->IsModeSet(&kr) && (IS_LOCAL(memb->user)) && (source != memb->user)) { delaylist* dl = kr.ext.get(memb->chan); if (!dl) -- cgit v1.3.1-10-gc9f91 From 4b81b4004d086555885d5e4a2541b0a92eb4a9ae Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Mon, 18 Feb 2013 19:56:05 +0100 Subject: m_kicknorejoin Limit time to 30m by default In the current implementation we only expire entries when someone joins, without a limit it was possible to make us practically never remove entries and consume (a tiny amount of) memory for each entry until the mode was removed/parameter was changed The default limit of 30m is chosen to not surprise people when they upgrade. If you need to prevent rejoins for more than a minute then you should set a (timed)ban instead Config option is available to change the limit (2.0 only) --- docs/conf/modules.conf.example | 2 ++ src/modules/m_kicknorejoin.cpp | 51 ++++++++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 14 deletions(-) (limited to 'src/modules/m_kicknorejoin.cpp') diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example index 0e7b3a29b..7a6c478f1 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.conf.example @@ -954,6 +954,8 @@ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Anti-Auto-Rejoin: Adds support for prevention of auto-rejoin (+J) # +# Set the maximum time that is accepted as a parameter for +J here. +# #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Knock module: adds the /KNOCK command and +K channel mode diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 6d2d10c84..9614b84f2 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -31,27 +31,42 @@ typedef std::map delaylist; /** Handles channel mode +J */ -class KickRejoin : public ParamChannelModeHandler +class KickRejoin : public ModeHandler { public: + unsigned int max; SimpleExtItem ext; - KickRejoin(Module* Creator) : ParamChannelModeHandler(Creator, "kicknorejoin", 'J'), ext("norejoinusers", Creator) { } - - bool ParamValidate(std::string& parameter) + KickRejoin(Module* Creator) + : ModeHandler(Creator, "kicknorejoin", 'J', PARAM_SETONLY, MODETYPE_CHANNEL) + , ext("norejoinusers", Creator) { - int v = atoi(parameter.c_str()); - if (v <= 0) - return false; - parameter = ConvToStr(v); - return true; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) { - ModeAction rv = ParamChannelModeHandler::OnModeChange(source, dest, channel, parameter, adding); - if (rv == MODEACTION_ALLOW && !adding) + if (adding) + { + int v = ConvToInt(parameter); + if (v <= 0) + return MODEACTION_DENY; + if (parameter == channel->GetModeParameter(this)) + return MODEACTION_DENY; + + if ((IS_LOCAL(source) && ((unsigned int)v > max))) + v = max; + + parameter = ConvToStr(v); + channel->SetModeParam(this, parameter); + } + else + { + if (!channel->IsModeSet(this)) + return MODEACTION_DENY; + ext.unset(channel); - return rv; + channel->SetModeParam(this, ""); + } + return MODEACTION_ALLOW; } }; @@ -70,8 +85,16 @@ public: { ServerInstance->Modules->AddService(kr); ServerInstance->Modules->AddService(kr.ext); - Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick }; + Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick, I_OnRehash }; ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + OnRehash(NULL); + } + + void OnRehash(User* user) + { + kr.max = ServerInstance->Duration(ServerInstance->Config->ConfValue("kicknorejoin")->getString("maxtime")); + if (!kr.max) + kr.max = 30*60; } ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) -- cgit v1.3.1-10-gc9f91 From 1dfead3b2cc9e8c603f6ad6f7216576a2ce361fb Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Tue, 16 Apr 2013 13:20:24 +0200 Subject: m_kicknorejoin Store and compare uuids instead pointers Fixes the off chance scenario where we disallow a join because a previously kicked user has quit and the User who is trying to join happens to be allocated at the exact same memory location --- src/modules/m_kicknorejoin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/modules/m_kicknorejoin.cpp') diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 9614b84f2..c754aa0f0 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -27,7 +27,7 @@ /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */ -typedef std::map delaylist; +typedef std::map delaylist; /** Handles channel mode +J */ @@ -108,7 +108,7 @@ public: { if (iter->second > ServerInstance->Time()) { - if (iter->first == user) + if (iter->first == user->uuid) { std::string modeparam = chan->GetModeParameter(&kr); user->WriteNumeric(ERR_DELAYREJOIN, "%s %s :You must wait %s seconds after being kicked to rejoin (+J)", @@ -141,7 +141,7 @@ public: dl = new delaylist; kr.ext.set(memb->chan, dl); } - (*dl)[memb->user] = ServerInstance->Time() + ConvToInt(memb->chan->GetModeParameter(&kr)); + (*dl)[memb->user->uuid] = ServerInstance->Time() + ConvToInt(memb->chan->GetModeParameter(&kr)); } } -- cgit v1.3.1-10-gc9f91