/*
-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 <set>
-#include "strfnd.h"
+#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)
- {
- infostream<<"WARNING: BanManager: creating "
- <<m_banfilepath<<std::endl;
+ } catch(SerializationError &e) {
+ infostream << "BanManager: creating "
+ << m_banfilepath << std::endl;
}
}
void BanManager::load()
{
- JMutexAutoLock lock(m_mutex);
+ 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)
- {
+ 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;
+
+ 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())
- continue;
- m_ips[ip] = name;
+ if(!ip.empty()) {
+ m_ips[ip] = name;
+ }
}
m_modified = false;
}
void BanManager::save()
{
- JMutexAutoLock lock(m_mutex);
- infostream<<"BanManager: saving to "<<m_banfilepath<<std::endl;
- std::ofstream os(m_banfilepath.c_str(), std::ios::binary);
-
- if(os.good() == false)
- {
- infostream<<"BanManager: failed saving to "<<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 (const auto &ip : m_ips)
+ ss << ip.first << "|" << ip.second << "\n";
- for(std::map<std::string, std::string>::iterator
- i = m_ips.begin();
- i != m_ips.end(); i++)
- {
- os<<i->first<<"|"<<i->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(const std::string &ip)
{
- JMutexAutoLock lock(m_mutex);
+ MutexAutoLock lock(m_mutex);
return m_ips.find(ip) != m_ips.end();
}
std::string BanManager::getBanDescription(const std::string &ip_or_name)
{
- JMutexAutoLock lock(m_mutex);
- std::string s = "";
- for(std::map<std::string, std::string>::iterator
- i = m_ips.begin();
- i != m_ips.end(); i++)
- {
- if(i->first == ip_or_name || i->second == ip_or_name
- || ip_or_name == "")
- s += i->first + "|" + i->second + ", ";
+ 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);
+ s = s.substr(0, s.size() - 2);
return s;
}
std::string BanManager::getBanName(const std::string &ip)
{
- JMutexAutoLock lock(m_mutex);
- std::map<std::string, std::string>::iterator i = m_ips.find(ip);
- if(i == m_ips.end())
+ MutexAutoLock lock(m_mutex);
+ StringMap::iterator it = m_ips.find(ip);
+ if (it == m_ips.end())
return "";
- return i->second;
+ return it->second;
}
void BanManager::add(const std::string &ip, const std::string &name)
{
- JMutexAutoLock lock(m_mutex);
+ MutexAutoLock lock(m_mutex);
m_ips[ip] = name;
m_modified = true;
}
void BanManager::remove(const std::string &ip_or_name)
{
- JMutexAutoLock lock(m_mutex);
- //m_ips.erase(m_ips.find(ip));
- // Find out all ip-name pairs that match the ip or name
- std::set<std::string> ips_to_delete;
- for(std::map<std::string, std::string>::iterator
- i = m_ips.begin();
- i != m_ips.end(); i++)
- {
- if(i->first == ip_or_name || i->second == ip_or_name)
- ips_to_delete.insert(i->first);
- }
- // Erase them
- for(std::set<std::string>::iterator
- i = ips_to_delete.begin();
- i != ips_to_delete.end(); i++)
- {
- m_ips.erase(*i);
+ 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;
+ }
}
- m_modified = true;
}
-
+
bool BanManager::isModified()
{
- JMutexAutoLock lock(m_mutex);
+ MutexAutoLock lock(m_mutex);
return m_modified;
}
projects / dragonfireclient.git / blobdiff