Remove an unused variable in the http_acl module.

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

diff --git a/src/xline.cpp b/src/xline.cpp
index fbb4f0c8b47aeb6045e77b56f74e979c5b83378d..04ac67f684d1ff2cd2ace35d371b39257589cd49 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -1,11 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2018-2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2005-2009 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2004-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2006-2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -446,9 +451,9 @@ void XLineManager::ExpireLine(ContainerIter container, LookupIter item, bool sil
 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)
@@ -458,7 +463,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;
+                       }
                }
        }
 
@@ -486,13 +498,36 @@ void XLineManager::InvokeStats(const std::string& type, unsigned int numeric, St
                                ExpireLine(n, i);
                        }
                        else
-                               stats.AddRow(numeric, i->second->Displayable()+" "+
-                                       ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+i->second->source+" :"+i->second->reason);
+                               stats.AddRow(numeric, i->second->Displayable(), i->second->set_time, i->second->duration, i->second->source, i->second->reason);
                        i = safei;
                }
        }
 }
 
+bool XLineManager::InvokeStats(const std::string& type, Stats::Context& context)
+{
+       ContainerIter citer = lookup_lines.find(type);
+       if (citer == lookup_lines.end())
+               return false;
+
+       for (LookupIter liter = citer->second.begin(); liter != citer->second.end(); )
+       {
+               // We might be about to expire the XLine so we have to increment the
+               // iterator early to avoid doing that causing iterator invalidation.
+               LookupIter current = liter++;
+
+               XLine* xline = current->second;
+               if (xline->duration && xline->expiry <= ServerInstance->Time())
+               {
+                       // This XLine has expired so remove and skip it.
+                       ExpireLine(citer, current);
+                       continue;
+               }
+
+               context.AddRow(RPL_STATS, context.GetSymbol(), xline->Displayable(), xline->set_time, xline->duration, xline->source, xline->reason);
+       }
+       return true;
+}
 
 XLineManager::XLineManager()
 {
@@ -560,7 +595,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));
        }
 }