#include "strfnd.h"
#include "debug.h"
+std::set<std::string> privsToSet(u64 privs)
+{
+ std::set<std::string> s;
+ if(privs & PRIV_INTERACT)
+ s.insert("interact");
+ if(privs & PRIV_TELEPORT)
+ s.insert("teleport");
+ if(privs & PRIV_SETTIME)
+ s.insert("settime");
+ if(privs & PRIV_PRIVS)
+ s.insert("privs");
+ if(privs & PRIV_SHOUT)
+ s.insert("shout");
+ if(privs & PRIV_BAN)
+ s.insert("ban");
+ if(privs & PRIV_GIVE)
+ s.insert("give");
+ if(privs & PRIV_PASSWORD)
+ s.insert("password");
+ return s;
+}
+
// 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_INTERACT)
+ os<<"interact,";
if(privs & PRIV_TELEPORT)
os<<"teleport,";
if(privs & PRIV_SETTIME)
os<<"privs,";
if(privs & PRIV_SHOUT)
os<<"shout,";
+ if(privs & PRIV_BAN)
+ os<<"ban,";
+ if(privs & PRIV_GIVE)
+ os<<"give,";
+ if(privs & PRIV_PASSWORD)
+ os<<"password,";
if(os.tellp())
{
// Drop the trailing comma. (Why on earth can't
{
std::string s = trim(f.next(","));
if(s == "build")
- privs |= PRIV_BUILD;
+ privs |= PRIV_INTERACT;
+ else if(s == "interact")
+ privs |= PRIV_INTERACT;
else if(s == "teleport")
privs |= PRIV_TELEPORT;
else if(s == "settime")
privs |= PRIV_PRIVS;
else if(s == "shout")
privs |= PRIV_SHOUT;
+ else if(s == "ban")
+ privs |= PRIV_BAN;
+ else if(s == "give")
+ privs |= PRIV_GIVE;
+ else if(s == "password")
+ privs |= PRIV_PASSWORD;
else
return PRIV_INVALID;
}
}
AuthManager::AuthManager(const std::string &authfilepath):
- m_authfilepath(authfilepath)
+ m_authfilepath(authfilepath),
+ m_modified(false)
{
m_mutex.Init();
ad.privs = privs;
m_authdata[name] = ad;
}
+
+ m_modified = false;
}
void AuthManager::save()
AuthData ad = i.getNode()->getValue();
os<<name<<":"<<ad.pwd<<":"<<privsToString(ad.privs)<<"\n";
}
+
+ m_modified = false;
}
bool AuthManager::exists(const std::string &username)
JMutexAutoLock lock(m_mutex);
m_authdata[username] = ad;
+
+ m_modified = true;
}
void AuthManager::add(const std::string &username)
JMutexAutoLock lock(m_mutex);
m_authdata[username] = AuthData();
+
+ m_modified = true;
}
std::string AuthManager::getPassword(const std::string &username)
AuthData ad = n->getValue();
ad.pwd = password;
n->setValue(ad);
+
+ m_modified = true;
}
u64 AuthManager::getPrivs(const std::string &username)
AuthData ad = n->getValue();
ad.privs = privs;
n->setValue(ad);
+
+ m_modified = true;
}
+bool AuthManager::isModified()
+{
+ JMutexAutoLock lock(m_mutex);
+ return m_modified;
+}
+
+