X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=0d627023e7a6dabdc160ad326e098ec328f0b877;hb=aa0221d87ca355d5021f81f8f65cf6a47bc93c38;hp=921d96045e879802797a4a15271f3dd4da9430fe;hpb=a81394b65dc366a9650fe05edf1c0f18d0ac700a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 921d96045..0d627023e 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -1,758 +1,828 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 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 . */ + #include "inspircd.h" -#include "inspircd_io.h" -#include "inspircd_util.h" -#include "inspircd_config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include "connection.h" -#include "users.h" -#include "servers.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" -#include "commands.h" #include "xline.h" -#include "inspstring.h" - -#ifdef GCC3 -#define nspace __gnu_cxx -#else -#define nspace std -#endif - - -using namespace std; - -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; - -extern int LogLevel; -extern char ServerName[MAXBUF]; -extern char Network[MAXBUF]; -extern char ServerDesc[MAXBUF]; -extern char AdminName[MAXBUF]; -extern char AdminEmail[MAXBUF]; -extern char AdminNick[MAXBUF]; -extern char diepass[MAXBUF]; -extern char restartpass[MAXBUF]; -extern char motd[MAXBUF]; -extern char rules[MAXBUF]; -extern char list[MAXBUF]; -extern char PrefixQuit[MAXBUF]; -extern char DieValue[MAXBUF]; - -extern int debugging; -extern int WHOWAS_STALE; -extern int WHOWAS_MAX; -extern int DieDelay; -extern time_t startup_time; -extern int NetBufferSize; -extern time_t nb_start; - -extern std::vector fd_reap; -extern std::vector module_names; - -extern int boundPortCount; -extern int portCount; -extern int SERVERportCount; -extern int ports[MAXSOCKS]; -extern int defaultRoute; - -extern std::vector auth_cookies; -extern std::stringstream config_f; - -extern serverrec* me[32]; - -extern FILE *log_file; - -namespace nspace -{ -#ifdef GCC34 - template<> struct hash -#else - template<> struct nspace::hash -#endif - { - size_t operator()(const struct in_addr &a) const - { - size_t q; - memcpy(&q,&a,sizeof(size_t)); - return q; - } - }; -#ifdef GCC34 - template<> struct hash -#else - template<> struct nspace::hash -#endif - { - size_t operator()(const string &s) const - { - char a[MAXBUF]; - static struct hash strhash; - strlcpy(a,s.c_str(),MAXBUF); - strlower(a); - return strhash(a); - } - }; -} +#include "modules/stats.h" +/** An XLineFactory specialized to generate GLine* pointers + */ +class GLineFactory : public XLineFactory +{ + public: + GLineFactory() : XLineFactory("G") { } + + /** 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); + } +}; -struct StrHashComp +/** An XLineFactory specialized to generate ELine* pointers + */ +class ELineFactory : public XLineFactory { + public: + ELineFactory() : XLineFactory("E") { } - bool operator()(const string& s1, const string& s2) const + /** 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 { - char a[MAXBUF],b[MAXBUF]; - strlcpy(a,s1.c_str(),MAXBUF); - strlcpy(b,s2.c_str(),MAXBUF); - strlower(a); - strlower(b); - return (strcasecmp(a,b) == 0); + IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); + return new ELine(set_time, duration, source, reason, ih.first, ih.second); } +}; + +/** An XLineFactory specialized to generate KLine* pointers + */ +class KLineFactory : public XLineFactory +{ + public: + KLineFactory() : XLineFactory("K") { } + /** Generate a KLine + */ + XLine* Generate(time_t set_time, 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); + } }; -struct InAddr_HashComp +/** An XLineFactory specialized to generate QLine* pointers + */ +class QLineFactory : public XLineFactory { + public: + QLineFactory() : XLineFactory("Q") { } - bool operator()(const in_addr &s1, const in_addr &s2) const + /** 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 { - size_t q; - size_t p; - - memcpy(&q,&s1,sizeof(size_t)); - memcpy(&p,&s2,sizeof(size_t)); - - return (q == p); + return new QLine(set_time, duration, source, reason, xline_specific_mask); } +}; +/** An XLineFactory specialized to generate ZLine* pointers + */ +class ZLineFactory : public XLineFactory +{ + public: + ZLineFactory() : XLineFactory("Z") { } + + /** Generate a ZLine + */ + XLine* Generate(time_t set_time, 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); + } }; -typedef nspace::hash_map, StrHashComp> user_hash; -typedef nspace::hash_map, StrHashComp> chan_hash; -typedef nspace::hash_map, InAddr_HashComp> address_cache; -typedef std::deque command_table; +/* + * 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 XLine::Matches(User *u) +{ + return false; +} + +/* + * Checks what users match a given vector of ELines and sets their ban exempt flag accordingly. + */ +void XLineManager::CheckELines() +{ + ContainerIter n = lookup_lines.find("E"); + + if (n == lookup_lines.end()) + return; -extern user_hash clientlist; -extern chan_hash chanlist; -extern user_hash whowas; -extern command_table cmdlist; -extern file_cache MOTD; -extern file_cache RULES; -extern address_cache IP; + XLineLookup& ELines = n->second; -extern time_t TIME; + if (ELines.empty()) + return; -std::vector klines; -std::vector glines; -std::vector zlines; -std::vector qlines; -std::vector elines; + 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; -// Reads the default bans from the config file. -// only a very small number of bans are defined -// this way these days, such as qlines against -// services nicks, etc. + /* 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++; -void read_xline_defaults() + XLine *e = i->second; + if ((!e->duration || ServerInstance->Time() < e->expiry) && e->Matches(u)) + u->exempt = true; + + i = safei; + } + } +} + + +XLineLookup* XLineManager::GetAll(const std::string &type) { - char ipmask[MAXBUF]; - char nick[MAXBUF]; - char host[MAXBUF]; - char reason[MAXBUF]; + ContainerIter n = lookup_lines.find(type); + + if (n == lookup_lines.end()) + return NULL; + + LookupIter safei; + const time_t current = ServerInstance->Time(); - for (int i = 0; i < ConfValueEnum("badip",&config_f); i++) + /* Expire any dead ones, before sending */ + for (LookupIter x = n->second.begin(); x != n->second.end(); ) { - ConfValue("badip","ipmask",i,ipmask,&config_f); - ConfValue("badip","reason",i,reason,&config_f); - add_zline(0,"",reason,ipmask); - log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason); + safei = x; + safei++; + if (x->second->duration && current > x->second->expiry) + { + ExpireLine(n, x); + } + x = safei; } - - for (int i = 0; i < ConfValueEnum("badnick",&config_f); i++) + + 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()) { - ConfValue("badnick","nick",i,nick,&config_f); - ConfValue("badnick","reason",i,reason,&config_f); - add_qline(0,"",reason,nick); - log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason); + ExpireLine(n, x); } - - for (int i = 0; i < ConfValueEnum("badhost",&config_f); i++) +} + +std::vector XLineManager::GetAllTypes() +{ + 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) +{ + IdentHostPair n = std::make_pair("*","*"); + std::string::size_type x = ident_and_host.find('@'); + if (x != std::string::npos) { - ConfValue("badhost","host",i,host,&config_f); - ConfValue("badhost","reason",i,reason,&config_f); - add_kline(0,"",reason,host); - log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason); + 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("*"); } - for (int i = 0; i < ConfValueEnum("exception",&config_f); i++) + else { - ConfValue("exception","host",i,host,&config_f); - ConfValue("exception","reason",i,reason,&config_f); - add_eline(0,"",reason,host); - log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason); + n.first.clear(); + n.second = ident_and_host; } + + return n; } -// adds a g:line +// adds a line -void add_gline(long duration, const char* source,const char* reason,const char* hostmask) +bool XLineManager::AddLine(XLine* line, User* user) { - del_gline(hostmask); - GLine item; - item.duration = duration; - strlcpy(item.hostmask,hostmask,MAXBUF); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,MAXBUF); - item.n_matches = 0; - item.set_time = TIME; - glines.push_back(item); + if (line->duration && ServerInstance->Time() > line->expiry) + return false; // Don't apply expired XLines. + + /* 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; + + // 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; + + 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); + } + } + + /*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; + + ServerInstance->BanCache.RemoveEntries(line->type, false); // XXX perhaps remove ELines here? + + if (xlf->AutoApplyToUserList(line)) + pending_lines.push_back(line); + + lookup_lines[line->type][line->Displayable()] = line; + line->OnAdd(); + + FOREACH_MOD(OnAddLine, (user, line)); + + return true; } -// adds an e:line (exception to bans) +// deletes a line, returns true if the line existed and was removed -void add_eline(long duration, const char* source, const char* reason, const char* hostmask) +bool XLineManager::DelLine(const char* hostmask, const std::string& type, std::string& reason, User* user, bool simulate) { - del_eline(hostmask); - ELine item; - item.duration = duration; - strlcpy(item.hostmask,hostmask,MAXBUF); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,MAXBUF); - item.n_matches = 0; - item.set_time = TIME; - elines.push_back(item); + 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; + + reason.assign(y->second->reason); + + if (simulate) + return true; + + ServerInstance->BanCache.RemoveEntries(y->second->type, true); + + FOREACH_MOD(OnDelLine, (user, y->second)); + + y->second->Unset(); + + stdalgo::erase(pending_lines, y->second); + + delete y->second; + x->second.erase(y); + + return true; } -// adds a q:line -void add_qline(long duration, const char* source, const char* reason, const char* nickname) +void ELine::Unset() { - del_qline(nickname); - QLine item; - item.duration = duration; - strlcpy(item.nick,nickname,MAXBUF); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,MAXBUF); - item.n_matches = 0; - item.is_global = false; - item.set_time = TIME; - qlines.push_back(item); + ServerInstance->XLines->CheckELines(); } -// adds a z:line +// returns a pointer to the reason if a nickname matches a Q-line, NULL if it didn't match -void add_zline(long duration, const char* source, const char* reason, const char* ipaddr) +XLine* XLineManager::MatchesLine(const std::string &type, User* user) { - del_zline(ipaddr); - ZLine item; - item.duration = duration; - if (strchr(ipaddr,'@')) + 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(); ) { - while (*ipaddr != '@') - ipaddr++; - ipaddr++; + safei = i; + safei++; + + if (i->second->duration && current > i->second->expiry) + { + /* Expire the line, proceed to next one */ + ExpireLine(x, i); + i = safei; + continue; + } + + if (i->second->Matches(user)) + { + return i->second; + } + + i = safei; } - strlcpy(item.ipaddr,ipaddr,MAXBUF); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,MAXBUF); - item.n_matches = 0; - item.is_global = false; - item.set_time = TIME; - zlines.push_back(item); + return NULL; } -// adds a k:line - -void add_kline(long duration, const char* source, const char* reason, const char* hostmask) +XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern) { - del_kline(hostmask); - KLine item; - item.duration = duration; - strlcpy(item.hostmask,hostmask,MAXBUF); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,MAXBUF); - item.n_matches = 0; - item.set_time = TIME; - klines.push_back(item); -} + ContainerIter x = lookup_lines.find(type); -// deletes a g:line, returns true if the line existed and was removed + if (x == lookup_lines.end()) + return NULL; -bool del_gline(const char* hostmask) -{ - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + 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)) { - glines.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 - -bool del_eline(const char* hostmask) +// removes lines that have expired +void XLineManager::ExpireLine(ContainerIter container, LookupIter item, bool silent) { - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) - { - if (!strcasecmp(hostmask,i->hostmask)) - { - elines.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 q:line, returns true if the line existed and was removed -bool del_qline(const char* nickname) +// applies lines, removing clients and changing nicks etc as applicable +void XLineManager::ApplyLines() { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers(); + for (UserManager::LocalList::const_iterator j = list.begin(); j != list.end(); ) { - if (!strcasecmp(nickname,i->nick)) + 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++) { - qlines.erase(i); - return true; + XLine *x = *i; + if (x->Matches(u)) + { + 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 false; + + pending_lines.clear(); } -bool qline_make_global(const char* nickname) +void XLineManager::InvokeStats(const std::string& type, unsigned int numeric, Stats::Context& stats) { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + ContainerIter n = lookup_lines.find(type); + + time_t current = ServerInstance->Time(); + + LookupIter safei; + + if (n != lookup_lines.end()) { - if (!strcasecmp(nickname,i->nick)) + XLineLookup& list = n->second; + for (LookupIter i = list.begin(); i != list.end(); ) { - i->is_global = true; - return true; + safei = i; + safei++; + + if (i->second->duration && current > i->second->expiry) + { + ExpireLine(n, i); + } + else + stats.AddRow(numeric, i->second->Displayable(), i->second->set_time, i->second->duration, i->second->source, i->second->reason); + i = safei; } } - return false; } -bool zline_make_global(const char* ipaddr) +bool XLineManager::InvokeStats(const std::string& type, Stats::Context& context) { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + 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(ipaddr,i->ipaddr)) + // 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()) { - i->is_global = true; - 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; } -void sync_xlines(serverrec* serv, char* tcp_host) +XLineManager::XLineManager() { - char data[MAXBUF]; - - // for zlines and qlines, we should first check if theyre global... - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + GLineFactory* GFact; + ELineFactory* EFact; + KLineFactory* KFact; + QLineFactory* QFact; + ZLineFactory* ZFact; + + + GFact = new GLineFactory; + EFact = new ELineFactory; + KFact = new KLineFactory; + QFact = new QLineFactory; + ZFact = new ZLineFactory; + + RegisterFactory(GFact); + RegisterFactory(EFact); + RegisterFactory(KFact); + RegisterFactory(QFact); + RegisterFactory(ZFact); +} + +XLineManager::~XLineManager() +{ + const char gekqz[] = "GEKQZ"; + for(unsigned int i=0; i < sizeof(gekqz); i++) { - if (i->is_global) - { - snprintf(data,MAXBUF,"} %s %s %lu %lu :%s",i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); - serv->SendPacket(data,tcp_host); - } + XLineFactory* xlf = GetFactory(std::string(1, gekqz[i])); + delete xlf; } - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + + // Delete all existing XLines + for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++) { - if (i->is_global) + for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++) { - snprintf(data,MAXBUF,"{ %s %s %lu %lu :%s",i->nick,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); - serv->SendPacket(data,tcp_host); + delete j->second; } } - // glines are always global, so no need to check - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - { - snprintf(data,MAXBUF,"# %s %s %lu %lu :%s",i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason); - serv->SendPacket(data,tcp_host); - } } +void XLine::Apply(User* u) +{ +} -// deletes a z:line, returns true if the line existed and was removed +bool XLine::IsBurstable() +{ + return !from_config; +} -bool del_zline(const char* ipaddr) +void XLine::DefaultApply(User* u, const std::string &line, bool bancache) { - for (std::vector::iterator i = zlines.begin(); i != zlines.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(ipaddr,i->ipaddr)) - { - zlines.erase(i); - return true; - } + 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 false; } -// deletes a k:line, returns true if the line existed and was removed - -bool del_kline(const char* hostmask) +bool KLine::Matches(User *u) { - for (std::vector::iterator i = klines.begin(); i != klines.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(hostmask,i->hostmask)) + if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { - klines.erase(i); return true; } } + return false; } -// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match +void KLine::Apply(User* u) +{ + DefaultApply(u, "K", (this->identmask == "*") ? true : false); +} -char* matches_qline(const char* nick) +bool GLine::Matches(User *u) { - if (qlines.empty()) - return NULL; - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + LocalUser* lu = IS_LOCAL(u); + if (lu && lu->exempt) + return false; + + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - if (match(nick,i->nick)) + if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { - return i->reason; + return true; } } - return NULL; + + return false; } -// returns a pointer to the reason if a host matches a gline, NULL if it didnt match +void GLine::Apply(User* u) +{ + DefaultApply(u, "G", (this->identmask == "*") ? true : false); +} -char* matches_gline(const char* host) +bool ELine::Matches(User *u) { - if (glines.empty()) - return NULL; - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - if (match(host,i->hostmask)) + if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { - return i->reason; + return true; } } - return NULL; + + return false; } -char* matches_exception(const char* host) +bool ZLine::Matches(User *u) { - if (elines.empty()) - return NULL; - char host2[MAXBUF]; - snprintf(host2,MAXBUF,"*@%s",host); - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) - { - if ((match(host,i->hostmask)) || (match(host2,i->hostmask))) - { - return i->reason; - } - } - return NULL; -} + LocalUser* lu = IS_LOCAL(u); + if (lu && lu->exempt) + return false; + if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr)) + return true; + else + return false; +} -void gline_set_creation_time(char* host, time_t create_time) +void ZLine::Apply(User* u) { - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - { - if (!strcasecmp(host,i->hostmask)) - { - i->set_time = create_time; - return; - } - } - return ; + DefaultApply(u, "Z", true); } -void qline_set_creation_time(char* nick, time_t create_time) + +bool QLine::Matches(User *u) { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - { - if (!strcasecmp(nick,i->nick)) - { - i->set_time = create_time; - return; - } - } - return ; + if (InspIRCd::Match(u->nick, this->nick)) + return true; + + return false; } -void zline_set_creation_time(char* ip, time_t create_time) +void QLine::Apply(User* u) { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - { - if (!strcasecmp(ip,i->ipaddr)) - { - i->set_time = create_time; - return; - } - } - return ; + /* Force to uuid on apply of Q-line, no need to disconnect anymore :) */ + u->ChangeNick(u->uuid); } -// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match -char* matches_zline(const char* ipaddr) +bool ZLine::Matches(const std::string &str) { - if (zlines.empty()) - return NULL; - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - { - if (match(ipaddr,i->ipaddr)) - { - return i->reason; - } - } - return NULL; + if (InspIRCd::MatchCIDR(str, this->ipaddr)) + return true; + else + return false; +} + +bool QLine::Matches(const std::string &str) +{ + if (InspIRCd::Match(str, this->nick)) + return true; + + return false; } -// returns a pointer to the reason if a host matches a kline, NULL if it didnt match +bool ELine::Matches(const std::string &str) +{ + return (InspIRCd::MatchCIDR(str, matchtext)); +} -char* matches_kline(const char* host) +bool KLine::Matches(const std::string &str) { - if (klines.empty()) - return NULL; - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) - { - if (match(host,i->hostmask)) - { - return i->reason; - } - } - return NULL; + return (InspIRCd::MatchCIDR(str.c_str(), matchtext)); } -// removes lines that have expired +bool GLine::Matches(const std::string &str) +{ + return (InspIRCd::MatchCIDR(str, matchtext)); +} -void expire_lines() +void ELine::OnAdd() { - bool go_again = true; - time_t current = TIME; - - // because we mess up an iterator when we remove from the vector, we must bail from - // the loop early if we delete an item, therefore this outer while loop is required. - while (go_again) + /* 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++) { - go_again = false; + LocalUser* u = *u2; + if (this->Matches(u)) + u->exempt = true; + } +} - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) - { - if ((current > (i->duration + i->set_time)) && (i->duration > 0)) - { - WriteOpers("Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); - klines.erase(i); - go_again = true; - break; - } - } +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()); +} - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) - { - if ((current > (i->duration + i->set_time)) && (i->duration > 0)) - { - WriteOpers("Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); - elines.erase(i); - go_again = true; - break; - } - } - - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - { - if ((current > (i->duration + i->set_time)) && (i->duration > 0)) - { - WriteOpers("Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); - glines.erase(i); - go_again = true; - break; - } - } +const std::string& ELine::Displayable() +{ + return matchtext; +} - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - { - if ((current > (i->duration + i->set_time)) && (i->duration > 0)) - { - WriteOpers("Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration); - zlines.erase(i); - go_again = true; - break; - } - } +const std::string& KLine::Displayable() +{ + return matchtext; +} - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - { - if ((current > (i->duration + i->set_time)) && (i->duration > 0)) - { - WriteOpers("Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration); - qlines.erase(i); - go_again = true; - break; - } - } - } +const std::string& GLine::Displayable() +{ + return matchtext; } -// applies lines, removing clients and changing nicks etc as applicable +const std::string& ZLine::Displayable() +{ + return ipaddr; +} -void apply_lines() +const std::string& QLine::Displayable() { - bool go_again = true; - char reason[MAXBUF]; - char host[MAXBUF]; - - if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size())) - return; - - while (go_again) - { - go_again = false; - for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - if (!strcasecmp(u->second->server,ServerName)) - { - snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host); - if (elines.size()) - { - // ignore people matching exempts - if (matches_exception(host)) - continue; - } - if (glines.size()) - { - char* check = matches_gline(host); - if (check) - { - WriteOpers("*** User %s matches G-Line: %s",u->second->registered == 7 ? u->second->nick:"",check); - snprintf(reason,MAXBUF,"G-Lined: %s",check); - kill_link(u->second,reason); - go_again = true; - break; - } - } - if (klines.size()) - { - char* check = matches_kline(host); - if (check) - { - WriteOpers("*** User %s matches K-Line: %s",u->second->registered == 7 ? u->second->nick:"",check); - snprintf(reason,MAXBUF,"K-Lined: %s",check); - kill_link(u->second,reason); - go_again = true; - break; - } - } - if (qlines.size()) - { - char* check = matches_qline(u->second->nick); - if (check) - { - snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check); - WriteOpers("*** Q-Lined nickname %s from %s: %s",u->second->registered == 7 ? u->second->nick:"",u->second->host,check); - kill_link(u->second,reason); - go_again = true; - break; - } - } - if (zlines.size()) - { - char* check = matches_zline(u->second->ip); - if (check) - { - snprintf(reason,MAXBUF,"Z-Lined: %s",check); - WriteOpers("*** User %s matches Z-Line: %s",u->second->registered == 7 ? u->second->nick:"",u->second->host,check); - kill_link(u->second,reason); - go_again = true; - break; - } - } - } - } - } + return nick; } -void stats_k(userrec* user) +bool KLine::IsBurstable() { - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) - { - WriteServ(user->fd,"216 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason); - } + return false; } -void stats_g(userrec* user) +bool XLineManager::RegisterFactory(XLineFactory* xlf) { - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - { - WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,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 stats_q(userrec* user) +bool XLineManager::UnregisterFactory(XLineFactory* xlf) { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - { - WriteServ(user->fd,"217 %s :%s %d %d %s %s",user->nick,i->nick,i->set_time,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; } -void stats_z(userrec* user) +XLineFactory* XLineManager::GetFactory(const std::string &type) { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - { - WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason); - } + XLineFactMap::iterator n = line_factory.find(type); + + if (n == line_factory.end()) + return NULL; + + return n->second; } -void stats_e(userrec* user) +void XLineManager::ExpireRemovedConfigLines(const std::string& type, const insp::flat_set& configlines) { - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) - { - WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason); - } + // Nothing to do. + if (lookup_lines.empty()) + return; + + ContainerIter xlines = lookup_lines.find(type); + if (xlines == lookup_lines.end()) + return; + + 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); + } }