TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged with master

Browse Source
This commit is contained in:
WolverinDEV
2019-09-14 17:42:43 +02:00
parent 2ae00f07cd 9cb069db5a
commit 244b7dc0cb
13 changed files with 457 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/InstanceHandlerSetup.cpp
+65 -65
View File
@@ -31,26 +31,26 @@ struct GroupInfo {
/* TODO may use a transaction here? */
bool InstanceHandler::setupDefaultGroups() {
debugMessage(LOG_INSTANCE, "Creating new instance groups");
debugMessage(LOG_INSTANCE, "Creating new instance groups");
deque<shared_ptr<GroupInfo>> groups;
ifstream in(PERMISSION_TEMPLATE_FILE);
if(!in) {
logCritical(LOG_INSTANCE, "Could not open default permissions file {}", PERMISSION_TEMPLATE_FILE);
return false;
}
string line;
while(getline(in, line)){
TEST_COMMENT;
ifstream in(PERMISSION_TEMPLATE_FILE);
if(!in) {
logCritical(LOG_INSTANCE, "Could not open default permissions file {}", PERMISSION_TEMPLATE_FILE);
return false;
}
string line;
while(getline(in, line)){
TEST_COMMENT;
if(line != "--start") {
logCritical(LOG_INSTANCE, R"(Permission template file contains invalid start line ("{}", expected "{}")!)", line, "--start");
return false;
}
auto group = make_shared<GroupInfo>();
while(true){
getline(in, line);
TEST_COMMENT;
if(line != "--start") {
logCritical(LOG_INSTANCE, R"(Permission template file contains invalid start line ("{}", expected "{}")!)", line, "--start");
return false;
}
auto group = make_shared<GroupInfo>();
while(true){
getline(in, line);
TEST_COMMENT;
if(line == "--end") break;
if(line.find("name:") == 0) {
@@ -66,59 +66,59 @@ bool InstanceHandler::setupDefaultGroups() {
continue;
}
if(line.find("permission:") == 0) {
line = line.substr(11);
auto assign_index = line.find('=');
if(line.find("permission:") == 0) {
line = line.substr(11);
auto assign_index = line.find('=');
string permission_name = line.substr(0, assign_index);
string string_value = line.substr(assign_index + 1);
string string_granted, string_skip, string_negate;
string permission_name = line.substr(0, assign_index);
string string_value = line.substr(assign_index + 1);
string string_granted, string_skip, string_negate;
if(string_value.find(',') != -1) {
string_granted = string_value.substr(string_value.find(',') + 1);
string_value = string_value.substr(0, string_value.find(','));
}
if(string_granted.find(',') != -1) {
string_skip = string_granted.substr(string_granted.find(',') + 1);
string_granted = string_granted.substr(0, string_granted.find(','));
}
if(string_skip.find(',') != -1) {
string_negate = string_skip.substr(string_skip.find(',') + 1);
string_skip = string_skip.substr(0, string_skip.find(','));
}
if(string_value.find(',') != -1) {
string_granted = string_value.substr(string_value.find(',') + 1);
string_value = string_value.substr(0, string_value.find(','));
}
if(string_granted.find(',') != -1) {
string_skip = string_granted.substr(string_granted.find(',') + 1);
string_granted = string_granted.substr(0, string_granted.find(','));
}
if(string_skip.find(',') != -1) {
string_negate = string_skip.substr(string_skip.find(',') + 1);
string_skip = string_skip.substr(0, string_skip.find(','));
}
auto permInfo = permission::resolvePermissionData(permission_name);
if(permInfo->type == permission::unknown){
logError(LOG_INSTANCE, "Default permission file contains unknown permission. Key: {}", permission_name);
continue;
}
auto permInfo = permission::resolvePermissionData(permission_name);
if(permInfo->type == permission::unknown){
logError(LOG_INSTANCE, "Default permission file contains unknown permission. Key: {}", permission_name);
continue;
}
permission::PermissionValue permission_value;
try {
permission_value = stoi(string_value);
} catch(std::exception& ex) {
logError(LOG_INSTANCE, "Failed to parse value for key {}. Value: {}", permission_name, string_value);
continue;
}
permission::PermissionValue permission_value;
try {
permission_value = stoi(string_value);
} catch(std::exception& ex) {
logError(LOG_INSTANCE, "Failed to parse value for key {}. Value: {}", permission_name, string_value);
continue;
}
permission::PermissionValue permission_granted = permNotGranted;
if(!string_granted.empty()) {
try {
permission_granted = stoi(string_granted);
} catch(std::exception& ex) {
logError(LOG_INSTANCE, "Failed to parse granted value for key {}. Value: {}", permission_name, string_granted);
continue;
}
}
permission::PermissionValue permission_granted = permNotGranted;
if(!string_granted.empty()) {
try {
permission_granted = stoi(string_granted);
} catch(std::exception& ex) {
logError(LOG_INSTANCE, "Failed to parse granted value for key {}. Value: {}", permission_name, string_granted);
continue;
}
}
bool flag_skip = string_skip == "true" || string_skip == "1";
bool flag_negate = string_negate == "true" || string_negate == "1";
bool flag_skip = string_skip == "true" || string_skip == "1";
bool flag_negate = string_negate == "true" || string_negate == "1";
group->permissions.emplace_back(make_tuple(permInfo->type, permission_value, permission_granted, flag_skip, flag_negate));
}
}
groups.push_back(group);
}
group->permissions.emplace_back(make_tuple(permInfo->type, permission_value, permission_granted, flag_skip, flag_negate));
}
}
groups.push_back(group);
}
debugMessage(LOG_INSTANCE, "Read " + to_string(groups.size()) + " default groups");
for(const auto& info : groups) {
@@ -143,6 +143,6 @@ bool InstanceHandler::setupDefaultGroups() {
}
}
this->save_group_permissions();
this->getSql()->pool->threads()->wait_for(); //Wait for all permissions to flush
return true;
this->getSql()->pool->threads()->wait_for(); //Wait for all permissions to flush
return true;
}