Use FindUUID in place of FindNick in places that only get a UUID.

[user/henk/code/inspircd.git] / src / xline.cpp

diff --git a/src/xline.cpp b/src/xline.cpp
index ccdc58dc235cec6021998872fd50aa458916de70..accffb8d0ebaf7ba0181f69b506ed3f2c2f59b86 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -265,12 +265,31 @@ bool XLineManager::AddLine(XLine* line, User* user)
                LookupIter i = x->second.find(line->Displayable());
                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;
+                       bool silent = false;
 
-                       ExpireLine(x, i);
+                       // Allow replacing a config line for an updated config line.
+                       if (i->second->from_config && line->from_config)
+                       {
+                               // Nothing changed, skip adding this one.
+                               if (i->second->reason == line->reason)
+                                       return false;
+
+                               silent = true;
+                       }
+                       // Allow replacing a non-config line for a new config line.
+                       else if (!line->from_config)
+                       {
+                               // X-line 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;
+                       }
+                       else
+                       {
+                               silent = true;
+                       }
+
+                       ExpireLine(x, i, silent);
                }
        }
 
@@ -403,11 +422,13 @@ XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pat
 }
 
 // removes lines that have expired
-void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
+void XLineManager::ExpireLine(ContainerIter container, LookupIter item, bool silent)
 {
        FOREACH_MOD(OnExpireLine, (item->second));
 
-       item->second->DisplayExpiry();
+       if (!silent)
+               item->second->DisplayExpiry();
+
        item->second->Unset();
 
        /* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line
@@ -425,9 +446,9 @@ void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
 void XLineManager::ApplyLines()
 {
        const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
-       for (UserManager::LocalList::const_iterator j = list.begin(); j != list.end(); ++j)
+       for (UserManager::LocalList::const_iterator j = list.begin(); j != list.end(); )
        {
-               LocalUser* u = *j;
+               LocalUser* u = *j++;
 
                // Don't ban people who are exempt.
                if (u->exempt)
@@ -437,7 +458,14 @@ void XLineManager::ApplyLines()
                {
                        XLine *x = *i;
                        if (x->Matches(u))
+                       {
                                x->Apply(u);
+
+                               // If applying the X-line has killed the user then don't
+                               // apply any more lines to them.
+                               if (u->quitting)
+                                       break;
+                       }
                }
        }
 
@@ -539,7 +567,7 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
        if (bancache)
        {
                ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString());
-               ServerInstance->BanCache.AddHit(u->GetIPString(), this->type, banReason, this->duration);
+               ServerInstance->BanCache.AddHit(u->GetIPString(), this->type, banReason, (this->duration > 0 ? (this->expiry - ServerInstance->Time()) : 0));
        }
 }
 
@@ -682,8 +710,8 @@ void ELine::OnAdd()
 void XLine::DisplayExpiry()
 {
        bool onechar = (type.length() == 1);
-       ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %ld seconds ago): %s",
-               type.c_str(), (onechar ? "-line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time), reason.c_str());
+       ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %s ago): %s",
+               type.c_str(), (onechar ? "-line" : ""), Displayable().c_str(), source.c_str(), InspIRCd::DurationString(ServerInstance->Time() - set_time).c_str(), reason.c_str());
 }
 
 const std::string& ELine::Displayable()
@@ -750,23 +778,23 @@ XLineFactory* XLineManager::GetFactory(const std::string &type)
        return n->second;
 }
 
-void XLineManager::ClearConfigLines()
+void XLineManager::ExpireRemovedConfigLines(const std::string& type, const insp::flat_set<std::string>& configlines)
 {
        // Nothing to do.
        if (lookup_lines.empty())
                return;
 
-       ServerInstance->SNO->WriteToSnoMask('x', "Server rehashing; expiring lines defined in the server config ...");
-       for (ContainerIter type = lookup_lines.begin(); type != lookup_lines.end(); ++type)
+       ContainerIter xlines = lookup_lines.find(type);
+       if (xlines == lookup_lines.end())
+               return;
+
+       for (LookupIter xline = xlines->second.begin(); xline != xlines->second.end(); )
        {
-               for (LookupIter xline = type->second.begin(); xline != type->second.end(); )
-               {
-                       // We cache this to avoid iterator invalidation.
-                       LookupIter cachedxline = xline++;
-                       if (cachedxline->second->from_config)
-                       {
-                               ExpireLine(type, cachedxline);
-                       }
-               }
+               LookupIter cachedxline = xline++;
+               if (!cachedxline->second->from_config)
+                       continue;
+
+               if (!configlines.count(cachedxline->second->Displayable()))
+                       ExpireLine(xlines, cachedxline);
        }
 }