X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fban.cpp;h=3decc9666117274c4a7e21d490b4ce567edca655;hb=6c9df2ffa7ee81a05b28fdd6123a926abd284c72;hp=0d66e804174a145752bd39d025ec57abfa25f1f9;hpb=5784c14ab798847248e4682ef28434767a549fc6;p=minetest.git

diff --git a/src/ban.cpp b/src/ban.cpp
index 0d66e8041..3decc9666 100644
--- a/src/ban.cpp
+++ b/src/ban.cpp
@@ -1,41 +1,41 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2018 nerzhul, Loic BLOT <loic.blot@unix-experience.fr>
 
 This program 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; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 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.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "ban.h"
 #include <fstream>
-#include <jmutexautolock.h>
+#include "threading/mutex_auto_lock.h"
 #include <sstream>
-#include "strfnd.h"
-#include "debug.h"
+#include <set>
+#include "util/strfnd.h"
+#include "util/string.h"
+#include "log.h"
+#include "filesys.h"
 
 BanManager::BanManager(const std::string &banfilepath):
-		m_banfilepath(banfilepath),
-		m_modified(false)
+		m_banfilepath(banfilepath)
 {
-	m_mutex.Init();
-	try{
+	try {
 		load();
-	}
-	catch(SerializationError &e)
-	{
-		dstream<<"WARNING: BanManager: creating "
-				<<m_banfilepath<<std::endl;
+	} catch(SerializationError &e) {
+		infostream << "BanManager: creating "
+				<< m_banfilepath << std::endl;
 	}
 }
 
@@ -46,73 +46,97 @@ BanManager::~BanManager()
 
 void BanManager::load()
 {
-	JMutexAutoLock lock(m_mutex);
-	dstream<<"BanManager: loading from "<<m_banfilepath<<std::endl;
+	MutexAutoLock lock(m_mutex);
+	infostream<<"BanManager: loading from "<<m_banfilepath<<std::endl;
 	std::ifstream is(m_banfilepath.c_str(), std::ios::binary);
-	if(is.good() == false)
-	{
-		dstream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
+	if (!is.good()) {
+		infostream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
 		throw SerializationError("BanManager::load(): Couldn't open file");
 	}
-	
-	for(;;)
-	{
-		if(is.eof() || is.good() == false)
-			break;
-		std::string ip;
-		std::getline(is, ip, '\n');
-		m_ips.insert(ip);
+
+	while (!is.eof() && is.good()) {
+		std::string line;
+		std::getline(is, line, '\n');
+		Strfnd f(line);
+		std::string ip = trim(f.next("|"));
+		std::string name = trim(f.next("|"));
+		if(!ip.empty()) {
+			m_ips[ip] = name;
+		}
 	}
 	m_modified = false;
 }
 
 void BanManager::save()
 {
-	JMutexAutoLock lock(m_mutex);
-	dstream<<"BanManager: saving to "<<m_banfilepath<<std::endl;
-	std::ofstream os(m_banfilepath.c_str(), std::ios::binary);
-	
-	if(os.good() == false)
-	{
-		dstream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
-		throw SerializationError("BanManager::load(): Couldn't open file");
-	}
+	MutexAutoLock lock(m_mutex);
+	infostream << "BanManager: saving to " << m_banfilepath << std::endl;
+	std::ostringstream ss(std::ios_base::binary);
 
-	for(std::set<std::string>::iterator
-			i = m_ips.begin();
-			i != m_ips.end(); i++)
-	{
-		if(*i == "")
-			continue;
-		os<<*i<<"\n";
+	for (const auto &ip : m_ips)
+		ss << ip.first << "|" << ip.second << "\n";
+
+	if (!fs::safeWriteToFile(m_banfilepath, ss.str())) {
+		infostream << "BanManager: failed saving to " << m_banfilepath << std::endl;
+		throw SerializationError("BanManager::save(): Couldn't write file");
 	}
+
 	m_modified = false;
 }
 
-bool BanManager::isIpBanned(std::string ip)
+bool BanManager::isIpBanned(const std::string &ip)
 {
-	JMutexAutoLock lock(m_mutex);
+	MutexAutoLock lock(m_mutex);
 	return m_ips.find(ip) != m_ips.end();
 }
 
-void BanManager::add(std::string ip)
+std::string BanManager::getBanDescription(const std::string &ip_or_name)
 {
-	JMutexAutoLock lock(m_mutex);
-	m_ips.insert(ip);
-	m_modified = true;
+	MutexAutoLock lock(m_mutex);
+	std::string s;
+	for (const auto &ip : m_ips) {
+		if (ip.first  == ip_or_name || ip.second == ip_or_name
+				|| ip_or_name.empty()) {
+			s += ip.first + "|" + ip.second + ", ";
+		}
+	}
+	s = s.substr(0, s.size() - 2);
+	return s;
 }
 
-void BanManager::remove(std::string ip)
+std::string BanManager::getBanName(const std::string &ip)
 {
-	JMutexAutoLock lock(m_mutex);
-	m_ips.erase(m_ips.find(ip));
+	MutexAutoLock lock(m_mutex);
+	StringMap::iterator it = m_ips.find(ip);
+	if (it == m_ips.end())
+		return "";
+	return it->second;
+}
+
+void BanManager::add(const std::string &ip, const std::string &name)
+{
+	MutexAutoLock lock(m_mutex);
+	m_ips[ip] = name;
 	m_modified = true;
 }
-	
+
+void BanManager::remove(const std::string &ip_or_name)
+{
+	MutexAutoLock lock(m_mutex);
+	for (StringMap::iterator it = m_ips.begin(); it != m_ips.end();) {
+		if ((it->first == ip_or_name) || (it->second == ip_or_name)) {
+			m_ips.erase(it++);
+			m_modified = true;
+		} else {
+			++it;
+		}
+	}
+}
+
 
 bool BanManager::isModified()
 {
-	JMutexAutoLock lock(m_mutex);
+	MutexAutoLock lock(m_mutex);
 	return m_modified;
 }