* | 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.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
#ifndef INSPIRCD_LISTMODE_PROVIDER
#define INSPIRCD_LISTMODE_PROVIDER
-#include "wildcard.h"
-
/** 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();
}
{
public:
std::string nick;
- irc::string mask;
+ std::string mask;
std::string time;
};
/** Items stored in the channel's list
*/
-typedef std::vector<ListItem> modelist;
+typedef std::list<ListItem> modelist;
/** Max items per channel by name
*/
-typedef std::vector<ListLimit> limitlist;
+typedef std::list<ListLimit> limitlist;
/** A request used to check if a user is on a channel's list or not
*/
{
public:
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, User* u, Channel* 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)
{
}
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;
* specified in ListModeBase::configtag
*/
limitlist chanlimits;
-
+
public:
/** Constructor.
* @param Instance The creator of this class
* @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")
+ 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";
}
- /** See mode.h
+ /** See mode.h
*/
std::pair<bool,std::string> ModeSet(User*, User*, Channel* channel, const std::string ¶meter)
{
{
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->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());
}
/** 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)
+ virtual void RemoveMode(Channel* channel, irc::modestacker* stack)
{
modelist* el;
channel->GetExt(infokey, el);
if (el)
{
- irc::modestacker modestack(false);
+ irc::modestacker modestack(ServerInstance, false);
std::deque<std::string> stackresult;
- const char* mode_junk[MAXMODES+2];
- mode_junk[0] = channel->name;
+ std::vector<std::string> mode_junk;
+ mode_junk.push_back(channel->name);
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;
+
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, ServerInstance->FakeClient);
+ mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
+ ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+ mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
}
}
}
/** See mode.h
*/
- virtual void RemoveMode(User*)
+ virtual void RemoveMode(User*, irc::modestacker* stack)
{
/* Listmodes dont get set on users */
}
*/
virtual void DoImplements(Module* m)
{
- Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnCleanup, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, m, 4);
+ 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(User* source, User*, Channel* channel, std::string ¶meter, bool adding)
+ virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding, bool servermode)
{
// Try and grab the list
modelist* el;
{
/* Give a subclass a chance to error about this */
TellAlreadyOnList(source, channel, parameter);
-
+
// it does, deny the change
return MODEACTION_DENY;
}
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.
{
// And now add the mask onto the list...
ListItem e;
- e.mask = assign(parameter);
- e.nick = source->nick;
- e.time = stringtime();
+ e.mask = parameter;
+ e.nick = servermode ? ServerInstance->Config->ServerName : source->nick;
+ e.time = stringtime(ServerInstance);
el->push_back(e);
return MODEACTION_ALLOW;
/* 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
{
*/
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(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<std::string> stackresult;
- if (list)
+ std::deque<TranslateType> 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);
}
}
virtual void DoCleanup(int, void*)
{
}
-
+
/** Validate parameters.
* Overridden by implementing module.
* @param source Source user adding the parameter
{
return true;
}
-
+
/** Tell the user the list is too long.
* Overridden by implementing module.
* @param source Source user adding the parameter
{
return false;
}
-
+
/** Tell the user an item is already on the list.
* Overridden by implementing module.
* @param source Source user adding the parameter
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
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
-
projects / user / henk / code / inspircd.git / blobdiff