X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbancache.cpp;h=af8626fe73c3772ce97e40b17dc0373ab42e763d;hb=092f2b181848d4575f4317267866dade7312c542;hp=a831b1219d822562bdad3e0f8bebafa7dcc9329b;hpb=5434e946ee280dcc1dc7e0951bfa1ccc3054e6ab;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/bancache.cpp b/src/bancache.cpp
index a831b1219..af8626fe7 100644
--- a/src/bancache.cpp
+++ b/src/bancache.cpp
@@ -1,66 +1,110 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * 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 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 <http://www.gnu.org/licenses/>.
  */
 
-/* $Core: libIRCDbancache */
 
 #include "inspircd.h"
-#include "bancache.h"
 
-BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &type, const std::string &reason)
+BanCacheHit::BanCacheHit(const std::string& type, const std::string& reason, time_t seconds)
+	: Type(type)
+	, Reason(reason)
+	, Expiry(ServerInstance->Time() + seconds)
 {
-	BanCacheHit *b;
-
+}
 
-	if (this->BanHash->find(ip) != this->BanHash->end()) // can't have two cache entries on the same IP, sorry..
+BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &type, const std::string &reason, time_t seconds)
+{
+	BanCacheHit*& b = BanHash[ip];
+	if (b != NULL) // can't have two cache entries on the same IP, sorry..
 		return NULL;
 
-	b = new BanCacheHit(ServerInstance, ip, type, reason);
-
-	this->BanHash->insert(std::make_pair(ip, b));
+	b = new BanCacheHit(type, reason, (seconds ? seconds : 86400));
 	return b;
 }
 
 BanCacheHit *BanCacheManager::GetHit(const std::string &ip)
 {
-	BanCacheHash::iterator i = this->BanHash->find(ip);
+	BanCacheHash::iterator i = this->BanHash.find(ip);
 
-	if (i == this->BanHash->end())
+	if (i == this->BanHash.end())
 		return NULL; // free and safe
-	else
-		return i->second; // hit.
+
+	if (RemoveIfExpired(i))
+		return NULL; // expired
+
+	return i->second; // hit.
 }
 
-bool BanCacheManager::RemoveHit(BanCacheHit *b)
+bool BanCacheManager::RemoveIfExpired(BanCacheHash::iterator& it)
 {
-	BanCacheHash::iterator i;
+	if (ServerInstance->Time() < it->second->Expiry)
+		return false;
 
-	if (!b)
-		return false; // I don't think so.
-
-	i = this->BanHash->find(b->IP);
+	ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "Hit on " + it->first + " is out of date, removing!");
+	delete it->second;
+	it = BanHash.erase(it);
+	return true;
+}
 
-	if (i == this->BanHash->end())
-	{
-		// err..
-		ServerInstance->Log(DEBUG, "BanCacheManager::RemoveHit(): I got asked to remove a hit that wasn't in the hash(?)");
-	}
+void BanCacheManager::RemoveEntries(const std::string& type, bool positive)
+{
+	if (positive)
+		ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCacheManager::RemoveEntries(): Removing positive hits for " + type);
 	else
+		ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCacheManager::RemoveEntries(): Removing all negative hits");
+
+	for (BanCacheHash::iterator i = BanHash.begin(); i != BanHash.end(); )
 	{
-		this->BanHash->erase(i);
+		if (RemoveIfExpired(i))
+			continue; // updates the iterator if expired
+
+		BanCacheHit* b = i->second;
+		bool remove = false;
+
+		if (positive)
+		{
+			// when removing positive hits, remove only if the type matches
+			remove = b->IsPositive() && (b->Type == type);
+		}
+		else
+		{
+			// when removing negative hits, remove all of them
+			remove = !b->IsPositive();
+		}
+
+		if (remove)
+		{
+			/* we need to remove this one. */
+			ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCacheManager::RemoveEntries(): Removing a hit on " + i->first);
+			delete b;
+			i = BanHash.erase(i);
+		}
+		else
+			++i;
 	}
-
-	delete b;
-	return true;
 }
 
-
+BanCacheManager::~BanCacheManager()
+{
+	for (BanCacheHash::iterator n = BanHash.begin(); n != BanHash.end(); ++n)
+		delete n->second;
+}