X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=e9b682081920c91c3f88d87193412388a5b9a42d;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;hp=45e4dab1196cb188d8b2c208d9ba86ab0164ab8a;hpb=98bea6aca4a6033f1b2693fbaa4935ef009eb30a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 45e4dab11..e9b682081 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -10,13 +10,8 @@ * * --------------------------------------------------- */ - -#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. */ @@ -41,16 +38,18 @@ class ModuleSafeList : public Module int global_listing; int LimitList; public: - ModuleSafeList(InspIRCd* Me) : Module::Module(Me) + ModuleSafeList(InspIRCd* Me) : Module(Me) { OnRehash(NULL, ""); + Implementation eventlist[] = { I_OnBufferFlushed, I_OnPreCommand, I_OnCleanup, I_OnUserQuit, I_On005Numeric, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 6); } - + virtual ~ModuleSafeList() { } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader MyConf(ServerInstance); ThrottleSecs = MyConf.ReadInteger("safelist", "throttle", "60", 0, true); @@ -58,52 +57,51 @@ class ModuleSafeList : public Module 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) - { - List[I_OnBufferFlushed] = List[I_OnPreCommand] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnRehash] = 1; + return Version("$Id$",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) + */ + virtual int 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; - + if (command == "LIST") { - return this->HandleList(parameters, pcnt, user); + return this->HandleList(parameters, user); } return 0; } - + /* * HandleList() * Handle (override) the LIST command. */ - int HandleList(const char** parameters, int pcnt, userrec* user) + int HandleList(const std::vector ¶meters, User* user) { - if (global_listing >= LimitList) + 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); - user->WriteServ("321 %s Channel :Users Name",user->nick); - user->WriteServ("323 %s :End of channel list.",user->nick); + 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 1; } /* First, let's check if the user is currently /list'ing */ ListData *ld; user->GetExt("safelist_cache", ld); - + if (ld) { /* user is already /list'ing, we don't want to do shit. */ @@ -111,8 +109,21 @@ class ModuleSafeList : public Module } /* Work around mIRC suckyness. YOU SUCK, KHALED! */ - if ((pcnt == 1) && (*parameters[0] == '<')) - pcnt = 0; + if (pcnt == 1) + { + if (parameters[0][0] == '<') + { + 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; + } + } time_t* last_list_time; user->GetExt("safelist_last", last_list_time); @@ -120,86 +131,105 @@ class ModuleSafeList : public Module { if (ServerInstance->Time() < (*last_list_time)+ThrottleSecs) { - 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); + 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 1; } - DELETE(last_list_time); + delete last_list_time; user->Shrink("safelist_last"); } - + /* * start at channel 0! ;) */ - ld = new ListData(0,ServerInstance->Time(), pcnt ? parameters[0] : "*"); + ld = new ListData(0,ServerInstance->Time(), (pcnt && (parameters[0][0] != '<' && parameters[0][0] != '>')) ? parameters[0] : "*", minusers, maxusers); user->Extend("safelist_cache", ld); time_t* llt = new time_t; *llt = ServerInstance->Time(); user->Extend("safelist_last", llt); - user->WriteServ("321 %s Channel :Users Name",user->nick); + user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str()); global_listing++; return 1; } - virtual void OnBufferFlushed(userrec* user) + virtual void OnBufferFlushed(User* user) { char buffer[MAXBUF]; ListData* ld; if (user->GetExt("safelist_cache", 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)) + { + ld->list_position++; + continue; + } + + if (chan) { - bool display = match(chan->name, ld->glob.c_str()); - long users = chan->GetUserCounter(); - if ((users) && (display)) + 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); + delete ld; global_listing--; } } @@ -209,19 +239,20 @@ class ModuleSafeList : public Module { if(target_type == TYPE_USER) { - userrec* u = (userrec*)item; + User* u = (User*)item; ListData* ld; u->GetExt("safelist_cache", ld); if (ld) { u->Shrink("safelist_cache"); - DELETE(ld); + delete ld; + global_listing--; } time_t* last_list_time; u->GetExt("safelist_last", last_list_time); if (last_list_time) { - DELETE(last_list_time); + delete last_list_time; u->Shrink("safelist_last"); } } @@ -232,33 +263,11 @@ class ModuleSafeList : public Module output.append(" SAFELIST"); } - virtual void OnUserQuit(userrec* user, const std::string &message) + virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_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)