X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=0160de7c2458a18e3c384495cb198dda39a57b85;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=007e6f8900c0d2070ce5ba64f0f3901eb8f3edf0;hpb=8cb8131110c194b4c10a64215dd6a4c5e54d2bc9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 007e6f890..0160de7c2 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 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. @@ -12,7 +12,6 @@ */ #include "inspircd.h" -#include "wildcard.h" /** Holds a users m_safelist state */ @@ -38,55 +37,59 @@ class ModuleSafeList : public Module size_t ServerNameSize; int global_listing; int LimitList; + SimpleExtItem listData; + LocalIntExt listTime; public: - ModuleSafeList(InspIRCd* Me) : Module(Me) + ModuleSafeList() : listData("safelist_data", this), listTime("safelist_last", this) { - OnRehash(NULL, ""); - Implementation eventlist[] = { I_OnBufferFlushed, I_OnPreCommand, I_OnCleanup, I_OnUserQuit, I_On005Numeric, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 6); + 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(User* 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() + + Version GetVersion() { - return Version(1,2,0,0,VF_VENDOR,API_VERSION); + 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 std::vector ¶meters, User *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, user); } - return 0; + return MOD_RES_PASSTHRU; } - + /* * HandleList() * Handle (override) the LIST command. */ - int HandleList(const std::vector ¶meters, User* user) + ModResult HandleList(const std::vector ¶meters, User* user) { int pcnt = parameters.size(); int minusers = 0, maxusers = 0; @@ -96,17 +99,16 @@ class ModuleSafeList : public Module 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; + 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! */ @@ -126,52 +128,41 @@ class ModuleSafeList : public Module } } - time_t* last_list_time; - user->GetExt("safelist_last", last_list_time); - if (last_list_time) + time_t last_list_time = listTime.get(user); + if (last_list_time && ServerInstance->Time() < last_list_time + ThrottleSecs) { - 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.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; - user->Shrink("safelist_last"); + 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] : "*", minusers, maxusers); - user->Extend("safelist_cache", ld); - - time_t* llt = new time_t; - *llt = ServerInstance->Time(); - user->Extend("safelist_last", llt); + 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()); user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str()); global_listing++; - return 1; + return MOD_RES_DENY; } - virtual void OnBufferFlushed(User* user) + void OnBufferFlushed(User* user) { char buffer[MAXBUF]; - ListData* ld; - if (user->GetExt("safelist_cache", ld)) + ListData* ld = listData.get(user); + if (ld) { Channel* chan = NULL; unsigned long amount_sent = 0; do { chan = ServerInstance->GetChannelIndex(ld->list_position); - bool has_user = (chan && chan->HasUser(user)); + 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)); @@ -183,82 +174,63 @@ class ModuleSafeList : public Module continue; } - if ((chan) && (chan->modes[CM_PRIVATE]) && (!IS_OPER(user))) + if (chan) { - bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob))); - 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) + { + 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) || IS_OPER(user))) - { - bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob))); - if ((users) && (display)) + else { - int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",user->nick.c_str(), chan->name, users, chan->ChanModes(has_user || IS_OPER(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->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str()); - } + 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->MyClass->GetSendqMax() / 4))); if (ld->list_ended) { - user->Shrink("safelist_cache"); - delete ld; - global_listing--; - } - } - } - - virtual void OnCleanup(int target_type, void* item) - { - if(target_type == TYPE_USER) - { - User* u = (User*)item; - ListData* ld; - u->GetExt("safelist_cache", ld); - if (ld) - { - u->Shrink("safelist_cache"); - delete ld; + listData.unset(user); global_listing--; } - time_t* last_list_time; - u->GetExt("safelist_last", last_list_time); - if (last_list_time) - { - delete last_list_time; - u->Shrink("safelist_last"); - } } } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::string &output) { output.append(" SAFELIST"); } - virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) - { - this->OnCleanup(TYPE_USER,user); - } - }; MODULE_INIT(ModuleSafeList)