summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorSimon Rettberg2017-11-16 14:21:23 +0100
committerSimon Rettberg2017-11-16 14:21:23 +0100
commit0d3d853f8414bd383fa1caea8a9322cb7854e5f3 (patch)
treeb775b745b8497ab520ab41e2c0ca2b2f1f61712a /src/server
parentfix qresource precompilation with cmake (diff)
downloadpvs2-0d3d853f8414bd383fa1caea8a9322cb7854e5f3.tar.gz
pvs2-0d3d853f8414bd383fa1caea8a9322cb7854e5f3.tar.xz
pvs2-0d3d853f8414bd383fa1caea8a9322cb7854e5f3.zip
Fix SSL on Qt5
Diffstat (limited to 'src/server')
-rw-r--r--src/server/mainwindow/mainwindow.h5
-rw-r--r--src/server/net/client.cpp2
-rw-r--r--src/server/net/client.h7
-rw-r--r--src/server/net/listenserver.cpp6
-rw-r--r--src/server/net/sslserver.cpp39
-rw-r--r--src/server/net/sslserver.h6
6 files changed, 45 insertions, 20 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h
index ac59481..6a0db89 100644
--- a/src/server/mainwindow/mainwindow.h
+++ b/src/server/mainwindow/mainwindow.h
@@ -103,11 +103,12 @@ private:
void reloadCurrentRoom();
- void DisableButtons();
- void EnableButtons();
void clientCountChanged();
protected slots:
+ void DisableButtons();
+ void EnableButtons();
+
void onSessionNameClick();
void onSessionNameUpdate();
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index 1b0bbdb..82ebf26 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -17,7 +17,7 @@
int Client::_clientIdCounter = 0;
/******************************************************************************/
-Client::Client(QSslSocket* socket) : _socket(socket)
+Client::Client(QTcpSocket* socket) : _socket(socket)
{
assert(socket != NULL);
_authed = 0;
diff --git a/src/server/net/client.h b/src/server/net/client.h
index 9bbc23f..885d4fc 100644
--- a/src/server/net/client.h
+++ b/src/server/net/client.h
@@ -4,8 +4,7 @@
#include <QtCore>
#include <QHostAddress>
#include <QAbstractSocket>
-#include <QSslSocket>
-#include <QSslError>
+#include <QTcpSocket>
#include "../../shared/networkmessage.h"
//class QSslSocket;
@@ -26,7 +25,7 @@ class Client : public QObject
Q_OBJECT
public:
- explicit Client(QSslSocket* socket);
+ explicit Client(QTcpSocket* socket);
~Client();
// Getters
@@ -59,7 +58,7 @@ public:
private:
- QSslSocket * const _socket;
+ QTcpSocket * const _socket;
bool _locked;
int _authed; // 0 = challenge sent, awaiting reply 1 = challenge ok, client challenge replied, awaiting login, 2 = ESTABLISHED
QString _name;
diff --git a/src/server/net/listenserver.cpp b/src/server/net/listenserver.cpp
index 1ce5016..0a585c7 100644
--- a/src/server/net/listenserver.cpp
+++ b/src/server/net/listenserver.cpp
@@ -10,7 +10,7 @@
*/
ListenServer::ListenServer(quint16 port)
{
- if (!_server.listen(QHostAddress::Any, port) || !_server.isListening())
+ if (!_server.listen(QHostAddress::AnyIPv4, port) || !_server.isListening())
qFatal("Cannot bind to TCP port %d (incoming SSL clients)", (int)port);
connect(&_server, SIGNAL(newConnection()), this, SLOT(newClientConnection()));
}
@@ -30,8 +30,8 @@ ListenServer::~ListenServer()
*/
void ListenServer::newClientConnection()
{
- QSslSocket* sock;
- while ((sock = (QSslSocket*)_server.nextPendingConnection()) != NULL) {
+ QTcpSocket* sock;
+ while ((sock = _server.nextPendingConnection()) != NULL) {
Client* client = new Client(sock); // TODO: what happens with disconnected clients
emit newClient(client);
}
diff --git a/src/server/net/sslserver.cpp b/src/server/net/sslserver.cpp
index 6aefae9..0e0639e 100644
--- a/src/server/net/sslserver.cpp
+++ b/src/server/net/sslserver.cpp
@@ -20,22 +20,21 @@
#include "certmanager.h"
#include <unistd.h>
-SslServer::SslServer()
+SslServer::SslServer() : QTcpServer(NULL)
{
_tmr = startTimer(5123);
- //QSslSocket::setDefaultCiphers(QSslSocket::supportedCiphers());
}
SslServer::~SslServer()
{
- killTimer((_tmr));
+ killTimer(_tmr);
}
/**
* Handle incomming connection.
* @param socketDescriptor
*/
-void SslServer::incomingConnection(int socketDescriptor)
+void SslServer::incomingConnection(qintptr socketDescriptor)
{
static int certFails = 0;
QSslKey key;
@@ -49,24 +48,48 @@ void SslServer::incomingConnection(int socketDescriptor)
}
QSslSocket *serverSocket = new QSslSocket(NULL);
connect(serverSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
+ connect(serverSocket, SIGNAL(disconnected()), this, SLOT(sock_closed()));
+ connect(serverSocket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(sock_error(QAbstractSocket::SocketError)));
serverSocket->setPrivateKey(key);
serverSocket->setLocalCertificate(cert);
serverSocket->setPeerVerifyMode(QSslSocket::VerifyNone);
- serverSocket->setProtocol(QSsl::TlsV1SslV3);
- //printf("Keylen %d\n", serverSocket->privateKey().length());
+ serverSocket->setProtocol(QSsl::SecureProtocols);
if (serverSocket->setSocketDescriptor(socketDescriptor)) {
// Once the connection is successfully encrypted, raise our newConnection event
+ connect(serverSocket, &QSslSocket::encrypted, [=]() {
+ disconnect(serverSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
+ disconnect(serverSocket, SIGNAL(disconnected()), this, SLOT(sock_closed()));
+ disconnect(serverSocket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(sock_error(QAbstractSocket::SocketError)));
+ });
connect(serverSocket, SIGNAL(encrypted()), this, SIGNAL(newConnection()));
serverSocket->startServerEncryption();
_pending.push_back(serverSocket);
} else {
+ qDebug() << "Failed to setSocketDescriptor on new SSL Socket";
serverSocket->deleteLater();
}
}
-void SslServer::sslErrors(const QList<QSslError> & /* errors */ )
+void SslServer::sslErrors(const QList<QSslError> &errors)
{
- //qDebug("FIXME: SSL ERRORS on SERVER: %s", qPrintable(errors.begin()->errorString()));
+ /*
+ qDebug() << "Client caused sslErrors before connection:";
+ for (QList<QSslError>::const_iterator it = errors.begin(); it != errors.end(); it++) {
+ qDebug() << it->errorString();
+ }
+ */
+}
+
+void SslServer::sock_closed()
+{
+ qDebug() << "Client closed connection before SSL handshake completed.";
+ sender()->deleteLater();
+}
+
+void SslServer::sock_error(QAbstractSocket::SocketError err)
+{
+ qDebug() << "Client error before SSL handshake completed: " << err;
+ sender()->deleteLater();
}
void SslServer::timerEvent(QTimerEvent* /* event */ )
diff --git a/src/server/net/sslserver.h b/src/server/net/sslserver.h
index 7b727aa..6e8f26e 100644
--- a/src/server/net/sslserver.h
+++ b/src/server/net/sslserver.h
@@ -32,6 +32,8 @@ class SslServer : public QTcpServer
private Q_SLOTS:
void sslErrors ( const QList<QSslError> & errors );
+ void sock_closed();
+ void sock_error(QAbstractSocket::SocketError err);
public:
SslServer();
@@ -43,8 +45,8 @@ public:
virtual QTcpSocket* nextPendingConnection();
protected:
- void incomingConnection(int socketDescriptor);
- void timerEvent (QTimerEvent* event);
+ void incomingConnection(qintptr handle);
+ void timerEvent(QTimerEvent* event);
QList<QSslSocket*> _pending;
QList<QSslSocket*> _delete;
int _tmr;