X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fxline.cpp;h=3f0ddbf2b14104ae6f34db8d7c957a96454f93a6;hb=57608fe351cff19679b1d78fb5cbfb7cad89dfc1;hp=7979a1d82278cf4cd2871fdc142e64f61c4c4cb4;hpb=ae8341627017a0a1b1e1033c6239b4ebb16e7219;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 7979a1d82..3f0ddbf2b 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -2,11 +2,11 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 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. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -16,6 +16,7 @@ #include "inspircd.h" #include "wildcard.h" #include "xline.h" +#include "bancache.h" /* * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and @@ -36,123 +37,92 @@ * 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. + * All lines are (as in v1) stored together -- no seperation of perm and non-perm. They are stored in + * a map of maps (first map is line type, second map is for quick lookup on add/delete/etc). * - * Application will be by a list of lines 'pending' application, meaning only the newly added lines - * will be gone over. Much faster. + * Expiry is *no longer* performed on a timer, and no longer uses a sorted list of any variety. This + * is now done by only checking for expiry when a line is accessed, meaning that expiry is no longer + * a resource intensive problem. * - * More of course is to come. + * Application no longer tries to apply every single line on every single user - instead, now only lines + * added since the previous application are applied. This keeps S2S ADDLINE during burst nice and fast, + * while at the same time not slowing things the fuck down when we try adding a ban with lots of preexisting + * bans. :) */ -/* Version two, now with optimized expiry! - * - * Because the old way was horrendously slow, the new way of expiring xlines is very - * very efficient. I have improved the efficiency of the algorithm in two ways: - * - * (1) There are now two lists of items for each linetype. One list holds temporary - * items, and the other list holds 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 - * soonest is always pointed at by vector::begin(), so a simple while loop can - * very efficiently, very quickly and above all SAFELY pick off the first few - * items in the vector which need zapping. - * - * -- Brain - */ - -bool InitXLine(ServerConfig* conf, const char* tag) -{ - return true; -} - -bool DoneZLine(ServerConfig* conf, const char* tag) +bool XLine::Matches(User *u) { - // XXX we should really only call this once - after we've finished processing configuration all together - conf->GetInstance()->XLines->ApplyLines(); - return true; + return false; } -bool DoneQLine(ServerConfig* conf, const char* tag) +/* + * Checks what users match a given vector of ELines and sets their ban exempt flag accordingly. + */ +void XLineManager::CheckELines() { - // XXX we should really only call this once - after we've finished processing configuration all together - conf->GetInstance()->XLines->ApplyLines(); - return true; -} + ContainerIter n = lookup_lines.find("E"); -bool DoneKLine(ServerConfig* conf, const char* tag) -{ - // XXX we should really only call this once - after we've finished processing configuration all together - conf->GetInstance()->XLines->ApplyLines(); - return true; -} + if (n == lookup_lines.end()) + return; -bool DoneELine(ServerConfig* conf, const char* tag) -{ - // XXX we should really only call this once - after we've finished processing configuration all together - conf->GetInstance()->XLines->ApplyLines(); - return true; -} + XLineLookup& ELines = n->second; -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(); + if (ELines.empty()) + return; - conf->GetInstance()->XLines->AddZLine(0,"",reason,ipmask); - return true; -} + for (std::vector::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) + { + User* u = (User*)(*u2); -bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) -{ - const char* reason = values[0].GetString(); - const char* nick = values[1].GetString(); + /* This uses safe iteration to ensure that if a line expires here, it doenst trash the iterator */ + LookupIter safei; - conf->GetInstance()->XLines->AddQLine(0,"",reason,nick); - return true; -} + for (LookupIter i = ELines.begin(); i != ELines.end(); ) + { + safei = i; + safei++; -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(); + XLine *e = i->second; + u->exempt = e->Matches(u); - conf->GetInstance()->XLines->AddKLine(0,"",reason,host); - return true; + i = safei; + } + } } -bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) + +XLineLookup* XLineManager::GetAll(const std::string &type) { - const char* reason = values[0].GetString(); - const char* host = values[1].GetString(); + ContainerIter n = lookup_lines.find(type); - conf->GetInstance()->XLines->AddELine(0,"",reason,host); - return true; -} + if (n == lookup_lines.end()) + return NULL; -bool XLine::Matches(User *u) -{ - return false; -} + LookupIter safei; + const time_t current = ServerInstance->Time(); -//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++) + /* Expire any dead ones, before sending */ + for (LookupIter x = n->second.begin(); x != n->second.end(); ) { - User* u = (User*)(*u2); - - for (std::vector::iterator i = ELines.begin(); i != ELines.end(); i++) + safei = x; + safei++; + if (x->second->duration && current > x->second->expiry) { - ELine *e = (*i); - - u->exempt = e->Matches(u); + ExpireLine(n, x); } + x = safei; } + + return &(n->second); } +std::vector XLineManager::GetAllTypes() +{ + std::vector items; + for (ContainerIter x = lookup_lines.begin(); x != lookup_lines.end(); ++x) + items.push_back(x->first); + return items; +} IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) { @@ -169,411 +139,179 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) } else { + n.first = ""; n.second = ident_and_host; } return n; } -// adds a g:line +// adds a line -bool XLineManager::AddGLine(long duration, const char* source,const char* reason,const char* hostmask) +bool XLineManager::AddLine(XLine* line, User* user) { - IdentHostPair ih = IdentSplit(hostmask); - - if (DelGLine(hostmask, true)) - return false; - - GLine* item = new GLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + /*IdentHostPair ih = IdentSplit(hostmask);*/ - glines.push_back(item); - sort(glines.begin(), glines.end(),XLineManager::XSortComparison); - pending_lines.push_back(item); + ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here? - return true; -} - -// adds an e:line (exception to bans) - -bool XLineManager::AddELine(long duration, const char* source, const char* reason, const char* hostmask) -{ - IdentHostPair ih = IdentSplit(hostmask); - - if (DelELine(hostmask, true)) + if (DelLine(line->Displayable(), line->type, user, true)) return false; - ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); - - elines.push_back(item); - sort(elines.begin(), elines.end(),XLineManager::XSortComparison); + /*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/ + pending_lines.push_back(line); + lookup_lines[line->type][line->Displayable()] = line; + line->OnAdd(); - // XXX we really only need to check one line (the new one) - this is a bit wasteful! - CheckELines(ServerInstance, elines); + FOREACH_MOD(I_OnAddLine,OnAddLine(user, line)); return true; } -// adds a q:line +// deletes a line, returns true if the line existed and was removed -bool XLineManager::AddQLine(long duration, const char* source, const char* reason, const char* nickname) +bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate) { - if (DelQLine(nickname, true)) - return false; - - 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); + ContainerIter x = lookup_lines.find(type); - return true; -} - -// adds a z:line - -bool XLineManager::AddZLine(long duration, const char* source, const char* reason, const char* ipaddr) -{ - if (strchr(ipaddr,'@')) - { - while (*ipaddr != '@') - ipaddr++; - ipaddr++; - } - - if (DelZLine(ipaddr, true)) + if (x == lookup_lines.end()) return false; - ZLine* item = new ZLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ipaddr); + LookupIter y = x->second.find(hostmask); - zlines.push_back(item); - sort(zlines.begin(), zlines.end(),XLineManager::XSortComparison); - pending_lines.push_back(item); + if (y == x->second.end()) + return false; - return true; -} + if (simulate) + return true; -// adds a k:line + ServerInstance->BanCache->RemoveEntries(y->second->type, true); -bool XLineManager::AddKLine(long duration, const char* source, const char* reason, const char* hostmask) -{ - IdentHostPair ih = IdentSplit(hostmask); + FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second)); - if (DelKLine(hostmask, true)) - return false; + y->second->Unset(); - KLine* item = new KLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + std::vector::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), y->second); + if (pptr != pending_lines.end()) + pending_lines.erase(pptr); - klines.push_back(item); - sort(klines.begin(), klines.end(),XLineManager::XSortComparison); - pending_lines.push_back(item); + delete y->second; + x->second.erase(y); return true; } -// deletes a g:line, returns true if the line existed and was removed -bool XLineManager::DelGLine(const char* hostmask, bool simulate) +void ELine::Unset() { - IdentHostPair ih = IdentSplit(hostmask); - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + /* remove exempt from everyone and force recheck after deleting eline */ + for (std::vector::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { - if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) - { - if (!simulate) - { - delete *i; - glines.erase(i); - } - return true; - } + User* u = (User*)(*u2); + u->exempt = false; } - return false; + ServerInstance->XLines->CheckELines(); } -// deletes a e:line, returns true if the line existed and was removed +// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match -bool XLineManager::DelELine(const char* hostmask, bool simulate) +XLine* XLineManager::MatchesLine(const std::string &type, User* user) { - 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)) - { - 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; - } - } + ContainerIter x = lookup_lines.find(type); - return false; -} - -// deletes a q:line, returns true if the line existed and was removed - -bool XLineManager::DelQLine(const char* nickname, bool simulate) -{ - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - { - if (!strcasecmp(nickname,(*i)->nick)) - { - if (!simulate) - { - delete *i; - qlines.erase(i); - } - return true; - } - } + if (x == lookup_lines.end()) + return NULL; - return false; -} + const time_t current = ServerInstance->Time(); -// deletes a z:line, returns true if the line existed and was removed + LookupIter safei; -bool XLineManager::DelZLine(const char* ipaddr, bool simulate) -{ - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + for (LookupIter i = x->second.begin(); i != x->second.end(); ) { - if (!strcasecmp(ipaddr,(*i)->ipaddr)) - { - if (!simulate) - { - delete *i; - zlines.erase(i); - } - return true; - } - } - - return false; -} + safei = i; + safei++; -// deletes a k:line, returns true if the line existed and was removed - -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)) + if (i->second->Matches(user)) { - if (!simulate) + if (i->second->duration && current > i->second->expiry) { - delete *i; - klines.erase(i); + /* Expire the line, return nothing */ + ExpireLine(x, i); + /* Continue, there may be another that matches + * (thanks aquanight) + */ + i = safei; + continue; } - return true; + else + return i->second; } - } - - 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) -{ - if (qlines.empty()) - return NULL; - - 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(User* user) -{ - if (glines.empty()) - return NULL; - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - { - if ((*i)->Matches(user)) - return (*i); + i = safei; } - return NULL; } -ELine* XLineManager::matches_exception(User* user) +XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern) { - if (elines.empty()) + ContainerIter x = lookup_lines.find(type); + + if (x == lookup_lines.end()) return NULL; - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) - { - if ((*i)->Matches(user)) - return (*i); - } - return NULL; -} + const time_t current = ServerInstance->Time(); + LookupIter safei; -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 (LookupIter i = x->second.begin(); i != x->second.end(); ) { - if (!strcasecmp(host,(*i)->hostmask)) - { - (*i)->set_time = create_time; - (*i)->expiry = create_time + (*i)->duration; - return; - } - } - - return ; -} + safei = i; + safei++; -void XLineManager::eline_set_creation_time(const char* host, time_t create_time) -{ - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) - { - if (!strcasecmp(host,(*i)->hostmask)) + if (i->second->Matches(pattern)) { - (*i)->set_time = create_time; - (*i)->expiry = create_time + (*i)->duration; - return; - } - } - - return; -} - -void XLineManager::qline_set_creation_time(const char* nick, time_t create_time) -{ - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - { - if (!strcasecmp(nick,(*i)->nick)) - { - (*i)->set_time = create_time; - (*i)->expiry = create_time + (*i)->duration; - return; - } - } - - return; -} - -void XLineManager::zline_set_creation_time(const char* ip, time_t create_time) -{ - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - { - if (!strcasecmp(ip,(*i)->ipaddr)) - { - (*i)->set_time = create_time; - (*i)->expiry = create_time + (*i)->duration; - return; + if (i->second->duration && current > i->second->expiry) + { + /* Expire the line, return nothing */ + ExpireLine(x, i); + /* See above */ + i = safei; + continue; + } + else + return i->second; } - } - - return; -} - -// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match - -ZLine* XLineManager::matches_zline(User *u) -{ - if (zlines.empty()) - return NULL; - - 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(User* user) -{ - if (klines.empty()) - return NULL; - - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) - { - if ((*i)->Matches(user)) - return (*i); + i = safei; } - return NULL; } -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() +void XLineManager::ExpireLine(ContainerIter container, LookupIter item) { - time_t current = ServerInstance->Time(); + FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second)); - /* 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. - */ + item->second->DisplayExpiry(); + item->second->Unset(); - 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) && ((*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) && ((*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) && ((*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) && ((*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); - } + /* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line + * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending? + * -- Brain + */ + std::vector::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second); + if (pptr != pending_lines.end()) + pending_lines.erase(pptr); + delete item->second; + container->second.erase(item); } + // applies lines, removing clients and changing nicks etc as applicable void XLineManager::ApplyLines() { - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) + for (std::vector::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { User* u = (User*)(*u2); @@ -588,64 +326,93 @@ void XLineManager::ApplyLines() pending_lines.clear(); } -void XLineManager::stats_k(User* user, string_list &results) +void XLineManager::InvokeStats(const std::string &type, int numeric, 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); -} -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); -} + ContainerIter n = lookup_lines.find(type); -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); -} + time_t current = ServerInstance->Time(); -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); -} + LookupIter safei; -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); + if (n != lookup_lines.end()) + { + XLineLookup& list = n->second; + for (LookupIter i = list.begin(); i != list.end(); ) + { + safei = i; + safei++; + + if (i->second->duration && current > i->second->expiry) + { + ExpireLine(n, i); + } + else + results.push_back(sn+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+ + ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+std::string(i->second->source)+" :"+(i->second->reason)); + i = safei; + } + } } + XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance) { + GFact = new GLineFactory(Instance); + EFact = new ELineFactory(Instance); + KFact = new KLineFactory(Instance); + QFact = new QLineFactory(Instance); + ZFact = new ZLineFactory(Instance); + + RegisterFactory(GFact); + RegisterFactory(EFact); + RegisterFactory(KFact); + RegisterFactory(QFact); + RegisterFactory(ZFact); } -bool XLine::Matches(const std::string &str) +XLineManager::~XLineManager() { - return false; + UnregisterFactory(GFact); + UnregisterFactory(EFact); + UnregisterFactory(KFact); + UnregisterFactory(QFact); + UnregisterFactory(ZFact); + + delete GFact; + delete EFact; + delete KFact; + delete QFact; + delete ZFact; } void XLine::Apply(User* u) { } -void XLine::DefaultApply(User* u, char line) +bool XLine::IsBurstable() { - char reason[MAXBUF]; - snprintf(reason, MAXBUF, "%c-Lined: %s", line, this->reason); + return true; +} + +void XLine::DefaultApply(User* u, const std::string &line, bool bancache) +{ + char sreason[MAXBUF]; + snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), 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); + User::QuitUser(ServerInstance, u, line + "-Lined", sreason); else - User::QuitUser(ServerInstance, u, reason); + User::QuitUser(ServerInstance, u, sreason); + + + if (bancache) + { + ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Adding positive hit (") + line + ") for " + u->GetIPString()); + ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason); + } } bool KLine::Matches(User *u) @@ -666,7 +433,7 @@ bool KLine::Matches(User *u) void KLine::Apply(User* u) { - DefaultApply(u, 'K'); + DefaultApply(u, "K", (strcmp(this->identmask, "*") == 0) ? true : false); } bool GLine::Matches(User *u) @@ -687,7 +454,7 @@ bool GLine::Matches(User *u) void GLine::Apply(User* u) { - DefaultApply(u, 'G'); + DefaultApply(u, "G", (strcmp(this->identmask, "*") == 0) ? true : false); } bool ELine::Matches(User *u) @@ -719,7 +486,7 @@ bool ZLine::Matches(User *u) void ZLine::Apply(User* u) { - DefaultApply(u, 'Z'); + DefaultApply(u, "Z", true); } @@ -736,8 +503,8 @@ bool QLine::Matches(User *u) void QLine::Apply(User* u) { - /* Can we force the user to their uid here instead? */ - DefaultApply(u, 'Q'); + /* Force to uuid on apply of qline, no need to disconnect any more :) */ + u->ForceNickChange(u->uuid); } @@ -757,3 +524,118 @@ bool QLine::Matches(const std::string &str) return false; } +bool ELine::Matches(const std::string &str) +{ + return ((match(str.c_str(), matchtext.c_str(), true))); +} + +bool KLine::Matches(const std::string &str) +{ + return ((match(str.c_str(), matchtext.c_str(), true))); +} + +bool GLine::Matches(const std::string &str) +{ + return ((match(str.c_str(), matchtext.c_str(), true))); +} + +void ELine::OnAdd() +{ + /* When adding one eline, only check the one eline */ + for (std::vector::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) + { + User* u = (User*)(*u2); + if (this->Matches(u)) + u->exempt = true; + } +} + +void ELine::DisplayExpiry() +{ + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); +} + +void QLine::DisplayExpiry() +{ + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,this->duration); +} + +void ZLine::DisplayExpiry() +{ + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,this->duration); +} + +void KLine::DisplayExpiry() +{ + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); +} + +void GLine::DisplayExpiry() +{ + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); +} + +const char* ELine::Displayable() +{ + return matchtext.c_str(); +} + +const char* KLine::Displayable() +{ + return matchtext.c_str(); +} + +const char* GLine::Displayable() +{ + return matchtext.c_str(); +} + +const char* ZLine::Displayable() +{ + return ipaddr; +} + +const char* QLine::Displayable() +{ + return nick; +} + +bool KLine::IsBurstable() +{ + return false; +} + +bool XLineManager::RegisterFactory(XLineFactory* xlf) +{ + XLineFactMap::iterator n = line_factory.find(xlf->GetType()); + + if (n != line_factory.end()) + return false; + + line_factory[xlf->GetType()] = xlf; + + return true; +} + +bool XLineManager::UnregisterFactory(XLineFactory* xlf) +{ + XLineFactMap::iterator n = line_factory.find(xlf->GetType()); + + if (n == line_factory.end()) + return false; + + line_factory.erase(n); + + return true; +} + +XLineFactory* XLineManager::GetFactory(const std::string &type) +{ + XLineFactMap::iterator n = line_factory.find(type); + + if (n == line_factory.end()) + return NULL; + + return n->second; +} +