X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_safelist.cpp;h=0160de7c2458a18e3c384495cb198dda39a57b85;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=1bdfb97bd50c11bb40c082ea172c7a7b69401044;hpb=52214a3195d062bc45522e7da58bbe7611d040f6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 1bdfb97bd..0160de7c2 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -2,21 +2,16 @@ * | 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. * * --------------------------------------------------- */ - -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "configreader.h" + #include "inspircd.h" -#include "wildcard.h" /** Holds a users m_safelist state */ @@ -27,9 +22,11 @@ class ListData : public classbase long list_position; bool list_ended; const std::string glob; + int minusers; + int maxusers; ListData() : list_start(0), list_position(0), list_ended(false) {}; - ListData(long pos, time_t t, const std::string &pattern) : list_start(t), list_position(pos), list_ended(false), glob(pattern) {}; + ListData(long pos, time_t t, const std::string &pattern, int mi, int ma) : list_start(t), list_position(pos), list_ended(false), glob(pattern), minusers(mi), maxusers(ma) {}; }; /* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */ @@ -38,211 +35,202 @@ class ModuleSafeList : public Module { time_t ThrottleSecs; size_t ServerNameSize; + int global_listing; + int LimitList; + SimpleExtItem listData; + LocalIntExt listTime; public: - ModuleSafeList(InspIRCd* Me) : Module::Module(Me) + ModuleSafeList() : listData("safelist_data", this), listTime("safelist_last", this) { - OnRehash(NULL, ""); + OnRehash(NULL); + Extensible::Register(&listData); + Extensible::Register(&listTime); + Implementation eventlist[] = { I_OnBufferFlushed, I_OnPreCommand, I_On005Numeric, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 4); } - - virtual ~ModuleSafeList() + + ~ModuleSafeList() { } - virtual void OnRehash(userrec* user, const std::string ¶meter) + void OnRehash(User* user) { - ConfigReader MyConf(ServerInstance); + ConfigReader MyConf; ThrottleSecs = MyConf.ReadInteger("safelist", "throttle", "60", 0, true); + LimitList = MyConf.ReadInteger("safelist", "maxlisters", "50", 0, true); ServerNameSize = strlen(ServerInstance->Config->ServerName) + 4; + global_listing = 0; } - - virtual Version GetVersion() - { - return Version(1,1,0,0,VF_VENDOR,API_VERSION); - } - - void Implements(char* List) + + Version GetVersion() { - List[I_OnBufferFlushed] = List[I_OnPreCommand] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnRehash] = 1; + return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR,API_VERSION); } + /* * OnPreCommand() * Intercept the LIST command. - */ - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + */ + ModResult OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) { /* If the command doesnt appear to be valid, we dont want to mess with it. */ if (!validated) - return 0; - + return MOD_RES_PASSTHRU; + if (command == "LIST") { - return this->HandleList(parameters, pcnt, user); + return this->HandleList(parameters, user); } - return 0; + return MOD_RES_PASSTHRU; } - + /* * HandleList() * Handle (override) the LIST command. */ - int HandleList(const char** parameters, int pcnt, userrec* user) + ModResult HandleList(const std::vector ¶meters, User* user) { + int pcnt = parameters.size(); + int minusers = 0, maxusers = 0; + + if (global_listing >= LimitList && !IS_OPER(user)) + { + user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick.c_str()); + user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str()); + user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str()); + return MOD_RES_DENY; + } + /* First, let's check if the user is currently /list'ing */ - ListData *ld; - user->GetExt("safelist_cache", ld); - + ListData *ld = listData.get(user); + if (ld) { /* user is already /list'ing, we don't want to do shit. */ - return 1; + return MOD_RES_DENY; } /* Work around mIRC suckyness. YOU SUCK, KHALED! */ - if ((pcnt == 1) && (*parameters[0] == '<')) - pcnt = 0; - - time_t* last_list_time; - user->GetExt("safelist_last", last_list_time); - if (last_list_time) + if (pcnt == 1) { - if (ServerInstance->Time() < (*last_list_time)+ThrottleSecs) + if (parameters[0][0] == '<') { - user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick); - user->WriteServ("321 %s Channel :Users Name",user->nick); - user->WriteServ("323 %s :End of channel list.",user->nick); - return 1; + maxusers = atoi(parameters[0].c_str()+1); + ServerInstance->Logs->Log("m_safelist",DEBUG,"Max users: %d", maxusers); + pcnt = 0; } + else if (parameters[0][0] == '>') + { + minusers = atoi(parameters[0].c_str()+1); + ServerInstance->Logs->Log("m_safelist",DEBUG,"Min users: %d", minusers); + pcnt = 0; + } + } - DELETE(last_list_time); - user->Shrink("safelist_last"); + time_t last_list_time = listTime.get(user); + if (last_list_time && ServerInstance->Time() < last_list_time + ThrottleSecs) + { + user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick.c_str()); + user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str()); + user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str()); + return MOD_RES_DENY; } - + /* * start at channel 0! ;) */ - ld = new ListData(0,ServerInstance->Time(), pcnt ? parameters[0] : "*"); - user->Extend("safelist_cache", ld); + ld = new ListData(0,ServerInstance->Time(), (pcnt && (parameters[0][0] != '<' && parameters[0][0] != '>')) ? parameters[0] : "*", minusers, maxusers); + listData.set(user, ld); + listTime.set(user, ServerInstance->Time()); - time_t* llt = new time_t; - *llt = ServerInstance->Time(); - user->Extend("safelist_last", llt); + user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str()); - user->WriteServ("321 %s Channel :Users Name",user->nick); + global_listing++; - return 1; + return MOD_RES_DENY; } - virtual void OnBufferFlushed(userrec* user) + void OnBufferFlushed(User* user) { char buffer[MAXBUF]; - ListData* ld; - if (user->GetExt("safelist_cache", ld)) + ListData* ld = listData.get(user); + if (ld) { - chanrec* chan = NULL; - long amount_sent = 0; + Channel* chan = NULL; + unsigned long amount_sent = 0; do { chan = ServerInstance->GetChannelIndex(ld->list_position); - bool has_user = (chan && chan->HasUser(user)); - if ((chan) && (chan->modes[CM_PRIVATE])) + bool is_special = (chan && (chan->HasUser(user) || user->HasPrivPermission("channels/auspex"))); + long users = chan ? chan->GetUserCounter() : 0; + + bool too_few = (ld->minusers && (users <= ld->minusers)); + bool too_many = (ld->maxusers && (users >= ld->maxusers)); + + if (chan && (too_many || too_few)) { - bool display = match(chan->name, ld->glob.c_str()); - long users = chan->GetUserCounter(); - if ((users) && (display)) + ld->list_position++; + continue; + } + + if (chan) + { + bool display = (InspIRCd::Match(chan->name, ld->glob) || (!chan->topic.empty() && InspIRCd::Match(chan->topic, ld->glob))); + + if (!users || !display) + { + ld->list_position++; + continue; + } + + /* +s, not in chan / not got channels/auspex */ + if (chan->IsModeSet('s') && !is_special) { - int counter = snprintf(buffer, MAXBUF, "322 %s *", user->nick); + ld->list_position++; + continue; + } + + if (chan->IsModeSet('p') && !is_special) + { + /* Channel is +p and user is outside/not privileged */ + int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick.c_str(), users); amount_sent += counter + ServerNameSize; user->WriteServ(std::string(buffer)); } - } - else if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user))) - { - bool display = match(chan->name, ld->glob.c_str()); - long users = chan->GetUserCounter(); - if ((users) && (display)) + else { - int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",user->nick, chan->name, users, chan->ChanModes(has_user), chan->topic); + /* User is in the channel/privileged, channel is not +s */ + int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s", user->nick.c_str(), chan->name.c_str(), users, chan->ChanModes(is_special), chan->topic.c_str()); amount_sent += counter + ServerNameSize; user->WriteServ(std::string(buffer)); } } else { - if (!chan) + if (!ld->list_ended) { - if (!ld->list_ended) - { - ld->list_ended = true; - user->WriteServ("323 %s :End of channel list.",user->nick); - } + ld->list_ended = true; + user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str()); } } + ld->list_position++; } - while ((chan != NULL) && (amount_sent < (user->sendqmax / 4))); + while ((chan != NULL) && (amount_sent < (user->MyClass->GetSendqMax() / 4))); if (ld->list_ended) { - user->Shrink("safelist_cache"); - DELETE(ld); - } - } - } - - virtual void OnCleanup(int target_type, void* item) - { - if(target_type == TYPE_USER) - { - userrec* u = (userrec*)item; - ListData* ld; - u->GetExt("safelist_cache", ld); - if (ld) - { - u->Shrink("safelist_cache"); - DELETE(ld); - } - time_t* last_list_time; - u->GetExt("safelist_last", last_list_time); - if (last_list_time) - { - DELETE(last_list_time); - u->Shrink("safelist_last"); + listData.unset(user); + global_listing--; } } } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::string &output) { output.append(" SAFELIST"); } - virtual void OnUserQuit(userrec* user, const std::string &message) - { - this->OnCleanup(TYPE_USER,user); - } - }; - -class ModuleSafeListFactory : public ModuleFactory -{ - public: - ModuleSafeListFactory() - { - } - - ~ModuleSafeListFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSafeList(Me); - } - -}; - -extern "C" void * init_module( void ) -{ - return new ModuleSafeListFactory; -} +MODULE_INIT(ModuleSafeList)