Merge pull request #179 from woogerboy21/registered-user-only-server

Registered Only Server

cockatrice/src/window_main.cpp

@@ -1,4 +1,4 @@
-/***************************************************************************
+/***************************************************************************
  *   Copyright (C) 2008 by Max-Wilhelm Bruker   *
  *   brukie@gmx.net   *
  *                                                                         *
@@ -225,8 +225,6 @@ void MainWindow::actAbout()
         + tr("French:") + " Yannick Hammer, Arnaud Faes<br>"
         + tr("Japanese:") + " Nagase Task<br>"
         + tr("Russian:") + " Alexander Davidov<br>"
-//        + tr("Czech:") + " Ondřej Trhoň<br>"
-//        + tr("Slovak:") + " Ganjalf Rendy<br>"
         + tr("Italian:") + " Luigi Sciolla<br>"
         + tr("Swedish:") + " Jessica Dahl<br>"
     ));
@@ -261,6 +259,9 @@ void MainWindow::loginError(Response::ResponseCode r, QString reasonStr, quint32
         case Response::RespUsernameInvalid:
             QMessageBox::critical(this, tr("Error"), tr("Invalid username."));
             break;
+        case Response::RespRegistrationRequired:
+            QMessageBox::critical(this, tr("Error"), tr("This server requires user registration."));
+            break;
         default:
             QMessageBox::critical(this, tr("Error"), tr("Unknown login error: %1").arg(static_cast<int>(r)));
     }

common/pb/response.proto

@@ -23,6 +23,7 @@ message Response {
 		RespUserIsBanned = 19;
 		RespAccessDenied = 20;
 		RespUsernameInvalid = 21;
+		RespRegistrationRequired = 22;
 	}
 	enum ResponseType {
 		JOIN_ROOM = 1000;

common/server.cpp

@@ -34,6 +34,7 @@
 #include <QCoreApplication>
 #include <QThread>
 #include <QDebug>
+#include <QSettings>
 
 Server::Server(bool _threaded, QObject *parent)
     : QObject(parent), threaded(_threaded), nextLocalGameId(0)
@@ -131,6 +132,14 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
     } else if (authState == UnknownUser) {
         // Change user name so that no two users have the same names,
         // don't interfere with registered user names though.
+        QSettings settings("servatrice.ini", QSettings::IniFormat);
+        bool requireReg = settings.value("authentication/regonly", 0).toBool();
+        if (requireReg) {
+            qDebug("Login denied: registration required");
+            databaseInterface->unlockSessionTables();
+            return RegistrationRequired;
+        }
+
         QString tempName = name;
         int i = 0;
         while (users.contains(tempName) || databaseInterface->userExists(tempName) || databaseInterface->userSessionExists(tempName))

common/server.h

@@ -27,7 +27,7 @@ class GameEventContainer;
 class CommandContainer;
 class Command_JoinGame;
 
-enum AuthenticationResult { NotLoggedIn = 0, PasswordRight = 1, UnknownUser = 2, WouldOverwriteOldSession = 3, UserIsBanned = 4, UsernameInvalid = 5 };
+enum AuthenticationResult { NotLoggedIn = 0, PasswordRight = 1, UnknownUser = 2, WouldOverwriteOldSession = 3, UserIsBanned = 4, UsernameInvalid = 5, RegistrationRequired = 6 };
 
 class Server : public QObject
 {

common/server_protocolhandler.cpp

@@ -345,6 +345,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
         case NotLoggedIn: return Response::RespWrongPassword;
         case WouldOverwriteOldSession: return Response::RespWouldOverwriteOldSession;
         case UsernameInvalid: return Response::RespUsernameInvalid;
+        case RegistrationRequired: return Response::RespRegistrationRequired;
         default: authState = res;
     }
     

servatrice/servatrice.ini.example

@@ -16,6 +16,7 @@ ssl_key=ssl_key.pem
 
 [authentication]
 method=none
+regonly=0
 
 [database]
 type=none

servatrice/src/servatrice.cpp

@@ -136,12 +136,18 @@ bool Servatrice::initServer()
 {
     serverName = settings->value("server/name").toString();
     serverId = settings->value("server/id", 0).toInt();
+    bool regServerOnly = settings->value("server/regonly", 0).toBool();
         
     const QString authenticationMethodStr = settings->value("authentication/method").toString();
-	if (authenticationMethodStr == "sql")
+    if (authenticationMethodStr == "sql") {
         authenticationMethod = AuthenticationSql;
-	else
+    } else {
+        if (regServerOnly) {
+            qDebug() << "Registration only server enabled but no DB Connection : Error.";
+            return false;   
+        }
         authenticationMethod = AuthenticationNone;
+    }
     
     QString dbTypeStr = settings->value("database/type").toString();
     if (dbTypeStr == "mysql")