Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move CM check before auth check

Browse Source
This commit is contained in:
in1tiate 2021-03-04 05:27:00 -06:00 committed by GitHub
parent 3aa937f908
commit 62b3f8647f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/aoclient.cpp
View File

@ -264,16 +264,14 @@ void AOClient::sendServerBroadcast(QString message)
bool AOClient::checkAuth(unsigned long long acl_mask) bool AOClient::checkAuth(unsigned long long acl_mask)
{ {
if (acl_mask != ACLFlags.value("NONE")) { if (acl_mask != ACLFlags.value("NONE")) {
if (!authenticated && acl_mask != ACLFlags.value("CM")) {
return false;
}
if (acl_mask == ACLFlags.value("CM")) { if (acl_mask == ACLFlags.value("CM")) {
AreaData* area = server->areas[current_area]; AreaData* area = server->areas[current_area];
if (area->owners.contains(id)) if (area->owners.contains(id))
return true; return true;
} }
else if (!authenticated) {
return false;
}
QSettings settings("config/config.ini", QSettings::IniFormat); QSettings settings("config/config.ini", QSettings::IniFormat);
settings.beginGroup("Options"); settings.beginGroup("Options");
QString auth_type = settings.value("auth", "simple").toString(); QString auth_type = settings.value("auth", "simple").toString();