Almost completed registration

 * added missing bits of serverside code;
 * added fronted in client;
 * removed demo python scripts;

cockatrice/CMakeLists.txt

@@ -12,6 +12,7 @@ SET(cockatrice_SOURCES
     src/dlg_connect.cpp 
     src/dlg_create_token.cpp 
     src/dlg_edit_tokens.cpp
+    src/dlg_register.cpp 
     src/abstractclient.cpp 
     src/remoteclient.cpp 
     src/main.cpp 

cockatrice/src/abstractclient.h

@@ -29,9 +29,9 @@ enum ClientStatus {
     StatusDisconnected,
     StatusDisconnecting,
     StatusConnecting,
-    StatusAwaitingWelcome,
+    StatusRegistering,
     StatusLoggingIn,
-    StatusLoggedIn
+    StatusLoggedIn,
 };
 
 class AbstractClient : public QObject {
@@ -59,6 +59,7 @@ signals:
     void buddyListReceived(const QList<ServerInfo_User> &buddyList);
     void ignoreListReceived(const QList<ServerInfo_User> &ignoreList);
     void replayAddedEventReceived(const Event_ReplayAdded &event);
+    void registerAccepted();
     
     void sigQueuePendingCommand(PendingCommand *pend);
 private:
@@ -71,7 +72,8 @@ protected slots:
     void processProtocolItem(const ServerMessage &item);
 protected:
     QMap<int, PendingCommand *> pendingCommands;
-    QString userName, password;
+    QString userName, password, email, country, realName;
+    int gender;
     void setStatus(ClientStatus _status);
     int getNewCmdId() { return nextCmdId++; }
     virtual void sendCommandContainer(const CommandContainer &cont) = 0;

cockatrice/src/dlg_register.h

+#ifndef DLG_REGISTER_H
+#define DLG_REGISTER_H
+
+#include <QDialog>
+#include <QLineEdit>
+#include <QComboBox>
+
+class QLabel;
+class QPushButton;
+class QCheckBox;
+
+class DlgRegister : public QDialog {
+    Q_OBJECT
+public:
+    DlgRegister(QWidget *parent = 0);
+    QString getHost() const { return hostEdit->text(); }
+    int getPort() const { return portEdit->text().toInt(); }
+    QString getPlayerName() const { return playernameEdit->text(); }
+    QString getPassword() const { return passwordEdit->text(); }
+    QString getEmail() const { return emailEdit->text(); }
+    int getGender() const { return genderEdit->currentIndex() - 1; }
+    QString getCountry() const { return genderEdit->currentIndex() == 0 ? "" : countryEdit->currentText(); }
+    QString getRealName() const { return realnameEdit->text(); }
+private slots:
+    void actOk();
+    void actCancel();
+private:
+    QLabel *hostLabel, *portLabel, *playernameLabel, *passwordLabel, *emailLabel, *genderLabel, *countryLabel, *realnameLabel;
+    QLineEdit *hostEdit, *portEdit, *playernameEdit, *passwordEdit, *emailEdit, *realnameEdit;
+    QComboBox *genderEdit, *countryEdit;
+};
+
+#endif

cockatrice/src/remoteclient.cpp

@@ -6,6 +6,7 @@
 #include "pb/commands.pb.h"
 #include "pb/session_commands.pb.h"
 #include "pb/response_login.pb.h"
+#include "pb/response_register.pb.h"
 #include "pb/server_message.pb.h"
 #include "pb/event_server_identification.pb.h"
 
@@ -28,6 +29,7 @@ RemoteClient::RemoteClient(QObject *parent)
     connect(this, SIGNAL(connectionClosedEventReceived(Event_ConnectionClosed)), this, SLOT(processConnectionClosedEvent(Event_ConnectionClosed)));
     connect(this, SIGNAL(sigConnectToServer(QString, unsigned int, QString, QString)), this, SLOT(doConnectToServer(QString, unsigned int, QString, QString)));
     connect(this, SIGNAL(sigDisconnectFromServer()), this, SLOT(doDisconnectFromServer()));
+    connect(this, SIGNAL(sigRegisterToServer(QString, unsigned int, QString, QString, QString, int, QString, QString)), this, SLOT(doRegisterToServer(QString, unsigned int, QString, QString, QString, int, QString, QString)));
 }
 
 RemoteClient::~RemoteClient()
@@ -52,8 +54,6 @@ void RemoteClient::slotConnected()
     sendCommandContainer(CommandContainer());
     getNewCmdId();
     // end of hack
-
-    setStatus(StatusAwaitingWelcome);
 }
 
 void RemoteClient::processServerIdentificationEvent(const Event_ServerIdentification &event)
@@ -63,6 +63,24 @@ void RemoteClient::processServerIdentificationEvent(const Event_ServerIdentifica
         setStatus(StatusDisconnecting);
         return;
     }
+
+    if(getStatus() == StatusRegistering)
+    {
+        Command_Register cmdRegister;
+        cmdRegister.set_user_name(userName.toStdString());
+        cmdRegister.set_password(password.toStdString());
+        cmdRegister.set_email(email.toStdString());
+        cmdRegister.set_gender((ServerInfo_User_Gender) gender);
+        cmdRegister.set_country(country.toStdString());
+        cmdRegister.set_real_name(realName.toStdString());
+
+        PendingCommand *pend = prepareSessionCommand(cmdRegister);
+        connect(pend, SIGNAL(finished(Response, CommandContainer, QVariant)), this, SLOT(registerResponse(Response)));
+        sendCommand(pend);
+
+        return;
+    }
+
     setStatus(StatusLoggingIn);
     
     Command_Login cmdLogin;
@@ -101,6 +119,18 @@ void RemoteClient::loginResponse(const Response &response)
     }
 }
 
+void RemoteClient::registerResponse(const Response &response)
+{
+    const Response_Register &resp = response.GetExtension(Response_Register::ext);
+    if (response.response_code() == Response::RespRegistrationAccepted) {
+        emit registerAccepted();
+    } else {
+        emit registerError(response.response_code(), QString::fromStdString(resp.denied_reason_str()), resp.denied_end_time());
+    }
+    setStatus(StatusDisconnecting);
+    doDisconnectFromServer();
+}
+
 void RemoteClient::readData()
 {
     lastDataReceived = timeRunning;
@@ -175,6 +205,21 @@ void RemoteClient::doConnectToServer(const QString &hostname, unsigned int port,
     setStatus(StatusConnecting);
 }
 
+void RemoteClient::doRegisterToServer(const QString &hostname, unsigned int port, const QString &_userName, const QString &_password, const QString &_email, const int _gender, const QString &_country, const QString &_realname)
+{
+    doDisconnectFromServer();
+    
+    userName = _userName;
+    password = _password;
+    email = _email;
+    gender = _gender;
+    country = _country;
+    realName = _realname;
+
+    socket->connectToHost(hostname, port);
+    setStatus(StatusRegistering);
+}
+
 void RemoteClient::doDisconnectFromServer()
 {
     timer->stop();
@@ -225,6 +270,11 @@ void RemoteClient::connectToServer(const QString &hostname, unsigned int port, c
     emit sigConnectToServer(hostname, port, _userName, _password);
 }
 
+void RemoteClient::registerToServer(const QString &hostname, unsigned int port, const QString &_userName, const QString &_password, const QString &_email, const int _gender, const QString &_country, const QString &_realname)
+{
+    emit sigRegisterToServer(hostname, port, _userName, _password, _email, _gender, _country, _realname);
+}
+
 void RemoteClient::disconnectFromServer()
 {
     emit sigDisconnectFromServer();

cockatrice/src/remoteclient.h

@@ -12,10 +12,12 @@ signals:
     void maxPingTime(int seconds, int maxSeconds);
     void serverTimeout();
     void loginError(Response::ResponseCode resp, QString reasonStr, quint32 endTime);
+    void registerError(Response::ResponseCode resp, QString reasonStr, quint32 endTime);
     void socketError(const QString &errorString);
     void protocolVersionMismatch(int clientVersion, int serverVersion);
     void protocolError();
     void sigConnectToServer(const QString &hostname, unsigned int port, const QString &_userName, const QString &_password);
+    void sigRegisterToServer(const QString &hostname, unsigned int port, const QString &_userName, const QString &_password, const QString &_email, const int _gender, const QString &_country, const QString &_realname);
     void sigDisconnectFromServer();
 private slots:
     void slotConnected();
@@ -25,7 +27,9 @@ private slots:
     void processServerIdentificationEvent(const Event_ServerIdentification &event);
     void processConnectionClosedEvent(const Event_ConnectionClosed &event);
     void loginResponse(const Response &response);
+    void registerResponse(const Response &response);
     void doConnectToServer(const QString &hostname, unsigned int port, const QString &_userName, const QString &_password);
+    void doRegisterToServer(const QString &hostname, unsigned int port, const QString &_userName, const QString &_password, const QString &_email, const int _gender, const QString &_country, const QString &_realname);
     void doDisconnectFromServer();
 private:
     static const int maxTimeout = 10;
@@ -45,6 +49,8 @@ public:
     ~RemoteClient();
     QString peerName() const { return socket->peerName(); }
     void connectToServer(const QString &hostname, unsigned int port, const QString &_userName, const QString &_password);
+    void registerToServer(const QString &hostname, unsigned int port, const QString &_userName, const QString &_password, const QString &_email, const int _gender, const QString &_country, const QString &_realname);
+
     void disconnectFromServer();
 };
 

cockatrice/src/window_main.cpp

@@ -34,6 +34,7 @@
 #include "main.h"
 #include "window_main.h"
 #include "dlg_connect.h"
+#include "dlg_register.h"
 #include "dlg_settings.h"
 #include "tab_supervisor.h"
 #include "remoteclient.h"
@@ -99,8 +100,6 @@ void MainWindow::statusChanged(ClientStatus _status)
 {
     setClientStatusTitle();
     switch (_status) {
-        case StatusConnecting:
-            break;
         case StatusDisconnected:
             tabSupervisor->stop();
             aSinglePlayer->setEnabled(true);
@@ -112,8 +111,9 @@ void MainWindow::statusChanged(ClientStatus _status)
             aConnect->setEnabled(false);
             aDisconnect->setEnabled(true);
             break;
+        case StatusConnecting:
+        case StatusRegistering:
         case StatusLoggedIn:
-            break;
         default:
             break;
     }
@@ -124,6 +124,12 @@ void MainWindow::userInfoReceived(const ServerInfo_User &info)
     tabSupervisor->start(info);
 }
 
+void MainWindow::registerAccepted()
+{
+    QMessageBox::information(this, tr("Success"), tr("Registration accepted.\nNow check your email for instructions on how to activate your account."));
+    actConnect();
+}
+
 // Actions
 
 void MainWindow::actConnect()
@@ -133,6 +139,24 @@ void MainWindow::actConnect()
         client->connectToServer(dlg.getHost(), dlg.getPort(), dlg.getPlayerName(), dlg.getPassword());
 }
 
+void MainWindow::actRegister()
+{
+    DlgRegister dlg(this);
+    if (dlg.exec())
+    {
+        client->registerToServer(
+            dlg.getHost(),
+            dlg.getPort(),
+            dlg.getPlayerName(),
+            dlg.getPassword(),
+            dlg.getEmail(),
+            dlg.getGender(),
+            dlg.getCountry(),
+            dlg.getRealName()
+        );
+    }
+}
+
 void MainWindow::actDisconnect()
 {
     client->disconnectFromServer();
@@ -271,7 +295,12 @@ void MainWindow::loginError(Response::ResponseCode r, QString reasonStr, quint32
             QMessageBox::critical(this, tr("Error"), tr("Invalid username.\nYou may only use A-Z, a-z, 0-9, _, ., and - in your username."));
             break;
         case Response::RespRegistrationRequired:
-            QMessageBox::critical(this, tr("Error"), tr("This server requires user registration."));
+            if (QMessageBox::question(this, tr("Error"), tr("This server requires user registration. Do you want to register now?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+                actRegister();
+            }
+            break;
+        case Response::RespAccountNotActivated:
+            QMessageBox::critical(this, tr("Error"), tr("Your account has not been activated yet."));
             break;
         default:
             QMessageBox::critical(this, tr("Error"), tr("Unknown login error: %1").arg(static_cast<int>(r)));
@@ -279,6 +308,48 @@ void MainWindow::loginError(Response::ResponseCode r, QString reasonStr, quint32
     actConnect();
 }
 
+void MainWindow::registerError(Response::ResponseCode r, QString reasonStr, quint32 endTime)
+{
+    switch (r) {
+        case Response::RespRegistrationDisabled:
+            QMessageBox::critical(this, tr("Registration denied"), tr("Registration is currently disabled on this server"));
+            break;
+        case Response::RespUserAlreadyExists:
+            QMessageBox::critical(this, tr("Registration denied"), tr("There is already an existing account with the same user name."));
+            break;
+        case Response::RespEmailRequiredToRegister:
+            QMessageBox::critical(this, tr("Registration denied"), tr("It's mandatory to specify an email when registering."));
+            break;
+        case Response::RespTooManyRequests:
+            QMessageBox::critical(this, tr("Registration denied"), tr("Too many registration attempts from your IP address."));
+            break;
+        case Response::RespPasswordTooShort:
+            QMessageBox::critical(this, tr("Registration denied"), tr("Password too short."));
+            break;
+        case Response::RespUserIsBanned: {
+            QString bannedStr;
+            if (endTime)
+                bannedStr = tr("You are banned until %1.").arg(QDateTime::fromTime_t(endTime).toString());
+            else
+                bannedStr = tr("You are banned indefinitely.");
+            if (!reasonStr.isEmpty())
+                bannedStr.append("\n\n" + reasonStr);
+        
+            QMessageBox::critical(this, tr("Error"), bannedStr);
+            break;
+        }
+        case Response::RespUsernameInvalid:
+            QMessageBox::critical(this, tr("Error"), tr("Invalid username.\nYou may only use A-Z, a-z, 0-9, _, ., and - in your username."));
+            break;
+        case Response::RespRegistrationFailed:
+            QMessageBox::critical(this, tr("Error"), tr("Registration failed for a technical problem on the server."));
+            break;
+        default:
+            QMessageBox::critical(this, tr("Error"), tr("Unknown login error: %1").arg(static_cast<int>(r)));
+    }
+    actRegister();
+}
+
 void MainWindow::socketError(const QString &errorStr)
 {
     QMessageBox::critical(this, tr("Error"), tr("Socket error: %1").arg(errorStr));
@@ -297,6 +368,7 @@ void MainWindow::setClientStatusTitle()
 {
     switch (client->getStatus()) {
         case StatusConnecting: setWindowTitle(appName + " - " + tr("Connecting to %1...").arg(client->peerName())); break;
+        case StatusRegistering: setWindowTitle(appName + " - " + tr("Registering to %1 as %2...").arg(client->peerName()).arg(client->getUserName())); break;
         case StatusDisconnected: setWindowTitle(appName + " - " + tr("Disconnected")); break;
         case StatusLoggingIn: setWindowTitle(appName + " - " + tr("Connected, logging in at %1").arg(client->peerName())); break;
         case StatusLoggedIn: setWindowTitle(appName + " - " + tr("Logged in as %1 at %2").arg(client->getUserName()).arg(client->peerName())); break;
@@ -315,6 +387,7 @@ void MainWindow::retranslateUi()
     aDeckEditor->setText(tr("&Deck editor"));
     aFullScreen->setText(tr("&Full screen"));
     aFullScreen->setShortcut(QKeySequence("Ctrl+F"));
+    aRegister->setText(tr("&Register to server..."));
     aSettings->setText(tr("&Settings..."));
     aExit->setText(tr("&Exit"));
     
@@ -346,6 +419,8 @@ void MainWindow::createActions()
     aFullScreen = new QAction(this);
     aFullScreen->setCheckable(true);
     connect(aFullScreen, SIGNAL(toggled(bool)), this, SLOT(actFullScreen(bool)));
+    aRegister = new QAction(this);
+    connect(aRegister, SIGNAL(triggered()), this, SLOT(actRegister()));
     aSettings = new QAction(this);
     connect(aSettings, SIGNAL(triggered()), this, SLOT(actSettings()));
     aExit = new QAction(this);
@@ -378,6 +453,7 @@ void MainWindow::createMenus()
     cockatriceMenu = menuBar()->addMenu(QString());
     cockatriceMenu->addAction(aConnect);
     cockatriceMenu->addAction(aDisconnect);
+    cockatriceMenu->addAction(aRegister);
     cockatriceMenu->addSeparator();
     cockatriceMenu->addAction(aSinglePlayer);
     cockatriceMenu->addAction(aWatchReplay);
@@ -410,7 +486,10 @@ MainWindow::MainWindow(QWidget *parent)
     connect(client, SIGNAL(statusChanged(ClientStatus)), this, SLOT(statusChanged(ClientStatus)));
     connect(client, SIGNAL(protocolVersionMismatch(int, int)), this, SLOT(protocolVersionMismatch(int, int)));
     connect(client, SIGNAL(userInfoChanged(const ServerInfo_User &)), this, SLOT(userInfoReceived(const ServerInfo_User &)), Qt::BlockingQueuedConnection);
-    
+
+    connect(client, SIGNAL(registerAccepted()), this, SLOT(registerAccepted()));
+    connect(client, SIGNAL(registerError(Response::ResponseCode, QString, quint32)), this, SLOT(registerError(Response::ResponseCode, QString, quint32)));
+
     clientThread = new QThread(this);
     client->moveToThread(clientThread);
     clientThread->start();

cockatrice/src/window_main.h

@@ -43,9 +43,11 @@ private slots:
     void processServerShutdownEvent(const Event_ServerShutdown &event);
     void serverTimeout();
     void loginError(Response::ResponseCode r, QString reasonStr, quint32 endTime);
+    void registerError(Response::ResponseCode r, QString reasonStr, quint32 endTime);
     void socketError(const QString &errorStr);
     void protocolVersionMismatch(int localVersion, int remoteVersion);
     void userInfoReceived(const ServerInfo_User &userInfo);
+    void registerAccepted();
     void localGameEnded();
     void pixmapCacheSizeChanged(int newSizeInMBs);
 
@@ -55,6 +57,7 @@ private slots:
     void actWatchReplay();
     void actDeckEditor();
     void actFullScreen(bool checked);
+    void actRegister();
     void actSettings();
     void actExit();
     
@@ -82,7 +85,7 @@ private:
     QList<QMenu *> tabMenus;
     QMenu *cockatriceMenu, *helpMenu;
     QAction *aConnect, *aDisconnect, *aSinglePlayer, *aWatchReplay, *aDeckEditor, *aFullScreen, *aSettings, *aExit,
-        *aAbout, *aCheckCardUpdates;
+        *aAbout, *aCheckCardUpdates, *aRegister;
     TabSupervisor *tabSupervisor;
 
     QMenu *trayIconMenu;

common/pb/response.proto

@@ -27,8 +27,8 @@ message Response {
 		RespRegistrationAccepted = 23; // Server agrees to process client's registration request
 		RespUserAlreadyExists = 24; // Client attempted to register a name which is already registered
 		RespEmailRequiredToRegister = 25; // Server requires email to register accounts but client did not provide one
-		RespServerDoesNotUseAuth = 26; // Client attempted to register but server does not use authentication
-		RespTooManyRequests = 27; // Server refused to complete command because client has sent too many too quickly
+		RespTooManyRequests = 26; // Server refused to complete command because client has sent too many too quickly
+		RespPasswordTooShort = 27; // Server requires a decent password
 		RespAccountNotActivated = 28; // Client attempted to log into a registered username but the account hasn't been activated
 		RespRegistrationDisabled = 29; // Server does not allow clients to register
 		RespRegistrationFailed = 30; // Server accepted a reg request but failed to perform the registration

common/server.cpp

@@ -113,7 +113,7 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
     QWriteLocker locker(&clientsLock);
     
     AuthenticationResult authState = databaseInterface->checkUserPassword(session, name, password, reasonStr, secondsLeft);
-    if ((authState == NotLoggedIn) || (authState == UserIsBanned || authState == UsernameInvalid))
+    if (authState == NotLoggedIn || authState == UserIsBanned || authState == UsernameInvalid || authState == UserIsInactive)
         return authState;
     
     ServerInfo_User data = databaseInterface->getUserData(name, true);
@@ -140,7 +140,7 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
 
         QString tempName = name;
         int i = 0;
-        while (users.contains(tempName) || databaseInterface->userExists(tempName) || databaseInterface->userSessionExists(tempName))
+        while (users.contains(tempName) || databaseInterface->activeUserExists(tempName) || databaseInterface->userSessionExists(tempName))
             tempName = name + "_" + QString::number(++i);
         name = tempName;
         data.set_name(name.toStdString());
@@ -177,8 +177,6 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
 
 RegistrationResult Server::registerUserAccount(const QString &ipAddress, const Command_Register &cmd, QString &banReason, int &banSecondsRemaining)
 {
-    // TODO
-
     if (!registrationEnabled)
         return RegistrationDisabled;
 
@@ -193,6 +191,9 @@ RegistrationResult Server::registerUserAccount(const QString &ipAddress, const C
     if (!databaseInterface->usernameIsValid(userName))
         return InvalidUsername;
 
+    if(databaseInterface->userExists(userName))
+        return UserAlreadyExists;
+
     if (databaseInterface->checkUserIsBanned(ipAddress, userName, banReason, banSecondsRemaining))
         return ClientIsBanned;
 
@@ -202,8 +203,12 @@ RegistrationResult Server::registerUserAccount(const QString &ipAddress, const C
     QString realName = QString::fromStdString(cmd.real_name());
     ServerInfo_User_Gender gender = cmd.gender();
     QString country = QString::fromStdString(cmd.country());
-    QString passwordSha512 = QString::fromStdString(cmd.password());
-    bool regSucceeded = databaseInterface->registerUser(userName, realName, gender, passwordSha512, emailAddress, country, false);
+    QString password = QString::fromStdString(cmd.password());
+
+    if(password.length() < 6)
+        return PasswordTooShort;
+
+    bool regSucceeded = databaseInterface->registerUser(userName, realName, gender, password, emailAddress, country, false);
 
     return regSucceeded ? Accepted : Failed;
 }

common/server.h

@@ -28,8 +28,8 @@ class GameEventContainer;
 class CommandContainer;
 class Command_JoinGame;
 
-enum AuthenticationResult { NotLoggedIn = 0, PasswordRight = 1, UnknownUser = 2, WouldOverwriteOldSession = 3, UserIsBanned = 4, UsernameInvalid = 5, RegistrationRequired = 6 };
-enum RegistrationResult { Accepted = 0, UserAlreadyExists = 1, EmailRequired = 2, UnauthenticatedServer = 3, TooManyRequests = 4, InvalidUsername = 5, ClientIsBanned = 6, RegistrationDisabled = 7, Failed = 8};
+enum AuthenticationResult { NotLoggedIn, PasswordRight, UnknownUser, WouldOverwriteOldSession, UserIsBanned, UsernameInvalid, RegistrationRequired, UserIsInactive };
+enum RegistrationResult { Accepted, UserAlreadyExists, EmailRequired, TooManyRequests, InvalidUsername, ClientIsBanned, RegistrationDisabled, Failed, PasswordTooShort };
 
 class Server : public QObject
 {

common/server_database_interface.h

@@ -14,6 +14,7 @@ public:
     
     virtual AuthenticationResult checkUserPassword(Server_ProtocolHandler *handler, const QString &user, const QString &password, QString &reasonStr, int &secondsLeft) = 0;
     virtual bool checkUserIsBanned(const QString &ipAddress, const QString &userName, QString &banReason, int &banSecondsRemaining) { return false; }
+    virtual bool activeUserExists(const QString & /* user */) { return false; }
     virtual bool userExists(const QString & /* user */) { return false; }
     virtual QMap<QString, ServerInfo_User> getBuddyList(const QString & /* name */) { return QMap<QString, ServerInfo_User>(); }
     virtual QMap<QString, ServerInfo_User> getIgnoreList(const QString & /* name */) { return QMap<QString, ServerInfo_User>(); }
@@ -37,7 +38,7 @@ public:
     virtual bool userSessionExists(const QString & /* userName */) { return false; }
 
     virtual bool getRequireRegistration() { return false; }
-    virtual bool registerUser(const QString &userName, const QString &realName, ServerInfo_User_Gender const &gender, const QString &passwordSha512, const QString &emailAddress, const QString &country, bool active = false) { return false; }
+    virtual bool registerUser(const QString & /* userName */, const QString & /* realName */, ServerInfo_User_Gender const & /* gender */, const QString & /* password */, const QString & /* emailAddress */, const QString & /* country */, bool /* active = false */) { return false; }
 
     enum LogMessage_TargetType { MessageTargetRoom, MessageTargetGame, MessageTargetChat, MessageTargetIslRoom };
     virtual void logMessage(const int /* senderId */, const QString & /* senderName */, const QString & /* senderIp */, const QString & /* logMessage */, LogMessage_TargetType /* targetType */, const int /* targetId */, const QString & /* targetName */) { };

common/server_protocolhandler.cpp

@@ -392,6 +392,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
         case WouldOverwriteOldSession: return Response::RespWouldOverwriteOldSession;
         case UsernameInvalid: return Response::RespUsernameInvalid;
         case RegistrationRequired: return Response::RespRegistrationRequired;
+        case UserIsInactive: return Response::RespAccountNotActivated;
         default: authState = res;
     }
     
@@ -442,10 +443,10 @@ Response::ResponseCode Server_ProtocolHandler::cmdRegisterAccount(const Command_
             return Response::RespUserAlreadyExists;
         case EmailRequired:
             return Response::RespEmailRequiredToRegister;
-        case UnauthenticatedServer:
-            return Response::RespServerDoesNotUseAuth;
         case TooManyRequests:
             return Response::RespTooManyRequests;
+        case PasswordTooShort:
+            return Response::RespPasswordTooShort;
         case InvalidUsername:
             return Response::RespUsernameInvalid;
         case Failed:

servatrice/scripts/mk_pypb.sh

-#!/bin/bash
-
-SRC_DIR=../../common/pb/
-DST_DIR=./pypb
-
-rm -rf "$DST_DIR"
-mkdir -p "$DST_DIR"
-protoc -I=$SRC_DIR --python_out=$DST_DIR $SRC_DIR/*.proto
-touch "$DST_DIR/__init__.py"
-

servatrice/scripts/register.py

-#!/usr/bin/env python
-
-import socket, sys, struct, time
-
-from pypb.server_message_pb2 import ServerMessage
-from pypb.session_commands_pb2 import Command_Register as Reg
-from pypb.commands_pb2 import CommandContainer as Cmd
-from pypb.event_server_identification_pb2 import Event_ServerIdentification as ServerId
-from pypb.response_pb2 import Response
-
-HOST = "localhost"
-PORT = 4747
-
-CMD_ID = 1
-
-def build_reg():
-    global CMD_ID
-    cmd = Cmd()
-    sc = cmd.session_command.add()
-
-    reg = sc.Extensions[Reg.ext]
-    reg.user_name = "testUser"
-    reg.email = "test@example.com"
-    reg.password = "password"
-
-    cmd.cmd_id = CMD_ID
-    CMD_ID += 1
-    return cmd
-
-def send(msg):
-    packed = struct.pack('>I', len(msg))
-    sock.sendall(packed)
-    sock.sendall(msg)
-
-def print_resp(resp):
-    print "<<<"
-    print repr(resp)
-    m = ServerMessage()
-    m.ParseFromString(bytes(resp))
-    print m
-
-def recv(sock):
-    print "< header"
-    header = sock.recv(4)
-    msg_size = struct.unpack('>I', header)[0]
-    print "< ", msg_size
-    raw_msg = sock.recv(msg_size)
-    print_resp(raw_msg)
-
-if __name__ == "__main__":
-    address = (HOST, PORT)
-    sock = socket.socket()
-
-    print "Connecting to server ", address
-    sock.connect(address)
-
-    # hack for old xml clients - server expects this and discards first message
-    print ">>> xml hack"
-    xmlClientHack = Cmd().SerializeToString()
-    send(xmlClientHack)
-    print sock.recv(60)
-
-    recv(sock)
-
-    print ">>> register"
-    r = build_reg()
-    print r
-    msg = r.SerializeToString()
-    send(msg)
-    recv(sock)
-
-    print "Done"
-

servatrice/servatrice.ini.example

@@ -59,9 +59,11 @@ regonly=0
 ; Servatrice can process registration requests to add new users on the fly.
 ; Enable this feature? Default false.
 ;enabled=false
+
 ; Require users to provide an email address in order to register. Default true.
 ;requireemail=true
 
+
 [database]
 
 ; Database type. Valid values are:

servatrice/src/passwordhasher.cpp

@@ -8,6 +8,8 @@
     #include <QCryptographicHash>
 #endif
 
+#include "rng_sfmt.h"
+
 void PasswordHasher::initialize()
 {
 #if QT_VERSION < 0x050000
@@ -51,3 +53,20 @@ QString PasswordHasher::computeHash(const QString &password, const QString &salt
     return hashedPass;
 }
 #endif
+
+QString PasswordHasher::generateRandomSalt(const int len)
+{
+    static const char alphanum[] =
+        "0123456789"
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        "abcdefghijklmnopqrstuvwxyz";
+
+    QString ret;
+    int size = sizeof(alphanum) - 1;
+
+    for (int i = 0; i < len; ++i) {
+        ret.append(alphanum[rng->rand(0, size)]);
+    }
+
+    return ret;
+}

servatrice/src/passwordhasher.h

@@ -7,6 +7,7 @@ class PasswordHasher {
 public:
 	static void initialize();
 	static QString computeHash(const QString &password, const QString &salt);
+	static QString generateRandomSalt(const int len = 16);
 };
 
 #endif

servatrice/src/servatrice_database_interface.cpp

@@ -130,7 +130,6 @@ bool Servatrice_DatabaseInterface::registerUser(const QString &userName, const Q
 
     if (!execSqlQuery(query)) {
         qDebug() << "Failed to insert user: " << query->lastError() << " sql: " << query->lastQuery();
-        // TODO handle duplicate insert error
         return false;
     }
 
@@ -172,7 +171,6 @@ AuthenticationResult Servatrice_DatabaseInterface::checkUserPassword(Server_Prot
         if (checkUserIsBanned(handler->getAddress(), user, reasonStr, banSecondsLeft))
             return UserIsBanned;
         
-        QSqlQuery *passwordQuery = prepareQuery("select password_sha512 from {prefix}_users where name = :name and active = 1");
         passwordQuery->bindValue(":name", user);
         if (!execSqlQuery(passwordQuery)) {
             qDebug("Login denied: SQL error");
@@ -270,7 +268,6 @@ bool Servatrice_DatabaseInterface::checkUserIsIpBanned(const QString &ipAddress,
     return false;
 }
 
-bool Servatrice_DatabaseInterface::userExists(const QString &user)
 {
     if (server->getAuthenticationMethod() == Servatrice::AuthenticationSql) {
         checkSql();

servatrice/src/servatrice_database_interface.h

@@ -4,7 +4,7 @@
 #include <QObject>
 #include <QSqlDatabase>
 #include <QHash>
-#include <qchar.h>
+#include <QChar>
 
 #include "server.h"
 #include "server_database_interface.h"
@@ -41,6 +41,7 @@ public:
 	bool execSqlQuery(QSqlQuery *query);
 	const QSqlDatabase &getDatabase() { return sqlDatabase; }
 
+	bool activeUserExists(const QString &user);
 	bool userExists(const QString &user);
 	int getUserIdInDB(const QString &name);
 	QMap<QString, ServerInfo_User> getBuddyList(const QString &name);
@@ -63,7 +64,7 @@ public:
 	bool userSessionExists(const QString &userName);
 
 	bool getRequireRegistration();
-	bool registerUser(const QString &userName, const QString &realName, ServerInfo_User_Gender const &gender, const QString &passwordSha512, const QString &emailAddress, const QString &country, bool active = false);
+	bool registerUser(const QString &userName, const QString &realName, ServerInfo_User_Gender const &gender, const QString &password, const QString &emailAddress, const QString &country, bool active = false);
 
     void logMessage(const int senderId, const QString &senderName, const QString &senderIp, const QString &logMessage, LogMessage_TargetType targetType, const int targetId, const QString &targetName);
 };