X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=4f93248259df3f5378f1f7abec9e25758c436694;hb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;hp=2fd36bff5142149bfa4ec830748ed9cddfb318a8;hpb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 2fd36bff5..4f9324825 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -2,26 +2,18 @@ * | 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; - #include "inspircd.h" -#include "users.h" -#include "modules.h" #include "wildcard.h" #include "xline.h" -#include "cull_list.h" /* Version two, now with optimized expiry! * @@ -32,7 +24,7 @@ using namespace std; * 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 @@ -46,66 +38,98 @@ bool InitXLine(ServerConfig* conf, const char* tag) return true; } -bool DoneXLine(ServerConfig* conf, const char* tag) +bool DoneZLine(ServerConfig* conf, const char* tag) +{ + conf->GetInstance()->XLines->apply_lines(APPLY_ZLINES|APPLY_PERM_ONLY); + return true; +} + +bool DoneQLine(ServerConfig* conf, const char* tag) +{ + conf->GetInstance()->XLines->apply_lines(APPLY_QLINES|APPLY_PERM_ONLY); + return true; +} + +bool DoneKLine(ServerConfig* conf, const char* tag) { - conf->GetInstance()->XLines->apply_lines(APPLY_ALL); + conf->GetInstance()->XLines->apply_lines(APPLY_KLINES|APPLY_PERM_ONLY); return true; } -bool DoZLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) +bool DoneELine(ServerConfig* conf, const char* tag) { - char* reason = (char*)values[0]; - char* ipmask = (char*)values[1]; - + /* Yes, this is supposed to do nothing, we dont 'apply' these */ + return true; +} + +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; } -bool DoQLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) +bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { - char* reason = (char*)values[0]; - char* nick = (char*)values[1]; - + 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; } -bool DoKLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) +bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { - char* reason = (char*)values[0]; - char* host = (char*)values[1]; - + const char* reason = values[0].GetString(); + const char* host = values[1].GetString(); + 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, void** values, int* types) +bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { - char* reason = (char*)values[0]; - char* host = (char*)values[1]; - + const char* reason = values[0].GetString(); + const char* host = values[1].GetString(); + 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) + { + 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 + { + n.second = ident_and_host; + } + + return n; +} + // adds a g:line bool XLineManager::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 = ServerInstance->Time(); - + IdentHostPair ih = IdentSplit(hostmask); + + if (del_gline(hostmask, true)) + return false; + + GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + if (duration) { glines.push_back(item); @@ -115,22 +139,21 @@ bool XLineManager::add_gline(long duration, const char* source,const char* reaso { pglines.push_back(item); } - - return !ret; + + return true; } // adds an e:line (exception to bans) bool XLineManager::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 = ServerInstance->Time(); + IdentHostPair ih = IdentSplit(hostmask); + + if (del_eline(hostmask, true)) + return false; + + ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + if (duration) { elines.push_back(item); @@ -140,22 +163,18 @@ bool XLineManager::add_eline(long duration, const char* source, const char* reas { pelines.push_back(item); } - return !ret; + return true; } // adds a q:line bool XLineManager::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 = ServerInstance->Time(); + if (del_qline(nickname, true)) + return false; + + QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname); + if (duration) { qlines.push_back(item); @@ -165,28 +184,25 @@ bool XLineManager::add_qline(long duration, const char* source, const char* reas { pqlines.push_back(item); } - return !ret; + return true; } // adds a z:line bool XLineManager::add_zline(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 = ServerInstance->Time(); + + if (del_zline(ipaddr, true)) + return false; + + ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr); + if (duration) { zlines.push_back(item); @@ -196,21 +212,20 @@ bool XLineManager::add_zline(long duration, const char* source, const char* reas { pzlines.push_back(item); } - return !ret; + return true; } // adds a k:line bool XLineManager::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 = ServerInstance->Time(); + IdentHostPair ih = IdentSplit(hostmask); + + if (del_kline(hostmask, true)) + return false; + + KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + if (duration) { klines.push_back(item); @@ -220,26 +235,35 @@ bool XLineManager::add_kline(long duration, const char* source, const char* reas { pklines.push_back(item); } - return !ret; + return true; } // deletes a g:line, returns true if the line existed and was removed -bool XLineManager::del_gline(const char* hostmask) +bool XLineManager::del_gline(const char* hostmask, bool simulate) { - 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)) { - glines.erase(i); + if (!simulate) + { + 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)) { - pglines.erase(i); + if (!simulate) + { + delete *i; + pglines.erase(i); + } return true; } } @@ -248,21 +272,30 @@ bool XLineManager::del_gline(const char* hostmask) // deletes a e:line, returns true if the line existed and was removed -bool XLineManager::del_eline(const char* hostmask) +bool XLineManager::del_eline(const char* hostmask, bool simulate) { - for (std::vector::iterator i = elines.begin(); i != elines.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)) { - elines.erase(i); + if (!simulate) + { + delete *i; + elines.erase(i); + } return true; } } - for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + for (std::vector::iterator i = pelines.begin(); i != pelines.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); + if (!simulate) + { + delete *i; + pelines.erase(i); + } return true; } } @@ -271,47 +304,29 @@ bool XLineManager::del_eline(const char* hostmask) // 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++) - { - 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; -} - -bool XLineManager::qline_make_global(const char* nickname) +bool XLineManager::del_qline(const char* nickname, bool simulate) { - 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; + if (!simulate) + { + delete *i; + qlines.erase(i); + } return true; } } - return false; -} - -bool XLineManager::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; + if (!simulate) + { + delete *i; + pqlines.erase(i); + } return true; } } @@ -320,21 +335,29 @@ bool XLineManager::zline_make_global(const char* ipaddr) // deletes a z:line, returns true if the line existed and was removed -bool XLineManager::del_zline(const char* ipaddr) +bool XLineManager::del_zline(const char* ipaddr, bool simulate) { - 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)) { - zlines.erase(i); + if (!simulate) + { + 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)) { - pzlines.erase(i); + if (!simulate) + { + delete *i; + pzlines.erase(i); + } return true; } } @@ -343,21 +366,30 @@ bool XLineManager::del_zline(const char* ipaddr) // deletes a k:line, returns true if the line existed and was removed -bool XLineManager::del_kline(const char* hostmask) +bool XLineManager::del_kline(const char* hostmask, bool simulate) { - 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)) { - klines.erase(i); + if (!simulate) + { + 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)) { - pklines.erase(i); + if (!simulate) + { + delete *i; + pklines.erase(i); + } return true; } } @@ -366,86 +398,125 @@ bool XLineManager::del_kline(const char* hostmask) // returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match -char* XLineManager::matches_qline(const char* nick) +QLine* XLineManager::matches_qline(const char* nick, bool permonly) { 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; + if (!permonly) + { + for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + if (match(nick,(*i)->nick)) + return (*i); + } + for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) + if (match(nick,(*i)->nick)) + return (*i); return NULL; } // returns a pointer to the reason if a host matches a gline, NULL if it didnt match -char* XLineManager::matches_gline(const char* host) +GLine* XLineManager::matches_gline(User* user, bool permonly) { if ((glines.empty()) && (pglines.empty())) return NULL; - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - if (match(host,i->hostmask, true)) - return i->reason; - for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) - if (match(host,i->hostmask, true)) - return i->reason; + if (!permonly) + { + 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* XLineManager::matches_exception(const char* host) +ELine* XLineManager::matches_exception(User* user, bool permonly) { 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, true))) - return i->reason; - for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) - if ((match(host,i->hostmask)) || (match(host2,i->hostmask, true))) - return i->reason; + snprintf(host2,MAXBUF,"*@%s",user->host); + if (!permonly) + { + for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) + { + if ((match(user->ident,(*i)->identmask))) + { + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + { + return (*i); + } + } + } + } + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + { + if ((match(user->ident,(*i)->identmask))) + { + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + { + return (*i); + } + } + } return NULL; } 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 ; + return ; } 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; } } @@ -454,19 +525,20 @@ void XLineManager::eline_set_creation_time(const char* host, 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; } } @@ -475,19 +547,20 @@ void XLineManager::qline_set_creation_time(const char* nick, 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; } } @@ -496,57 +569,77 @@ void XLineManager::zline_set_creation_time(const 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* XLineManager::matches_zline(const char* ipaddr) +ZLine* XLineManager::matches_zline(const char* ipaddr, bool permonly) { 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->reason; - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) - if (match(ipaddr,i->ipaddr, true)) - return i->reason; + if (!permonly) + { + for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + if (match(ipaddr,(*i)->ipaddr, true)) + return (*i); + } + for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) + if (match(ipaddr,(*i)->ipaddr, true)) + return (*i); return NULL; } // returns a pointer to the reason if a host matches a kline, NULL if it didnt match -char* XLineManager::matches_kline(const char* host) +KLine* XLineManager::matches_kline(User* user, bool permonly) { if ((klines.empty()) && (pklines.empty())) return NULL; - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) - if (match(host,i->hostmask, true)) - return i->reason; - for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) - if (match(host,i->hostmask, true)) - return i->reason; + if (!permonly) + { + 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 XLineManager::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 XLineManager::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 XLineManager::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 XLineManager::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 XLineManager::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 @@ -555,152 +648,246 @@ void XLineManager::expire_lines() { 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(); - ServerInstance->SNO->WriteToSnoMask('x',"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(); - ServerInstance->SNO->WriteToSnoMask('x',"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(); - ServerInstance->SNO->WriteToSnoMask('x',"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(); - ServerInstance->SNO->WriteToSnoMask('x',"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(); - ServerInstance->SNO->WriteToSnoMask('x',"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); } - + } // applies lines, removing clients and changing nicks etc as applicable void XLineManager::apply_lines(const int What) { - char reason[MAXBUF]; - char host[MAXBUF]; - - if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && - (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) + if (!What) return; - CullList* Goners = new CullList(ServerInstance); - char* check = NULL; - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) + if (What & APPLY_PERM_ONLY) { - 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())) + char reason[MAXBUF]; + + if ((!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) + return; + + XLine* check = NULL; + for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { - if ((check = matches_gline(host))) + User* u = (User*)(*u2); + + if (elines.size() || pelines.size()) + if (matches_exception(u)) + continue; + + if ((What & APPLY_GLINES) && pglines.size()) { - snprintf(reason,MAXBUF,"G-Lined: %s",check); - Goners->AddItem(u,reason); + if ((check = matches_gline(u,true))) + { + snprintf(reason,MAXBUF,"G-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + User::QuitUser(ServerInstance, u, "G-Lined", reason); + else + User::QuitUser(ServerInstance, u, reason); + } } - } - if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) - { - if ((check = matches_kline(host))) + + if ((What & APPLY_KLINES) && pklines.size()) { - snprintf(reason,MAXBUF,"K-Lined: %s",check); - Goners->AddItem(u,reason); + if ((check = matches_kline(u,true))) + { + snprintf(reason,MAXBUF,"K-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + User::QuitUser(ServerInstance, u, "K-Lined", reason); + else + User::QuitUser(ServerInstance, u, reason); + } } - } - if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size())) - { - if ((check = matches_qline(u->nick))) + + if ((What & APPLY_QLINES) && pqlines.size()) { - snprintf(reason,MAXBUF,"Q-Lined: %s",check); - Goners->AddItem(u,reason); + if ((check = matches_qline(u->nick,true))) + { + snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + User::QuitUser(ServerInstance, u, "Q-Lined", reason); + else + User::QuitUser(ServerInstance, u, reason); + } + } + + if ((What & APPLY_ZLINES) && pzlines.size()) + { + if ((check = matches_zline(u->GetIPString(),true))) + { + snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + User::QuitUser(ServerInstance, u, "Z-Lined", reason); + else + User::QuitUser(ServerInstance, u, reason); + } } } - if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) + } + else + { + char reason[MAXBUF]; + + if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && + (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) + return; + + XLine* check = NULL; + for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { - if ((check = matches_zline(u->GetIPString()))) + User* u = (User*)(*u2); + + if (elines.size() || pelines.size()) { - snprintf(reason,MAXBUF,"Z-Lined: %s",check); - Goners->AddItem(u,reason); + // ignore people matching exempts + if (matches_exception(u)) + continue; + } + if ((What & APPLY_GLINES) && (glines.size() || pglines.size())) + { + if ((check = matches_gline(u))) + { + snprintf(reason,MAXBUF,"G-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + User::QuitUser(ServerInstance, u, "G-Lined", reason); + else + User::QuitUser(ServerInstance, u, reason); + } + } + if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) + { + if ((check = matches_kline(u))) + { + snprintf(reason,MAXBUF,"K-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + User::QuitUser(ServerInstance, u, "K-Lined", reason); + else + User::QuitUser(ServerInstance, u, reason); + } + } + if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size())) + { + if ((check = matches_qline(u->nick))) + { + snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + User::QuitUser(ServerInstance, u, "Q-Lined", reason); + else + User::QuitUser(ServerInstance, u, reason); + } + } + if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) + { + if ((check = matches_zline(u->GetIPString()))) + { + snprintf(reason,MAXBUF,"Z-Lined: %s", check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + User::QuitUser(ServerInstance, u, "Z-Lined", reason); + else + User::QuitUser(ServerInstance, u, reason); + } } } } - - Goners->Apply(); - DELETE(Goners); } -void XLineManager::stats_k(userrec* user, string_list &results) +void XLineManager::stats_k(User* 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->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->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); + 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 XLineManager::stats_g(userrec* user, string_list &results) +void XLineManager::stats_g(User* user, string_list &results) { std::string sn = ServerInstance->Config->ServerName; - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - results.push_back(sn+" 223 "+user->nick+" :"+i->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->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); + 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 XLineManager::stats_q(userrec* user, string_list &results) +void XLineManager::stats_q(User* user, string_list &results) { std::string sn = ServerInstance->Config->ServerName; - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - results.push_back(sn+" 217 "+user->nick+" :"+i->nick+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); - for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) - results.push_back(sn+" 217 "+user->nick+" :"+i->nick+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); + 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 XLineManager::stats_z(userrec* user, string_list &results) +void XLineManager::stats_z(User* user, string_list &results) { 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); + 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 XLineManager::stats_e(userrec* user, string_list &results) +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->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->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); + 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); } XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance)