X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=e4c6b6fb39e8354571f065a4227c2612c3197dd4;hb=05fe4bdd1dbe3162abb6efe830bc21bb94c73fa8;hp=93c9f795d261bfbd2bdfb2cf37cff51b31e25b3f;hpb=ab6a7318e36bd8e0a259cd9eef3694a0f0e8684a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 93c9f795d..e4c6b6fb3 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -1,103 +1,237 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013 Adam + * Copyright (C) 2012-2014, 2016 Attila Molnar + * Copyright (C) 2012, 2018-2019 Robby + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2009 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2008, 2010 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 . */ -/* $Core: libIRCDxline */ #include "inspircd.h" -#include "wildcard.h" #include "xline.h" +#include "modules/stats.h" -/* 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 +/** An XLineFactory specialized to generate GLine* pointers */ +class GLineFactory : public XLineFactory +{ + public: + GLineFactory() : XLineFactory("G") { } -bool InitXLine(ServerConfig* conf, const char* tag) + /** Generate a GLine + */ + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + { + 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 { - return true; -} + public: + ELineFactory() : XLineFactory("E") { } + + /** Generate an ELine + */ + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + { + IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); + return new ELine(set_time, duration, source, reason, ih.first, ih.second); + } +}; -bool DoneZLine(ServerConfig* conf, const char* tag) +/** An XLineFactory specialized to generate KLine* pointers + */ +class KLineFactory : public XLineFactory { - conf->GetInstance()->XLines->apply_lines(APPLY_ZLINES|APPLY_PERM_ONLY); - return true; -} + public: + KLineFactory() : XLineFactory("K") { } -bool DoneQLine(ServerConfig* conf, const char* tag) + /** Generate a KLine + */ + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + { + 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 { - conf->GetInstance()->XLines->apply_lines(APPLY_QLINES|APPLY_PERM_ONLY); - return true; -} + public: + QLineFactory() : XLineFactory("Q") { } -bool DoneKLine(ServerConfig* conf, const char* tag) + /** Generate a QLine + */ + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + { + return new QLine(set_time, duration, source, reason, xline_specific_mask); + } +}; + +/** An XLineFactory specialized to generate ZLine* pointers + */ +class ZLineFactory : public XLineFactory { - conf->GetInstance()->XLines->apply_lines(APPLY_KLINES|APPLY_PERM_ONLY); - return true; -} + public: + ZLineFactory() : XLineFactory("Z") { } + + /** Generate a ZLine + */ + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + { + 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 separate 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.) + * + * 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. + * + * VERSION 3: + * All lines are (as in v1) stored together -- no separation 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). + * + * 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 DoneELine(ServerConfig* conf, const char* tag) +bool XLine::Matches(User *u) { - /* Yes, this is supposed to do nothing, we dont 'apply' these */ - return true; + return false; } -bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) +/* + * Checks what users match a given vector of ELines and sets their ban exempt flag accordingly. + */ +void XLineManager::CheckELines() { - const char* reason = values[0].GetString(); - const char* ipmask = values[1].GetString(); + ContainerIter n = lookup_lines.find("E"); - conf->GetInstance()->XLines->add_zline(0,"",reason,ipmask); - 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; + u->exempt = false; + + /* 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; + if ((!e->duration || ServerInstance->Time() < e->expiry) && e->Matches(u)) + u->exempt = true; + + i = safei; + } + } } -bool DoQLine(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* nick = values[1].GetString(); + ContainerIter n = lookup_lines.find(type); - conf->GetInstance()->XLines->add_qline(0,"",reason,nick); - return true; + 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, ValueList &values, int* types) +void XLineManager::DelAll(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->add_kline(0,"",reason,host); - return true; + 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, ValueList &values, int* types) +std::vector XLineManager::GetAllTypes() { - const char* reason = values[0].GetString(); - const char* host = values[1].GetString(); - - conf->GetInstance()->XLines->add_eline(0,"",reason,host); - return true; + std::vector 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) @@ -115,783 +249,581 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) } 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. - if (del_gline(hostmask, true)) - return false; + /* Don't apply duplicate xlines */ + ContainerIter x = lookup_lines.find(line->type); + if (x != lookup_lines.end()) + { + LookupIter i = x->second.find(line->Displayable()); + if (i != x->second.end()) + { + bool silent = false; - GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + // Allow replacing a config line for an updated config line. + if (i->second->from_config && line->from_config) + { + // Nothing changed, skip adding this one. + if (i->second->reason == line->reason) + return false; - if (duration) - { - glines.push_back(item); - sort(glines.begin(), glines.end(),XLineManager::GSortComparison); - } - else - { - pglines.push_back(item); + silent = true; + } + // Allow replacing a non-config line for a new config line. + else if (!line->from_config) + { + // X-line 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; + } + else + { + silent = true; + } + + ExpireLine(x, i, silent); + } } - return true; -} + /*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; -// adds an e:line (exception to bans) + ServerInstance->BanCache.RemoveEntries(line->type, false); // XXX perhaps remove ELines here? -bool XLineManager::add_eline(long duration, const char* source, const char* reason, const char* hostmask) -{ - IdentHostPair ih = IdentSplit(hostmask); + if (xlf->AutoApplyToUserList(line)) + pending_lines.push_back(line); - if (del_eline(hostmask, true)) - return false; + lookup_lines[line->type][line->Displayable()] = line; + line->OnAdd(); - ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + FOREACH_MOD(OnAddLine, (user, line)); - if (duration) - { - elines.push_back(item); - sort(elines.begin(), elines.end(),XLineManager::ESortComparison); - } - else - { - pelines.push_back(item); - } 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, std::string& reason, User* user, bool simulate) { - if (del_qline(nickname, true)) + ContainerIter x = lookup_lines.find(type); + + if (x == lookup_lines.end()) return false; - QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname); + LookupIter y = x->second.find(hostmask); - if (duration) - { - qlines.push_back(item); - sort(qlines.begin(), qlines.end(),XLineManager::QSortComparison); - } - else - { - pqlines.push_back(item); - } - return true; -} + if (y == x->second.end()) + return false; -// adds a z:line + reason.assign(y->second->reason); -bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr) -{ - if (strchr(ipaddr,'@')) - { - while (*ipaddr != '@') - ipaddr++; - ipaddr++; - } + if (simulate) + return true; - if (del_zline(ipaddr, true)) - return false; + ServerInstance->BanCache.RemoveEntries(y->second->type, true); - ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr); + FOREACH_MOD(OnDelLine, (user, y->second)); + + y->second->Unset(); + + stdalgo::erase(pending_lines, y->second); + + delete y->second; + x->second.erase(y); - if (duration) - { - zlines.push_back(item); - sort(zlines.begin(), zlines.end(),XLineManager::ZSortComparison); - } - else - { - pzlines.push_back(item); - } return true; } -// adds a k:line -bool XLineManager::add_kline(long duration, const char* source, const char* reason, const char* hostmask) +void ELine::Unset() { - IdentHostPair ih = IdentSplit(hostmask); + ServerInstance->XLines->CheckELines(); +} - if (del_kline(hostmask, true)) - return false; +// returns a pointer to the reason if a nickname matches a Q-line, NULL if it didn't match - KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); +XLine* XLineManager::MatchesLine(const std::string &type, User* user) +{ + ContainerIter x = lookup_lines.find(type); - if (duration) - { - klines.push_back(item); - sort(klines.begin(), klines.end(),XLineManager::KSortComparison); - } - else - { - pklines.push_back(item); - } - return true; -} + if (x == lookup_lines.end()) + return NULL; -// deletes a g:line, returns true if the line existed and was removed + const time_t current = ServerInstance->Time(); -bool XLineManager::del_gline(const char* hostmask, bool simulate) -{ - IdentHostPair ih = IdentSplit(hostmask); - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + 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) { - if (!simulate) - { - delete *i; - glines.erase(i); - } - return true; + /* Expire the line, proceed to next one */ + ExpireLine(x, i); + i = safei; + continue; } - } - for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) - { - if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) + + if (i->second->Matches(user)) { - if (!simulate) - { - delete *i; - pglines.erase(i); - } - return true; + return i->second; } + + i = safei; } - return false; + return NULL; } -// deletes a e:line, returns true if the line existed and was removed - -bool XLineManager::del_eline(const char* hostmask, bool simulate) +XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern) { - IdentHostPair ih = IdentSplit(hostmask); - for (std::vector::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; - } - } - for (std::vector::iterator i = pelines.begin(); i != pelines.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->Matches(pattern)) { - if (!simulate) + if (i->second->duration && current > i->second->expiry) { - delete *i; - pelines.erase(i); + /* Expire the line, return nothing */ + ExpireLine(x, i); + /* See above */ + i = safei; + continue; } - return true; + else + 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, bool simulate) +// removes lines that have expired +void XLineManager::ExpireLine(ContainerIter container, LookupIter item, bool silent) { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - { - if (!strcasecmp(nickname,(*i)->nick)) - { - if (!simulate) - { - delete *i; - qlines.erase(i); - } - return true; - } - } - for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) - { - if (!strcasecmp(nickname,(*i)->nick)) - { - if (!simulate) - { - delete *i; - pqlines.erase(i); - } - return true; - } - } - return false; + FOREACH_MOD(OnExpireLine, (item->second)); + + if (!silent) + 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 z:line, returns true if the line existed and was removed -bool XLineManager::del_zline(const char* ipaddr, bool simulate) +// applies lines, removing clients and changing nicks etc as applicable +void XLineManager::ApplyLines() { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers(); + for (UserManager::LocalList::const_iterator j = list.begin(); j != list.end(); ) { - if (!strcasecmp(ipaddr,(*i)->ipaddr)) - { - if (!simulate) - { - delete *i; - zlines.erase(i); - } - return true; - } - } - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) - { - if (!strcasecmp(ipaddr,(*i)->ipaddr)) + LocalUser* u = *j++; + + // Don't ban people who are exempt. + if (u->exempt) + continue; + + for (std::vector::iterator i = pending_lines.begin(); i != pending_lines.end(); i++) { - if (!simulate) + XLine *x = *i; + if (x->Matches(u)) { - delete *i; - pzlines.erase(i); + x->Apply(u); + + // If applying the X-line has killed the user then don't + // apply any more lines to them. + if (u->quitting) + break; } - return true; } } - return false; -} -// deletes a k:line, returns true if the line existed and was removed + pending_lines.clear(); +} -bool XLineManager::del_kline(const char* hostmask, bool simulate) +void XLineManager::InvokeStats(const std::string& type, unsigned int numeric, Stats::Context& stats) { - IdentHostPair ih = IdentSplit(hostmask); - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) + ContainerIter n = lookup_lines.find(type); + + time_t current = ServerInstance->Time(); + + LookupIter safei; + + if (n != lookup_lines.end()) { - if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) + XLineLookup& list = n->second; + for (LookupIter i = list.begin(); i != list.end(); ) { - if (!simulate) + safei = i; + safei++; + + if (i->second->duration && current > i->second->expiry) { - delete *i; - klines.erase(i); + ExpireLine(n, i); } - return true; + else + stats.AddRow(numeric, i->second->Displayable(), i->second->set_time, i->second->duration, i->second->source, i->second->reason); + i = safei; } } - for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) +} + +bool XLineManager::InvokeStats(const std::string& type, Stats::Context& context) +{ + ContainerIter citer = lookup_lines.find(type); + if (citer == lookup_lines.end()) + return false; + + for (LookupIter liter = citer->second.begin(); liter != citer->second.end(); ) { - if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) + // We might be about to expire the XLine so we have to increment the + // iterator early to avoid doing that causing iterator invalidation. + LookupIter current = liter++; + + XLine* xline = current->second; + if (xline->duration && xline->expiry <= ServerInstance->Time()) { - if (!simulate) - { - delete *i; - pklines.erase(i); - } - return true; + // This XLine has expired so remove and skip it. + ExpireLine(citer, current); + continue; } + + context.AddRow(RPL_STATS, context.GetSymbol(), xline->Displayable(), xline->set_time, xline->duration, xline->source, xline->reason); } - return false; + return true; } -// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match - -QLine* XLineManager::matches_qline(const char* nick, bool permonly) +XLineManager::XLineManager() { - if ((qlines.empty()) && (pqlines.empty())) - return NULL; - if (!permonly) - { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - if (match(nick,(*i)->nick)) - return (*i); - } - for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) - if (match(nick,(*i)->nick)) - return (*i); - return NULL; -} + GLineFactory* GFact; + ELineFactory* EFact; + KLineFactory* KFact; + QLineFactory* QFact; + ZLineFactory* ZFact; -// returns a pointer to the reason if a host matches a gline, NULL if it didnt match -GLine* XLineManager::matches_gline(User* user, bool permonly) + 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() { - if ((glines.empty()) && (pglines.empty())) - return NULL; - if (!permonly) + const char gekqz[] = "GEKQZ"; + for(unsigned int i=0; i < sizeof(gekqz); i++) { - for (std::vector::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); - } - } - } + XLineFactory* xlf = GetFactory(std::string(1, gekqz[i])); + delete xlf; } - for (std::vector::iterator i = pglines.begin(); i != pglines.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; } -ELine* XLineManager::matches_exception(User* user, bool permonly) +void XLine::Apply(User* u) { - if ((elines.empty()) && (pelines.empty())) - return NULL; - char host2[MAXBUF]; - snprintf(host2,MAXBUF,"*@%s",user->host); - if (!permonly) - { - for (std::vector::iterator i = elines.begin(); i != elines.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::iterator i = pelines.begin(); i != pelines.end(); i++) - { - if ((match(user->ident,(*i)->identmask))) - { - if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) - { - return (*i); - } - } - } - return NULL; } +bool XLine::IsBurstable() +{ + return !from_config; +} -void XLineManager::gline_set_creation_time(const char* host, time_t create_time) +void XLine::DefaultApply(User* u, const std::string &line, bool bancache) { - for (std::vector::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::iterator i = pglines.begin(); i != pglines.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 > 0 ? (this->expiry - ServerInstance->Time()) : 0)); } - return ; } -void XLineManager::eline_set_creation_time(const char* host, time_t create_time) +bool KLine::Matches(User *u) { - for (std::vector::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::iterator i = pelines.begin(); i != pelines.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(host,(*i)->hostmask)) + if (InspIRCd::MatchCIDR(u->GetRealHost(), 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::qline_set_creation_time(const char* nick, time_t create_time) +void KLine::Apply(User* u) { - for (std::vector::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::iterator i = pqlines.begin(); i != pqlines.end(); i++) - { - if (!strcasecmp(nick,(*i)->nick)) - { - (*i)->set_time = create_time; - return; - } - } - return; + DefaultApply(u, "K", (this->identmask == "*") ? true : false); } -void XLineManager::zline_set_creation_time(const char* ip, time_t create_time) +bool GLine::Matches(User *u) { - for (std::vector::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::iterator i = pzlines.begin(); i != pzlines.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(ip,(*i)->ipaddr)) + if (InspIRCd::MatchCIDR(u->GetRealHost(), 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, bool permonly) +void GLine::Apply(User* u) { - if ((zlines.empty()) && (pzlines.empty())) - return NULL; - if (!permonly) - { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - if (match(ipaddr,(*i)->ipaddr, true)) - return (*i); - } - for (std::vector::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(User* user, bool permonly) +bool ELine::Matches(User *u) { - if ((klines.empty()) && (pklines.empty())) - return NULL; - if (!permonly) + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) + if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { - if ((match(user->ident,(*i)->identmask))) - { - if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) - { - return (*i); - } - } - } - } - for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) - { - if ((match(user->ident,(*i)->identmask))) - { - if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) - { - return (*i); - } + return true; } } - return NULL; + + return false; } -bool XLineManager::GSortComparison ( const GLine* one, const GLine* 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::ESortComparison ( const ELine* one, const ELine* two ) +void ZLine::Apply(User* u) { - return (one->expiry) < (two->expiry); + DefaultApply(u, "Z", true); } -bool XLineManager::ZSortComparison ( const ZLine* one, const ZLine* two ) + +bool QLine::Matches(User *u) { - return (one->expiry) < (two->expiry); + if (InspIRCd::Match(u->nick, this->nick)) + return true; + + return false; } -bool XLineManager::KSortComparison ( const KLine* one, const KLine* two ) +void QLine::Apply(User* u) { - return (one->expiry) < (two->expiry); + /* Force to uuid on apply of Q-line, no need to disconnect anymore :) */ + u->WriteNumeric(RPL_SAVENICK, u->uuid, "Your nickname has been Q-lined."); + u->ChangeNick(u->uuid); } -bool XLineManager::QSortComparison ( const QLine* one, const QLine* two ) + +bool ZLine::Matches(const std::string &str) { - return (one->expiry) < (two->expiry); + if (InspIRCd::MatchCIDR(str, this->ipaddr)) + return true; + else + return false; } -// removes lines that have expired - -void XLineManager::expire_lines() +bool QLine::Matches(const std::string &str) { - time_t current = ServerInstance->Time(); + if (InspIRCd::Match(str, this->nick)) + return true; - /* 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. - */ + return false; +} - while ((glines.size()) && (current > (*glines.begin())->expiry)) - { - std::vector::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); - } +bool ELine::Matches(const std::string &str) +{ + return (InspIRCd::MatchCIDR(str, matchtext)); +} - while ((elines.size()) && (current > (*elines.begin())->expiry)) - { - std::vector::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 KLine::Matches(const std::string &str) +{ + return (InspIRCd::MatchCIDR(str.c_str(), matchtext)); +} - while ((zlines.size()) && (current > (*zlines.begin())->expiry)) - { - std::vector::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 GLine::Matches(const std::string &str) +{ + return (InspIRCd::MatchCIDR(str, matchtext)); +} - while ((klines.size()) && (current > (*klines.begin())->expiry)) +void ELine::OnAdd() +{ + /* When adding one E-line, only check the one E-line */ + const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers(); + for (UserManager::LocalList::const_iterator u2 = list.begin(); u2 != list.end(); u2++) { - std::vector::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); + LocalUser* u = *u2; + if (this->Matches(u)) + u->exempt = true; } +} - while ((qlines.size()) && (current > (*qlines.begin())->expiry)) - { - std::vector::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); - } +void XLine::DisplayExpiry() +{ + bool onechar = (type.length() == 1); + ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %s ago): %s", + type.c_str(), (onechar ? "-line" : ""), Displayable().c_str(), source.c_str(), InspIRCd::DurationString(ServerInstance->Time() - set_time).c_str(), reason.c_str()); +} +const std::string& ELine::Displayable() +{ + return matchtext; } -// applies lines, removing clients and changing nicks etc as applicable +const std::string& KLine::Displayable() +{ + return matchtext; +} -void XLineManager::apply_lines(const int What) +const std::string& GLine::Displayable() { - if (!What) - return; + return matchtext; +} - if (What & APPLY_PERM_ONLY) - { - char reason[MAXBUF]; +const std::string& ZLine::Displayable() +{ + return ipaddr; +} - if ((!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) - return; +const std::string& QLine::Displayable() +{ + return nick; +} - XLine* check = NULL; - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) - { - User* u = (User*)(*u2); +bool KLine::IsBurstable() +{ + return false; +} - if (elines.size() || pelines.size()) - if (matches_exception(u)) - continue; +bool XLineManager::RegisterFactory(XLineFactory* xlf) +{ + XLineFactMap::iterator n = line_factory.find(xlf->GetType()); - if ((What & APPLY_GLINES) && pglines.size()) - { - if ((check = matches_gline(u,true))) - { - 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); - } - } + if (n != line_factory.end()) + return false; - if ((What & APPLY_KLINES) && pklines.size()) - { - if ((check = matches_kline(u,true))) - { - 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); - } - } + line_factory[xlf->GetType()] = xlf; - if ((What & APPLY_QLINES) && pqlines.size()) - { - if ((check = matches_qline(u->nick,true))) - { - 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); - } - } + return true; +} - if ((What & APPLY_ZLINES) && pzlines.size()) - { - if ((check = matches_zline(u->GetIPString(),true))) - { - 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); - } - } - } - } - else - { - char reason[MAXBUF]; +bool XLineManager::UnregisterFactory(XLineFactory* xlf) +{ + XLineFactMap::iterator n = line_factory.find(xlf->GetType()); - if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && - (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) - return; + if (n == line_factory.end()) + return false; - XLine* check = NULL; - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) - { - User* u = (User*)(*u2); + line_factory.erase(n); - 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); - 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); - } - } - if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) - { - if ((check = matches_kline(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); - } - } - if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size())) - { - if ((check = matches_qline(u->nick))) - { - 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); - } - } - if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) - { - if ((check = matches_zline(u->GetIPString()))) - { - 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); - } - } - } - } + return true; } -void XLineManager::stats_k(User* user, string_list &results) +XLineFactory* XLineManager::GetFactory(const std::string &type) { - std::string sn = ServerInstance->Config->ServerName; - for (std::vector::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::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); -} + XLineFactMap::iterator n = line_factory.find(type); -void XLineManager::stats_g(User* user, string_list &results) -{ - std::string sn = ServerInstance->Config->ServerName; - for (std::vector::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::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); -} + if (n == line_factory.end()) + return NULL; -void XLineManager::stats_q(User* user, string_list &results) -{ - std::string sn = ServerInstance->Config->ServerName; - for (std::vector::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::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 n->second; } -void XLineManager::stats_z(User* user, string_list &results) +void XLineManager::ExpireRemovedConfigLines(const std::string& type, const insp::flat_set& configlines) { - std::string sn = ServerInstance->Config->ServerName; - for (std::vector::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::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); -} + // Nothing to do. + if (lookup_lines.empty()) + return; -void XLineManager::stats_e(User* user, string_list &results) -{ - std::string sn = ServerInstance->Config->ServerName; - for (std::vector::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::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); -} + ContainerIter xlines = lookup_lines.find(type); + if (xlines == lookup_lines.end()) + return; -XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance) -{ + for (LookupIter xline = xlines->second.begin(); xline != xlines->second.end(); ) + { + LookupIter cachedxline = xline++; + if (!cachedxline->second->from_config) + continue; + + if (!configlines.count(cachedxline->second->Displayable())) + ExpireLine(xlines, cachedxline); + } }