aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Commit to resolve requests made by @Daenyth discussed after the commit.

Browse source 
See https://github.com/Cockatrice/Cockatrice/pull/1340 for details.
This commit is contained in:
woogerboy21 2015-08-07 13:21:31 -04:00
parent 62dc3a7ca3
commit 94942e1a92
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/main.cpp
View file

@ -35,7 +35,6 @@
#include "QtNetwork/QNetworkInterface" #include "QtNetwork/QNetworkInterface"
#include <QCryptographicHash> #include <QCryptographicHash>
#include "main.h" #include "main.h"
#include "window_main.h" #include "window_main.h"
#include "dlg_settings.h" #include "dlg_settings.h"
@ -100,7 +99,7 @@ bool settingsValid()
!settingsCache->getPicsPath().isEmpty(); !settingsCache->getPicsPath().isEmpty();
} }
void generateClientID() QString const generateClientID()
{ {
QString macList; QString macList;
foreach(QNetworkInterface interface, QNetworkInterface::allInterfaces()) foreach(QNetworkInterface interface, QNetworkInterface::allInterfaces())
@ -110,7 +109,7 @@ void generateClientID()
macList += interface.hardwareAddress() + "."; macList += interface.hardwareAddress() + ".";
} }
QString strClientID = QCryptographicHash::hash(macList.toUtf8(), QCryptographicHash::Sha1).toHex().right(15); QString strClientID = QCryptographicHash::hash(macList.toUtf8(), QCryptographicHash::Sha1).toHex().right(15);
settingsCache->setClientID(strClientID); return strClientID;
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -220,7 +219,7 @@ int main(int argc, char *argv[])
QIcon icon(":/resources/appicon.svg"); QIcon icon(":/resources/appicon.svg");
ui.setWindowIcon(icon); ui.setWindowIcon(icon);
generateClientID(); //generate the users client id settingsCache->setClientID(generateClientID());
qDebug() << "ClientID In Cache: " << settingsCache->getClientID(); qDebug() << "ClientID In Cache: " << settingsCache->getClientID();
ui.showMaximized(); ui.showMaximized();

4
cockatrice/src/main.h
View file

@ -7,14 +7,14 @@ class QSystemTrayIcon;
class SoundEngine; class SoundEngine;
extern CardDatabase *db; extern CardDatabase *db;
extern QSystemTrayIcon *trayIcon; extern QSystemTrayIcon *trayIcon;
extern QTranslator *translator; extern QTranslator *translator;
extern const QString translationPrefix; extern const QString translationPrefix;
extern QString translationPath; extern QString translationPath;
void installNewTranslator(); void installNewTranslator();
void generateClientID();
QString const generateClientID();
bool settingsValid(); bool settingsValid();

2
common/pb/response.proto
View file

@ -35,7 +35,7 @@ message Response {
RespActivationAccepted = 31; // Server accepted a reg user activation token RespActivationAccepted = 31; // Server accepted a reg user activation token
RespActivationFailed = 32; // Server didn't accept a reg user activation token RespActivationFailed = 32; // Server didn't accept a reg user activation token
RespRegistrationAcceptedNeedsActivation = 33; // Server accepted cient registration, but it will need token activation RespRegistrationAcceptedNeedsActivation = 33; // Server accepted cient registration, but it will need token activation
RespClientIDRequired = 34; // Server require's client to generate and send its client id before allowing access RespClientIDRequired = 34; // Server requires client to generate and send its client id before allowing access
} }
enum ResponseType { enum ResponseType {
JOIN_ROOM = 1000; JOIN_ROOM = 1000;

1
common/server.cpp
View file

@ -170,7 +170,6 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
event.mutable_user_info()->CopyFrom(session->copyUserInfo(true, true, true)); event.mutable_user_info()->CopyFrom(session->copyUserInfo(true, true, true));
locker.unlock(); locker.unlock();
// check if client id exists (older client compatibility)
if (clientid.isEmpty()){ if (clientid.isEmpty()){
// client id is empty, either out dated client or client has been modified // client id is empty, either out dated client or client has been modified
} }

8
common/server_protocolhandler.cpp
View file

@ -381,12 +381,16 @@ Response::ResponseCode Server_ProtocolHandler::cmdPing(const Command_Ping & /*cm
Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd, ResponseContainer &rc) Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd, ResponseContainer &rc)
{ {
QString userName = QString::fromStdString(cmd.user_name()).simplified(); QString userName = QString::fromStdString(cmd.user_name()).simplified();
QString clientid = QString::fromStdString(cmd.clientid()).simplified(); QString clientId = QString::fromStdString(cmd.clientid()).simplified();
if (userName.isEmpty() || (userInfo != 0)) if (userName.isEmpty() || (userInfo != 0))
return Response::RespContextError; return Response::RespContextError;
if (clientId.isEmpty())
return Response::RespContextError;
QString reasonStr; QString reasonStr;
int banSecondsLeft = 0; int banSecondsLeft = 0;
AuthenticationResult res = server->loginUser(this, userName, QString::fromStdString(cmd.password()), reasonStr, banSecondsLeft, clientid); AuthenticationResult res = server->loginUser(this, userName, QString::fromStdString(cmd.password()), reasonStr, banSecondsLeft, clientId);
switch (res) { switch (res) {
case UserIsBanned: { case UserIsBanned: {
Response_Login *re = new Response_Login; Response_Login *re = new Response_Login;