From 63611932ebae93620386b26cfa82f7c4552b22ff Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 29 May 2011 21:11:16 +0300 Subject: player passwords and privileges in world/auth.txt --HG-- extra : rebase_source : 7260636295d9068fbeeddf4143c89f2b8a91446c --- src/auth.cpp | 244 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 244 insertions(+) create mode 100644 src/auth.cpp (limited to 'src/auth.cpp') diff --git a/src/auth.cpp b/src/auth.cpp new file mode 100644 index 000000000..49985e697 --- /dev/null +++ b/src/auth.cpp @@ -0,0 +1,244 @@ +/* +Minetest-c55 +Copyright (C) 2011 celeron55, Perttu Ahola + +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 +(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. + +You should have received a copy of the GNU 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 "auth.h" +#include +#include +//#include "main.h" // for g_settings +#include +#include "strfnd.h" +#include "debug.h" + +// Convert a privileges value into a human-readable string, +// with each component separated by a comma. +std::string privsToString(u64 privs) +{ + std::ostringstream os(std::ios_base::binary); + if(privs & PRIV_BUILD) + os<<"build,"; + if(privs & PRIV_TELEPORT) + os<<"teleport,"; + if(privs & PRIV_SETTIME) + os<<"settime,"; + if(privs & PRIV_PRIVS) + os<<"privs,"; + if(privs & PRIV_SHOUT) + os<<"shout,"; + if(os.tellp()) + { + // Drop the trailing comma. (Why on earth can't + // you truncate a C++ stream anyway???) + std::string tmp = os.str(); + return tmp.substr(0, tmp.length() -1); + } + return os.str(); +} + +// Converts a comma-seperated list of privilege values into a +// privileges value. The reverse of privsToString(). Returns +// PRIV_INVALID if there is anything wrong with the input. +u64 stringToPrivs(std::string str) +{ + u64 privs=0; + Strfnd f(str); + while(f.atend() == false) + { + std::string s = trim(f.next(",")); + if(s == "build") + privs |= PRIV_BUILD; + else if(s == "teleport") + privs |= PRIV_TELEPORT; + else if(s == "settime") + privs |= PRIV_SETTIME; + else if(s == "privs") + privs |= PRIV_PRIVS; + else if(s == "shout") + privs |= PRIV_SHOUT; + else + return PRIV_INVALID; + } + return privs; +} + +AuthManager::AuthManager(const std::string &authfilepath): + m_authfilepath(authfilepath) +{ + m_mutex.Init(); + + try{ + load(); + } + catch(SerializationError &e) + { + dstream<<"WARNING: AuthManager: creating " + <::Iterator + i = m_authdata.getIterator(); + i.atEnd()==false; i++) + { + std::string name = i.getNode()->getKey(); + if(name == "") + continue; + AuthData ad = i.getNode()->getValue(); + os<::Node *n; + n = m_authdata.find(username); + if(n == NULL) + return false; + return true; +} + +void AuthManager::set(const std::string &username, AuthData ad) +{ + JMutexAutoLock lock(m_mutex); + + m_authdata[username] = ad; +} + +void AuthManager::add(const std::string &username) +{ + JMutexAutoLock lock(m_mutex); + + m_authdata[username] = AuthData(); +} + +std::string AuthManager::getPassword(const std::string &username) +{ + JMutexAutoLock lock(m_mutex); + + core::map::Node *n; + n = m_authdata.find(username); + if(n == NULL) + throw AuthNotFoundException(""); + + return n->getValue().pwd; +} + +void AuthManager::setPassword(const std::string &username, + const std::string &password) +{ + JMutexAutoLock lock(m_mutex); + + core::map::Node *n; + n = m_authdata.find(username); + if(n == NULL) + throw AuthNotFoundException(""); + + AuthData ad = n->getValue(); + ad.pwd = password; + n->setValue(ad); +} + +u64 AuthManager::getPrivs(const std::string &username) +{ + JMutexAutoLock lock(m_mutex); + + core::map::Node *n; + n = m_authdata.find(username); + if(n == NULL) + throw AuthNotFoundException(""); + + return n->getValue().privs; +} + +void AuthManager::setPrivs(const std::string &username, u64 privs) +{ + JMutexAutoLock lock(m_mutex); + + core::map::Node *n; + n = m_authdata.find(username); + if(n == NULL) + throw AuthNotFoundException(""); + + AuthData ad = n->getValue(); + ad.privs = privs; + n->setValue(ad); +} + -- cgit v1.2.3 From db36771c63040933d43bc12adc4ad840472004d3 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Tue, 31 May 2011 00:23:39 +0300 Subject: auth stuff is now saved only when modified --- src/auth.cpp | 22 +++++++++++++++++++++- src/auth.h | 2 ++ src/server.cpp | 3 ++- 3 files changed, 25 insertions(+), 2 deletions(-) (limited to 'src/auth.cpp') diff --git a/src/auth.cpp b/src/auth.cpp index 49985e697..5d61243c6 100644 --- a/src/auth.cpp +++ b/src/auth.cpp @@ -77,7 +77,8 @@ u64 stringToPrivs(std::string str) } AuthManager::AuthManager(const std::string &authfilepath): - m_authfilepath(authfilepath) + m_authfilepath(authfilepath), + m_modified(false) { m_mutex.Init(); @@ -138,6 +139,8 @@ void AuthManager::load() ad.privs = privs; m_authdata[name] = ad; } + + m_modified = false; } void AuthManager::save() @@ -162,6 +165,8 @@ void AuthManager::save() AuthData ad = i.getNode()->getValue(); os<getValue(); ad.pwd = password; n->setValue(ad); + + m_modified = true; } u64 AuthManager::getPrivs(const std::string &username) @@ -240,5 +251,14 @@ void AuthManager::setPrivs(const std::string &username, u64 privs) AuthData ad = n->getValue(); ad.privs = privs; n->setValue(ad); + + m_modified = true; } +bool AuthManager::isModified() +{ + JMutexAutoLock lock(m_mutex); + return m_modified; +} + + diff --git a/src/auth.h b/src/auth.h index 472409d46..62dced2a3 100644 --- a/src/auth.h +++ b/src/auth.h @@ -89,10 +89,12 @@ public: const std::string &password); u64 getPrivs(const std::string &username); void setPrivs(const std::string &username, u64 privs); + bool isModified(); private: JMutex m_mutex; std::string m_authfilepath; core::map m_authdata; + bool m_modified; }; #endif diff --git a/src/server.cpp b/src/server.cpp index 9bcac5a64..e668db0c3 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1728,7 +1728,8 @@ void Server::AsyncRunStep() ScopeProfiler sp(&g_profiler, "Server: saving stuff"); // Auth stuff - m_authmanager.save(); + if(m_authmanager.isModified()) + m_authmanager.save(); // Map JMutexAutoLock lock(m_env_mutex); -- cgit v1.2.3