X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fu_listmode.h;h=1e7d1cceb21f7a8e18e0a11fca76b3e8c2f68774;hb=96a4a1d41e42dba806c2e9954e148ed838262511;hp=28c364698fb07010b34d3fb0dbcfab88c5ccfaf9;hpb=8302af8e8a51b1489ecf40970c02bfb828cf1106;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/u_listmode.h b/include/u_listmode.h index 28c364698..1e7d1cceb 100644 --- a/include/u_listmode.h +++ b/include/u_listmode.h @@ -2,11 +2,11 @@ * | 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 - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -14,28 +14,12 @@ #ifndef INSPIRCD_LISTMODE_PROVIDER #define INSPIRCD_LISTMODE_PROVIDER -#include -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "wildcard.h" -#include "inspircd.h" - -/* $ModDesc: Provides support for easily creating listmodes, stores the time set, the user, and a parameter. */ - -/* Updated to use the config tag if it exists */ -/* Written by Om , December 2005. */ -/* Based on code previously written by Om - April 2005 */ -/* Updated to new API July 8th 2006 by Brain */ -/* Originally based on m_chanprotect and m_silence */ - -inline std::string stringtime() +/** Get the time as a string + */ +inline std::string stringtime(InspIRCd* Instance) { std::ostringstream TIME; - TIME << time(NULL); + TIME << Instance->Time(); return TIME.str(); } @@ -58,47 +42,114 @@ public: unsigned int limit; }; -// Just defining the type we use for the exception list here... -typedef std::vector modelist; -typedef std::vector limitlist; +/** Items stored in the channel's list + */ +typedef std::list modelist; +/** Max items per channel by name + */ +typedef std::list limitlist; +/** A request used to check if a user is on a channel's list or not + */ class ListModeRequest : public Request { public: - userrec* user; - chanrec* chan; + User* user; + std::string literal; + const char extban; + Channel* chan; + + /** Check if a user is on a channel's list. + * The Event::Send() event returns the ban string if the user is on the channel's list, + * or NULL if the user is not on the list. + * @param sender Sending module + * @param target Target module + * @param u User to check against + * @param c Channel to check against + */ + ListModeRequest(Module* sender, Module* target, User* u, Channel* c) : Request(sender, target, "LM_CHECKLIST"), user(u), literal(""), extban(0), chan(c) + { + } - ListModeRequest(Module* sender, Module* target, userrec* u, chanrec* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c) + /** Check if a literal string is on a channel's list, optionally using an extban char. + * The Event::Send() event returns the ban string if the user is on the channel's list, + * or NULL if the user is not on the list. + * @param sender Sending module + * @param target Target module + * @param literalstr String to check against, e.g. "Bob!Bobbertson@weeblshouse" + * @param extbanchar Extended ban character to use for the match, or a null char if not using extban + */ + ListModeRequest(Module* sender, Module* target, std::string literalstr, char extbanchar, Channel* channel) : Request(sender, target, "LM_CHECKLIST_EX"), user(NULL), literal(literalstr), extban(extbanchar), chan(channel) { } + /** Check if a literal string is on a channel's list, optionally using an extban char. + * The Event::Send() event returns the ban string if the user is on the channel's list, + * or NULL if the user is not on the list. + * @param sender Sending module + * @param target Target module + * @param User to check against, e.g. "Bob!Bobbertson@weeblshouse" + * @param extbanchar Extended ban character to use for the match, or a null char if not using extban + */ + ListModeRequest(Module* sender, Module* target, User* u, char extbanchar, Channel* channel) : Request(sender, target, "LM_CHECKLIST_EX"), user(u), literal(""), extban(extbanchar), chan(channel) + { + } + + /** Destructor + */ ~ListModeRequest() { } }; -/** The base class for listmodes defined by u_listmode.h +/** The base class for list modes, should be inherited. */ class ListModeBase : public ModeHandler { protected: + /** Storage key + */ std::string infokey; - std::string listnumeric; - std::string endoflistnumeric; + /** Numeric to use when outputting the list + */ + unsigned int listnumeric; + /** Numeric to indicate end of list + */ + unsigned int endoflistnumeric; + /** String to send for end of list + */ std::string endofliststring; + /** Automatically tidy up entries + */ bool tidy; + /** Config tag to check for max items per channel + */ std::string configtag; + /** Limits on a per-channel basis read from the tag + * specified in ListModeBase::configtag + */ limitlist chanlimits; - + public: - ListModeBase(InspIRCd* Instance, char modechar, const std::string &eolstr, const std::string &lnum, const std::string &eolnum, bool autotidy, const std::string &ctag = "banlist") + /** Constructor. + * @param Instance The creator of this class + * @param modechar Mode character + * @param eolstr End of list string + * @pram lnum List numeric + * @param eolnum End of list numeric + * @param autotidy Automatically tidy list entries on add + * @param ctag Configuration tag to get limits from + */ + ListModeBase(InspIRCd* Instance, char modechar, const std::string &eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy, const std::string &ctag = "banlist") : ModeHandler(Instance, modechar, 1, 1, true, MODETYPE_CHANNEL, false), listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy), configtag(ctag) { this->DoRehash(); infokey = "listbase_mode_" + std::string(1, mode) + "_list"; } - std::pair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + /** See mode.h + */ + std::pair ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { modelist* el; channel->GetExt(infokey, el); @@ -115,73 +166,93 @@ class ListModeBase : public ModeHandler return std::make_pair(false, parameter); } - virtual void DisplayList(userrec* user, chanrec* channel) + /** Display the list for this mode + * @param user The user to send the list to + * @param channel The channel the user is requesting the list for + */ + virtual void DisplayList(User* user, Channel* channel) { modelist* el; channel->GetExt(infokey, el); if (el) { - for(modelist::iterator it = el->begin(); it != el->end(); it++) + for (modelist::reverse_iterator it = el->rbegin(); it != el->rend(); ++it) { - user->WriteServ("%s %s %s %s %s %s", listnumeric.c_str(), user->nick, channel->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str()); + user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), (it->nick.length() ? it->nick.c_str() : ServerInstance->Config->ServerName), it->time.c_str()); } } - user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str()); + user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str()); } - virtual void RemoveMode(chanrec* channel) + virtual void DisplayEmptyList(User* user, Channel* channel) + { + user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str()); + } + + /** Remove all instances of the mode from a channel. + * See mode.h + * @param channel The channel to remove all instances of the mode from + */ + virtual void RemoveMode(Channel* channel, irc::modestacker* stack) { - ServerInstance->Log(DEBUG,"Removing listmode base from %s %s",channel->name,infokey.c_str()); modelist* el; channel->GetExt(infokey, el); if (el) { - ServerInstance->Log(DEBUG,"Channel is extended with a list"); - irc::modestacker modestack(false); + irc::modestacker modestack(ServerInstance, false); std::deque stackresult; - const char* mode_junk[MAXMODES+1]; - mode_junk[0] = channel->name; - userrec* n = new userrec(ServerInstance); - n->SetFd(FD_MAGIC_NUMBER); - for(modelist::iterator it = el->begin(); it != el->end(); it++) + std::vector mode_junk; + mode_junk.push_back(channel->name); + + for (modelist::iterator it = el->begin(); it != el->end(); it++) { - modestack.Push(this->GetModeChar(), it->mask); + if (stack) + stack->Push(this->GetModeChar(), it->mask); + else + modestack.Push(this->GetModeChar(), it->mask); } + + if (stack) + return; + while (modestack.GetStackedLine(stackresult)) { for (size_t j = 0; j < stackresult.size(); j++) { - mode_junk[j+1] = stackresult[j].c_str(); + mode_junk.push_back(stackresult[j]); } - ServerInstance->SendMode(mode_junk, stackresult.size() + 1, n); - } - delete n; + ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient); + } } } - virtual void RemoveMode(userrec* user) + /** See mode.h + */ + virtual void RemoveMode(User*, irc::modestacker* stack) { /* Listmodes dont get set on users */ } + /** Perform a rehash of this mode's configuration data + */ virtual void DoRehash() { ConfigReader Conf(ServerInstance); chanlimits.clear(); - for(int i = 0; i < Conf.Enumerate(configtag); i++) + for (int i = 0; i < Conf.Enumerate(configtag); i++) { // For each tag ListLimit limit; limit.mask = Conf.ReadValue(configtag, "chan", i); limit.limit = Conf.ReadInteger(configtag, "limit", i, true); - if(limit.mask.size() && limit.limit > 0) + if (limit.mask.size() && limit.limit > 0) chanlimits.push_back(limit); } - if(chanlimits.size() == 0) + if (chanlimits.size() == 0) { ListLimit limit; limit.mask = "*"; @@ -190,12 +261,18 @@ class ListModeBase : public ModeHandler } } - virtual void DoImplements(char* List) + /** Populate the Implements list with the correct events for a List Mode + */ + virtual void DoImplements(Module* m) { - List[I_OnChannelDelete] = List[I_OnSyncChannel] = List[I_OnCleanup] = List[I_OnRehash] = 1; + Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnCleanup, I_OnRehash, I_OnRequest }; + ServerInstance->Modules->Attach(eventlist, m, 5); } - virtual ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + /** Handle the list mode. + * See mode.h + */ + virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding, bool servermode) { // Try and grab the list modelist* el; @@ -218,11 +295,11 @@ class ListModeBase : public ModeHandler // Check if the item already exists in the list for (modelist::iterator it = el->begin(); it != el->end(); it++) { - if(parameter == it->mask) + if (parameter == it->mask) { /* Give a subclass a chance to error about this */ TellAlreadyOnList(source, channel, parameter); - + // it does, deny the change return MODEACTION_DENY; } @@ -232,11 +309,11 @@ class ListModeBase : public ModeHandler for (limitlist::iterator it = chanlimits.begin(); it != chanlimits.end(); it++) { - if (match(channel->name, it->mask.c_str())) + if (InspIRCd::Match(channel->name, it->mask)) { // We have a pattern matching the channel... maxsize = el->size(); - if (maxsize < it->limit) + if (IS_LOCAL(source) || (maxsize < it->limit)) { /* Ok, it *could* be allowed, now give someone subclassing us * a chance to validate the parameter. @@ -248,13 +325,13 @@ class ListModeBase : public ModeHandler * 2) 'fix' parameter and then allow * 3) deny */ - if(ValidateParam(source, channel, parameter)) + if (ValidateParam(source, channel, parameter)) { // And now add the mask onto the list... ListItem e; e.mask = parameter; - e.nick = source->nick; - e.time = stringtime(); + e.nick = servermode ? ServerInstance->Config->ServerName : source->nick; + e.time = stringtime(ServerInstance); el->push_back(e); return MODEACTION_ALLOW; @@ -269,13 +346,13 @@ class ListModeBase : public ModeHandler } /* List is full, give subclass a chance to send a custom message */ - if(!TellListTooLong(source, channel, parameter)) + if (!TellListTooLong(source, channel, parameter)) { - source->WriteServ("478 %s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str()); + source->WriteNumeric(478, "%s %s %s :Channel ban/ignore list is full", source->nick.c_str(), channel->name.c_str(), parameter.c_str()); } - + parameter = ""; - return MODEACTION_DENY; + return MODEACTION_DENY; } else { @@ -284,10 +361,10 @@ class ListModeBase : public ModeHandler { for (modelist::iterator it = el->begin(); it != el->end(); it++) { - if(parameter == it->mask) + if (parameter == it->mask) { el->erase(it); - if(el->size() == 0) + if (el->size() == 0) { channel->Shrink(infokey); delete el; @@ -311,66 +388,176 @@ class ListModeBase : public ModeHandler return MODEACTION_DENY; } + /** Get Extensible key for this mode + */ virtual std::string& GetInfoKey() { return infokey; } - virtual void DoChannelDelete(chanrec* chan) + /** Handle channel deletion. + * See modules.h. + * @param chan Channel being deleted + */ + virtual void DoChannelDelete(Channel* chan) { - modelist* list; - chan->GetExt(infokey, list); + modelist* mlist; + chan->GetExt(infokey, mlist); - if (list) + if (mlist) { chan->Shrink(infokey); - delete list; + delete mlist; } } - virtual void DoSyncChannel(chanrec* chan, Module* proto, void* opaque) + /** Syncronize channel item list with another server. + * See modules.h + * @param chan Channel to syncronize + * @param proto Protocol module pointer + * @param opaque Opaque connection handle + */ + virtual void DoSyncChannel(Channel* chan, Module* proto, void* opaque) { - modelist* list; - chan->GetExt(infokey, list); - irc::modestacker modestack(true); + modelist* mlist; + chan->GetExt(infokey, mlist); + irc::modestacker modestack(ServerInstance, true); std::deque stackresult; - if (list) + std::deque types; + types.push_back(TR_TEXT); + if (mlist) { - for (modelist::iterator it = list->begin(); it != list->end(); it++) + for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++) { modestack.Push(std::string(1, mode)[0], it->mask); } } while (modestack.GetStackedLine(stackresult)) { - irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1); - std::string line = mode_join.GetJoined(); - proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, line); + types.assign(stackresult.size(), this->GetTranslateType()); + proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, stackresult, types); } } - virtual void DoCleanup(int target_type, void* item) + /** Clean up module on unload + * @param target_type Type of target to clean + * @param item Item to clean + */ + virtual void DoCleanup(int, void*) { } - - virtual bool ValidateParam(userrec* source, chanrec* channel, std::string ¶meter) + + /** Validate parameters. + * Overridden by implementing module. + * @param source Source user adding the parameter + * @param channel Channel the parameter is being added to + * @param parameter The actual parameter being added + * @return true if the parameter is valid + */ + virtual bool ValidateParam(User*, Channel*, std::string&) { return true; } - - virtual bool TellListTooLong(userrec* source, chanrec* channel, std::string ¶meter) + + /** Tell the user the list is too long. + * Overridden by implementing module. + * @param source Source user adding the parameter + * @param channel Channel the parameter is being added to + * @param parameter The actual parameter being added + * @return Ignored + */ + virtual bool TellListTooLong(User*, Channel*, std::string&) { return false; } - - virtual void TellAlreadyOnList(userrec* source, chanrec* channel, std::string ¶meter) + + /** Tell the user an item is already on the list. + * Overridden by implementing module. + * @param source Source user adding the parameter + * @param channel Channel the parameter is being added to + * @param parameter The actual parameter being added + */ + virtual void TellAlreadyOnList(User*, Channel*, std::string&) { } - - virtual void TellNotSet(userrec* source, chanrec* channel, std::string ¶meter) + + /** Tell the user that the parameter is not in the list. + * Overridden by implementing module. + * @param source Source user removing the parameter + * @param channel Channel the parameter is being removed from + * @param parameter The actual parameter being removed + */ + virtual void TellNotSet(User*, Channel*, std::string&) + { + } + + virtual const char* DoOnRequest(Request* request) { - + ListModeRequest* LM = (ListModeRequest*)request; + if (strcmp("LM_CHECKLIST", request->GetId()) == 0) + { + modelist* mlist; + LM->chan->GetExt(GetInfoKey(), mlist); + if (mlist) + { + std::string mask = LM->user->nick + "!" + LM->user->ident + "@" + LM->user->GetIPString(); + for (modelist::iterator it = mlist->begin(); it != mlist->end(); ++it) + { + if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask))) + return it->mask.c_str(); + } + return NULL; + } + } + else if (strcmp("LM_CHECKLIST_EX", request->GetId()) == 0) + { + modelist* mlist; + LM->chan->GetExt(GetInfoKey(), mlist); + + if (mlist) + { + if (LM->user) + { + LM->literal = LM->user->nick + "!" + LM->user->ident + "@" + LM->user->GetIPString(); + } + + for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++) + { + if (LM->extban && it->mask.length() > 1 && it->mask[0] == LM->extban && it->mask[1] == ':') + { + std::string ext = it->mask.substr(2); + if (LM->user) + { + if (InspIRCd::Match(LM->user->GetFullRealHost(), ext) || InspIRCd::Match(LM->user->GetFullHost(), ext) || (InspIRCd::MatchCIDR(LM->literal, ext))) + { + return it->mask.c_str(); + } + } + else if (InspIRCd::Match(LM->literal, ext)) + { + return it->mask.c_str(); + } + } + else + { + if (LM->user) + { + if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(LM->literal, it->mask))) + { + return it->mask.c_str(); + } + } + else if (InspIRCd::Match(LM->literal, it->mask)) + { + return it->mask.c_str(); + } + } + } + } + } + return NULL; } + }; #endif