X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=66d24f439a6b12b600033a17bf40ef3b72ba6efd;hb=8ffce4d2f3ab29677b466238ce900a85b6c9d693;hp=d23f3b108e564403acc9a624ceb9b00519d7c720;hpb=4c5acb6a26da3aa16123e848d22e96799e545d2c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index d23f3b108..66d24f439 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -1,759 +1,782 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 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) 2009 Daniel De Graaf + * Copyright (C) 2005-2009 Robin Burchell + * Copyright (C) 2004-2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 John Brooks * - * --------------------------------------------------- + * 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 . */ -using namespace std; -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#include -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include -#include "users.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" -#include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" -#include "cull_list.h" - -extern ServerConfig *Config; - -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern ServerConfig* Config; -extern user_hash clientlist; -extern std::vector local_users; - -/* 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 permenant items (ones which will expire). - * Items which are on the permenant 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 - */ +#include "bancache.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, long duration, std::string source, std::string reason, std::string xline_specific_mask) + { + IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); + return new GLine(set_time, duration, source, reason, ih.first, ih.second); + } +}; -extern time_t TIME; +/** An XLineFactory specialized to generate ELine* pointers + */ +class ELineFactory : public XLineFactory +{ + public: + ELineFactory() : XLineFactory("E") { } -/* Lists for temporary lines with an expiry time */ + /** Generate an ELine + */ + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + { + IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); + return new ELine(set_time, duration, source, reason, ih.first, ih.second); + } +}; -std::vector klines; -std::vector glines; -std::vector zlines; -std::vector qlines; -std::vector elines; +/** An XLineFactory specialized to generate KLine* pointers + */ +class KLineFactory : public XLineFactory +{ + public: + KLineFactory() : XLineFactory("K") { } -/* Seperate lists for perm XLines that isnt checked by expiry functions */ + /** Generate a KLine + */ + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + { + IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); + return new KLine(set_time, duration, source, reason, ih.first, ih.second); + } +}; -std::vector pklines; -std::vector pglines; -std::vector pzlines; -std::vector pqlines; -std::vector pelines; +/** An XLineFactory specialized to generate QLine* pointers + */ +class QLineFactory : public XLineFactory +{ + public: + QLineFactory() : XLineFactory("Q") { } + /** Generate a QLine + */ + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + { + return new QLine(set_time, duration, source, reason, xline_specific_mask); + } +}; -bool GSortComparison ( const GLine one, const GLine two ); -bool ZSortComparison ( const ZLine one, const ZLine two ); -bool ESortComparison ( const ELine one, const ELine two ); -bool QSortComparison ( const QLine one, const QLine two ); -bool KSortComparison ( const KLine one, const KLine two ); +/** An XLineFactory specialized to generate ZLine* pointers + */ +class ZLineFactory : public XLineFactory +{ + public: + ZLineFactory() : XLineFactory("Z") { } -// 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. + /** Generate a ZLine + */ + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + { + return new ZLine(set_time, duration, source, reason, xline_specific_mask); + } +}; -bool InitXLine(const char* tag) -{ - return true; -} -bool DoneXLine(const char* tag) -{ - apply_lines(APPLY_ALL); - return true; -} +/* + * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and + * efficient as we can this time so we can close this file and never ever touch it again .. + * + * Background: + * Version 1 stored all line types in one list (one for g, one for z, etc). This was fine, + * but both version 1 and 2 suck at applying lines efficiently. That is, every time a new line + * was added, it iterated every existing line for every existing user. Ow. Expiry was also + * expensive, as the lists were NOT sorted. + * + * Version 2 moved permanent lines into a seperate list from non-permanent to help optimize + * matching speed, but matched in the same way. + * Expiry was also sped up by sorting the list by expiry (meaning just remove the items at the + * head of the list that are outdated.) + * + * 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 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). + * + * 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 DoZLine(const char* tag, char** entries, void** values, int* types) +bool XLine::Matches(User *u) { - char* reason = (char*)values[0]; - char* ipmask = (char*)values[1]; - add_zline(0,"",reason,ipmask); - log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason); - return true; + return false; } -bool DoQLine(const char* tag, char** entries, void** values, int* types) +/* + * Checks what users match a given vector of ELines and sets their ban exempt flag accordingly. + */ +void XLineManager::CheckELines() { - char* reason = (char*)values[0]; - char* nick = (char*)values[1]; - add_qline(0,"",reason,nick); - log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason); - return true; -} + ContainerIter n = lookup_lines.find("E"); -bool DoKLine(const char* tag, char** entries, void** values, int* types) -{ - char* reason = (char*)values[0]; - char* host = (char*)values[1]; - add_kline(0,"",reason,host); - log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason); - return true; -} + if (n == lookup_lines.end()) + return; -bool DoELine(const char* tag, char** entries, void** values, int* types) -{ - char* reason = (char*)values[0]; - char* host = (char*)values[1]; - add_eline(0,"",reason,host); - log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason); - return true; -} + XLineLookup& ELines = n->second; -// adds a g:line + if (ELines.empty()) + return; -bool add_gline(long duration, const char* source,const char* reason,const char* hostmask) -{ - bool ret = del_gline(hostmask); - GLine item; - item.duration = duration; - strlcpy(item.hostmask,hostmask,199); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,255); - item.n_matches = 0; - item.set_time = TIME; - if (duration) - { - glines.push_back(item); - sort(glines.begin(), glines.end(),GSortComparison); - } - else + for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { - pglines.push_back(item); - } - return !ret; -} + User* u = (User*)(*u2); -// adds an e:line (exception to bans) + /* This uses safe iteration to ensure that if a line expires here, it doenst trash the iterator */ + LookupIter safei; -bool add_eline(long duration, const char* source, const char* reason, const char* hostmask) -{ - bool ret = del_eline(hostmask); - ELine item; - item.duration = duration; - strlcpy(item.hostmask,hostmask,199); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,255); - item.n_matches = 0; - item.set_time = TIME; - if (duration) - { - elines.push_back(item); - sort(elines.begin(), elines.end(),ESortComparison); - } - else - { - pelines.push_back(item); + for (LookupIter i = ELines.begin(); i != ELines.end(); ) + { + safei = i; + safei++; + + XLine *e = i->second; + u->exempt = e->Matches(u); + + i = safei; + } } - return !ret; } -// adds a q:line -bool add_qline(long duration, const char* source, const char* reason, const char* nickname) +XLineLookup* XLineManager::GetAll(const std::string &type) { - bool ret = del_qline(nickname); - QLine item; - item.duration = duration; - strlcpy(item.nick,nickname,63); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,255); - item.n_matches = 0; - item.is_global = false; - item.set_time = TIME; - if (duration) - { - qlines.push_back(item); - sort(qlines.begin(), qlines.end(),QSortComparison); - } - else + ContainerIter n = lookup_lines.find(type); + + if (n == lookup_lines.end()) + return NULL; + + LookupIter safei; + const time_t current = ServerInstance->Time(); + + /* Expire any dead ones, before sending */ + for (LookupIter x = n->second.begin(); x != n->second.end(); ) { - pqlines.push_back(item); + safei = x; + safei++; + if (x->second->duration && current > x->second->expiry) + { + ExpireLine(n, x); + } + x = safei; } - return !ret; -} -// adds a z:line + return &(n->second); +} -bool add_zline(long duration, const char* source, const char* reason, const char* ipaddr) +void XLineManager::DelAll(const std::string &type) { - bool ret = del_zline(ipaddr); - ZLine item; - item.duration = duration; - if (strchr(ipaddr,'@')) - { - while (*ipaddr != '@') - ipaddr++; - ipaddr++; - } - strlcpy(item.ipaddr,ipaddr,39); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,255); - item.n_matches = 0; - item.is_global = false; - item.set_time = TIME; - if (duration) - { - zlines.push_back(item); - sort(zlines.begin(), zlines.end(),ZSortComparison); - } - else + 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()) { - pzlines.push_back(item); + ExpireLine(n, x); } - return !ret; } -// adds a k:line +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; +} -bool add_kline(long duration, const char* source, const char* reason, const char* hostmask) +IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) { - bool ret = del_kline(hostmask); - KLine item; - item.duration = duration; - strlcpy(item.hostmask,hostmask,200); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,255); - item.n_matches = 0; - item.set_time = TIME; - if (duration) + IdentHostPair n = std::make_pair("*","*"); + std::string::size_type x = ident_and_host.find('@'); + if (x != std::string::npos) { - klines.push_back(item); - sort(klines.begin(), klines.end(),KSortComparison); + n.second = ident_and_host.substr(x + 1,ident_and_host.length()); + n.first = ident_and_host.substr(0, x); + if (!n.first.length()) + n.first.assign("*"); + if (!n.second.length()) + n.second.assign("*"); } else { - pklines.push_back(item); + n.first.clear(); + n.second = ident_and_host; } - return !ret; + + return n; } -// deletes a g:line, returns true if the line existed and was removed +// adds a line -bool del_gline(const char* hostmask) +bool XLineManager::AddLine(XLine* line, User* user) { - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - { - if (!strcasecmp(hostmask,i->hostmask)) - { - glines.erase(i); - return true; - } - } - for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) + 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()) { - if (!strcasecmp(hostmask,i->hostmask)) + LookupIter i = x->second.find(line->Displayable()); + if (i != x->second.end()) { - pglines.erase(i); - return true; + // XLine propagation bug was here, if the line to be added already exists and + // it's expired then expire it and add the new one instead of returning false + if ((!i->second->duration) || (ServerInstance->Time() < i->second->expiry)) + return false; + + ExpireLine(x, i); } } - return false; + + /*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(I_OnAddLine,OnAddLine(user, line)); + + return true; } -// deletes a e:line, returns true if the line existed and was removed +// deletes a line, returns true if the line existed and was removed -bool del_eline(const char* hostmask) +bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate) { - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) - { - if (!strcasecmp(hostmask,i->hostmask)) - { - 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 false; + + LookupIter y = x->second.find(hostmask); + + if (y == x->second.end()) + return false; + + if (simulate) + return true; + + ServerInstance->BanCache->RemoveEntries(y->second->type, true); + + FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second)); + + y->second->Unset(); + + std::vector::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), y->second); + if (pptr != pending_lines.end()) + pending_lines.erase(pptr); + + delete y->second; + x->second.erase(y); + + return true; +} + + +void ELine::Unset() +{ + /* remove exempt from everyone and force recheck after deleting eline */ + for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { - if (!strcasecmp(hostmask,i->hostmask)) - { - pelines.erase(i); - return true; - } + User* u = (User*)(*u2); + u->exempt = false; } - return false; + + ServerInstance->XLines->CheckELines(); } -// deletes a q: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 del_qline(const char* nickname) +XLine* XLineManager::MatchesLine(const std::string &type, User* user) { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + ContainerIter x = lookup_lines.find(type); + + if (x == lookup_lines.end()) + return NULL; + + const time_t current = ServerInstance->Time(); + + LookupIter safei; + + for (LookupIter i = x->second.begin(); i != x->second.end(); ) { - if (!strcasecmp(nickname,i->nick)) + safei = i; + safei++; + + if (i->second->duration && current > i->second->expiry) { - qlines.erase(i); - return true; + /* Expire the line, proceed to next one */ + ExpireLine(x, i); + i = safei; + continue; } - } - for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) - { - if (!strcasecmp(nickname,i->nick)) + + if (i->second->Matches(user)) { - pqlines.erase(i); - return true; + return i->second; } + + i = safei; } - return false; + return NULL; } -bool qline_make_global(const char* nickname) +XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern) { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + ContainerIter x = lookup_lines.find(type); + + if (x == lookup_lines.end()) + return NULL; + + const time_t current = ServerInstance->Time(); + + LookupIter safei; + + for (LookupIter i = x->second.begin(); i != x->second.end(); ) { - if (!strcasecmp(nickname,i->nick)) + safei = i; + safei++; + + if (i->second->Matches(pattern)) { - i->is_global = true; - 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; } -bool zline_make_global(const char* ipaddr) +// removes lines that have expired +void XLineManager::ExpireLine(ContainerIter container, LookupIter item) { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - { - if (!strcasecmp(ipaddr,i->ipaddr)) - { - i->is_global = true; - return true; - } - } - return false; + FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second)); + + item->second->DisplayExpiry(); + item->second->Unset(); + + /* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line + * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending? + * -- Brain + */ + std::vector::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); } -// deletes a z:line, returns true if the line existed and was removed -bool del_zline(const char* ipaddr) +// applies lines, removing clients and changing nicks etc as applicable +void XLineManager::ApplyLines() { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + LocalUserList::reverse_iterator u2 = ServerInstance->Users->local_users.rbegin(); + while (u2 != ServerInstance->Users->local_users.rend()) { - if (!strcasecmp(ipaddr,i->ipaddr)) + User* u = *u2++; + + // Don't ban people who are exempt. + if (u->exempt) + continue; + + for (std::vector::iterator i = pending_lines.begin(); i != pending_lines.end(); i++) { - zlines.erase(i); - return true; + XLine *x = *i; + if (x->Matches(u)) + x->Apply(u); } } - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) + + pending_lines.clear(); +} + +void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, string_list &results) +{ + ContainerIter n = lookup_lines.find(type); + + time_t current = ServerInstance->Time(); + + LookupIter safei; + + if (n != lookup_lines.end()) { - if (!strcasecmp(ipaddr,i->ipaddr)) + XLineLookup& list = n->second; + for (LookupIter i = list.begin(); i != list.end(); ) { - pzlines.erase(i); - return true; + safei = i; + safei++; + + if (i->second->duration && current > i->second->expiry) + { + ExpireLine(n, i); + } + else + results.push_back(ServerInstance->Config->ServerName+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+ + ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+i->second->source+" :"+i->second->reason); + i = safei; } } - return false; } -// deletes a k:line, returns true if the line existed and was removed -bool del_kline(const char* hostmask) +XLineManager::XLineManager() +{ + GLineFactory* GFact; + ELineFactory* EFact; + KLineFactory* KFact; + QLineFactory* QFact; + ZLineFactory* ZFact; + + + GFact = new GLineFactory; + EFact = new ELineFactory; + KFact = new KLineFactory; + QFact = new QLineFactory; + ZFact = new ZLineFactory; + + RegisterFactory(GFact); + RegisterFactory(EFact); + RegisterFactory(KFact); + RegisterFactory(QFact); + RegisterFactory(ZFact); +} + +XLineManager::~XLineManager() { - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) + const char gekqz[] = "GEKQZ"; + for(unsigned int i=0; i < sizeof(gekqz); i++) { - if (!strcasecmp(hostmask,i->hostmask)) - { - klines.erase(i); - return true; - } + XLineFactory* xlf = GetFactory(std::string(1, gekqz[i])); + delete xlf; } - for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) + + // Delete all existing XLines + for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++) { - if (!strcasecmp(hostmask,i->hostmask)) + for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++) { - pklines.erase(i); - return true; + delete j->second; } } - return false; } -// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match - -char* matches_qline(const char* nick) +void XLine::Apply(User* u) { - if ((qlines.empty()) && (pqlines.empty())) - return NULL; - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - if (match(nick,i->nick)) - return i->reason; - for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) - if (match(nick,i->nick)) - return i->reason; - return NULL; } -// returns a pointer to the reason if a host matches a gline, NULL if it didnt match - -char* matches_gline(const char* host) +bool XLine::IsBurstable() { - if ((glines.empty()) && (pglines.empty())) - return NULL; - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - if (match(host,i->hostmask)) - return i->reason; - for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) - if (match(host,i->hostmask)) - return i->reason; - return NULL; + return true; } -char* matches_exception(const char* host) +void XLine::DefaultApply(User* u, const std::string &line, bool bancache) { - if ((elines.empty()) && (pelines.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; - for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) - if ((match(host,i->hostmask)) || (match(host2,i->hostmask))) - return i->reason; - return NULL; -} + char sreason[MAXBUF]; + snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason.c_str()); + if (!ServerInstance->Config->MoronBanner.empty()) + u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner.c_str()); + if (ServerInstance->Config->HideBans) + ServerInstance->Users->QuitUser(u, line + "-Lined", sreason); + else + ServerInstance->Users->QuitUser(u, sreason); -void gline_set_creation_time(char* host, time_t create_time) -{ - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - { - if (!strcasecmp(host,i->hostmask)) - { - i->set_time = create_time; - return; - } - } - for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) + + if (bancache) { - if (!strcasecmp(host,i->hostmask)) - { - i->set_time = create_time; - return; - } + ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString()); + if (this->duration > 0) + ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason, this->duration); + else + ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason); } - return ; } -void eline_set_creation_time(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; - return; - } - } - for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + if (u->exempt) + return false; + + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - if (!strcasecmp(host,i->hostmask)) + if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { - i->set_time = create_time; - return; + return true; } } - return; + + return false; } -void qline_set_creation_time(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; - 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 zline_set_creation_time(char* ip, time_t create_time) +bool GLine::Matches(User *u) { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + if (u->exempt) + return false; + + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - if (!strcasecmp(ip,i->ipaddr)) + if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { - i->set_time = create_time; - return; + return true; } } - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) + + return false; +} + +void GLine::Apply(User* u) +{ + DefaultApply(u, "G", (this->identmask == "*") ? true : false); +} + +bool ELine::Matches(User *u) +{ + if (u->exempt) + return false; + + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - if (!strcasecmp(ip,i->ipaddr)) + if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { - i->set_time = create_time; - return; + return true; } } - return; + + return false; } -// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match +bool ZLine::Matches(User *u) +{ + if (u->exempt) + return false; -char* matches_zline(const char* ipaddr) + if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr)) + return true; + else + return false; +} + +void ZLine::Apply(User* u) { - if ((zlines.empty()) && (pzlines.empty())) - return NULL; - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - if (match(ipaddr,i->ipaddr)) - return i->reason; - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) - if (match(ipaddr,i->ipaddr)) - return i->reason; - return NULL; + DefaultApply(u, "Z", true); } -// returns a pointer to the reason if a host matches a kline, NULL if it didnt match -char* matches_kline(const char* host) +bool QLine::Matches(User *u) { - if ((klines.empty()) && (pklines.empty())) - return NULL; - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) - if (match(host,i->hostmask)) - return i->reason; - for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) - if (match(host,i->hostmask)) - return i->reason; - return NULL; + if (InspIRCd::Match(u->nick, this->nick)) + return true; + + return false; } -bool GSortComparison ( const GLine one, const GLine two ) +void QLine::Apply(User* u) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + /* Force to uuid on apply of qline, no need to disconnect any more :) */ + u->ForceNickChange(u->uuid.c_str()); } -bool ESortComparison ( const ELine one, const ELine two ) + +bool ZLine::Matches(const std::string &str) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + if (InspIRCd::MatchCIDR(str, this->ipaddr)) + return true; + else + return false; } -bool ZSortComparison ( const ZLine one, const ZLine two ) +bool QLine::Matches(const std::string &str) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + if (InspIRCd::Match(str, this->nick)) + return true; + + return false; } -bool KSortComparison ( const KLine one, const KLine two ) +bool ELine::Matches(const std::string &str) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + return (InspIRCd::MatchCIDR(str, matchtext)); } -bool QSortComparison ( const QLine one, const QLine two ) +bool KLine::Matches(const std::string &str) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + return (InspIRCd::MatchCIDR(str.c_str(), matchtext)); } -// removes lines that have expired - -void expire_lines() +bool GLine::Matches(const std::string &str) { - time_t current = TIME; - - /* Because we now store all our XLines in sorted order using (i->duration + i->set_time) as a key, this - * means that to expire the XLines we just need to do a while, picking off the top few until there are - * none left at the head of the queue that are after the current time. - */ - - while ((glines.size()) && (current > (glines.begin()->duration + glines.begin()->set_time))) - { - std::vector::iterator i = glines.begin(); - WriteOpers("Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); - glines.erase(i); - } + return (InspIRCd::MatchCIDR(str, matchtext)); +} - while ((elines.size()) && (current > (elines.begin()->duration + elines.begin()->set_time))) +void ELine::OnAdd() +{ + /* When adding one eline, only check the one eline */ + for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { - std::vector::iterator i = elines.begin(); - WriteOpers("Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); - elines.erase(i); + User* u = (User*)(*u2); + if (this->Matches(u)) + u->exempt = true; } +} - while ((zlines.size()) && (current > (zlines.begin()->duration + zlines.begin()->set_time))) - { - std::vector::iterator i = zlines.begin(); - WriteOpers("Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration); - zlines.erase(i); - } +void ELine::DisplayExpiry() +{ + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)", + identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time)); +} - while ((klines.size()) && (current > (klines.begin()->duration + klines.begin()->set_time))) - { - std::vector::iterator i = klines.begin(); - WriteOpers("Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); - klines.erase(i); - } +void QLine::DisplayExpiry() +{ + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)", + nick.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time)); +} - while ((qlines.size()) && (current > (qlines.begin()->duration + qlines.begin()->set_time))) - { - std::vector::iterator i = qlines.begin(); - WriteOpers("Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration); - qlines.erase(i); - } - +void ZLine::DisplayExpiry() +{ + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)", + ipaddr.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time)); } -// applies lines, removing clients and changing nicks etc as applicable +void KLine::DisplayExpiry() +{ + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)", + identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time)); +} -void apply_lines(const int What) +void GLine::DisplayExpiry() { - char reason[MAXBUF]; - char host[MAXBUF]; + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)", + identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time)); +} - if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && - (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) - return; +const char* ELine::Displayable() +{ + return matchtext.c_str(); +} - CullList* Goners = new CullList(); - char* check = NULL; - for (std::vector::const_iterator u2 = local_users.begin(); u2 != local_users.end(); u2++) - { - userrec* u = (userrec*)(*u2); - u->MakeHost(host); - if (elines.size() || pelines.size()) - { - // ignore people matching exempts - if (matches_exception(host)) - continue; - } - if ((What & APPLY_GLINES) && (glines.size() || pglines.size())) - { - if ((check = matches_gline(host))) - { - snprintf(reason,MAXBUF,"G-Lined: %s",check); - Goners->AddItem(u,reason); - } - } - if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) - { - if ((check = matches_kline(host))) - { - snprintf(reason,MAXBUF,"K-Lined: %s",check); - Goners->AddItem(u,reason); - } - } - if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size())) - { - if ((check = matches_qline(u->nick))) - { - snprintf(reason,MAXBUF,"Q-Lined: %s",check); - Goners->AddItem(u,reason); - } - } - if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) - { - if ((check = matches_zline((char*)inet_ntoa(u->ip4)))) - { - snprintf(reason,MAXBUF,"Z-Lined: %s",check); - Goners->AddItem(u,reason); - } - } - } +const char* KLine::Displayable() +{ + return matchtext.c_str(); +} - Goners->Apply(); - delete Goners; +const char* GLine::Displayable() +{ + return matchtext.c_str(); } -void stats_k(userrec* user) +const char* ZLine::Displayable() { - 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); - for (std::vector::iterator i = pklines.begin(); i != pklines.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 ipaddr.c_str(); } -void stats_g(userrec* user) +const char* QLine::Displayable() { - 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); - for (std::vector::iterator i = pglines.begin(); i != pglines.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); + return nick.c_str(); } -void stats_q(userrec* user) +bool KLine::IsBurstable() { - 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); - for (std::vector::iterator i = pqlines.begin(); i != pqlines.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); + return false; } -void stats_z(userrec* user) +bool XLineManager::RegisterFactory(XLineFactory* xlf) { - 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); - for (std::vector::iterator i = pzlines.begin(); i != pzlines.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(xlf->GetType()); + + if (n != line_factory.end()) + return false; + + line_factory[xlf->GetType()] = xlf; + + return true; } -void stats_e(userrec* user) +bool XLineManager::UnregisterFactory(XLineFactory* xlf) { - 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); - for (std::vector::iterator i = pelines.begin(); i != pelines.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.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; +}