* | Inspire 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.
+ * 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.
*
* ---------------------------------------------------
*/
-using namespace std;
+/* $Core */
#include "inspircd.h"
-#include "users.h"
-#include "modules.h"
-#include "wildcard.h"
#include "xline.h"
-#include "cull_list.h"
+#include "bancache.h"
-/* Version two, now with optimized expiry!
+/*
+ * 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;
-bool DoQLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
-{
- 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;
-}
+ XLineLookup& ELines = n->second;
-bool DoKLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
-{
- 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;
-}
+ if (ELines.empty())
+ return;
-bool DoELine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
-{
- 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;
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+ {
+ User* u = (User*)(*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;
+ }
+ }
}
-// adds a g:line
-bool XLineManager::add_gline(long duration, const char* source,const char* reason,const char* hostmask)
+XLineLookup* XLineManager::GetAll(const std::string &type)
{
- bool ret = del_gline(hostmask);
-
- GLine item;
- item.duration = duration;
- strlcpy(item.hostmask,hostmask,199);
- strlcpy(item.reason,reason,MAXBUF);
- strlcpy(item.source,source,255);
- item.n_matches = 0;
- item.set_time = ServerInstance->Time();
-
- if (duration)
+ 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(); )
{
- glines.push_back(item);
- sort(glines.begin(), glines.end(),XLineManager::GSortComparison);
+ safei = x;
+ safei++;
+ if (x->second->duration && current > x->second->expiry)
+ {
+ ExpireLine(n, x);
+ }
+ x = safei;
}
- else
+
+ return &(n->second);
+}
+
+void XLineManager::DelAll(const std::string &type)
+{
+ 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())
{
- pglines.push_back(item);
+ ExpireLine(n, x);
}
-
- return !ret;
}
-// adds an e:line (exception to bans)
+std::vector<std::string> XLineManager::GetAllTypes()
+{
+ std::vector<std::string> items;
+ for (ContainerIter x = lookup_lines.begin(); x != lookup_lines.end(); ++x)
+ items.push_back(x->first);
+ return items;
+}
-bool XLineManager::add_eline(long duration, const char* source, const char* reason, const char* hostmask)
+IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
{
- bool ret = del_eline(hostmask);
- ELine item;
- item.duration = duration;
- strlcpy(item.hostmask,hostmask,199);
- strlcpy(item.reason,reason,MAXBUF);
- strlcpy(item.source,source,255);
- item.n_matches = 0;
- item.set_time = ServerInstance->Time();
- if (duration)
+ IdentHostPair n = std::make_pair<std::string,std::string>("*","*");
+ std::string::size_type x = ident_and_host.find('@');
+ if (x != std::string::npos)
{
- elines.push_back(item);
- sort(elines.begin(), elines.end(),XLineManager::ESortComparison);
+ 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.assign("*");
+ if (!n.second.length())
+ n.second.assign("*");
}
else
{
- pelines.push_back(item);
+ n.first = "";
+ n.second = ident_and_host;
}
- return !ret;
+
+ return n;
}
-// adds a q:line
+// adds a line
-bool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname)
+bool XLineManager::AddLine(XLine* line, User* user)
{
- bool ret = del_qline(nickname);
- QLine item;
- item.duration = duration;
- strlcpy(item.nick,nickname,63);
- strlcpy(item.reason,reason,MAXBUF);
- strlcpy(item.source,source,255);
- item.n_matches = 0;
- item.is_global = false;
- item.set_time = ServerInstance->Time();
- if (duration)
- {
- qlines.push_back(item);
- sort(qlines.begin(), qlines.end(),XLineManager::QSortComparison);
- }
- else
+ ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
+
+ /* If the line exists, check if its an expired line */
+ ContainerIter x = lookup_lines.find(line->type);
+ if (x != lookup_lines.end())
{
- pqlines.push_back(item);
+ LookupIter i = x->second.find(line->Displayable());
+ if (i != x->second.end())
+ {
+ if (i->second->duration && ServerInstance->Time() > i->second->expiry)
+ ExpireLine(x, i);
+ else
+ return false;
+ }
}
- return !ret;
+
+ /*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
+ XLineFactory* xlf = GetFactory(line->type);
+ if (!xlf)
+ return false;
+
+ if (xlf->AutoApplyToUserList(line))
+ pending_lines.push_back(line);
+
+ lookup_lines[line->type][line->Displayable()] = line;
+ line->OnAdd();
+
+ FOREACH_MOD(I_OnAddLine,OnAddLine(user, line));
+
+ return true;
}
-// adds a z:line
+// deletes a line, returns true if the line existed and was removed
-bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
+bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate)
{
- bool ret = del_zline(ipaddr);
- ZLine item;
- item.duration = duration;
- if (strchr(ipaddr,'@'))
- {
- while (*ipaddr != '@')
- ipaddr++;
- ipaddr++;
- }
- strlcpy(item.ipaddr,ipaddr,39);
- strlcpy(item.reason,reason,MAXBUF);
- strlcpy(item.source,source,255);
- item.n_matches = 0;
- item.is_global = false;
- item.set_time = ServerInstance->Time();
- if (duration)
- {
- zlines.push_back(item);
- sort(zlines.begin(), zlines.end(),XLineManager::ZSortComparison);
- }
- else
- {
- pzlines.push_back(item);
- }
- return !ret;
+ ContainerIter x = lookup_lines.find(type);
+
+ if (x == lookup_lines.end())
+ return false;
+
+ LookupIter y = x->second.find(hostmask);
+
+ if (y == x->second.end())
+ return false;
+
+ if (simulate)
+ return true;
+
+ ServerInstance->BanCache->RemoveEntries(y->second->type, true);
+
+ FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second));
+
+ y->second->Unset();
+
+ std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), y->second);
+ if (pptr != pending_lines.end())
+ pending_lines.erase(pptr);
+
+ delete y->second;
+ x->second.erase(y);
+
+ return true;
}
-// adds a k:line
-bool XLineManager::add_kline(long duration, const char* source, const char* reason, const char* hostmask)
+void ELine::Unset()
{
- bool ret = del_kline(hostmask);
- KLine item;
- item.duration = duration;
- strlcpy(item.hostmask,hostmask,200);
- strlcpy(item.reason,reason,MAXBUF);
- strlcpy(item.source,source,255);
- item.n_matches = 0;
- item.set_time = ServerInstance->Time();
- if (duration)
+ /* remove exempt from everyone and force recheck after deleting eline */
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
- klines.push_back(item);
- sort(klines.begin(), klines.end(),XLineManager::KSortComparison);
+ User* u = (User*)(*u2);
+ u->exempt = false;
}
- else
- {
- pklines.push_back(item);
- }
- return !ret;
+
+ ServerInstance->XLines->CheckELines();
}
-// deletes a g: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_gline(const char* hostmask)
+XLine* XLineManager::MatchesLine(const std::string &type, User* user)
{
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.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(hostmask,i->hostmask))
+ safei = i;
+ safei++;
+
+ if (i->second->Matches(user))
{
- glines.erase(i);
- return true;
+ if (i->second->duration && current > i->second->expiry)
+ {
+ /* Expire the line, return nothing */
+ ExpireLine(x, i);
+ /* Continue, there may be another that matches
+ * (thanks aquanight)
+ */
+ i = safei;
+ continue;
+ }
+ else
+ return i->second;
}
+
+ i = safei;
}
- for (std::vector<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
+ return NULL;
+}
+
+XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern)
+{
+ 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(hostmask,i->hostmask))
+ safei = i;
+ safei++;
+
+ if (i->second->Matches(pattern))
{
- pglines.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 e:line, returns true if the line existed and was removed
+// removes lines that have expired
+void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
+{
+ FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second));
-bool XLineManager::del_eline(const char* hostmask)
+ 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
+ */
+ std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second);
+ if (pptr != pending_lines.end())
+ pending_lines.erase(pptr);
+
+ delete item->second;
+ container->second.erase(item);
+}
+
+
+// applies lines, removing clients and changing nicks etc as applicable
+void XLineManager::ApplyLines()
{
- for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
- if (!strcasecmp(hostmask,i->hostmask))
+ User* u = (User*)(*u2);
+
+ for (std::vector<XLine *>::iterator i = pending_lines.begin(); i != pending_lines.end(); i++)
{
- elines.erase(i);
- return true;
+ XLine *x = *i;
+ if (x->Matches(u))
+ x->Apply(u);
}
}
- for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
+
+ pending_lines.clear();
+}
+
+void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, string_list &results)
+{
+ std::string sn = ServerInstance->Config->ServerName;
+
+ ContainerIter n = lookup_lines.find(type);
+
+ time_t current = ServerInstance->Time();
+
+ LookupIter safei;
+
+ if (n != lookup_lines.end())
{
- if (!strcasecmp(hostmask,i->hostmask))
+ XLineLookup& list = n->second;
+ for (LookupIter i = list.begin(); i != list.end(); )
{
- pelines.erase(i);
- return true;
+ safei = i;
+ safei++;
+
+ if (i->second->duration && current > i->second->expiry)
+ {
+ ExpireLine(n, i);
+ }
+ else
+ results.push_back(sn+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+
+ ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+std::string(i->second->source)+" :"+(i->second->reason));
+ i = safei;
}
}
- return false;
}
-// deletes a q:line, returns true if the line existed and was removed
-bool XLineManager::del_qline(const char* nickname)
+XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance)
{
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
- {
- if (!strcasecmp(nickname,i->nick))
- {
- qlines.erase(i);
- return true;
- }
- }
- for (std::vector<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
+ GFact = new GLineFactory(Instance);
+ EFact = new ELineFactory(Instance);
+ KFact = new KLineFactory(Instance);
+ QFact = new QLineFactory(Instance);
+ ZFact = new ZLineFactory(Instance);
+
+ RegisterFactory(GFact);
+ RegisterFactory(EFact);
+ RegisterFactory(KFact);
+ RegisterFactory(QFact);
+ RegisterFactory(ZFact);
+}
+
+XLineManager::~XLineManager()
+{
+ UnregisterFactory(GFact);
+ UnregisterFactory(EFact);
+ UnregisterFactory(KFact);
+ UnregisterFactory(QFact);
+ UnregisterFactory(ZFact);
+
+ delete GFact;
+ delete EFact;
+ delete KFact;
+ delete QFact;
+ delete ZFact;
+
+ // Delete all existing XLines
+ for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++)
{
- if (!strcasecmp(nickname,i->nick))
+ for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++)
{
- pqlines.erase(i);
- return true;
+ delete j->second;
}
+ i->second.clear();
}
- return false;
+ lookup_lines.clear();
+
}
-bool XLineManager::qline_make_global(const char* nickname)
+void XLine::Apply(User* u)
{
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
+}
+
+bool XLine::IsBurstable()
+{
+ return true;
+}
+
+void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
+{
+ char sreason[MAXBUF];
+ snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
+ if (*ServerInstance->Config->MoronBanner)
+ u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner);
+
+ if (ServerInstance->Config->HideBans)
+ ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
+ else
+ ServerInstance->Users->QuitUser(u, sreason);
+
+
+ if (bancache)
{
- if (!strcasecmp(nickname,i->nick))
- {
- i->is_global = true;
- return true;
- }
+ ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Adding positive hit (") + line + ") for " + u->GetIPString());
+ if (this->duration > 0)
+ ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason, this->duration);
+ else
+ ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason);
}
- return false;
}
-bool XLineManager::zline_make_global(const char* ipaddr)
+bool KLine::Matches(User *u)
{
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ if (u->exempt)
+ return false;
+
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if (!strcasecmp(ipaddr,i->ipaddr))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
- i->is_global = true;
return true;
}
}
+
return false;
}
-// deletes a z:line, returns true if the line existed and was removed
+void KLine::Apply(User* u)
+{
+ DefaultApply(u, "K", (strcmp(this->identmask, "*") == 0) ? true : false);
+}
-bool XLineManager::del_zline(const char* ipaddr)
+bool GLine::Matches(User *u)
{
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
- {
- if (!strcasecmp(ipaddr,i->ipaddr))
- {
- zlines.erase(i);
- return true;
- }
- }
- for (std::vector<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
+ if (u->exempt)
+ return false;
+
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if (!strcasecmp(ipaddr,i->ipaddr))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
- pzlines.erase(i);
return true;
}
}
+
return false;
}
-// deletes a k:line, returns true if the line existed and was removed
+void GLine::Apply(User* u)
+{
+ DefaultApply(u, "G", (strcmp(this->identmask, "*") == 0) ? true : false);
+}
-bool XLineManager::del_kline(const char* hostmask)
+bool ELine::Matches(User *u)
{
- for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
- {
- if (!strcasecmp(hostmask,i->hostmask))
- {
- klines.erase(i);
- return true;
- }
- }
- for (std::vector<KLine>::iterator i = pklines.begin(); i != pklines.end(); i++)
+ if (u->exempt)
+ return false;
+
+ if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{
- if (!strcasecmp(hostmask,i->hostmask))
+ if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+ InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{
- pklines.erase(i);
return true;
}
}
+
return false;
}
-// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
-
-char* XLineManager::matches_qline(const char* nick)
+bool ZLine::Matches(User *u)
{
- 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->reason;
- for (std::vector<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
- if (match(nick,i->nick))
- return i->reason;
- return NULL;
+ if (u->exempt)
+ return false;
+
+ if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr))
+ return true;
+ else
+ return false;
+}
+
+void ZLine::Apply(User* u)
+{
+ DefaultApply(u, "Z", true);
}
-// returns a pointer to the reason if a host matches a gline, NULL if it didnt match
-char* XLineManager::matches_gline(userrec* user)
+bool QLine::Matches(User *u)
{
- char match1[MAXBUF];
- char match2[MAXBUF];
- snprintf(match1, MAXBUF, "%s@%s", user->ident, user->GetIPString());
- snprintf(match2, MAXBUF, "%s@%s", user->ident, user->host);
+ if (InspIRCd::Match(u->nick, this->nick))
+ return true;
- if ((glines.empty()) && (pglines.empty()))
- return NULL;
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
- if (match(match1,i->hostmask, true) || (match(match2,i->hostmask, true)))
- return i->reason;
- for (std::vector<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
- if (match(match1,i->hostmask, true) || (match(match2,i->hostmask, true)))
- return i->reason;
- return NULL;
+ return false;
}
-char* XLineManager::matches_exception(userrec* user)
-{
- char match1[MAXBUF];
- char match2[MAXBUF];
- snprintf(match1, MAXBUF, "%s@%s", user->ident, user->GetIPString());
- snprintf(match2, MAXBUF, "%s@%s", user->ident, user->host);
-
- 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++)
- if ((match(match1,i->hostmask)) || (match(host2,i->hostmask, true)) || (match(match2,i->hostmask, true)))
- return i->reason;
- for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
- if ((match(match1,i->hostmask)) || (match(host2,i->hostmask, true)) || (match(match2,i->hostmask, true)))
- return i->reason;
- return NULL;
+void QLine::Apply(User* u)
+{
+ /* Force to uuid on apply of qline, no need to disconnect any more :) */
+ u->ForceNickChange(u->uuid.c_str());
}
-void XLineManager::gline_set_creation_time(const char* host, time_t create_time)
+bool ZLine::Matches(const std::string &str)
{
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
- {
- if (!strcasecmp(host,i->hostmask))
- {
- i->set_time = create_time;
- 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 ;
+ if (InspIRCd::MatchCIDR(str, this->ipaddr))
+ return true;
+ else
+ return false;
}
-void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
+bool QLine::Matches(const std::string &str)
{
- for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
- {
- if (!strcasecmp(host,i->hostmask))
- {
- i->set_time = create_time;
- return;
- }
- }
- for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
- {
- if (!strcasecmp(host,i->hostmask))
- {
- i->set_time = create_time;
- return;
- }
- }
- return;
+ if (InspIRCd::Match(str, this->nick))
+ return true;
+
+ return false;
}
-void XLineManager::qline_set_creation_time(const char* nick, time_t create_time)
+bool ELine::Matches(const std::string &str)
{
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
- {
- if (!strcasecmp(nick,i->nick))
- {
- i->set_time = create_time;
- return;
- }
- }
- for (std::vector<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
- {
- if (!strcasecmp(nick,i->nick))
- {
- i->set_time = create_time;
- return;
- }
- }
- return;
+ return (InspIRCd::MatchCIDR(str, matchtext));
}
-void XLineManager::zline_set_creation_time(const char* ip, time_t create_time)
+bool KLine::Matches(const std::string &str)
{
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
- {
- if (!strcasecmp(ip,i->ipaddr))
- {
- i->set_time = create_time;
- return;
- }
- }
- for (std::vector<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
- {
- if (!strcasecmp(ip,i->ipaddr))
- {
- i->set_time = create_time;
- return;
- }
- }
- return;
+ return (InspIRCd::MatchCIDR(str.c_str(), matchtext));
}
-// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match
-
-char* XLineManager::matches_zline(const char* ipaddr)
+bool GLine::Matches(const std::string &str)
{
- 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->reason;
- for (std::vector<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
- if (match(ipaddr,i->ipaddr, true))
- return i->reason;
- return NULL;
+ return (InspIRCd::MatchCIDR(str, matchtext));
}
-// returns a pointer to the reason if a host matches a kline, NULL if it didnt match
-
-char* XLineManager::matches_kline(userrec* user)
+void ELine::OnAdd()
{
- char match1[MAXBUF];
- char match2[MAXBUF];
- snprintf(match1, MAXBUF, "%s@%s", user->ident, user->GetIPString());
- snprintf(match2, MAXBUF, "%s@%s", user->ident, user->host);
- if ((klines.empty()) && (pklines.empty()))
- return NULL;
- for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
- if ((match(match1,i->hostmask, true)) || (match(match2,i->hostmask, true)))
- return i->reason;
- for (std::vector<KLine>::iterator i = pklines.begin(); i != pklines.end(); i++)
- if ((match(match1,i->hostmask, true)) || (match(match2,i->hostmask, true)))
- return i->reason;
- return NULL;
+ /* When adding one eline, only check the one eline */
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+ {
+ User* u = (User*)(*u2);
+ if (this->Matches(u))
+ u->exempt = true;
+ }
}
-bool XLineManager::GSortComparison ( const GLine one, const GLine two )
+void ELine::DisplayExpiry()
{
- return (one.duration + one.set_time) < (two.duration + two.set_time);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
}
-bool XLineManager::ESortComparison ( const ELine one, const ELine two )
+void QLine::DisplayExpiry()
{
- return (one.duration + one.set_time) < (two.duration + two.set_time);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,this->duration);
}
-bool XLineManager::ZSortComparison ( const ZLine one, const ZLine two )
+void ZLine::DisplayExpiry()
{
- return (one.duration + one.set_time) < (two.duration + two.set_time);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,this->duration);
}
-bool XLineManager::KSortComparison ( const KLine one, const KLine two )
+void KLine::DisplayExpiry()
{
- return (one.duration + one.set_time) < (two.duration + two.set_time);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
}
-bool XLineManager::QSortComparison ( const QLine one, const QLine two )
+void GLine::DisplayExpiry()
{
- return (one.duration + one.set_time) < (two.duration + two.set_time);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
}
-// removes lines that have expired
-
-void XLineManager::expire_lines()
+const char* ELine::Displayable()
{
- time_t current = ServerInstance->Time();
-
- /* 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.
- */
-
- while ((glines.size()) && (current > (glines.begin()->duration + glines.begin()->set_time)))
- {
- std::vector<GLine>::iterator i = glines.begin();
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
- glines.erase(i);
- }
-
- while ((elines.size()) && (current > (elines.begin()->duration + elines.begin()->set_time)))
- {
- std::vector<ELine>::iterator i = elines.begin();
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
- elines.erase(i);
- }
-
- while ((zlines.size()) && (current > (zlines.begin()->duration + zlines.begin()->set_time)))
- {
- 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);
- }
-
- while ((klines.size()) && (current > (klines.begin()->duration + klines.begin()->set_time)))
- {
- std::vector<KLine>::iterator i = klines.begin();
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
- klines.erase(i);
- }
-
- while ((qlines.size()) && (current > (qlines.begin()->duration + qlines.begin()->set_time)))
- {
- 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);
- }
-
+ return matchtext.c_str();
}
-// applies lines, removing clients and changing nicks etc as applicable
-
-void XLineManager::apply_lines(const int What)
+const char* KLine::Displayable()
{
- char reason[MAXBUF];
- char host[MAXBUF];
-
- if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&
- (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
- return;
-
- CullList* Goners = new CullList(ServerInstance);
- char* check = NULL;
- for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
- {
- userrec* u = (userrec*)(*u2);
- u->MakeHost(host);
- 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);
- Goners->AddItem(u,reason);
- }
- }
- if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
- {
- if ((check = matches_kline(u)))
- {
- snprintf(reason,MAXBUF,"K-Lined: %s",check);
- 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);
- 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);
- Goners->AddItem(u,reason);
- }
- }
- }
+ return matchtext.c_str();
+}
- Goners->Apply();
- DELETE(Goners);
+const char* GLine::Displayable()
+{
+ return matchtext.c_str();
}
-void XLineManager::stats_k(userrec* user, string_list &results)
+const char* 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->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->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
+ return ipaddr;
}
-void XLineManager::stats_g(userrec* user, string_list &results)
+const char* 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->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->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->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->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