X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=4bb9551ecc6d8c1006f6b70459ec936004c78047;hb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;hp=8fbb73280d0af90eb788f713613f2d39c2029ef9;hpb=5a13b1834b3dfdeeeabb4569af5def7baa7c6248;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 8fbb73280..4bb9551ec 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -1,24 +1,111 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2005-2009 Robin Burchell + * Copyright (C) 2004-2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 John Brooks * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * --------------------------------------------------- + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $Core: libIRCDxline */ #include "inspircd.h" -#include "wildcard.h" #include "xline.h" +#include "bancache.h" + +/** An XLineFactory specialized to generate GLine* pointers + */ +class GLineFactory : public XLineFactory +{ + public: + GLineFactory() : XLineFactory("G") { } + + /** Generate a GLine + */ + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + { + IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); + return new GLine(set_time, duration, source, reason, ih.first, ih.second); + } +}; + +/** An XLineFactory specialized to generate ELine* pointers + */ +class ELineFactory : public XLineFactory +{ + public: + ELineFactory() : XLineFactory("E") { } + + /** Generate an ELine + */ + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + { + IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); + return new ELine(set_time, duration, source, reason, ih.first, ih.second); + } +}; + +/** An XLineFactory specialized to generate KLine* pointers + */ +class KLineFactory : public XLineFactory +{ + public: + KLineFactory() : XLineFactory("K") { } + + /** Generate a KLine + */ + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + { + IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); + return new KLine(set_time, duration, source, reason, ih.first, ih.second); + } +}; + +/** An XLineFactory specialized to generate QLine* pointers + */ +class QLineFactory : public XLineFactory +{ + public: + QLineFactory() : XLineFactory("Q") { } + + /** Generate a QLine + */ + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + { + return new QLine(set_time, duration, source, reason, xline_specific_mask); + } +}; + +/** An XLineFactory specialized to generate ZLine* pointers + */ +class ZLineFactory : public XLineFactory +{ + public: + ZLineFactory() : XLineFactory("Z") { } + + /** Generate a ZLine + */ + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + { + return new ZLine(set_time, duration, source, reason, xline_specific_mask); + } +}; + /* - * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and + * 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: @@ -57,36 +144,87 @@ 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; - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) + for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { - User* u = (User*)(*u2); + LocalUser* u = *u2; + + /* This uses safe iteration to ensure that if a line expires here, it doenst trash the iterator */ + LookupIter safei; - for (std::map::iterator i = ELines.begin(); i != ELines.end(); i++) + 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); } +void XLineManager::DelAll(const std::string &type) +{ + ContainerIter n = lookup_lines.find(type); + + if (n == lookup_lines.end()) + return; + + LookupIter x; + + /* Delete all of a given type (this should probably use DelLine, but oh well) */ + while ((x = n->second.begin()) != n->second.end()) + { + ExpireLine(n, x); + } +} + +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) { @@ -103,225 +241,203 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) } else { + n.first.clear(); n.second = 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, User* user) { - /*IdentHostPair ih = IdentSplit(hostmask);*/ + if (line->duration && ServerInstance->Time() > line->expiry) + return false; // Don't apply expired XLines. + + /* Don't apply duplicate xlines */ + ContainerIter x = lookup_lines.find(line->type); + if (x != lookup_lines.end()) + { + LookupIter i = x->second.find(line->Displayable().c_str()); + if (i != x->second.end()) + { + // XLine propagation bug was here, if the line to be added already exists and + // it's expired then expire it and add the new one instead of returning false + if ((!i->second->duration) || (ServerInstance->Time() < i->second->expiry)) + return false; + + ExpireLine(x, i); + } + } - if (DelLine(line->Displayable(), line->type, user, true)) + /*ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/ + XLineFactory* xlf = GetFactory(line->type); + if (!xlf) return false; - /*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/ + ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here? - 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(); + if (xlf->AutoApplyToUserList(line)) + pending_lines.push_back(line); - if (!line->duration) - PermLines++; + lookup_lines[line->type][line->Displayable().c_str()] = line; + line->OnAdd(); - FOREACH_MOD(I_OnAddLine,OnAddLine(user, line)); + 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, User* user, 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(); + LookupIter y = x->second.find(hostmask); - if (lookup_lines.find(type) != lookup_lines.end()) - lookup_lines[type].erase(hostmask); + if (y == x->second.end()) + return false; - FOREACH_MOD(I_OnDelLine,OnDelLine(user, *i)); + if (simulate) + return true; - std::vector::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), *i); - if (pptr != pending_lines.end()) - pending_lines.erase(pptr); + ServerInstance->BanCache->RemoveEntries(y->second->type, true); - if (!(*i)->duration) - PermLines--; + FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second)); - delete *i; - active_lines.erase(i); - } - return true; - } - } - } + y->second->Unset(); - return false; + 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; } void ELine::Unset() { /* 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++) + for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { - User* u = (User*)(*u2); + LocalUser* u = *u2; 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) +XLine* XLineManager::MatchesLine(const std::string &type, User* user) { - if (lookup_lines.find('Q') == lookup_lines.end()) - return NULL; + ContainerIter x = lookup_lines.find(type); - if (lookup_lines.find('Q') != lookup_lines.end() && lookup_lines['Q'].empty()) + if (x == lookup_lines.end()) 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) -{ - if (lookup_lines.find('G') == lookup_lines.end()) - return NULL; + const time_t current = ServerInstance->Time(); - if (lookup_lines.find('G') != lookup_lines.end() && lookup_lines['G'].empty()) - return NULL; + LookupIter safei; - 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; -} + for (LookupIter i = x->second.begin(); i != x->second.end(); ) + { + safei = i; + safei++; -ELine* XLineManager::matches_exception(User* user) -{ - if (lookup_lines.find('E') == lookup_lines.end()) - return NULL; + if (i->second->duration && current > i->second->expiry) + { + /* Expire the line, proceed to next one */ + ExpireLine(x, i); + i = safei; + continue; + } - if (lookup_lines.find('E') != lookup_lines.end() && lookup_lines['E'].empty()) - return NULL; + if (i->second->Matches(user)) + { + return i->second; + } - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - { - if ((*i)->type == 'E' && (*i)->Matches(user)) - return (ELine*)(*i); + i = safei; } return NULL; } -// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match - -ZLine* XLineManager::matches_zline(User *u) +XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern) { - if (lookup_lines.find('Z') == lookup_lines.end()) - return NULL; + ContainerIter x = lookup_lines.find(type); - if (lookup_lines.find('Z') != lookup_lines.end() && lookup_lines['Z'].empty()) + if (x == lookup_lines.end()) 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 + const time_t current = ServerInstance->Time(); -KLine* XLineManager::matches_kline(User* user) -{ - if (lookup_lines.find('K') == lookup_lines.end()) - return NULL; + LookupIter safei; - if (lookup_lines.find('K') != lookup_lines.end() && lookup_lines['K'].empty()) - return NULL; + for (LookupIter i = x->second.begin(); i != x->second.end(); ) + { + safei = i; + safei++; - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - if ((*i)->Matches(user)) - return (KLine*)(*i); + if (i->second->Matches(pattern)) + { + 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; + } + i = safei; + } return NULL; } -bool XLineManager::XSortComparison(const XLine *one, const XLine *two) -{ - 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(); - - /* 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. We use PermLines as an offset into the - * vector past the first item with a duration 0. - */ - - std::vector::iterator start = active_lines.begin() + PermLines; - - while ((start < active_lines.end()) && (current > (*start)->expiry)) - { - (*start)->DisplayExpiry(); - (*start)->Unset(); + FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second)); - if (lookup_lines.find((*start)->type) != lookup_lines.end()) - lookup_lines[(*start)->type].erase((*start)->Displayable()); + item->second->DisplayExpiry(); + item->second->Unset(); - std::vector::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), *start); - if (pptr != pending_lines.end()) - pending_lines.erase(pptr); - - if (!(*start)->duration) - PermLines--; + /* 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 *start; - active_lines.erase(start); - } + 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++) + LocalUserList::reverse_iterator u2 = ServerInstance->Users->local_users.rbegin(); + while (u2 != ServerInstance->Users->local_users.rend()) { - User* u = (User*)(*u2); + LocalUser* u = *u2++; + + // Don't ban people who are exempt. + if (u->exempt) + continue; for (std::vector::iterator i = pending_lines.begin(); i != pending_lines.end(); i++) { @@ -334,36 +450,49 @@ void XLineManager::ApplyLines() pending_lines.clear(); } -/* k: 216 - * g: 223 - * q: 217 - * z: 223 - * e: 223 - */ - -void XLineManager::InvokeStats(const char type, int numeric, 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; + ContainerIter n = lookup_lines.find(type); + + time_t current = ServerInstance->Time(); - std::map >::iterator n = lookup_lines.find(type); + LookupIter safei; if (n != lookup_lines.end()) { - std::map& list = n->second; - for (std::map::iterator i = list.begin(); i != list.end(); i++) - 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)); + 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(ServerInstance->Config->ServerName+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+ + ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+i->second->source+" :"+i->second->reason); + i = safei; + } } } -XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance), PermLines(0) +XLineManager::XLineManager() { - GFact = new GLineFactory(Instance); - EFact = new ELineFactory(Instance); - KFact = new KLineFactory(Instance); - QFact = new QLineFactory(Instance); - ZFact = new ZLineFactory(Instance); + GLineFactory* GFact; + ELineFactory* EFact; + KLineFactory* KFact; + QLineFactory* QFact; + ZLineFactory* ZFact; + + + GFact = new GLineFactory; + EFact = new ELineFactory; + KFact = new KLineFactory; + QFact = new QLineFactory; + ZFact = new ZLineFactory; RegisterFactory(GFact); RegisterFactory(EFact); @@ -374,43 +503,62 @@ XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance), PermL XLineManager::~XLineManager() { - UnregisterFactory(GFact); - UnregisterFactory(EFact); - UnregisterFactory(KFact); - UnregisterFactory(QFact); - UnregisterFactory(ZFact); + const char gekqz[] = "GEKQZ"; + for(unsigned int i=0; i < sizeof(gekqz); i++) + { + XLineFactory* xlf = GetFactory(std::string(1, gekqz[i])); + delete xlf; + } - delete GFact; - delete EFact; - delete KFact; - delete QFact; - delete ZFact; + // Delete all existing XLines + for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++) + { + for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++) + { + delete j->second; + } + } } void XLine::Apply(User* u) { } -void XLine::DefaultApply(User* u, char line) +bool XLine::IsBurstable() +{ + return true; +} + +void XLine::DefaultApply(User* u, const std::string &line, bool bancache) { - 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); + const std::string banReason = line + "-Lined: " + reason; + + if (!ServerInstance->Config->MoronBanner.empty()) + u->WriteNotice("*** " + ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) - User::QuitUser(ServerInstance, u, line + std::string("-Lined"), reason); + ServerInstance->Users->QuitUser(u, line + "-Lined", banReason.c_str()); else - User::QuitUser(ServerInstance, u, reason); + ServerInstance->Users->QuitUser(u, banReason); + + + if (bancache) + { + ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString()); + ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason, this->duration); + } } bool KLine::Matches(User *u) { - if (u->exempt) + LocalUser* lu = IS_LOCAL(u); + if (lu && lu->exempt) return false; - if ((match(u->ident, this->identmask))) + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true))) + if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { return true; } @@ -421,17 +569,19 @@ bool KLine::Matches(User *u) void KLine::Apply(User* u) { - DefaultApply(u, 'K'); + DefaultApply(u, "K", (this->identmask == "*") ? true : false); } bool GLine::Matches(User *u) { - if (u->exempt) + LocalUser* lu = IS_LOCAL(u); + if (lu && lu->exempt) return false; - if ((match(u->ident, this->identmask))) + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true))) + if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { return true; } @@ -441,18 +591,20 @@ bool GLine::Matches(User *u) } void GLine::Apply(User* u) -{ - DefaultApply(u, 'G'); +{ + DefaultApply(u, "G", (this->identmask == "*") ? true : false); } bool ELine::Matches(User *u) { - if (u->exempt) + LocalUser* lu = IS_LOCAL(u); + if (lu && lu->exempt) return false; - if ((match(u->ident, this->identmask))) + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true))) + if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { return true; } @@ -463,42 +615,40 @@ bool ELine::Matches(User *u) bool ZLine::Matches(User *u) { - if (u->exempt) + LocalUser* lu = IS_LOCAL(u); + if (lu && lu->exempt) return false; - if (match(u->GetIPString(), this->ipaddr, true)) + if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr)) return true; else return false; } void ZLine::Apply(User* u) -{ - DefaultApply(u, 'Z'); +{ + DefaultApply(u, "Z", true); } bool QLine::Matches(User *u) { - if (u->exempt) - return false; - - if (match(u->nick, this->nick)) + if (InspIRCd::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'); +{ + /* Force to uuid on apply of qline, no need to disconnect any more :) */ + u->ForceNickChange(u->uuid); } bool ZLine::Matches(const std::string &str) { - if (match(str.c_str(), this->ipaddr, true)) + if (InspIRCd::MatchCIDR(str, this->ipaddr)) return true; else return false; @@ -506,7 +656,7 @@ bool ZLine::Matches(const std::string &str) bool QLine::Matches(const std::string &str) { - if (match(str.c_str(), this->nick)) + if (InspIRCd::Match(str, this->nick)) return true; return false; @@ -514,108 +664,70 @@ bool QLine::Matches(const std::string &str) bool ELine::Matches(const std::string &str) { - return ((match(str.c_str(), matchtext.c_str(), true))); + return (InspIRCd::MatchCIDR(str, matchtext)); } bool KLine::Matches(const std::string &str) { - return ((match(str.c_str(), matchtext.c_str(), true))); + return (InspIRCd::MatchCIDR(str.c_str(), matchtext)); } 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); + return (InspIRCd::MatchCIDR(str, matchtext)); } void ELine::OnAdd() { /* When adding one eline, only check the one eline */ - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) + for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { - User* u = (User*)(*u2); + LocalUser* u = *u2; if (this->Matches(u)) u->exempt = true; } } -void ELine::DisplayExpiry() -{ - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d 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 %d seconds ago)",this->nick,this->source,this->duration); -} - -void ZLine::DisplayExpiry() +void XLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",this->ipaddr,this->source,this->duration); + bool onechar = (type.length() == 1); + ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %ld seconds ago)", + type.c_str(), (onechar ? "-Line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time)); } -void KLine::DisplayExpiry() +const std::string& ELine::Displayable() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration); + return matchtext; } -void GLine::DisplayExpiry() +const std::string& KLine::Displayable() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration); + return matchtext; } -const char* ELine::Displayable() +const std::string& GLine::Displayable() { - return matchtext.c_str(); + return matchtext; } -const char* KLine::Displayable() +const std::string& ZLine::Displayable() { - return matchtext.c_str(); -} - -const char* GLine::Displayable() -{ - return matchtext.c_str(); + return ipaddr; } -const char* ZLine::Displayable() +const std::string& QLine::Displayable() { - return ipaddr; + return nick; } -const char* QLine::Displayable() +bool KLine::IsBurstable() { - return nick; + return false; } bool XLineManager::RegisterFactory(XLineFactory* xlf) { - std::map::iterator n = line_factory.find(xlf->GetType()); + XLineFactMap::iterator n = line_factory.find(xlf->GetType()); if (n != line_factory.end()) return false; @@ -627,7 +739,7 @@ bool XLineManager::RegisterFactory(XLineFactory* xlf) bool XLineManager::UnregisterFactory(XLineFactory* xlf) { - std::map::iterator n = line_factory.find(xlf->GetType()); + XLineFactMap::iterator n = line_factory.find(xlf->GetType()); if (n == line_factory.end()) return false; @@ -637,13 +749,12 @@ bool XLineManager::UnregisterFactory(XLineFactory* xlf) return true; } -XLineFactory* XLineManager::GetFactory(const char type) +XLineFactory* XLineManager::GetFactory(const std::string &type) { - std::map::iterator n = line_factory.find(type); + XLineFactMap::iterator n = line_factory.find(type); - if (n != line_factory.end()) + if (n == line_factory.end()) return NULL; return n->second; } -