X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fu_listmode.h;h=4b8ffe9e07f6d0685141b016a3e6d81cc473bd81;hb=01c23b31f7d0ea87052cd22814af826ecb11f0f3;hp=baf7367450f39e1ec7ee4ac7f4243dcd0db44e7b;hpb=3868abe87d9c21db9998b17ee296e603da4d6855;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/u_listmode.h b/include/u_listmode.h index baf736745..4b8ffe9e0 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 - * 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. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -14,29 +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" - -/* 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 - */ - /** Get the time as a string */ -inline std::string stringtime() +inline std::string stringtime(InspIRCd* Instance) { std::ostringstream TIME; - TIME << time(NULL); + TIME << Instance->Time(); return TIME.str(); } @@ -46,7 +29,7 @@ class ListItem : public classbase { public: std::string nick; - irc::string mask; + std::string mask; std::string time; }; @@ -61,27 +44,54 @@ public: /** Items stored in the channel's list */ -typedef std::vector modelist; +typedef std::list modelist; /** Max items per channel by name */ -typedef std::vector limitlist; +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 true if the user is on the 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, userrec* u, chanrec* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c) + ListModeRequest(Module* sender, Module* target, User* u, Channel* c) : Request(sender, target, "LM_CHECKLIST"), user(u), literal(""), extban(0), 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) { } @@ -97,15 +107,12 @@ class ListModeRequest : public Request class ListModeBase : public ModeHandler { protected: - /** Storage key - */ - std::string infokey; /** Numeric to use when outputting the list */ - std::string listnumeric; + unsigned int listnumeric; /** Numeric to indicate end of list */ - std::string endoflistnumeric; + unsigned int endoflistnumeric; /** String to send for end of list */ std::string endofliststring; @@ -114,13 +121,17 @@ class ListModeBase : public ModeHandler bool tidy; /** Config tag to check for max items per channel */ - std::string configtag; + std::string configtag; /** Limits on a per-channel basis read from the tag * specified in ListModeBase::configtag */ limitlist chanlimits; - + public: + /** Storage key + */ + SimpleExtItem extItem; + /** Constructor. * @param Instance The creator of this class * @param modechar Mode character @@ -130,19 +141,21 @@ class ListModeBase : public ModeHandler * @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, const std::string &lnum, const std::string &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) + ListModeBase(InspIRCd* Instance, Module* Creator, char modechar, const std::string &eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy, const std::string &ctag = "banlist") + : ModeHandler(Creator, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL), + listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy), + configtag(ctag), extItem("listbase_mode_" + std::string(1, mode) + "_list", Creator) { + list = true; this->DoRehash(); - infokey = "listbase_mode_" + std::string(1, mode) + "_list"; + Extensible::Register(&extItem); } - /** See mode.h + /** See mode.h */ - std::pair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + std::pair ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { - modelist* el; - channel->GetExt(infokey, el); + modelist* el = extItem.get(channel); if (el) { for (modelist::iterator it = el->begin(); it != el->end(); it++) @@ -160,56 +173,60 @@ class ListModeBase : public ModeHandler * @param user The user to send the list to * @param channel The channel the user is requesting the list for */ - virtual void DisplayList(userrec* user, chanrec* channel) + virtual void DisplayList(User* user, Channel* channel) { - modelist* el; - channel->GetExt(infokey, el); + modelist* el = extItem.get(channel); if (el) { 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 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(chanrec* channel) + virtual void RemoveMode(Channel* channel, irc::modestacker* stack) { - modelist* el; - channel->GetExt(infokey, el); + modelist* el = extItem.get(channel); if (el) { - irc::modestacker modestack(false); - std::deque stackresult; - const char* mode_junk[MAXMODES+2]; - mode_junk[0] = channel->name; - userrec* n = new userrec(ServerInstance); - n->SetFd(FD_MAGIC_NUMBER); + irc::modestacker modestack(ServerInstance, false); + for (modelist::iterator it = el->begin(); it != el->end(); it++) { - modestack.Push(this->GetModeChar(), assign(it->mask)); + if (stack) + stack->Push(this->GetModeChar(), it->mask); + else + modestack.Push(this->GetModeChar(), it->mask); } + + if (stack) + return; + + std::vector stackresult; + stackresult.push_back(channel->name); while (modestack.GetStackedLine(stackresult)) { - for (size_t j = 0; j < stackresult.size(); j++) - { - mode_junk[j+1] = stackresult[j].c_str(); - } - ServerInstance->SendMode(mode_junk, stackresult.size() + 1, n); + ServerInstance->SendMode(stackresult, ServerInstance->FakeClient); + stackresult.clear(); + stackresult.push_back(channel->name); } - - delete n; } } /** See mode.h */ - virtual void RemoveMode(userrec* user) + virtual void RemoveMode(User*, irc::modestacker* stack) { /* Listmodes dont get set on users */ } @@ -243,19 +260,19 @@ class ListModeBase : public ModeHandler /** Populate the Implements list with the correct events for a List Mode */ - virtual void DoImplements(char* List) + 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); } /** Handle the list mode. * See mode.h */ - virtual ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding) { // Try and grab the list - modelist* el; - channel->GetExt(infokey, el); + modelist* el = extItem.get(channel); if (adding) { @@ -264,7 +281,7 @@ class ListModeBase : public ModeHandler { // Make one el = new modelist; - channel->Extend(infokey, el); + extItem.set(channel, el); } // Clean the mask up @@ -278,7 +295,7 @@ class ListModeBase : public ModeHandler { /* Give a subclass a chance to error about this */ TellAlreadyOnList(source, channel, parameter); - + // it does, deny the change return MODEACTION_DENY; } @@ -288,11 +305,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. @@ -308,9 +325,9 @@ class ListModeBase : public ModeHandler { // And now add the mask onto the list... ListItem e; - e.mask = assign(parameter); + e.mask = parameter; e.nick = source->nick; - e.time = stringtime(); + e.time = stringtime(ServerInstance); el->push_back(e); return MODEACTION_ALLOW; @@ -327,11 +344,11 @@ class ListModeBase : public ModeHandler /* List is full, give subclass a chance to send a custom message */ 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 { @@ -345,8 +362,7 @@ class ListModeBase : public ModeHandler el->erase(it); if (el->size() == 0) { - channel->Shrink(infokey); - delete el; + extItem.unset(channel); } return MODEACTION_ALLOW; } @@ -367,53 +383,31 @@ class ListModeBase : public ModeHandler return MODEACTION_DENY; } - /** Get Extensible key for this mode - */ - virtual std::string& GetInfoKey() - { - return infokey; - } - - /** Handle channel deletion. - * See modules.h. - * @param chan Channel being deleted - */ - virtual void DoChannelDelete(chanrec* chan) - { - modelist* list; - chan->GetExt(infokey, list); - - if (list) - { - chan->Shrink(infokey); - delete list; - } - } - /** 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(chanrec* chan, Module* proto, void* opaque) + virtual void DoSyncChannel(Channel* chan, Module* proto, void* opaque) { - modelist* list; - chan->GetExt(infokey, list); - irc::modestacker modestack(true); - std::deque stackresult; - if (list) + modelist* mlist = extItem.get(chan); + irc::modestacker modestack(ServerInstance, true); + std::vector stackresult; + std::vector 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], assign(it->mask)); + 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); + stackresult.clear(); } } @@ -421,10 +415,10 @@ class ListModeBase : public ModeHandler * @param target_type Type of target to clean * @param item Item to clean */ - virtual void DoCleanup(int target_type, void* item) + virtual void DoCleanup(int, void*) { } - + /** Validate parameters. * Overridden by implementing module. * @param source Source user adding the parameter @@ -432,11 +426,11 @@ class ListModeBase : public ModeHandler * @param parameter The actual parameter being added * @return true if the parameter is valid */ - virtual bool ValidateParam(userrec* source, chanrec* channel, std::string ¶meter) + virtual bool ValidateParam(User*, Channel*, std::string&) { return true; } - + /** Tell the user the list is too long. * Overridden by implementing module. * @param source Source user adding the parameter @@ -444,31 +438,96 @@ class ListModeBase : public ModeHandler * @param parameter The actual parameter being added * @return Ignored */ - virtual bool TellListTooLong(userrec* source, chanrec* channel, std::string ¶meter) + virtual bool TellListTooLong(User*, Channel*, std::string&) { return false; } - + /** 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(userrec* source, chanrec* channel, std::string ¶meter) + virtual void TellAlreadyOnList(User*, Channel*, std::string&) { } - + /** 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(userrec* source, chanrec* channel, std::string ¶meter) + 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 = extItem.get(LM->chan); + 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 = extItem.get(LM->chan); + + 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 -