Merge pull request #52 from MangosArentLiterature/auth-type-checking

Add checks to ensure auth_type is set correctly in config_manager.cpp and commands.cpp

src/commands.cpp

@@ -52,7 +52,7 @@ void AOClient::cmdLogin(int argc, QStringList argv)
         }
         server->areas.value(current_area)->logger->logLogin(this, authenticated, "moderator");
     }
-    else {
+    else if (auth_type == "advanced") {
         if (argc < 2) {
             sendServerMessage("You must specify a username and a password");
             return;
@@ -73,6 +73,10 @@ void AOClient::cmdLogin(int argc, QStringList argv)
         }
         server->areas.value(current_area)->logger->logLogin(this, authenticated, username);
     }
+    else {
+        qWarning() << "config.ini has an unrecognized auth_type!";
+        sendServerMessage("Config.ini contains an invalid auth_type, please check your config.");
+    }
 }
 
 void AOClient::cmdGetAreas(int argc, QStringList argv)

src/config_manager.cpp

@@ -84,6 +84,14 @@ bool ConfigManager::initConfig()
                                                      // This means the config is invalid
         return false;
     }
+    config.beginGroup("Options");
+    QString auth_type = config.value("auth", "simple").toString();
+    config.endGroup();
+    if (!(auth_type == "simple" || auth_type == "advanced")) {
+        qCritical() << "config.ini is invalid!";
+        return false;
+    }
+
     else {
         // Config is valid and up to date, so let's go ahead
         return true;