X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=f436d96922038bd69b981550bb1621d67deb6c49;hb=d67f0923b5502ac20b8327b98cce21e015123493;hp=df522de4c27a577274900a002d54aacc9903cec2;hpb=f7d0f0a514da049ed45c081a3a2b47ade8416039;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index df522de4c..f436d9692 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -2,60 +2,48 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; +/* $Core: libIRCDxline */ -#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; +/* + * 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. Expiry will + * still use a sorted list, and we'll just ignore anything permanent. + * + * Application will be by a list of lines 'pending' application, meaning only the newly added lines + * will be gone over. Much faster. + * + * More of course is to come. + */ /* Version two, now with optimized expiry! * @@ -63,10 +51,10 @@ extern std::vector local_users; * 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 + * 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 + * (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 @@ -75,677 +63,607 @@ extern std::vector local_users; * -- Brain */ +bool InitXLine(ServerConfig* conf, const char* tag) +{ + return true; +} +bool DoneZLine(ServerConfig* conf, const char* tag) +{ + // XXX we should really only call this once - after we've finished processing configuration all together + conf->GetInstance()->XLines->ApplyLines(); + return true; +} -extern time_t TIME; +bool DoneQLine(ServerConfig* conf, const char* tag) +{ + // XXX we should really only call this once - after we've finished processing configuration all together + conf->GetInstance()->XLines->ApplyLines(); + return true; +} -/* Lists for temporary lines with an expiry time */ +bool DoneKLine(ServerConfig* conf, const char* tag) +{ + // XXX we should really only call this once - after we've finished processing configuration all together + conf->GetInstance()->XLines->ApplyLines(); + return true; +} + +bool DoneELine(ServerConfig* conf, const char* tag) +{ + // XXX we should really only call this once - after we've finished processing configuration all together + conf->GetInstance()->XLines->ApplyLines(); + return true; +} -std::vector klines; -std::vector glines; -std::vector zlines; -std::vector qlines; -std::vector elines; +bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) +{ + const char* reason = values[0].GetString(); + const char* ipmask = values[1].GetString(); -/* Seperate lists for perm XLines that isnt checked by expiry functions */ + conf->GetInstance()->XLines->AddZLine(0,"",reason,ipmask); + return true; +} -std::vector pklines; -std::vector pglines; -std::vector pzlines; -std::vector pqlines; -std::vector pelines; +bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) +{ + const char* reason = values[0].GetString(); + const char* nick = values[1].GetString(); + conf->GetInstance()->XLines->AddQLine(0,"",reason,nick); + return true; +} -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 ); +bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) +{ + const char* reason = values[0].GetString(); + const char* host = values[1].GetString(); -// 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. + conf->GetInstance()->XLines->AddKLine(0,"",reason,host); + return true; +} -void read_xline_defaults() +bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { - char ipmask[MAXBUF]; - char nick[MAXBUF]; - char host[MAXBUF]; - char reason[MAXBUF]; + const char* reason = values[0].GetString(); + const char* host = values[1].GetString(); - for (int i = 0; i < Config->ConfValueEnum("badip",&Config->config_f); i++) - { - Config->ConfValue("badip","ipmask",i,ipmask,&Config->config_f); - Config->ConfValue("badip","reason",i,reason,&Config->config_f); - add_zline(0,"",reason,ipmask); - log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason); - } - - for (int i = 0; i < Config->ConfValueEnum("badnick",&Config->config_f); i++) - { - Config->ConfValue("badnick","nick",i,nick,&Config->config_f); - Config->ConfValue("badnick","reason",i,reason,&Config->config_f); - add_qline(0,"",reason,nick); - log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason); - } - - for (int i = 0; i < Config->ConfValueEnum("badhost",&Config->config_f); i++) - { - Config->ConfValue("badhost","host",i,host,&Config->config_f); - Config->ConfValue("badhost","reason",i,reason,&Config->config_f); - add_kline(0,"",reason,host); - log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason); - } - for (int i = 0; i < Config->ConfValueEnum("exception",&Config->config_f); i++) + conf->GetInstance()->XLines->AddELine(0,"",reason,host); + return true; +} + +bool XLine::Matches(User *u) +{ + return false; +} + +//XXX perhaps move into xlinemanager +void CheckELines(InspIRCd *ServerInstance, std::map &ELines) +{ + for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { - Config->ConfValue("exception","host",i,host,&Config->config_f); - Config->ConfValue("exception","reason",i,reason,&Config->config_f); - add_eline(0,"",reason,host); - log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason); + User* u = (User*)(*u2); + + for (std::map::iterator i = ELines.begin(); i != ELines.end(); i++) + { + ELine *e = i->second; + u->exempt = e->Matches(u); + } } } -// adds a g:line -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) +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) { - glines.push_back(item); - sort(glines.begin(), glines.end(),GSortComparison); + 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 { - pglines.push_back(item); + n.second = ident_and_host; } - return !ret; + + return n; +} + +// adds a g:line + +bool XLineManager::AddGLine(long duration, const char* source,const char* reason,const char* hostmask) +{ + IdentHostPair ih = IdentSplit(hostmask); + + if (DelLine(hostmask, 'G', true)) + return false; + + GLine* item = new GLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + + active_lines.push_back(item); + sort(active_lines.begin(), active_lines.end(),XLineManager::XSortComparison); + pending_lines.push_back(item); + + return true; } // adds an e:line (exception to bans) -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); - } - return !ret; +bool XLineManager::AddELine(long duration, const char* source, const char* reason, const char* hostmask) +{ + IdentHostPair ih = IdentSplit(hostmask); + + if (DelLine(hostmask, 'E', true)) + return false; + + ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + + active_lines.push_back(item); + sort(active_lines.begin(), active_lines.end(),XLineManager::XSortComparison); + elines[hostmask] = item; + + // XXX we really only need to check one line (the new one) - this is a bit wasteful! + CheckELines(ServerInstance, elines); + + return true; } // adds a q:line -bool add_qline(long duration, const char* source, const char* reason, const char* nickname) -{ - 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 - { - pqlines.push_back(item); - } - return !ret; +bool XLineManager::AddQLine(long duration, const char* source, const char* reason, const char* nickname) +{ + if (DelLine(nickname, 'Q', true)) + return false; + + QLine* item = new QLine(ServerInstance, ServerInstance->Time(), duration, source, reason, nickname); + + active_lines.push_back(item); + sort(active_lines.begin(), active_lines.end(), XLineManager::XSortComparison); + pending_lines.push_back(item); + + return true; } // adds a z:line -bool add_zline(long duration, const char* source, const char* reason, const char* ipaddr) +bool XLineManager::AddZLine(long duration, const char* source, const char* reason, const char* ipaddr) { - 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 - { - pzlines.push_back(item); - } - return !ret; -} -// adds a k:line + if (DelLine(ipaddr, 'Z', true)) + return false; -bool add_kline(long duration, const char* source, const char* reason, const char* hostmask) -{ - 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) - { - klines.push_back(item); - sort(klines.begin(), klines.end(),KSortComparison); - } - else - { - pklines.push_back(item); - } - return !ret; -} + ZLine* item = new ZLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ipaddr); -// deletes a g:line, returns true if the line existed and was removed + active_lines.push_back(item); + sort(active_lines.begin(), active_lines.end(),XLineManager::XSortComparison); + pending_lines.push_back(item); -bool del_gline(const char* hostmask) -{ - 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 (!strcasecmp(hostmask,i->hostmask)) - { - pglines.erase(i); - return true; - } - } - return false; + return true; } -// deletes a e:line, returns true if the line existed and was removed +// adds a k:line -bool del_eline(const char* hostmask) +bool XLineManager::AddKLine(long duration, const char* source, const char* reason, const char* hostmask) { - 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++) - { - if (!strcasecmp(hostmask,i->hostmask)) - { - pelines.erase(i); - return true; - } - } - return false; -} + IdentHostPair ih = IdentSplit(hostmask); -// deletes a q:line, returns true if the line existed and was removed + if (DelLine(hostmask, 'K', true)) + return false; -bool del_qline(const char* nickname) -{ - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - { - if (!strcasecmp(nickname,i->nick)) - { - qlines.erase(i); - return true; - } - } - for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) - { - if (!strcasecmp(nickname,i->nick)) - { - pqlines.erase(i); - return true; - } - } - return false; -} + KLine* item = new KLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); -bool qline_make_global(const char* nickname) -{ - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - { - if (!strcasecmp(nickname,i->nick)) - { - i->is_global = true; - return true; - } - } - return false; -} + active_lines.push_back(item); + sort(active_lines.begin(), active_lines.end(),XLineManager::XSortComparison); + pending_lines.push_back(item); -bool zline_make_global(const char* ipaddr) -{ - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - { - if (!strcasecmp(ipaddr,i->ipaddr)) - { - i->is_global = true; - return true; - } - } - return false; + return true; } -// deletes a z:line, returns true if the line existed and was removed +// deletes a g:line, returns true if the line existed and was removed -bool del_zline(const char* ipaddr) +bool XLineManager::DelLine(const char* hostmask, char type, bool simulate) { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - { - if (!strcasecmp(ipaddr,i->ipaddr)) - { - zlines.erase(i); - return true; - } - } - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) + IdentHostPair ih = IdentSplit(hostmask); + for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) { - if (!strcasecmp(ipaddr,i->ipaddr)) + if ((*i)->type == type) { - pzlines.erase(i); - return true; + if ((*i)->Matches(hostmask)) + { + if (!simulate) + { + (*i)->Unset(); + delete *i; + active_lines.erase(i); + /* XXX: Should erase from pending lines here */ + } + return true; + } } } + return false; } -// deletes a k:line, returns true if the line existed and was removed -bool del_kline(const char* hostmask) +void ELine::Unset() { - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) + /* remove exempt from everyone and force recheck after deleting eline */ + for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { - if (!strcasecmp(hostmask,i->hostmask)) - { - klines.erase(i); - return true; - } + User* u = (User*)(*u2); + u->exempt = false; } - for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) - { - if (!strcasecmp(hostmask,i->hostmask)) - { - pklines.erase(i); - return true; - } - } - return false; + ServerInstance->XLines->elines.erase(this->identmask + std::string("@") + this->hostmask); + CheckELines(ServerInstance, ServerInstance->XLines->elines); } // returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match -char* matches_qline(const char* nick) +QLine* XLineManager::matches_qline(const char* nick) { - 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; + for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) + if ((*i)->type == 'Q' && (*i)->Matches(nick)) + return (QLine*)(*i); 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) +GLine* XLineManager::matches_gline(User* user) { - 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; + for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) + if ((*i)->type == 'G' && (*i)->Matches(user)) + return (GLine*)(*i); + return NULL; } -char* matches_exception(const char* host) +ELine* XLineManager::matches_exception(User* user) { - 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; + if (elines.empty()) + return NULL; + + for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) + { + if ((*i)->type == 'E' && (*i)->Matches(user)) + return (ELine*)(*i); + } + return NULL; } -void gline_set_creation_time(char* host, time_t create_time) +void XLineManager::gline_set_creation_time(const char* host, time_t create_time) { - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + /*for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { - if (!strcasecmp(host,i->hostmask)) + if (!strcasecmp(host,(*i)->hostmask)) { - i->set_time = create_time; + (*i)->set_time = create_time; + (*i)->expiry = create_time + (*i)->duration; return; } - } - for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) - { - if (!strcasecmp(host,i->hostmask)) - { - i->set_time = create_time; - return; - } - } - return ; + }*/ + + return ; } -void eline_set_creation_time(char* host, time_t create_time) +void XLineManager::eline_set_creation_time(const char* host, time_t create_time) { - 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++) + /*for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) { - if (!strcasecmp(host,i->hostmask)) + if (!strcasecmp(host,(*i)->hostmask)) { - i->set_time = create_time; + (*i)->set_time = create_time; + (*i)->expiry = create_time + (*i)->duration; return; } - } + }*/ + return; } -void qline_set_creation_time(char* nick, time_t create_time) +void XLineManager::qline_set_creation_time(const char* nick, time_t create_time) { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + /*for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { - if (!strcasecmp(nick,i->nick)) + if (!strcasecmp(nick,(*i)->nick)) { - i->set_time = create_time; + (*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; } -void zline_set_creation_time(char* ip, time_t create_time) +void XLineManager::zline_set_creation_time(const char* ip, time_t create_time) { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + /*for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { - if (!strcasecmp(ip,i->ipaddr)) + if (!strcasecmp(ip,(*i)->ipaddr)) { - i->set_time = create_time; + (*i)->set_time = create_time; + (*i)->expiry = create_time + (*i)->duration; return; } - } - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) - { - if (!strcasecmp(ip,i->ipaddr)) - { - i->set_time = create_time; - return; - } - } + }*/ + return; } // returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match -char* matches_zline(const char* ipaddr) +ZLine* XLineManager::matches_zline(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; + for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) + if ((*i)->type == 'Z' && (*i)->Matches(u)) + return (ZLine*)(*i); return NULL; } // returns a pointer to the reason if a host matches a kline, NULL if it didnt match -char* matches_kline(const char* host) +KLine* XLineManager::matches_kline(User* user) { - 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; + for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) + if ((*i)->Matches(user)) + return (KLine*)(*i); + return NULL; } -bool GSortComparison ( const GLine one, const GLine two ) +bool XLineManager::XSortComparison(const XLine *one, const XLine *two) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + // account for permanent lines + if (one->expiry == 0) + { + return false; + } + return (one->expiry) < (two->expiry); } -bool ESortComparison ( const ELine one, const ELine two ) +// removes lines that have expired +void XLineManager::expire_lines() { - return (one.duration + one.set_time) < (two.duration + two.set_time); + time_t current = ServerInstance->Time(); + + /* Because we now store all our XLines in sorted order using ((*i)->duration + (*i)->set_time) as a key, this + * means that to expire the XLines we just need to do a while, picking off the top few until there are + * none left at the head of the queue that are after the current time. + */ + + while ((active_lines.size()) && (current > (*active_lines.begin())->expiry) && ((*active_lines.begin())->duration != 0)) + { + std::vector::iterator i = active_lines.begin(); + (*i)->DisplayExpiry(); + (*i)->Unset(); + active_lines.erase(i); + delete *i; + } } -bool ZSortComparison ( const ZLine one, const ZLine two ) +// applies lines, removing clients and changing nicks etc as applicable +void XLineManager::ApplyLines() { - return (one.duration + one.set_time) < (two.duration + two.set_time); + for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) + { + User* u = (User*)(*u2); + + for (std::vector::iterator i = pending_lines.begin(); i != pending_lines.end(); i++) + { + XLine *x = *i; + if (x->Matches(u)) + x->Apply(u); + } + } + + pending_lines.clear(); } -bool KSortComparison ( const KLine one, const KLine two ) +void XLineManager::stats_k(User* user, string_list &results) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + /*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);*/ } -bool QSortComparison ( const QLine one, const QLine two ) +void XLineManager::stats_g(User* user, string_list &results) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + /*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);*/ } -// removes lines that have expired +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);*/ +} -void expire_lines() +void XLineManager::stats_z(User* user, string_list &results) { - time_t current = TIME; + /*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);*/ +} - /* 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. - */ +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);*/ +} - 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); - } +XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance) +{ +} - while ((elines.size()) && (current > (elines.begin()->duration + elines.begin()->set_time))) - { - 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); - } +bool XLine::Matches(const std::string &str) +{ + return false; +} - 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 XLine::Apply(User* u) +{ +} - 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 XLine::DefaultApply(User* u, char line) +{ + char reason[MAXBUF]; + snprintf(reason, MAXBUF, "%c-Lined: %s", line, this->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + User::QuitUser(ServerInstance, u, line + std::string("-Lined"), reason); + else + User::QuitUser(ServerInstance, u, reason); +} - while ((qlines.size()) && (current > (qlines.begin()->duration + qlines.begin()->set_time))) +bool KLine::Matches(User *u) +{ + if (u->exempt) + return false; + + if ((match(u->ident, this->identmask))) { - 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); + if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true))) + { + return true; + } } - -} -// applies lines, removing clients and changing nicks etc as applicable + return false; +} -void apply_lines(const int What) +void KLine::Apply(User* u) { - char reason[MAXBUF]; - char host[MAXBUF]; + DefaultApply(u, 'K'); +} - if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && - (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) - return; +bool GLine::Matches(User *u) +{ + if (u->exempt) + return false; - CullList* Goners = new CullList(); - char* check = NULL; - for (std::vector::const_iterator u2 = local_users.begin(); u2 != local_users.end(); u2++) + if ((match(u->ident, this->identmask))) { - 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 ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true))) { - 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); - } + return true; } - if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) + } + + return false; +} + +void GLine::Apply(User* u) +{ + DefaultApply(u, 'G'); +} + +bool ELine::Matches(User *u) +{ + if (u->exempt) + return false; + + if ((match(u->ident, this->identmask))) + { + if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true))) { - if ((check = matches_zline((char*)inet_ntoa(u->ip4)))) - { - snprintf(reason,MAXBUF,"Z-Lined: %s",check); - Goners->AddItem(u,reason); - } + return true; } } - Goners->Apply(); - delete Goners; + return false; +} + +bool ZLine::Matches(User *u) +{ + if (u->exempt) + return false; + + if (match(u->GetIPString(), this->ipaddr, true)) + return true; + else + return false; +} + +void ZLine::Apply(User* u) +{ + DefaultApply(u, 'Z'); +} + + +bool QLine::Matches(User *u) +{ + if (u->exempt) + return false; + + if (match(u->nick, this->nick)) + return true; + + return false; +} + +void QLine::Apply(User* u) +{ + /* Can we force the user to their uid here instead? */ + DefaultApply(u, 'Q'); +} + + +bool ZLine::Matches(const std::string &str) +{ + if (match(str.c_str(), this->ipaddr, true)) + return true; + else + return false; +} + +bool QLine::Matches(const std::string &str) +{ + if (match(str.c_str(), this->nick)) + return true; + + return false; } -void stats_k(userrec* user) +void ELine::DisplayExpiry() { - 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); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration); } -void stats_g(userrec* user) +void QLine::DisplayExpiry() { - 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); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s (set by %s %d seconds ago)",this->nick,this->source,this->duration); } -void stats_q(userrec* user) +void ZLine::DisplayExpiry() { - 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); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",this->ipaddr,this->source,this->duration); } -void stats_z(userrec* user) +void KLine::DisplayExpiry() { - 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); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration); } -void stats_e(userrec* user) +void GLine::DisplayExpiry() { - 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); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration); }