X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=746ad6388668de8e708559801290060427a5cc2f;hb=ed105d7fef72b5bb5f23e72fae40d6b4ffdcb5b8;hp=434aaeeb1b4c9d88de87f5e342806f632fa73862;hpb=dec44e09b85c9c5bd1e87b1f9607429f046a1e64;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 434aaeeb1..746ad6388 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -16,89 +16,12 @@ using namespace std; -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include "inspircd_util.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" - -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 module_names; - -extern int boundPortCount; -extern int portCount; - -extern int ports[MAXSOCKS]; - -extern std::stringstream config_f; - -extern FILE *log_file; - -typedef nspace::hash_map, irc::StrHashComp> user_hash; -typedef nspace::hash_map, irc::StrHashComp> chan_hash; -typedef nspace::hash_map, irc::InAddr_HashComp> address_cache; -typedef nspace::hash_map, irc::StrHashComp> whowas_hash; -typedef std::deque command_table; - - -extern user_hash clientlist; -extern chan_hash chanlist; -extern whowas_hash whowas; -extern command_table cmdlist; -extern file_cache MOTD; -extern file_cache RULES; -extern address_cache IP; +#include "cull_list.h" /* Version two, now with optimized expiry! * @@ -106,8 +29,8 @@ extern address_cache IP; * 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 * current time + duration. This means that the line which is due to expire the @@ -118,216 +41,210 @@ extern address_cache IP; * -- Brain */ +bool InitXLine(ServerConfig* conf, const char* tag) +{ + return true; +} +bool DoneXLine(ServerConfig* conf, const char* tag) +{ + conf->GetInstance()->XLines->apply_lines(APPLY_ALL); + return true; +} -extern time_t TIME; - -/* Lists for temporary lines with an expiry time */ - -std::vector klines; -std::vector glines; -std::vector zlines; -std::vector qlines; -std::vector elines; - -/* Seperate lists for perm XLines that isnt checked by expiry functions */ - -std::vector pklines; -std::vector pglines; -std::vector pzlines; -std::vector pqlines; -std::vector pelines; - - -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 ); - -// 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. +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(); + + conf->GetInstance()->XLines->add_zline(0,"",reason,ipmask); + conf->GetInstance()->Log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason); + return true; +} -void read_xline_defaults() +bool DoQLine(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* nick = values[1].GetString(); + + conf->GetInstance()->XLines->add_qline(0,"",reason,nick); + conf->GetInstance()->Log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason); + return true; +} - for (int i = 0; i < ConfValueEnum("badip",&config_f); i++) - { - 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); - } +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(); - for (int i = 0; i < ConfValueEnum("badnick",&config_f); i++) - { - 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); - } + conf->GetInstance()->XLines->add_kline(0,"",reason,host); + conf->GetInstance()->Log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason); + return true; +} + +bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) +{ + const char* reason = values[0].GetString(); + const char* host = values[1].GetString(); - for (int i = 0; i < ConfValueEnum("badhost",&config_f); i++) + conf->GetInstance()->XLines->add_eline(0,"",reason,host); + conf->GetInstance()->Log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason); + return true; +} + +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 = "*"; + if (!n.second.length()) + n.second = "*"; } - 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.second = ident_and_host; } + + return n; } // adds a g:line -void add_gline(long duration, const char* source,const char* reason,const char* hostmask) +bool XLineManager::add_gline(long duration, const char* source,const char* reason,const char* hostmask) { - 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; + IdentHostPair ih = IdentSplit(hostmask); + + bool ret = del_gline(hostmask); + + GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + if (duration) { glines.push_back(item); - sort(glines.begin(), glines.end(),GSortComparison); + sort(glines.begin(), glines.end(),XLineManager::GSortComparison); } else { pglines.push_back(item); } + + return !ret; } // adds an e:line (exception to bans) -void add_eline(long duration, const char* source, const char* reason, const char* hostmask) +bool XLineManager::add_eline(long duration, const char* source, const char* reason, const char* hostmask) { - 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; + IdentHostPair ih = IdentSplit(hostmask); + + bool ret = del_eline(hostmask); + + ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + if (duration) { - elines.push_back(item); - sort(elines.begin(), elines.end(),ESortComparison); + elines.push_back(item); + sort(elines.begin(), elines.end(),XLineManager::ESortComparison); } else { pelines.push_back(item); } + return !ret; } // adds a q:line -void add_qline(long duration, const char* source, const char* reason, const char* nickname) -{ - 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; +bool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname) +{ + bool ret = del_qline(nickname); + QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname); + if (duration) { qlines.push_back(item); - sort(qlines.begin(), qlines.end(),QSortComparison); + sort(qlines.begin(), qlines.end(),XLineManager::QSortComparison); } else { pqlines.push_back(item); } + return !ret; } // adds a z:line -void add_zline(long duration, const char* source, const char* reason, const char* ipaddr) +bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr) { - del_zline(ipaddr); - ZLine item; - item.duration = duration; + bool ret = del_zline(ipaddr); + 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; + + ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr); + if (duration) { zlines.push_back(item); - sort(zlines.begin(), zlines.end(),ZSortComparison); + sort(zlines.begin(), zlines.end(),XLineManager::ZSortComparison); } else { pzlines.push_back(item); } + return !ret; } // adds a k:line -void add_kline(long duration, const char* source, const char* reason, const char* hostmask) +bool XLineManager::add_kline(long duration, const char* source, const char* reason, const char* hostmask) { - 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; + IdentHostPair ih = IdentSplit(hostmask); + + bool ret = del_kline(hostmask); + + KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + if (duration) { klines.push_back(item); - sort(klines.begin(), klines.end(),KSortComparison); + sort(klines.begin(), klines.end(),XLineManager::KSortComparison); } else { pklines.push_back(item); } + return !ret; } // deletes a g:line, returns true if the line existed and was removed -bool del_gline(const char* hostmask) +bool XLineManager::del_gline(const char* hostmask) { - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + IdentHostPair ih = IdentSplit(hostmask); + for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { - if (!strcasecmp(hostmask,i->hostmask)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { + delete *i; glines.erase(i); return true; } } - for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) + for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) { - if (!strcasecmp(hostmask,i->hostmask)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { + delete *i; pglines.erase(i); return true; } @@ -337,70 +254,49 @@ bool del_gline(const char* hostmask) // deletes a e:line, returns true if the line existed and was removed -bool del_eline(const char* hostmask) +bool XLineManager::del_eline(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++) + IdentHostPair ih = IdentSplit(hostmask); + for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) { - if (!strcasecmp(hostmask,i->hostmask)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - pelines.erase(i); + delete *i; + elines.erase(i); return true; } } - return false; -} - -// deletes a q:line, returns true if the line existed and was removed - -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++) + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) { - if (!strcasecmp(nickname,i->nick)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - pqlines.erase(i); + delete *i; + pelines.erase(i); return true; } } return false; } -bool qline_make_global(const char* nickname) +// deletes a q:line, returns true if the line existed and was removed + +bool XLineManager::del_qline(const char* nickname) { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { - if (!strcasecmp(nickname,i->nick)) + if (!strcasecmp(nickname,(*i)->nick)) { - i->is_global = true; + delete *i; + qlines.erase(i); return true; } } - return false; -} - -bool zline_make_global(const char* ipaddr) -{ - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) { - if (!strcasecmp(ipaddr,i->ipaddr)) + if (!strcasecmp(nickname,(*i)->nick)) { - i->is_global = true; + delete *i; + pqlines.erase(i); return true; } } @@ -409,20 +305,22 @@ bool zline_make_global(const char* ipaddr) // deletes a z:line, returns true if the line existed and was removed -bool del_zline(const char* ipaddr) +bool XLineManager::del_zline(const char* ipaddr) { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { - if (!strcasecmp(ipaddr,i->ipaddr)) + if (!strcasecmp(ipaddr,(*i)->ipaddr)) { + delete *i; zlines.erase(i); return true; } } - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) + for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) { - if (!strcasecmp(ipaddr,i->ipaddr)) + if (!strcasecmp(ipaddr,(*i)->ipaddr)) { + delete *i; pzlines.erase(i); return true; } @@ -432,20 +330,23 @@ bool del_zline(const char* ipaddr) // deletes a k:line, returns true if the line existed and was removed -bool del_kline(const char* hostmask) +bool XLineManager::del_kline(const char* hostmask) { - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) + IdentHostPair ih = IdentSplit(hostmask); + for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) { - if (!strcasecmp(hostmask,i->hostmask)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { + delete *i; klines.erase(i); return true; } } - for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) + for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) { - if (!strcasecmp(hostmask,i->hostmask)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { + delete *i; pklines.erase(i); return true; } @@ -455,128 +356,160 @@ bool del_kline(const char* hostmask) // 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()) + 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 = qlines.begin(); i != qlines.end(); i++) + if (match(nick,(*i)->nick)) + return (*i); + for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) + if (match(nick,(*i)->nick)) + return (*i); return NULL; } // 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(userrec* user) { - if (glines.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; + if ((glines.empty()) && (pglines.empty())) + return NULL; + for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + { + if ((match(user->ident,(*i)->identmask))) + { + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + { + return (*i); + } + } + } + for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) + { + if ((match(user->ident,(*i)->identmask))) + { + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + { + return (*i); + } + } + } return NULL; } -char* matches_exception(const char* host) -{ - if (elines.empty()) - return NULL; +ELine* XLineManager::matches_exception(userrec* 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; + snprintf(host2,MAXBUF,"*@%s",user->host); + for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) + { + if ((match(user->ident,(*i)->identmask))) + { + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + { + return (*i); + } + } + } + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + { + if ((match(user->ident,(*i)->identmask))) + { + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + { + return (*i); + } + } + } + return NULL; } -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++) + for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) { - if (!strcasecmp(host,i->hostmask)) + if (!strcasecmp(host,(*i)->hostmask)) { - i->set_time = create_time; + (*i)->set_time = create_time; 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++) + 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; } } - for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) { - if (!strcasecmp(host,i->hostmask)) + if (!strcasecmp(host,(*i)->hostmask)) { - i->set_time = create_time; + (*i)->set_time = create_time; 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++) + for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) { - if (!strcasecmp(nick,i->nick)) + if (!strcasecmp(nick,(*i)->nick)) { - i->set_time = create_time; + (*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++) + for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) { - if (!strcasecmp(ip,i->ipaddr)) + if (!strcasecmp(ip,(*i)->ipaddr)) { - i->set_time = create_time; + (*i)->set_time = create_time; return; } } @@ -585,102 +518,116 @@ void zline_set_creation_time(char* ip, time_t create_time) // 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(const char* ipaddr) { - if (zlines.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; + if ((zlines.empty()) && (pzlines.empty())) + return NULL; + for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + if (match(ipaddr,(*i)->ipaddr, true)) + return (*i); + for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) + if (match(ipaddr,(*i)->ipaddr, true)) + return (*i); return NULL; } // 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(userrec* user) { - if (klines.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; + if ((klines.empty()) && (pklines.empty())) + return NULL; + for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) + { + if ((match(user->ident,(*i)->identmask))) + { + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + { + return (*i); + } + } + } + for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) + { + if ((match(user->ident,(*i)->identmask))) + { + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + { + return (*i); + } + } + } return NULL; } -bool GSortComparison ( const GLine one, const GLine two ) +bool XLineManager::GSortComparison ( const GLine* one, const GLine* two ) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + return (one->expiry) < (two->expiry); } -bool ESortComparison ( const ELine one, const ELine two ) +bool XLineManager::ESortComparison ( const ELine* one, const ELine* two ) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + return (one->expiry) < (two->expiry); } -bool ZSortComparison ( const ZLine one, const ZLine two ) +bool XLineManager::ZSortComparison ( const ZLine* one, const ZLine* two ) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + return (one->expiry) < (two->expiry); } -bool KSortComparison ( const KLine one, const KLine two ) +bool XLineManager::KSortComparison ( const KLine* one, const KLine* two ) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + return (one->expiry) < (two->expiry); } -bool QSortComparison ( const QLine one, const QLine two ) +bool XLineManager::QSortComparison ( const QLine* one, const QLine* two ) { - return (one.duration + one.set_time) < (two.duration + two.set_time); + return (one->expiry) < (two->expiry); } // removes lines that have expired -void expire_lines() +void XLineManager::expire_lines() { - time_t current = 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 + /* 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))) + while ((glines.size()) && (current > (*glines.begin())->expiry)) { - std::vector::iterator i = glines.begin(); - WriteOpers("Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); + std::vector::iterator i = glines.begin(); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration); glines.erase(i); } - while ((elines.size()) && (current > (elines.begin()->duration + elines.begin()->set_time))) + while ((elines.size()) && (current > (*elines.begin())->expiry)) { - std::vector::iterator i = elines.begin(); - WriteOpers("Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); + std::vector::iterator i = elines.begin(); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration); elines.erase(i); } - while ((zlines.size()) && (current > (zlines.begin()->duration + zlines.begin()->set_time))) + while ((zlines.size()) && (current > (*zlines.begin())->expiry)) { - std::vector::iterator i = zlines.begin(); - WriteOpers("Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration); + std::vector::iterator i = zlines.begin(); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",(*i)->ipaddr,(*i)->source,(*i)->duration); zlines.erase(i); } - while ((klines.size()) && (current > (klines.begin()->duration + klines.begin()->set_time))) + while ((klines.size()) && (current > (*klines.begin())->expiry)) { - std::vector::iterator i = klines.begin(); - WriteOpers("Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration); + std::vector::iterator i = klines.begin(); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration); klines.erase(i); } - while ((qlines.size()) && (current > (qlines.begin()->duration + qlines.begin()->set_time))) + while ((qlines.size()) && (current > (*qlines.begin())->expiry)) { - std::vector::iterator i = qlines.begin(); - WriteOpers("Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration); + std::vector::iterator i = qlines.begin(); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",(*i)->nick,(*i)->source,(*i)->duration); qlines.erase(i); } @@ -688,118 +635,109 @@ void expire_lines() // applies lines, removing clients and changing nicks etc as applicable -void apply_lines() +void XLineManager::apply_lines(const int What) { - bool go_again = true; char reason[MAXBUF]; - char host[MAXBUF]; - - if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size())) + + if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && + (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) return; - - while (go_again) + + CullList* Goners = new CullList(ServerInstance); + XLine* check = NULL; + for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { - go_again = false; - for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++) + userrec* u = (userrec*)(*u2); + + if (elines.size() || pelines.size()) + { + // ignore people matching exempts + if (matches_exception(u)) + continue; + } + if ((What & APPLY_GLINES) && (glines.size() || pglines.size())) { - if (u->second->server > -1) + if ((check = matches_gline(u))) { - 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() || pglines.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() || pklines.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() || pqlines.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() || pzlines.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; - } - } + snprintf(reason,MAXBUF,"G-Lined: %s",check->reason); + Goners->AddItem(u,reason); + } + } + if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) + { + if ((check = matches_kline(u))) + { + snprintf(reason,MAXBUF,"K-Lined: %s",check->reason); + 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->reason); + Goners->AddItem(u,reason); + } + } + if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) + { + if ((check = matches_zline(u->GetIPString()))) + { + snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason); + Goners->AddItem(u,reason); } } } + + Goners->Apply(); + DELETE(Goners); +} + +void XLineManager::stats_k(userrec* user, string_list &results) +{ + std::string sn = ServerInstance->Config->ServerName; + for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) + results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); + for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) + results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); } -void stats_k(userrec* user) +void XLineManager::stats_g(userrec* user, string_list &results) { - 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); + std::string sn = ServerInstance->Config->ServerName; + for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); + for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) + results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); } -void stats_g(userrec* user) +void XLineManager::stats_q(userrec* user, string_list &results) { - 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); + std::string sn = ServerInstance->Config->ServerName; + for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); + for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) + results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); } -void stats_q(userrec* user) +void XLineManager::stats_z(userrec* user, string_list &results) { - 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); + std::string sn = ServerInstance->Config->ServerName; + for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); + for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) + results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); } -void stats_z(userrec* user) +void XLineManager::stats_e(userrec* user, string_list &results) { - 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); + std::string sn = ServerInstance->Config->ServerName; + for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) + results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); } -void stats_e(userrec* user) +XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance) { - 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); }