X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=56bd029d7a754b8fefb9f9b3dd8ef1daa35c4d00;hb=3593e33ce374caee9aec0575b49ec9b0001a8ec6;hp=75f689265193ef69fac8a7a1b1713a08eda07e0f;hpb=4c62b8741904a5908179e96b31ef1cf170c8564a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 75f689265..56bd029d7 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -6,7 +6,7 @@ * 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. * * --------------------------------------------------- */ @@ -36,31 +36,17 @@ * 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. - */ - -/* 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 + * 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. :) */ bool XLine::Matches(User *u) @@ -71,8 +57,15 @@ bool XLine::Matches(User *u) /* * Checks what users match a given vector of ELines and sets their ban exempt flag accordingly. */ -void XLineManager::CheckELines(std::map &ELines) +void XLineManager::CheckELines() { + ContainerIter n = lookup_lines.find("E"); + + if (n == lookup_lines.end()) + return; + + XLineLookup& ELines = n->second; + if (ELines.empty()) return; @@ -80,27 +73,55 @@ void XLineManager::CheckELines(std::map &ELines) { User* u = (User*)(*u2); - for (std::map::iterator i = ELines.begin(); i != ELines.end(); i++) + /* This uses safe iteration to ensure that if a line expires here, it doenst trash the iterator */ + LookupIter safei; + + for (LookupIter i = ELines.begin(); i != ELines.end(); ) { + safei = i; + safei++; + XLine *e = i->second; u->exempt = e->Matches(u); + + i = safei; } } } -// this should probably be moved to configreader, but atm it relies on CheckELines above. -bool DoneELine(ServerConfig* conf, const char* tag) + +XLineLookup* XLineManager::GetAll(const std::string &type) { - for (std::vector::const_iterator u2 = conf->GetInstance()->local_users.begin(); u2 != conf->GetInstance()->local_users.end(); u2++) + ContainerIter n = lookup_lines.find(type); + + if (n == lookup_lines.end()) + return NULL; + + LookupIter safei; + const time_t current = ServerInstance->Time(); + + /* Expire any dead ones, before sending */ + for (LookupIter x = n->second.begin(); x != n->second.end(); ) { - User* u = (User*)(*u2); - u->exempt = false; + safei = x; + safei++; + if (x->second->duration && current > x->second->expiry) + { + ExpireLine(n, x); + } + x = safei; } - conf->GetInstance()->XLines->CheckELines(conf->GetInstance()->XLines->lookup_lines['E']); - return true; + 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) { @@ -123,61 +144,54 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) return n; } -// adds a g:line +// adds a line -/*bool XLineManager::AddELine(long duration, const char* source, const char* reason, const char* hostmask)*/ -bool XLineManager::AddLine(XLine* line) +bool XLineManager::AddLine(XLine* line, User* user) { /*IdentHostPair ih = IdentSplit(hostmask);*/ - if (DelLine(line->Displayable(), line->type, 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());*/ - - active_lines.push_back(line); - sort(active_lines.begin(), active_lines.end(), XLineManager::XSortComparison); + pending_lines.push_back(line); lookup_lines[line->type][line->Displayable()] = line; line->OnAdd(); + FOREACH_MOD(I_OnAddLine,OnAddLine(user, line)); + return true; } -/*bool XLineManager::AddZLine(long duration, const char* source, const char* reason, const char* ipaddr) +// deletes a line, returns true if the line existed and was removed + +bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate) { - if (strchr(ipaddr,'@')) - { - while (*ipaddr != '@') - ipaddr++; - ipaddr++; - }*/ + ContainerIter x = lookup_lines.find(type); -// deletes a g:line, returns true if the line existed and was removed + if (x == lookup_lines.end()) + return false; -bool XLineManager::DelLine(const char* hostmask, char type, bool simulate) -{ - IdentHostPair ih = IdentSplit(hostmask); - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - { - if ((*i)->type == type) - { - if ((*i)->MatchesLiteral(hostmask)) - { - if (!simulate) - { - (*i)->Unset(); - delete *i; - active_lines.erase(i); - if (lookup_lines.find(type) != lookup_lines.end()) - lookup_lines[type].erase(hostmask); - /* XXX: Should erase from pending lines here */ - } - return true; - } - } - } + LookupIter y = x->second.find(hostmask); - return false; + if (y == x->second.end()) + return false; + + if (simulate) + return true; + + FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second)); + + y->second->Unset(); + + std::vector::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), y->second); + if (pptr != pending_lines.end()) + pending_lines.erase(pptr); + + delete y->second; + x->second.erase(y); + + return true; } @@ -190,183 +204,102 @@ void ELine::Unset() u->exempt = false; } - if (ServerInstance->XLines->lookup_lines.find('E') != ServerInstance->XLines->lookup_lines.end()) - ServerInstance->XLines->CheckELines(ServerInstance->XLines->lookup_lines['E']); + ServerInstance->XLines->CheckELines(); } // 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 (lookup_lines.find('Q') == lookup_lines.end()) - return NULL; - - if (lookup_lines.find('Q') != lookup_lines.end() && lookup_lines['Q'].empty()) - return NULL; - - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - if ((*i)->type == 'Q' && (*i)->Matches(nick)) - return (QLine*)(*i); - return NULL; -} - -// returns a pointer to the reason if a host matches a gline, NULL if it didnt match - -GLine* XLineManager::matches_gline(User* user) +XLine* XLineManager::MatchesLine(const std::string &type, User* user) { - if (lookup_lines.find('G') == lookup_lines.end()) - return NULL; + ContainerIter x = lookup_lines.find(type); - if (lookup_lines.find('G') != lookup_lines.end() && lookup_lines['G'].empty()) + if (x == lookup_lines.end()) return NULL; - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - if ((*i)->type == 'G' && (*i)->Matches(user)) - return (GLine*)(*i); - - return NULL; -} + const time_t current = ServerInstance->Time(); -ELine* XLineManager::matches_exception(User* user) -{ - if (lookup_lines.find('E') == lookup_lines.end()) - return NULL; + LookupIter safei; - if (lookup_lines.find('E') != lookup_lines.end() && lookup_lines['E'].empty()) - return NULL; - - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) + for (LookupIter i = x->second.begin(); i != x->second.end(); ) { - if ((*i)->type == 'E' && (*i)->Matches(user)) - return (ELine*)(*i); - } - return NULL; -} + safei = i; + 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++) - { - if (!strcasecmp(host,(*i)->hostmask)) + if (i->second->Matches(user)) { - (*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); + /* Continue, there may be another that matches + * (thanks aquanight) + */ + i = safei; + continue; + } + else + return i->second; } - }*/ - return ; + i = safei; + } + return NULL; } -void XLineManager::eline_set_creation_time(const char* host, time_t create_time) +XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern) { - /*for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) - { - if (!strcasecmp(host,(*i)->hostmask)) - { - (*i)->set_time = create_time; - (*i)->expiry = create_time + (*i)->duration; - return; - } - }*/ + ContainerIter x = lookup_lines.find(type); - return; -} + if (x == lookup_lines.end()) + return NULL; -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; - } - }*/ + const time_t current = ServerInstance->Time(); - return; -} + LookupIter safei; -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 (LookupIter i = x->second.begin(); i != x->second.end(); ) { - if (!strcasecmp(ip,(*i)->ipaddr)) + safei = i; + safei++; + + if (i->second->Matches(pattern)) { - (*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 (lookup_lines.find('Z') == lookup_lines.end()) - return NULL; - - if (lookup_lines.find('Z') != lookup_lines.end() && lookup_lines['Z'].empty()) - return NULL; - - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - if ((*i)->type == 'Z' && (*i)->Matches(u)) - return (ZLine*)(*i); - return NULL; -} - -// returns a pointer to the reason if a host matches a kline, NULL if it didnt match - -KLine* XLineManager::matches_kline(User* user) -{ - if (lookup_lines.find('K') == lookup_lines.end()) - return NULL; - - if (lookup_lines.find('K') != lookup_lines.end() && lookup_lines['K'].empty()) - return NULL; - - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - if ((*i)->Matches(user)) - return (KLine*)(*i); - - return NULL; -} - -bool XLineManager::XSortComparison(const XLine *one, const XLine *two) -{ - // account for permanent lines - if (one->expiry == 0) - { - return false; + i = safei; } - return (one->expiry) < (two->expiry); + return NULL; } // removes lines that have expired -void XLineManager::expire_lines() +void XLineManager::ExpireLine(ContainerIter container, LookupIter item) { - time_t current = ServerInstance->Time(); + item->second->DisplayExpiry(); + item->second->Unset(); - /* 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. - */ + /* 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); - while ((active_lines.size()) && (current > (*active_lines.begin())->expiry) && ((*active_lines.begin())->duration != 0)) - { - std::vector::iterator i = active_lines.begin(); - (*i)->DisplayExpiry(); - (*i)->Unset(); - active_lines.erase(i); - delete *i; - } + delete item->second; + container->second.erase(item); } + // applies lines, removing clients and changing nicks etc as applicable void XLineManager::ApplyLines() { @@ -385,57 +318,79 @@ 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);*/ -} + std::string sn = ServerInstance->Config->ServerName; -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; + + 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; + } + } } -void XLineManager::stats_e(User* user, string_list &results) + +XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance) { - /*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);*/ + 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); } -XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance) +XLineManager::~XLineManager() { + 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) +void XLine::DefaultApply(User* u, const std::string &line) { char reason[MAXBUF]; - snprintf(reason, MAXBUF, "%c-Lined: %s", line, this->reason); + snprintf(reason, 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", reason); else User::QuitUser(ServerInstance, u, reason); } @@ -458,7 +413,7 @@ bool KLine::Matches(User *u) void KLine::Apply(User* u) { - DefaultApply(u, 'K'); + DefaultApply(u, "K"); } bool GLine::Matches(User *u) @@ -479,7 +434,7 @@ bool GLine::Matches(User *u) void GLine::Apply(User* u) { - DefaultApply(u, 'G'); + DefaultApply(u, "G"); } bool ELine::Matches(User *u) @@ -511,7 +466,7 @@ bool ZLine::Matches(User *u) void ZLine::Apply(User* u) { - DefaultApply(u, 'Z'); + DefaultApply(u, "Z"); } @@ -528,8 +483,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); } @@ -564,31 +519,6 @@ bool GLine::Matches(const std::string &str) return ((match(str.c_str(), matchtext.c_str(), true))); } -bool ELine::MatchesLiteral(const std::string &str) -{ - return (assign(str) == matchtext); -} - -bool ZLine::MatchesLiteral(const std::string &str) -{ - return (assign(str) == this->ipaddr); -} - -bool GLine::MatchesLiteral(const std::string &str) -{ - return (assign(str) == matchtext); -} - -bool KLine::MatchesLiteral(const std::string &str) -{ - return (assign(str) == matchtext); -} - -bool QLine::MatchesLiteral(const std::string &str) -{ - return (assign(str) == this->nick); -} - void ELine::OnAdd() { /* When adding one eline, only check the one eline */ @@ -650,3 +580,37 @@ const char* QLine::Displayable() return nick; } +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; +} +