X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=7979a1d82278cf4cd2871fdc142e64f61c4c4cb4;hb=ae8341627017a0a1b1e1033c6239b4ebb16e7219;hp=b7f32c3218aef39f21babcdb1ea953b02e61b3dc;hpb=b5763d79dc615faaf0e17d3349bdd36d593d3584;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index b7f32c321..7979a1d82 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -11,12 +11,39 @@ * --------------------------------------------------- */ +/* $Core: libIRCDxline */ + #include "inspircd.h" -#include "users.h" -#include "modules.h" #include "wildcard.h" #include "xline.h" -#include "cull_list.h" + +/* + * 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! * @@ -27,7 +54,7 @@ * 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 @@ -43,25 +70,29 @@ bool InitXLine(ServerConfig* conf, const char* tag) bool DoneZLine(ServerConfig* conf, const char* tag) { - conf->GetInstance()->XLines->apply_lines(APPLY_ZLINES|APPLY_PERM_ONLY); + // XXX we should really only call this once - after we've finished processing configuration all together + conf->GetInstance()->XLines->ApplyLines(); return true; } bool DoneQLine(ServerConfig* conf, const char* tag) { - conf->GetInstance()->XLines->apply_lines(APPLY_QLINES|APPLY_PERM_ONLY); + // XXX we should really only call this once - after we've finished processing configuration all together + conf->GetInstance()->XLines->ApplyLines(); return true; } bool DoneKLine(ServerConfig* conf, const char* tag) { - conf->GetInstance()->XLines->apply_lines(APPLY_KLINES|APPLY_PERM_ONLY); + // 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) { - /* Yes, this is supposed to do nothing, we dont 'apply' these */ + // XXX we should really only call this once - after we've finished processing configuration all together + conf->GetInstance()->XLines->ApplyLines(); return true; } @@ -69,8 +100,8 @@ bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val { const char* reason = values[0].GetString(); const char* ipmask = values[1].GetString(); - - conf->GetInstance()->XLines->add_zline(0,"",reason,ipmask); + + conf->GetInstance()->XLines->AddZLine(0,"",reason,ipmask); return true; } @@ -78,8 +109,8 @@ bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val { const char* reason = values[0].GetString(); const char* nick = values[1].GetString(); - - conf->GetInstance()->XLines->add_qline(0,"",reason,nick); + + conf->GetInstance()->XLines->AddQLine(0,"",reason,nick); return true; } @@ -87,8 +118,8 @@ bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val { const char* reason = values[0].GetString(); const char* host = values[1].GetString(); - - conf->GetInstance()->XLines->add_kline(0,"",reason,host); + + conf->GetInstance()->XLines->AddKLine(0,"",reason,host); return true; } @@ -96,11 +127,33 @@ bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &val { const char* reason = values[0].GetString(); const char* host = values[1].GetString(); - - conf->GetInstance()->XLines->add_eline(0,"",reason,host); + + 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::vector &ELines) +{ + 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 = ELines.begin(); i != ELines.end(); i++) + { + ELine *e = (*i); + + u->exempt = e->Matches(u); + } + } +} + + IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) { IdentHostPair n = std::make_pair("*","*"); @@ -110,9 +163,9 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) 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 = "*"; + n.first.assign("*"); if (!n.second.length()) - n.second = "*"; + n.second.assign("*"); } else { @@ -124,74 +177,62 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) // adds a g:line -bool XLineManager::add_gline(long duration, const char* source,const char* reason,const char* hostmask) +bool XLineManager::AddGLine(long duration, const char* source,const char* reason,const char* hostmask) { 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(),XLineManager::GSortComparison); - } - else - { - pglines.push_back(item); - } - - return !ret; + if (DelGLine(hostmask, true)) + return false; + + GLine* item = new GLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + + glines.push_back(item); + sort(glines.begin(), glines.end(),XLineManager::XSortComparison); + pending_lines.push_back(item); + + 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 XLineManager::AddELine(long duration, const char* source, const char* reason, const char* hostmask) { IdentHostPair ih = IdentSplit(hostmask); - bool ret = del_eline(hostmask); + if (DelELine(hostmask, true)) + return false; - ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); - if (duration) - { - elines.push_back(item); - sort(elines.begin(), elines.end(),XLineManager::ESortComparison); - } - else - { - pelines.push_back(item); - } - return !ret; + elines.push_back(item); + sort(elines.begin(), elines.end(),XLineManager::XSortComparison); + + // 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 XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname) +bool XLineManager::AddQLine(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 (DelQLine(nickname, true)) + return false; - if (duration) - { - qlines.push_back(item); - sort(qlines.begin(), qlines.end(),XLineManager::QSortComparison); - } - else - { - pqlines.push_back(item); - } - return !ret; + QLine* item = new QLine(ServerInstance, ServerInstance->Time(), duration, source, reason, nickname); + + qlines.push_back(item); + sort(qlines.begin(), qlines.end(),XLineManager::XSortComparison); + pending_lines.push_back(item); + + return true; } // adds a z:line -bool XLineManager::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); - if (strchr(ipaddr,'@')) { while (*ipaddr != '@') @@ -199,248 +240,185 @@ bool XLineManager::add_zline(long duration, const char* source, const char* reas ipaddr++; } - ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr); + if (DelZLine(ipaddr, true)) + return false; - if (duration) - { - zlines.push_back(item); - sort(zlines.begin(), zlines.end(),XLineManager::ZSortComparison); - } - else - { - pzlines.push_back(item); - } - return !ret; + ZLine* item = new ZLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ipaddr); + + zlines.push_back(item); + sort(zlines.begin(), zlines.end(),XLineManager::XSortComparison); + pending_lines.push_back(item); + + return true; } // adds a k:line -bool XLineManager::add_kline(long duration, const char* source, const char* reason, const char* hostmask) +bool XLineManager::AddKLine(long duration, const char* source, const char* reason, const char* hostmask) { IdentHostPair ih = IdentSplit(hostmask); - bool ret = del_kline(hostmask); + if (DelKLine(hostmask, true)) + return false; - KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + KLine* item = new KLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); - if (duration) - { - klines.push_back(item); - sort(klines.begin(), klines.end(),XLineManager::KSortComparison); - } - else - { - pklines.push_back(item); - } - return !ret; + klines.push_back(item); + sort(klines.begin(), klines.end(),XLineManager::XSortComparison); + pending_lines.push_back(item); + + return true; } // deletes a g:line, returns true if the line existed and was removed -bool XLineManager::del_gline(const char* hostmask) +bool XLineManager::DelGLine(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { 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++) - { - if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) - { - delete *i; - pglines.erase(i); + if (!simulate) + { + delete *i; + glines.erase(i); + } return true; } } + return false; } // deletes a e:line, returns true if the line existed and was removed -bool XLineManager::del_eline(const char* hostmask) +bool XLineManager::DelELine(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - elines.erase(i); - return true; - } - } - for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) - { - if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) - { - delete *i; - pelines.erase(i); + if (!simulate) + { + /* 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++) + { + User* u = (User*)(*u2); + u->exempt = false; + } + + delete *i; + elines.erase(i); + CheckELines(ServerInstance, elines); + } return true; } } + return false; } // deletes a q:line, returns true if the line existed and was removed -bool XLineManager::del_qline(const char* nickname) +bool XLineManager::DelQLine(const char* nickname, bool simulate) { for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { if (!strcasecmp(nickname,(*i)->nick)) { - delete *i; - qlines.erase(i); - return true; - } - } - for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) - { - if (!strcasecmp(nickname,(*i)->nick)) - { - delete *i; - pqlines.erase(i); + if (!simulate) + { + delete *i; + qlines.erase(i); + } return true; } } + return false; } // deletes a z:line, returns true if the line existed and was removed -bool XLineManager::del_zline(const char* ipaddr) +bool XLineManager::DelZLine(const char* ipaddr, bool simulate) { for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { if (!strcasecmp(ipaddr,(*i)->ipaddr)) { - delete *i; - zlines.erase(i); - return true; - } - } - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) - { - if (!strcasecmp(ipaddr,(*i)->ipaddr)) - { - delete *i; - pzlines.erase(i); + if (!simulate) + { + delete *i; + zlines.erase(i); + } return true; } } + return false; } // deletes a k:line, returns true if the line existed and was removed -bool XLineManager::del_kline(const char* hostmask) +bool XLineManager::DelKLine(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) { 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++) - { - if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) - { - delete *i; - pklines.erase(i); + if (!simulate) + { + delete *i; + klines.erase(i); + } return true; } } + return false; } // returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match -QLine* XLineManager::matches_qline(const char* nick, bool permonly) +QLine* XLineManager::matches_qline(const char* nick) { - if ((qlines.empty()) && (pqlines.empty())) + if (qlines.empty()) return NULL; - 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)) + + for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + if ((*i)->Matches(nick)) return (*i); return NULL; } // returns a pointer to the reason if a host matches a gline, NULL if it didnt match -GLine* XLineManager::matches_gline(userrec* user, bool permonly) +GLine* XLineManager::matches_gline(User* user) { - if ((glines.empty()) && (pglines.empty())) + if (glines.empty()) return NULL; - 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++) + + 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); - } - } + if ((*i)->Matches(user)) + return (*i); } + return NULL; } -ELine* XLineManager::matches_exception(userrec* user, bool permonly) -{ - if ((elines.empty()) && (pelines.empty())) +ELine* XLineManager::matches_exception(User* user) +{ + if (elines.empty()) return NULL; - char host2[MAXBUF]; - 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++) + + 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); - } - } + if ((*i)->Matches(user)) + return (*i); } return NULL; } @@ -457,15 +435,8 @@ void XLineManager::gline_set_creation_time(const char* host, time_t create_time) 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 XLineManager::eline_set_creation_time(const char* host, time_t create_time) @@ -479,14 +450,7 @@ void XLineManager::eline_set_creation_time(const char* host, time_t create_time) return; } } - for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) - { - if (!strcasecmp(host,(*i)->hostmask)) - { - (*i)->set_time = create_time; - return; - } - } + return; } @@ -501,14 +465,7 @@ void XLineManager::qline_set_creation_time(const char* nick, time_t create_time) return; } } - for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) - { - if (!strcasecmp(nick,(*i)->nick)) - { - (*i)->set_time = create_time; - return; - } - } + return; } @@ -523,94 +480,50 @@ void XLineManager::zline_set_creation_time(const char* ip, time_t create_time) 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 -ZLine* XLineManager::matches_zline(const char* ipaddr, bool permonly) +ZLine* XLineManager::matches_zline(User *u) { - if ((zlines.empty()) && (pzlines.empty())) + if (zlines.empty()) return NULL; - 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)) + + for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + if ((*i)->Matches(u)) return (*i); return NULL; } // returns a pointer to the reason if a host matches a kline, NULL if it didnt match -KLine* XLineManager::matches_kline(userrec* user, bool permonly) +KLine* XLineManager::matches_kline(User* user) { - if ((klines.empty()) && (pklines.empty())) + if (klines.empty()) return NULL; - 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++) + + 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); - } - } + if ((*i)->Matches(user)) + return (*i); } - return NULL; -} - -bool XLineManager::GSortComparison ( const GLine* one, const GLine* two ) -{ - return (one->expiry) < (two->expiry); -} - -bool XLineManager::ESortComparison ( const ELine* one, const ELine* two ) -{ - return (one->expiry) < (two->expiry); -} -bool XLineManager::ZSortComparison ( const ZLine* one, const ZLine* two ) -{ - return (one->expiry) < (two->expiry); -} - -bool XLineManager::KSortComparison ( const KLine* one, const KLine* two ) -{ - return (one->expiry) < (two->expiry); + return NULL; } -bool XLineManager::QSortComparison ( const QLine* one, const QLine* two ) +bool XLineManager::XSortComparison(const XLine *one, const XLine *two) { + // account for permanent lines + if (one->expiry == 0) + { + return false; + } return (one->expiry) < (two->expiry); } // removes lines that have expired - void XLineManager::expire_lines() { time_t current = ServerInstance->Time(); @@ -620,211 +533,227 @@ void XLineManager::expire_lines() * none left at the head of the queue that are after the current time. */ - while ((glines.size()) && (current > (*glines.begin())->expiry)) + while ((glines.size()) && (current > (*glines.begin())->expiry) && ((*glines.begin())->duration != 0)) { 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())->expiry)) + while ((elines.size()) && (current > (*elines.begin())->expiry) && ((*elines.begin())->duration != 0)) { 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())->expiry)) + while ((zlines.size()) && (current > (*zlines.begin())->expiry) && ((*zlines.begin())->duration != 0)) { 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())->expiry)) + while ((klines.size()) && (current > (*klines.begin())->expiry) && ((*klines.begin())->duration != 0)) { 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())->expiry)) + while ((qlines.size()) && (current > (*qlines.begin())->expiry) && ((*qlines.begin())->duration != 0)) { 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) +void XLineManager::ApplyLines() { - if (!What) - return; - - if (What & APPLY_PERM_ONLY) + for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { - char reason[MAXBUF]; - - if ((!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) - return; + User* u = (User*)(*u2); - CullList* Goners = new CullList(ServerInstance); - XLine* check = NULL; - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) + for (std::vector::iterator i = pending_lines.begin(); i != pending_lines.end(); i++) { - userrec* u = (userrec*)(*u2); - - if (elines.size() || pelines.size()) - if (matches_exception(u)) - continue; - - if ((What & APPLY_GLINES) && pglines.size()) - { - if ((check = matches_gline(u,true))) - { - snprintf(reason,MAXBUF,"G-Lined: %s",check->reason); - Goners->AddItem(u,reason); - } - } - - if ((What & APPLY_KLINES) && pklines.size()) - { - if ((check = matches_kline(u,true))) - { - snprintf(reason,MAXBUF,"K-Lined: %s",check->reason); - Goners->AddItem(u,reason); - } - } - - if ((What & APPLY_QLINES) && pqlines.size()) - { - if ((check = matches_qline(u->nick,true))) - { - snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason); - Goners->AddItem(u,reason); - } - } - - if ((What & APPLY_ZLINES) && pzlines.size()) - { - if ((check = matches_zline(u->GetIPString(),true))) - { - snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason); - Goners->AddItem(u,reason); - } - } + XLine *x = *i; + if (x->Matches(u)) + x->Apply(u); } - - Goners->Apply(); - DELETE(Goners); } - else - { - char reason[MAXBUF]; - - if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && - (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) - return; - - CullList* Goners = new CullList(ServerInstance); - XLine* check = NULL; - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) - { - 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 ((check = matches_gline(u))) - { - 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); - } + pending_lines.clear(); } -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)->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)->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); } -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); } -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)->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) { } + +bool XLine::Matches(const std::string &str) +{ + return false; +} + +void XLine::Apply(User* u) +{ +} + +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); +} + +bool KLine::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))) + { + return true; + } + } + + return false; +} + +void KLine::Apply(User* u) +{ + DefaultApply(u, 'K'); +} + +bool GLine::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))) + { + return true; + } + } + + 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))) + { + return true; + } + } + + 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; +} +