* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 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.
*
* ---------------------------------------------------
*/
#include "inspircd.h"
#include "wildcard.h"
#include "xline.h"
+#include "bancache.h"
/*
* This is now version 3 of the XLine subsystem, let's see if we can get it as nice and
* than it could have been, something which we address here.
*
* VERSION 3:
- * All lines are (as in v1) stored together -- no seperation of perm and non-perm. Expiry will
- * still use a sorted list, and we'll just ignore anything permanent.
+ * 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).
*
- * Application will be by a list of lines 'pending' application, meaning only the newly added lines
- * will be gone over. Much faster.
+ * 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.
*
- * More of course is to come.
+ * 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. :)
*/
-/* Version two, now with optimized expiry!
- *
- * 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:
- *
- * (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.
- *
- * -- Brain
- */
-
-bool InitXLine(ServerConfig* conf, const char* tag)
+bool XLine::Matches(User *u)
{
- return true;
+ return false;
}
-bool DoneZLine(ServerConfig* conf, const char* tag)
+/*
+ * Checks what users match a given vector of ELines and sets their ban exempt flag accordingly.
+ */
+void XLineManager::CheckELines()
{
- // XXX we should really only call this once - after we've finished processing configuration all together
- conf->GetInstance()->XLines->ApplyLines();
- return true;
-}
+ ContainerIter n = lookup_lines.find("E");
-bool DoneQLine(ServerConfig* conf, const char* tag)
-{
- // XXX we should really only call this once - after we've finished processing configuration all together
- conf->GetInstance()->XLines->ApplyLines();
- return true;
-}
+ if (n == lookup_lines.end())
+ return;
-bool DoneKLine(ServerConfig* conf, const char* tag)
-{
- // XXX we should really only call this once - after we've finished processing configuration all together
- conf->GetInstance()->XLines->ApplyLines();
- return true;
-}
+ XLineLookup& ELines = n->second;
-bool DoneELine(ServerConfig* conf, const char* tag)
-{
- // XXX we should really only call this once - after we've finished processing configuration all together
- conf->GetInstance()->XLines->ApplyLines();
- return true;
-}
+ if (ELines.empty())
+ return;
-bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
-{
- const char* reason = values[0].GetString();
- const char* ipmask = values[1].GetString();
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ {
+ User* u = (User*)(*u2);
- conf->GetInstance()->XLines->AddZLine(0,"<Config>",reason,ipmask);
- return true;
-}
+ /* This uses safe iteration to ensure that if a line expires here, it doenst trash the iterator */
+ LookupIter safei;
-bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
-{
- const char* reason = values[0].GetString();
- const char* nick = values[1].GetString();
+ for (LookupIter i = ELines.begin(); i != ELines.end(); )
+ {
+ safei = i;
+ safei++;
- conf->GetInstance()->XLines->AddQLine(0,"<Config>",reason,nick);
- return true;
+ XLine *e = i->second;
+ u->exempt = e->Matches(u);
+
+ i = safei;
+ }
+ }
}
-bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+
+XLineLookup* XLineManager::GetAll(const std::string &type)
{
- const char* reason = values[0].GetString();
- const char* host = values[1].GetString();
+ ContainerIter n = lookup_lines.find(type);
- conf->GetInstance()->XLines->AddKLine(0,"<Config>",reason,host);
- return true;
-}
+ if (n == lookup_lines.end())
+ return NULL;
-bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
-{
- const char* reason = values[0].GetString();
- const char* host = values[1].GetString();
+ LookupIter safei;
+ const time_t current = ServerInstance->Time();
- conf->GetInstance()->XLines->AddELine(0,"<Config>",reason,host);
- return true;
+ /* 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 XLine::Matches(User *u)
+std::vector<std::string> XLineManager::GetAllTypes()
{
- return false;
+ 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)
return n;
}
-// adds a g:line
-
-bool XLineManager::AddGLine(long duration, const char* source,const char* reason,const char* hostmask)
-{
- IdentHostPair ih = IdentSplit(hostmask);
-
- if (DelGLine(hostmask, true))
- return false;
-
- GLine* item = new GLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
-
- glines.push_back(item);
- sort(glines.begin(), glines.end(),XLineManager::XSortComparison);
- pending_lines.push_back(item);
-
- return true;
-}
-
-// adds an e:line (exception to bans)
+// adds a line
-bool XLineManager::AddELine(long duration, const char* source, const char* reason, const char* hostmask)
+bool XLineManager::AddLine(XLine* line, User* user)
{
- IdentHostPair ih = IdentSplit(hostmask);
-
- if (DelELine(hostmask, true))
- return false;
-
- ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
-
- elines.push_back(item);
- sort(elines.begin(), elines.end(),XLineManager::XSortComparison);
- pending_lines.push_back(item);
-
- return true;
-}
+ /*IdentHostPair ih = IdentSplit(hostmask);*/
-// adds a q:line
+ ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
-bool XLineManager::AddQLine(long duration, const char* source, const char* reason, const char* nickname)
-{
- if (DelQLine(nickname, true))
+ if (DelLine(line->Displayable(), line->type, user, true))
return false;
- QLine* item = new QLine(ServerInstance, ServerInstance->Time(), duration, source, reason, nickname);
+ /*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
+ pending_lines.push_back(line);
+ lookup_lines[line->type][line->Displayable()] = line;
+ line->OnAdd();
- qlines.push_back(item);
- sort(qlines.begin(), qlines.end(),XLineManager::XSortComparison);
- pending_lines.push_back(item);
+ 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::AddZLine(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)
{
- if (strchr(ipaddr,'@'))
- {
- while (*ipaddr != '@')
- ipaddr++;
- ipaddr++;
- }
+ ContainerIter x = lookup_lines.find(type);
- if (DelZLine(ipaddr, true))
+ if (x == lookup_lines.end())
return false;
- ZLine* item = new ZLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ipaddr);
+ LookupIter y = x->second.find(hostmask);
- zlines.push_back(item);
- sort(zlines.begin(), zlines.end(),XLineManager::XSortComparison);
- pending_lines.push_back(item);
+ if (y == x->second.end())
+ return false;
- return true;
-}
+ if (simulate)
+ return true;
-// adds a k:line
+ ServerInstance->BanCache->RemoveEntries(y->second->type, true);
-bool XLineManager::AddKLine(long duration, const char* source, const char* reason, const char* hostmask)
-{
- IdentHostPair ih = IdentSplit(hostmask);
+ FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second));
- if (DelKLine(hostmask, true))
- return false;
+ y->second->Unset();
- KLine* item = new KLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
+ std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), y->second);
+ if (pptr != pending_lines.end())
+ pending_lines.erase(pptr);
- klines.push_back(item);
- sort(klines.begin(), klines.end(),XLineManager::XSortComparison);
- pending_lines.push_back(item);
+ delete y->second;
+ x->second.erase(y);
return true;
}
-// deletes a g:line, returns true if the line existed and was removed
-bool XLineManager::DelGLine(const char* hostmask, bool simulate)
+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 */
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
{
- if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
- {
- if (!simulate)
- {
- delete *i;
- glines.erase(i);
- }
- return true;
- }
+ User* u = (User*)(*u2);
+ u->exempt = false;
}
- 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::DelELine(const char* hostmask, bool simulate)
+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++)
- {
- if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
- {
- if (!simulate)
- {
- delete *i;
- elines.erase(i);
- }
- return true;
- }
- }
+ ContainerIter x = lookup_lines.find(type);
- return false;
-}
+ if (x == lookup_lines.end())
+ return NULL;
-// deletes a q:line, returns true if the line existed and was removed
+ const time_t current = ServerInstance->Time();
-bool XLineManager::DelQLine(const char* nickname, bool simulate)
-{
- for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
- {
- if (!strcasecmp(nickname,(*i)->nick))
- {
- if (!simulate)
- {
- delete *i;
- qlines.erase(i);
- }
- return true;
- }
- }
-
- return false;
-}
+ LookupIter safei;
-// deletes a z:line, returns true if the line existed and was removed
-
-bool XLineManager::DelZLine(const char* ipaddr, bool simulate)
-{
- for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ for (LookupIter i = x->second.begin(); i != x->second.end(); )
{
- if (!strcasecmp(ipaddr,(*i)->ipaddr))
- {
- if (!simulate)
- {
- delete *i;
- zlines.erase(i);
- }
- return true;
- }
- }
-
- return false;
-}
-
-// deletes a k:line, returns true if the line existed and was removed
+ safei = i;
+ safei++;
-bool XLineManager::DelKLine(const char* hostmask, bool simulate)
-{
- 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))
+ if (i->second->Matches(user))
{
- if (!simulate)
+ if (i->second->duration && current > i->second->expiry)
{
- delete *i;
- klines.erase(i);
+ /* Expire the line, return nothing */
+ ExpireLine(x, i);
+ /* Continue, there may be another that matches
+ * (thanks aquanight)
+ */
+ i = safei;
+ continue;
}
- return true;
+ else
+ return i->second;
}
- }
-
- return false;
-}
-// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
-
-QLine* XLineManager::matches_qline(const char* nick)
-{
- if (qlines.empty())
- return NULL;
-
- for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
- if ((*i)->Matches(nick))
- return (*i);
- return NULL;
-}
-
-// returns a pointer to the reason if a host matches a gline, NULL if it didnt match
-
-GLine* XLineManager::matches_gline(User* user)
-{
- if (glines.empty())
- return NULL;
-
- for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
- {
- if ((*i)->Matches(user))
- return (*i);
- }
-
- return NULL;
-}
-
-ELine* XLineManager::matches_exception(User* user)
-{
- if (elines.empty())
- return NULL;
-
- for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
- {
- if ((*i)->Matches(user))
- return (*i);
+ i = safei;
}
return NULL;
}
-
-void XLineManager::gline_set_creation_time(const char* host, time_t create_time)
+XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern)
{
- 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;
- }
- }
+ ContainerIter x = lookup_lines.find(type);
- return ;
-}
+ if (x == lookup_lines.end())
+ return NULL;
-void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
-{
- 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;
- }
- }
+ const time_t current = ServerInstance->Time();
- return;
-}
+ LookupIter safei;
-void XLineManager::qline_set_creation_time(const char* nick, time_t create_time)
-{
- for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
+ for (LookupIter i = x->second.begin(); i != x->second.end(); )
{
- if (!strcasecmp(nick,(*i)->nick))
- {
- (*i)->set_time = create_time;
- (*i)->expiry = create_time + (*i)->duration;
- return;
- }
- }
-
- return;
-}
+ safei = i;
+ safei++;
-void XLineManager::zline_set_creation_time(const char* ip, time_t create_time)
-{
- for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
- {
- if (!strcasecmp(ip,(*i)->ipaddr))
+ if (i->second->Matches(pattern))
{
- (*i)->set_time = create_time;
- (*i)->expiry = create_time + (*i)->duration;
- return;
+ 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;
}
- }
-
- return;
-}
-// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match
-
-ZLine* XLineManager::matches_zline(User *u)
-{
- if (zlines.empty())
- return NULL;
-
- for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
- if ((*i)->Matches(u))
- return (*i);
- return NULL;
-}
-
-// returns a pointer to the reason if a host matches a kline, NULL if it didnt match
-
-KLine* XLineManager::matches_kline(User* user)
-{
- if (klines.empty())
- return NULL;
-
- for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
- {
- if ((*i)->Matches(user))
- return (*i);
+ i = safei;
}
-
return NULL;
}
-bool XLineManager::XSortComparison(const XLine *one, const XLine *two)
-{
- // account for permanent lines
- if (one->expiry == 0)
- {
- return false;
- }
- return (one->expiry) < (two->expiry);
-}
-
// removes lines that have expired
-void XLineManager::expire_lines()
+void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
{
- 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.
- */
+ FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second));
- while ((glines.size()) && (current > (*glines.begin())->expiry) && ((*glines.begin())->duration != 0))
- {
- 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);
- }
-
- while ((elines.size()) && (current > (*elines.begin())->expiry) && ((*elines.begin())->duration != 0))
- {
- 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);
- }
+ item->second->DisplayExpiry();
+ item->second->Unset();
- while ((zlines.size()) && (current > (*zlines.begin())->expiry) && ((*zlines.begin())->duration != 0))
- {
- 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())->expiry) && ((*klines.begin())->duration != 0))
- {
- 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);
- }
-
- while ((qlines.size()) && (current > (*qlines.begin())->expiry) && ((*qlines.begin())->duration != 0))
- {
- 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);
- }
+ /* 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
+// applies lines, removing clients and changing nicks etc as applicable
void XLineManager::ApplyLines()
{
- char reason[MAXBUF];
-
- XLine* check = NULL;
for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
{
User* u = (User*)(*u2);
- if (elines.size())
- {
- // ignore people matching exempts -- XXX cache the exempt state in userrec permanently?
- // should be fairly easy to accomplish really, and might achieve some nice gains?
- if (matches_exception(u))
- continue;
- }
-
for (std::vector<XLine *>::iterator i = pending_lines.begin(); i != pending_lines.end(); i++)
{
- XLine *x = (*i);
-
- switch (x->type)
- {
- case 'Z':
- {
- ZLine *z = dynamic_cast<ZLine *>(x);
-
- if (z->Matches(u))
- {
- snprintf(reason,MAXBUF,"Z-Lined: %s", check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- User::QuitUser(ServerInstance, u, "Z-Lined", reason);
- else
- User::QuitUser(ServerInstance, u, reason);
- }
- break;
- }
- case 'G':
- {
- GLine *g = dynamic_cast<GLine *>(x);
-
- if (g->Matches(u))
- {
- snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- User::QuitUser(ServerInstance, u, "G-Lined", reason);
- else
- User::QuitUser(ServerInstance, u, reason);
- }
- break;
- }
- case 'Q':
- {
- QLine *q = dynamic_cast<QLine *>(x);
-
- if (q->Matches(u))
- {
- snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- User::QuitUser(ServerInstance, u, "Q-Lined", reason);
- else
- User::QuitUser(ServerInstance, u, reason);
- }
- break;
- }
- case 'K':
- {
- KLine *k = dynamic_cast<KLine *>(x);
-
- if (k->Matches(u))
- {
- snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
- if (*ServerInstance->Config->MoronBanner)
- u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
- if (ServerInstance->Config->HideBans)
- User::QuitUser(ServerInstance, u, "K-Lined", reason);
- else
- User::QuitUser(ServerInstance, u, reason);
- }
- break;
- }
- case 'E':
- {
-// ELine *e = dynamic_cast<ELine *>(x);
- break;
- }
- default:
- {
- ServerInstance->Log(DEBUG, "Unknown line type pending: %c", x->type);
- break;
- }
- }
+ XLine *x = *i;
+ if (x->Matches(u))
+ x->Apply(u);
}
}
pending_lines.clear();
}
-void XLineManager::stats_k(User* user, string_list &results)
+void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, string_list &results)
{
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);
-}
-void XLineManager::stats_g(User* user, string_list &results)
-{
- 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);
-}
+ ContainerIter n = lookup_lines.find(type);
-void XLineManager::stats_q(User* user, string_list &results)
-{
- 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);
-}
+ time_t current = ServerInstance->Time();
-void XLineManager::stats_z(User* user, string_list &results)
-{
- 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);
-}
+ LookupIter safei;
-void XLineManager::stats_e(User* user, string_list &results)
-{
- 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);
+ if (n != lookup_lines.end())
+ {
+ XLineLookup& list = n->second;
+ for (LookupIter i = list.begin(); i != list.end(); )
+ {
+ 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;
+ }
+ }
}
+
XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance)
{
+ 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);
}
-bool XLine::Matches(const std::string &str)
+XLineManager::~XLineManager()
{
- return false;
+ UnregisterFactory(GFact);
+ UnregisterFactory(EFact);
+ UnregisterFactory(KFact);
+ UnregisterFactory(QFact);
+ UnregisterFactory(ZFact);
+
+ delete GFact;
+ delete EFact;
+ delete KFact;
+ delete QFact;
+ delete ZFact;
}
void XLine::Apply(User* u)
{
}
-void XLine::DefaultApply(User* u, char line)
+void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
{
char reason[MAXBUF];
- snprintf(reason, MAXBUF, "%c-Lined: %s", line, this->reason);
+ snprintf(reason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
if (*ServerInstance->Config->MoronBanner)
u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
if (ServerInstance->Config->HideBans)
- User::QuitUser(ServerInstance, u, line + std::string("-Lined"), reason);
+ User::QuitUser(ServerInstance, u, line + "-Lined", reason);
else
User::QuitUser(ServerInstance, u, reason);
+
+
+ if (bancache)
+ {
+ ServerInstance->Log(DEBUG, std::string("BanCache: Adding positive hit (") + line + ") for " + u->GetIPString());
+ ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason);
+ }
}
bool KLine::Matches(User *u)
{
+ if (u->exempt)
+ return false;
+
if ((match(u->ident, this->identmask)))
{
if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
void KLine::Apply(User* u)
{
- DefaultApply(u, 'K');
+ DefaultApply(u, "K", (strcmp(this->identmask, "*") == 0) ? true : false);
}
bool GLine::Matches(User *u)
{
+ if (u->exempt)
+ return false;
+
if ((match(u->ident, this->identmask)))
{
if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
void GLine::Apply(User* u)
{
- DefaultApply(u, 'G');
+ DefaultApply(u, "G", (strcmp(this->identmask, "*") == 0) ? true : false);
}
bool ELine::Matches(User *u)
{
+ if (u->exempt)
+ return false;
+
if ((match(u->ident, this->identmask)))
{
if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
bool ZLine::Matches(User *u)
{
+ if (u->exempt)
+ return false;
+
if (match(u->GetIPString(), this->ipaddr, true))
return true;
else
void ZLine::Apply(User* u)
{
- DefaultApply(u, 'Z');
+ DefaultApply(u, "Z", true);
}
bool QLine::Matches(User *u)
{
+ if (u->exempt)
+ return false;
+
if (match(u->nick, this->nick))
return true;
void QLine::Apply(User* u)
{
- /* Can we force the user to their uid here instead? */
- DefaultApply(u, 'Q');
+ /* Force to uuid on apply of qline, no need to disconnect any more :) */
+ u->ForceNickChange(u->uuid);
}
return false;
}
+bool ELine::Matches(const std::string &str)
+{
+ return ((match(str.c_str(), matchtext.c_str(), true)));
+}
+
+bool KLine::Matches(const std::string &str)
+{
+ return ((match(str.c_str(), matchtext.c_str(), true)));
+}
+
+bool GLine::Matches(const std::string &str)
+{
+ return ((match(str.c_str(), matchtext.c_str(), true)));
+}
+
+void ELine::OnAdd()
+{
+ /* When adding one eline, only check the one eline */
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ {
+ User* u = (User*)(*u2);
+ if (this->Matches(u))
+ u->exempt = true;
+ }
+}
+
+void ELine::DisplayExpiry()
+{
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+}
+
+void QLine::DisplayExpiry()
+{
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",this->nick,this->source,this->duration);
+}
+
+void ZLine::DisplayExpiry()
+{
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",this->ipaddr,this->source,this->duration);
+}
+
+void KLine::DisplayExpiry()
+{
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+}
+
+void GLine::DisplayExpiry()
+{
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+}
+
+const char* ELine::Displayable()
+{
+ return matchtext.c_str();
+}
+
+const char* KLine::Displayable()
+{
+ return matchtext.c_str();
+}
+
+const char* GLine::Displayable()
+{
+ return matchtext.c_str();
+}
+
+const char* ZLine::Displayable()
+{
+ return ipaddr;
+}
+
+const char* QLine::Displayable()
+{
+ return nick;
+}
+
+bool XLineManager::RegisterFactory(XLineFactory* xlf)
+{
+ XLineFactMap::iterator n = line_factory.find(xlf->GetType());
+
+ if (n != line_factory.end())
+ return false;
+
+ line_factory[xlf->GetType()] = xlf;
+
+ return true;
+}
+
+bool XLineManager::UnregisterFactory(XLineFactory* xlf)
+{
+ XLineFactMap::iterator n = line_factory.find(xlf->GetType());
+
+ if (n == line_factory.end())
+ return false;
+
+ line_factory.erase(n);
+
+ return true;
+}
+
+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