mirror of
https://github.com/moparisthebest/minetest
synced 2024-12-23 16:08:51 -05:00
auth stuff is now saved only when modified
This commit is contained in:
parent
41f07328c8
commit
db36771c63
22
src/auth.cpp
22
src/auth.cpp
@ -77,7 +77,8 @@ u64 stringToPrivs(std::string str)
|
|||||||
}
|
}
|
||||||
|
|
||||||
AuthManager::AuthManager(const std::string &authfilepath):
|
AuthManager::AuthManager(const std::string &authfilepath):
|
||||||
m_authfilepath(authfilepath)
|
m_authfilepath(authfilepath),
|
||||||
|
m_modified(false)
|
||||||
{
|
{
|
||||||
m_mutex.Init();
|
m_mutex.Init();
|
||||||
|
|
||||||
@ -138,6 +139,8 @@ void AuthManager::load()
|
|||||||
ad.privs = privs;
|
ad.privs = privs;
|
||||||
m_authdata[name] = ad;
|
m_authdata[name] = ad;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_modified = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void AuthManager::save()
|
void AuthManager::save()
|
||||||
@ -162,6 +165,8 @@ void AuthManager::save()
|
|||||||
AuthData ad = i.getNode()->getValue();
|
AuthData ad = i.getNode()->getValue();
|
||||||
os<<name<<":"<<ad.pwd<<":"<<privsToString(ad.privs)<<"\n";
|
os<<name<<":"<<ad.pwd<<":"<<privsToString(ad.privs)<<"\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_modified = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AuthManager::exists(const std::string &username)
|
bool AuthManager::exists(const std::string &username)
|
||||||
@ -180,6 +185,8 @@ void AuthManager::set(const std::string &username, AuthData ad)
|
|||||||
JMutexAutoLock lock(m_mutex);
|
JMutexAutoLock lock(m_mutex);
|
||||||
|
|
||||||
m_authdata[username] = ad;
|
m_authdata[username] = ad;
|
||||||
|
|
||||||
|
m_modified = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void AuthManager::add(const std::string &username)
|
void AuthManager::add(const std::string &username)
|
||||||
@ -187,6 +194,8 @@ void AuthManager::add(const std::string &username)
|
|||||||
JMutexAutoLock lock(m_mutex);
|
JMutexAutoLock lock(m_mutex);
|
||||||
|
|
||||||
m_authdata[username] = AuthData();
|
m_authdata[username] = AuthData();
|
||||||
|
|
||||||
|
m_modified = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string AuthManager::getPassword(const std::string &username)
|
std::string AuthManager::getPassword(const std::string &username)
|
||||||
@ -214,6 +223,8 @@ void AuthManager::setPassword(const std::string &username,
|
|||||||
AuthData ad = n->getValue();
|
AuthData ad = n->getValue();
|
||||||
ad.pwd = password;
|
ad.pwd = password;
|
||||||
n->setValue(ad);
|
n->setValue(ad);
|
||||||
|
|
||||||
|
m_modified = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
u64 AuthManager::getPrivs(const std::string &username)
|
u64 AuthManager::getPrivs(const std::string &username)
|
||||||
@ -240,5 +251,14 @@ void AuthManager::setPrivs(const std::string &username, u64 privs)
|
|||||||
AuthData ad = n->getValue();
|
AuthData ad = n->getValue();
|
||||||
ad.privs = privs;
|
ad.privs = privs;
|
||||||
n->setValue(ad);
|
n->setValue(ad);
|
||||||
|
|
||||||
|
m_modified = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool AuthManager::isModified()
|
||||||
|
{
|
||||||
|
JMutexAutoLock lock(m_mutex);
|
||||||
|
return m_modified;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -89,10 +89,12 @@ public:
|
|||||||
const std::string &password);
|
const std::string &password);
|
||||||
u64 getPrivs(const std::string &username);
|
u64 getPrivs(const std::string &username);
|
||||||
void setPrivs(const std::string &username, u64 privs);
|
void setPrivs(const std::string &username, u64 privs);
|
||||||
|
bool isModified();
|
||||||
private:
|
private:
|
||||||
JMutex m_mutex;
|
JMutex m_mutex;
|
||||||
std::string m_authfilepath;
|
std::string m_authfilepath;
|
||||||
core::map<std::string, AuthData> m_authdata;
|
core::map<std::string, AuthData> m_authdata;
|
||||||
|
bool m_modified;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1728,6 +1728,7 @@ void Server::AsyncRunStep()
|
|||||||
ScopeProfiler sp(&g_profiler, "Server: saving stuff");
|
ScopeProfiler sp(&g_profiler, "Server: saving stuff");
|
||||||
|
|
||||||
// Auth stuff
|
// Auth stuff
|
||||||
|
if(m_authmanager.isModified())
|
||||||
m_authmanager.save();
|
m_authmanager.save();
|
||||||
|
|
||||||
// Map
|
// Map
|
||||||
|
Loading…
Reference in New Issue
Block a user