-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2005-2009 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2004-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
*
- * ---------------------------------------------------
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-using namespace std;
#include "inspircd.h"
-#include "users.h"
-#include "modules.h"
-#include "wildcard.h"
#include "xline.h"
-#include "cull_list.h"
-/* Version two, now with optimized expiry!
+/** An XLineFactory specialized to generate GLine* pointers
+ */
+class GLineFactory : public XLineFactory
+{
+ public:
+ GLineFactory() : XLineFactory("G") { }
+
+ /** Generate a GLine
+ */
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+ {
+ IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
+ return new GLine(set_time, duration, source, reason, ih.first, ih.second);
+ }
+};
+
+/** An XLineFactory specialized to generate ELine* pointers
+ */
+class ELineFactory : public XLineFactory
+{
+ public:
+ ELineFactory() : XLineFactory("E") { }
+
+ /** Generate an ELine
+ */
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+ {
+ IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
+ return new ELine(set_time, duration, source, reason, ih.first, ih.second);
+ }
+};
+
+/** An XLineFactory specialized to generate KLine* pointers
+ */
+class KLineFactory : public XLineFactory
+{
+ public:
+ KLineFactory() : XLineFactory("K") { }
+
+ /** Generate a KLine
+ */
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+ {
+ IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
+ return new KLine(set_time, duration, source, reason, ih.first, ih.second);
+ }
+};
+
+/** An XLineFactory specialized to generate QLine* pointers
+ */
+class QLineFactory : public XLineFactory
+{
+ public:
+ QLineFactory() : XLineFactory("Q") { }
+
+ /** Generate a QLine
+ */
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+ {
+ return new QLine(set_time, duration, source, reason, xline_specific_mask);
+ }
+};
+
+/** An XLineFactory specialized to generate ZLine* pointers
+ */
+class ZLineFactory : public XLineFactory
+{
+ public:
+ ZLineFactory() : XLineFactory("Z") { }
+
+ /** Generate a ZLine
+ */
+ XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+ {
+ return new ZLine(set_time, duration, source, reason, xline_specific_mask);
+ }
+};
+
+
+/*
+ * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and
+ * efficient as we can this time so we can close this file and never ever touch it again ..
+ *
+ * Background:
+ * Version 1 stored all line types in one list (one for g, one for z, etc). This was fine,
+ * but both version 1 and 2 suck at applying lines efficiently. That is, every time a new line
+ * was added, it iterated every existing line for every existing user. Ow. Expiry was also
+ * expensive, as the lists were NOT sorted.
+ *
+ * Version 2 moved permanent lines into a seperate list from non-permanent to help optimize
+ * matching speed, but matched in the same way.
+ * Expiry was also sped up by sorting the list by expiry (meaning just remove the items at the
+ * head of the list that are outdated.)
*
- * Because the old way was horrendously slow, the new way of expiring xlines is very
- * very efficient. I have improved the efficiency of the algorithm in two ways:
+ * This was fine and good, but it looked less than ideal in code, and matching was still slower
+ * than it could have been, something which we address here.
*
- * (1) There are now two lists of items for each linetype. One list holds temporary
- * items, and the other list holds permanent items (ones which will expire).
- * Items which are on the permanent list are NEVER checked at all by the
- * expire_lines() function.
- * (2) The temporary xline lists are always kept in strict numerical order, keyed by
- * current time + duration. This means that the line which is due to expire the
- * soonest is always pointed at by vector::begin(), so a simple while loop can
- * very efficiently, very quickly and above all SAFELY pick off the first few
- * items in the vector which need zapping.
+ * VERSION 3:
+ * All lines are (as in v1) stored together -- no seperation of perm and non-perm. They are stored in
+ * a map of maps (first map is line type, second map is for quick lookup on add/delete/etc).
*
- * -- Brain
+ * Expiry is *no longer* performed on a timer, and no longer uses a sorted list of any variety. This
+ * is now done by only checking for expiry when a line is accessed, meaning that expiry is no longer
+ * a resource intensive problem.
+ *
+ * Application no longer tries to apply every single line on every single user - instead, now only lines
+ * added since the previous application are applied. This keeps S2S ADDLINE during burst nice and fast,
+ * while at the same time not slowing things the fuck down when we try adding a ban with lots of preexisting
+ * bans. :)
*/
-bool InitXLine(ServerConfig* conf, const char* tag)
+bool XLine::Matches(User *u)
{
- return true;
+ return false;
}
-bool DoneXLine(ServerConfig* conf, const char* tag)
+/*
+ * Checks what users match a given vector of ELines and sets their ban exempt flag accordingly.
+ */
+void XLineManager::CheckELines()
{
- conf->GetInstance()->XLines->apply_lines(APPLY_ALL);
- return true;
-}
+ ContainerIter n = lookup_lines.find("E");
-bool DoZLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
-{
- char* reason = (char*)values[0];
- char* ipmask = (char*)values[1];
-
- conf->GetInstance()->XLines->add_zline(0,"<Config>",reason,ipmask);
- conf->GetInstance()->Log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
- return true;
+ if (n == lookup_lines.end())
+ return;
+
+ XLineLookup& ELines = n->second;
+
+ if (ELines.empty())
+ return;
+
+ const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+ for (UserManager::LocalList::const_iterator u2 = list.begin(); u2 != list.end(); u2++)
+ {
+ LocalUser* u = *u2;
+
+ /* This uses safe iteration to ensure that if a line expires here, it doenst trash the iterator */
+ LookupIter safei;
+
+ for (LookupIter i = ELines.begin(); i != ELines.end(); )
+ {
+ safei = i;
+ safei++;
+
+ XLine *e = i->second;
+ u->exempt = e->Matches(u);
+
+ i = safei;
+ }
+ }
}
-bool DoQLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+
+XLineLookup* XLineManager::GetAll(const std::string &type)
{
- char* reason = (char*)values[0];
- char* nick = (char*)values[1];
-
- conf->GetInstance()->XLines->add_qline(0,"<Config>",reason,nick);
- conf->GetInstance()->Log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
- return true;
+ ContainerIter n = lookup_lines.find(type);
+
+ if (n == lookup_lines.end())
+ return NULL;
+
+ LookupIter safei;
+ const time_t current = ServerInstance->Time();
+
+ /* Expire any dead ones, before sending */
+ for (LookupIter x = n->second.begin(); x != n->second.end(); )
+ {
+ safei = x;
+ safei++;
+ if (x->second->duration && current > x->second->expiry)
+ {
+ ExpireLine(n, x);
+ }
+ x = safei;
+ }
+
+ return &(n->second);
}
-bool DoKLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+void XLineManager::DelAll(const std::string &type)
{
- char* reason = (char*)values[0];
- char* host = (char*)values[1];
-
- conf->GetInstance()->XLines->add_kline(0,"<Config>",reason,host);
- conf->GetInstance()->Log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
- return true;
+ ContainerIter n = lookup_lines.find(type);
+
+ if (n == lookup_lines.end())
+ return;
+
+ LookupIter x;
+
+ /* Delete all of a given type (this should probably use DelLine, but oh well) */
+ while ((x = n->second.begin()) != n->second.end())
+ {
+ ExpireLine(n, x);
+ }
}
-bool DoELine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+std::vector<std::string> XLineManager::GetAllTypes()
{
- char* reason = (char*)values[0];
- char* host = (char*)values[1];
-
- conf->GetInstance()->XLines->add_eline(0,"<Config>",reason,host);
- conf->GetInstance()->Log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
- return true;
+ std::vector<std::string> items;
+ for (ContainerIter x = lookup_lines.begin(); x != lookup_lines.end(); ++x)
+ items.push_back(x->first);
+ return items;
}
IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
n.second = ident_and_host.substr(x + 1,ident_and_host.length());
n.first = ident_and_host.substr(0, x);
if (!n.first.length())
- n.first = "*";
+ n.first.assign("*");
if (!n.second.length())
- n.second = "*";
+ n.second.assign("*");
}
else
{
+ n.first.clear();
n.second = ident_and_host;
}
return n;
}
-// adds a g:line
+// adds a line
-bool XLineManager::add_gline(long duration, const char* source,const char* reason,const char* hostmask)
+bool XLineManager::AddLine(XLine* line, User* user)
{
- IdentHostPair ih = IdentSplit(hostmask);
+ if (line->duration && ServerInstance->Time() > line->expiry)
+ return false; // Don't apply expired XLines.
- bool ret = del_gline(hostmask);
-
- GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
-
- if (duration)
+ /* Don't apply duplicate xlines */
+ ContainerIter x = lookup_lines.find(line->type);
+ if (x != lookup_lines.end())
{
- glines.push_back(item);
- sort(glines.begin(), glines.end(),XLineManager::GSortComparison);
- }
- else
- {
- pglines.push_back(item);
+ LookupIter i = x->second.find(line->Displayable().c_str());
+ if (i != x->second.end())
+ {
+ // XLine propagation bug was here, if the line to be added already exists and
+ // it's expired then expire it and add the new one instead of returning false
+ if ((!i->second->duration) || (ServerInstance->Time() < i->second->expiry))
+ return false;
+
+ ExpireLine(x, i);
+ }
}
-
- return !ret;
-}
-// adds an e:line (exception to bans)
+ /*ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
+ XLineFactory* xlf = GetFactory(line->type);
+ if (!xlf)
+ return false;
-bool XLineManager::add_eline(long duration, const char* source, const char* reason, const char* hostmask)
-{
- IdentHostPair ih = IdentSplit(hostmask);
+ ServerInstance->BanCache.RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
- bool ret = del_eline(hostmask);
+ if (xlf->AutoApplyToUserList(line))
+ pending_lines.push_back(line);
- ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
+ lookup_lines[line->type][line->Displayable().c_str()] = line;
+ line->OnAdd();
- if (duration)
- {
- elines.push_back(item);
- sort(elines.begin(), elines.end(),XLineManager::ESortComparison);
- }
- else
- {
- pelines.push_back(item);
- }
- return !ret;
+ FOREACH_MOD(OnAddLine, (user, line));
+
+ return true;
}
-// adds a q:line
+// deletes a line, returns true if the line existed and was removed
-bool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname)
+bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate)
{
- bool ret = del_qline(nickname);
- QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname);
+ ContainerIter x = lookup_lines.find(type);
- if (duration)
- {
- qlines.push_back(item);
- sort(qlines.begin(), qlines.end(),XLineManager::QSortComparison);
- }
- else
- {
- pqlines.push_back(item);
- }
- return !ret;
-}
-
-// adds a z:line
+ if (x == lookup_lines.end())
+ return false;
-bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
-{
- bool ret = del_zline(ipaddr);
+ LookupIter y = x->second.find(hostmask);
- if (strchr(ipaddr,'@'))
- {
- while (*ipaddr != '@')
- ipaddr++;
- ipaddr++;
- }
+ if (y == x->second.end())
+ return false;
- ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr);
+ if (simulate)
+ return true;
- if (duration)
- {
- zlines.push_back(item);
- sort(zlines.begin(), zlines.end(),XLineManager::ZSortComparison);
- }
- else
- {
- pzlines.push_back(item);
- }
- return !ret;
-}
+ ServerInstance->BanCache.RemoveEntries(y->second->type, true);
-// adds a k:line
+ FOREACH_MOD(OnDelLine, (user, y->second));
-bool XLineManager::add_kline(long duration, const char* source, const char* reason, const char* hostmask)
-{
- IdentHostPair ih = IdentSplit(hostmask);
+ y->second->Unset();
- bool ret = del_kline(hostmask);
+ stdalgo::erase(pending_lines, y->second);
- KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
+ delete y->second;
+ x->second.erase(y);
- if (duration)
- {
- klines.push_back(item);
- sort(klines.begin(), klines.end(),XLineManager::KSortComparison);
- }
- else
- {
- pklines.push_back(item);
- }
- return !ret;
+ return true;
}
-// deletes a g:line, returns true if the line existed and was removed
-bool XLineManager::del_gline(const char* hostmask)
+void ELine::Unset()
{
- IdentHostPair ih = IdentSplit(hostmask);
- for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
+ /* remove exempt from everyone and force recheck after deleting eline */
+ const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+ for (UserManager::LocalList::const_iterator u2 = list.begin(); u2 != list.end(); u2++)
{
- if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
- {
- delete *i;
- glines.erase(i);
- return true;
- }
+ LocalUser* u = *u2;
+ u->exempt = false;
}
- for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)
- {
- if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
- {
- delete *i;
- pglines.erase(i);
- return true;
- }
- }
- return false;
+
+ ServerInstance->XLines->CheckELines();
}
-// deletes a e:line, returns true if the line existed and was removed
+// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
-bool XLineManager::del_eline(const char* hostmask)
+XLine* XLineManager::MatchesLine(const std::string &type, User* user)
{
- IdentHostPair ih = IdentSplit(hostmask);
- for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
+ ContainerIter x = lookup_lines.find(type);
+
+ if (x == lookup_lines.end())
+ return NULL;
+
+ const time_t current = ServerInstance->Time();
+
+ LookupIter safei;
+
+ for (LookupIter i = x->second.begin(); i != x->second.end(); )
{
- if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
+ safei = i;
+ safei++;
+
+ if (i->second->duration && current > i->second->expiry)
{
- delete *i;
- elines.erase(i);
- return true;
+ /* Expire the line, proceed to next one */
+ ExpireLine(x, i);
+ i = safei;
+ continue;
}
- }
- for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
- {
- if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
+
+ if (i->second->Matches(user))
{
- delete *i;
- pelines.erase(i);
- return true;
+ return i->second;
}
+
+ i = safei;
}
- return false;
+ return NULL;
}
-// deletes a q:line, returns true if the line existed and was removed
-
-bool XLineManager::del_qline(const char* nickname)
+XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern)
{
- for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
- {
- if (!strcasecmp(nickname,(*i)->nick))
- {
- delete *i;
- qlines.erase(i);
- return true;
- }
- }
- for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
+ ContainerIter x = lookup_lines.find(type);
+
+ if (x == lookup_lines.end())
+ return NULL;
+
+ const time_t current = ServerInstance->Time();
+
+ LookupIter safei;
+
+ for (LookupIter i = x->second.begin(); i != x->second.end(); )
{
- if (!strcasecmp(nickname,(*i)->nick))
+ safei = i;
+ safei++;
+
+ if (i->second->Matches(pattern))
{
- delete *i;
- pqlines.erase(i);
- return true;
+ if (i->second->duration && current > i->second->expiry)
+ {
+ /* Expire the line, return nothing */
+ ExpireLine(x, i);
+ /* See above */
+ i = safei;
+ continue;
+ }
+ else
+ return i->second;
}
+
+ i = safei;
}
- return false;
+ return NULL;
}
-// deletes a z:line, returns true if the line existed and was removed
-
-bool XLineManager::del_zline(const char* ipaddr)
+// removes lines that have expired
+void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
{
- for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
- {
- if (!strcasecmp(ipaddr,(*i)->ipaddr))
- {
- delete *i;
- zlines.erase(i);
- return true;
- }
- }
- for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
- {
- if (!strcasecmp(ipaddr,(*i)->ipaddr))
- {
- delete *i;
- pzlines.erase(i);
- return true;
- }
- }
- return false;
+ FOREACH_MOD(OnExpireLine, (item->second));
+
+ item->second->DisplayExpiry();
+ item->second->Unset();
+
+ /* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line
+ * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending?
+ * -- Brain
+ */
+ stdalgo::erase(pending_lines, item->second);
+
+ delete item->second;
+ container->second.erase(item);
}
-// deletes a k:line, returns true if the line existed and was removed
-bool XLineManager::del_kline(const char* hostmask)
+// applies lines, removing clients and changing nicks etc as applicable
+void XLineManager::ApplyLines()
{
- IdentHostPair ih = IdentSplit(hostmask);
- for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
- {
- if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
- {
- delete *i;
- klines.erase(i);
- return true;
- }
- }
- for (std::vector<KLine*>::iterator i = pklines.begin(); i != pklines.end(); i++)
+ const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+ for (UserManager::LocalList::const_iterator j = list.begin(); j != list.end(); ++j)
{
- if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
+ LocalUser* u = *j;
+
+ // Don't ban people who are exempt.
+ if (u->exempt)
+ continue;
+
+ for (std::vector<XLine *>::iterator i = pending_lines.begin(); i != pending_lines.end(); i++)
{
- delete *i;
- pklines.erase(i);
- return true;
+ XLine *x = *i;
+ if (x->Matches(u))
+ x->Apply(u);
}
}
- return false;
-}
-// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
+ pending_lines.clear();
+}
-QLine* XLineManager::matches_qline(const char* nick)
+void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, string_list &results)
{
- if ((qlines.empty()) && (pqlines.empty()))
- return NULL;
- for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
- if (match(nick,(*i)->nick))
- return (*i);
- for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
- if (match(nick,(*i)->nick))
- return (*i);
- return NULL;
-}
+ ContainerIter n = lookup_lines.find(type);
-// returns a pointer to the reason if a host matches a gline, NULL if it didnt match
+ time_t current = ServerInstance->Time();
-GLine* XLineManager::matches_gline(userrec* user)
-{
- if ((glines.empty()) && (pglines.empty()))
- return NULL;
- for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
- {
- if ((match(user->ident,(*i)->identmask)))
- {
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
- {
- return (*i);
- }
- }
- }
- for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)
+ LookupIter safei;
+
+ if (n != lookup_lines.end())
{
- if ((match(user->ident,(*i)->identmask)))
+ XLineLookup& list = n->second;
+ for (LookupIter i = list.begin(); i != list.end(); )
{
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ safei = i;
+ safei++;
+
+ if (i->second->duration && current > i->second->expiry)
{
- return (*i);
+ ExpireLine(n, i);
}
+ else
+ results.push_back(ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+
+ ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+i->second->source+" :"+i->second->reason);
+ i = safei;
}
}
- return NULL;
}
-ELine* XLineManager::matches_exception(userrec* user)
-{
- if ((elines.empty()) && (pelines.empty()))
- return NULL;
- char host2[MAXBUF];
- snprintf(host2,MAXBUF,"*@%s",user->host);
- for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
+
+XLineManager::XLineManager()
+{
+ GLineFactory* GFact;
+ ELineFactory* EFact;
+ KLineFactory* KFact;
+ QLineFactory* QFact;
+ ZLineFactory* ZFact;
+
+
+ GFact = new GLineFactory;
+ EFact = new ELineFactory;
+ KFact = new KLineFactory;
+ QFact = new QLineFactory;
+ ZFact = new ZLineFactory;
+
+ RegisterFactory(GFact);
+ RegisterFactory(EFact);
+ RegisterFactory(KFact);
+ RegisterFactory(QFact);
+ RegisterFactory(ZFact);
+}
+
+XLineManager::~XLineManager()
+{
+ const char gekqz[] = "GEKQZ";
+ for(unsigned int i=0; i < sizeof(gekqz); i++)
{
- if ((match(user->ident,(*i)->identmask)))
- {
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
- {
- return (*i);
- }
- }
+ XLineFactory* xlf = GetFactory(std::string(1, gekqz[i]));
+ delete xlf;
}
- for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
+
+ // Delete all existing XLines
+ for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++)
{
- if ((match(user->ident,(*i)->identmask)))
+ for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++)
{
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
- {
- return (*i);
- }
+ delete j->second;
}
}
- return NULL;
}
+void XLine::Apply(User* u)
+{
+}
-void XLineManager::gline_set_creation_time(const char* host, time_t create_time)
+bool XLine::IsBurstable()
{
- for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
- {
- if (!strcasecmp(host,(*i)->hostmask))
- {
- (*i)->set_time = create_time;
- (*i)->expiry = create_time + (*i)->duration;
- return;
- }
- }
- for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)
- {
- if (!strcasecmp(host,(*i)->hostmask))
- {
- (*i)->set_time = create_time;
- return;
- }
- }
- return ;
+ return true;
}
-void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
+void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
{
- for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
- {
- if (!strcasecmp(host,(*i)->hostmask))
- {
- (*i)->set_time = create_time;
- (*i)->expiry = create_time + (*i)->duration;
- return;
- }
- }
- for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
+ const std::string banReason = line + "-Lined: " + reason;
+
+ if (!ServerInstance->Config->XLineMessage.empty())
+ u->WriteNumeric(ERR_YOUREBANNEDCREEP, ServerInstance->Config->XLineMessage);
+
+ if (ServerInstance->Config->HideBans)
+ ServerInstance->Users->QuitUser(u, line + "-Lined", &banReason);
+ else
+ ServerInstance->Users->QuitUser(u, banReason);
+
+
+ if (bancache)
{
- if (!strcasecmp(host,(*i)->hostmask))
- {
- (*i)->set_time = create_time;
- return;
- }
+ ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString());
+ ServerInstance->BanCache.AddHit(u->GetIPString(), this->type, banReason, this->duration);
}
- return;
}
-void XLineManager::qline_set_creation_time(const char* nick, time_t create_time)
+bool KLine::Matches(User *u)
{
- for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
- {
- if (!strcasecmp(nick,(*i)->nick))
- {
- (*i)->set_time = create_time;
- (*i)->expiry = create_time + (*i)->duration;
- return;
- }
- }
- for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
+ LocalUser* lu = IS_LOCAL(u);
+ if (lu && lu->exempt)
+ return false;
+
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if (!strcasecmp(nick,(*i)->nick))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
- (*i)->set_time = create_time;
- return;
+ return true;
}
}
- return;
+
+ return false;
}
-void XLineManager::zline_set_creation_time(const char* ip, time_t create_time)
+void KLine::Apply(User* u)
{
- for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
- {
- if (!strcasecmp(ip,(*i)->ipaddr))
- {
- (*i)->set_time = create_time;
- (*i)->expiry = create_time + (*i)->duration;
- return;
- }
- }
- for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
+ DefaultApply(u, "K", (this->identmask == "*") ? true : false);
+}
+
+bool GLine::Matches(User *u)
+{
+ LocalUser* lu = IS_LOCAL(u);
+ if (lu && lu->exempt)
+ return false;
+
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if (!strcasecmp(ip,(*i)->ipaddr))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
- (*i)->set_time = create_time;
- return;
+ return true;
}
}
- return;
-}
-// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match
+ return false;
+}
-ZLine* XLineManager::matches_zline(const char* ipaddr)
+void GLine::Apply(User* u)
{
- if ((zlines.empty()) && (pzlines.empty()))
- return NULL;
- for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
- if (match(ipaddr,(*i)->ipaddr, true))
- return (*i);
- for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
- if (match(ipaddr,(*i)->ipaddr, true))
- return (*i);
- return NULL;
+ DefaultApply(u, "G", (this->identmask == "*") ? true : false);
}
-// returns a pointer to the reason if a host matches a kline, NULL if it didnt match
-
-KLine* XLineManager::matches_kline(userrec* user)
+bool ELine::Matches(User *u)
{
- if ((klines.empty()) && (pklines.empty()))
- return NULL;
- for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
- {
- if ((match(user->ident,(*i)->identmask)))
- {
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
- {
- return (*i);
- }
- }
- }
- for (std::vector<KLine*>::iterator i = pklines.begin(); i != pklines.end(); i++)
+ LocalUser* lu = IS_LOCAL(u);
+ if (lu && lu->exempt)
+ return false;
+
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if ((match(user->ident,(*i)->identmask)))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
- if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
- {
- return (*i);
- }
+ return true;
}
}
- return NULL;
-}
-bool XLineManager::GSortComparison ( const GLine* one, const GLine* two )
-{
- return (one->expiry) < (two->expiry);
+ return false;
}
-bool XLineManager::ESortComparison ( const ELine* one, const ELine* two )
+bool ZLine::Matches(User *u)
{
- return (one->expiry) < (two->expiry);
+ LocalUser* lu = IS_LOCAL(u);
+ if (lu && lu->exempt)
+ return false;
+
+ if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr))
+ return true;
+ else
+ return false;
}
-bool XLineManager::ZSortComparison ( const ZLine* one, const ZLine* two )
+void ZLine::Apply(User* u)
{
- return (one->expiry) < (two->expiry);
+ DefaultApply(u, "Z", true);
}
-bool XLineManager::KSortComparison ( const KLine* one, const KLine* two )
+
+bool QLine::Matches(User *u)
{
- return (one->expiry) < (two->expiry);
+ if (InspIRCd::Match(u->nick, this->nick))
+ return true;
+
+ return false;
}
-bool XLineManager::QSortComparison ( const QLine* one, const QLine* two )
+void QLine::Apply(User* u)
{
- return (one->expiry) < (two->expiry);
+ /* Force to uuid on apply of qline, no need to disconnect any more :) */
+ u->ChangeNick(u->uuid);
}
-// removes lines that have expired
-void XLineManager::expire_lines()
+bool ZLine::Matches(const std::string &str)
{
- time_t current = ServerInstance->Time();
+ if (InspIRCd::MatchCIDR(str, this->ipaddr))
+ return true;
+ else
+ return false;
+}
- /* Because we now store all our XLines in sorted order using ((*i)->duration + (*i)->set_time) as a key, this
- * means that to expire the XLines we just need to do a while, picking off the top few until there are
- * none left at the head of the queue that are after the current time.
- */
+bool QLine::Matches(const std::string &str)
+{
+ if (InspIRCd::Match(str, this->nick))
+ return true;
- while ((glines.size()) && (current > (*glines.begin())->expiry))
- {
- std::vector<GLine*>::iterator i = glines.begin();
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);
- glines.erase(i);
- }
+ return false;
+}
- while ((elines.size()) && (current > (*elines.begin())->expiry))
- {
- std::vector<ELine*>::iterator i = elines.begin();
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);
- elines.erase(i);
- }
+bool ELine::Matches(const std::string &str)
+{
+ return (InspIRCd::MatchCIDR(str, matchtext));
+}
- while ((zlines.size()) && (current > (*zlines.begin())->expiry))
- {
- std::vector<ZLine*>::iterator i = zlines.begin();
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",(*i)->ipaddr,(*i)->source,(*i)->duration);
- zlines.erase(i);
- }
+bool KLine::Matches(const std::string &str)
+{
+ return (InspIRCd::MatchCIDR(str.c_str(), matchtext));
+}
- while ((klines.size()) && (current > (*klines.begin())->expiry))
- {
- std::vector<KLine*>::iterator i = klines.begin();
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);
- klines.erase(i);
- }
+bool GLine::Matches(const std::string &str)
+{
+ return (InspIRCd::MatchCIDR(str, matchtext));
+}
- while ((qlines.size()) && (current > (*qlines.begin())->expiry))
+void ELine::OnAdd()
+{
+ /* When adding one eline, only check the one eline */
+ const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+ for (UserManager::LocalList::const_iterator u2 = list.begin(); u2 != list.end(); u2++)
{
- std::vector<QLine*>::iterator i = qlines.begin();
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",(*i)->nick,(*i)->source,(*i)->duration);
- qlines.erase(i);
+ LocalUser* u = *u2;
+ if (this->Matches(u))
+ u->exempt = true;
}
-
}
-// applies lines, removing clients and changing nicks etc as applicable
-
-void XLineManager::apply_lines(const int What)
+void XLine::DisplayExpiry()
{
- char reason[MAXBUF];
-
- if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&
- (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
- return;
+ bool onechar = (type.length() == 1);
+ ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %ld seconds ago)",
+ type.c_str(), (onechar ? "-Line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time));
+}
- CullList* Goners = new CullList(ServerInstance);
- XLine* check = NULL;
- for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
- {
- userrec* u = (userrec*)(*u2);
+const std::string& ELine::Displayable()
+{
+ return matchtext;
+}
- if (elines.size() || pelines.size())
- {
- // ignore people matching exempts
- if (matches_exception(u))
- continue;
- }
- if ((What & APPLY_GLINES) && (glines.size() || pglines.size()))
- {
- if ((check = matches_gline(u)))
- {
- snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
- }
- }
- if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
- {
- if ((check = matches_kline(u)))
- {
- snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
- }
- }
- if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
- {
- if ((check = matches_qline(u->nick)))
- {
- snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
- }
- }
- if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
- {
- if ((check = matches_zline(u->GetIPString())))
- {
- snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
- }
- }
- }
+const std::string& KLine::Displayable()
+{
+ return matchtext;
+}
- Goners->Apply();
- DELETE(Goners);
+const std::string& GLine::Displayable()
+{
+ return matchtext;
}
-void XLineManager::stats_k(userrec* user, string_list &results)
+const std::string& ZLine::Displayable()
{
- std::string sn = ServerInstance->Config->ServerName;
- for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
- results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
- for (std::vector<KLine*>::iterator i = pklines.begin(); i != pklines.end(); i++)
- results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
+ return ipaddr;
}
-void XLineManager::stats_g(userrec* user, string_list &results)
+const std::string& QLine::Displayable()
{
- std::string sn = ServerInstance->Config->ServerName;
- for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
- results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
- for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)
- results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
+ return nick;
}
-void XLineManager::stats_q(userrec* user, string_list &results)
+bool KLine::IsBurstable()
{
- std::string sn = ServerInstance->Config->ServerName;
- for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
- results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
- for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
- results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
+ return false;
}
-void XLineManager::stats_z(userrec* user, string_list &results)
+bool XLineManager::RegisterFactory(XLineFactory* xlf)
{
- std::string sn = ServerInstance->Config->ServerName;
- for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
- results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
- for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
- results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
+ XLineFactMap::iterator n = line_factory.find(xlf->GetType());
+
+ if (n != line_factory.end())
+ return false;
+
+ line_factory[xlf->GetType()] = xlf;
+
+ return true;
}
-void XLineManager::stats_e(userrec* user, string_list &results)
+bool XLineManager::UnregisterFactory(XLineFactory* xlf)
{
- std::string sn = ServerInstance->Config->ServerName;
- for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
- results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
- for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
- results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
+ XLineFactMap::iterator n = line_factory.find(xlf->GetType());
+
+ if (n == line_factory.end())
+ return false;
+
+ line_factory.erase(n);
+
+ return true;
}
-XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance)
+XLineFactory* XLineManager::GetFactory(const std::string &type)
{
+ XLineFactMap::iterator n = line_factory.find(type);
+
+ if (n == line_factory.end())
+ return NULL;
+
+ return n->second;
}
projects / user / henk / code / inspircd.git / blobdiff