/***************************************************************************
- * Copyright (C) 2005-2018 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "sslserver.h"
-#ifdef HAVE_SSL
-# include <QSslSocket>
-#endif
-
#include <QDateTime>
+#include <QSslSocket>
+#include "core.h"
#include "quassel.h"
-#ifdef HAVE_SSL
-
SslServer::SslServer(QObject* parent)
: QTcpServer(parent)
{
}
}
-QTcpSocket* SslServer::nextPendingConnection()
-{
- if (_pendingConnections.isEmpty())
- return nullptr;
- else
- return _pendingConnections.takeFirst();
-}
-
void SslServer::incomingConnection(qintptr socketDescriptor)
{
- auto* serverSocket = new QSslSocket(this);
- if (serverSocket->setSocketDescriptor(socketDescriptor)) {
+ auto* socket = new QSslSocket(this);
+ if (socket->setSocketDescriptor(socketDescriptor)) {
if (isCertValid()) {
- serverSocket->setLocalCertificate(_cert);
- serverSocket->setPrivateKey(_key);
- serverSocket->addCaCertificates(_ca);
+ socket->setLocalCertificate(_cert);
+ socket->setPrivateKey(_key);
+ socket->addCaCertificates(_ca);
}
- _pendingConnections << serverSocket;
- emit newConnection();
+ addPendingConnection(socket);
}
else {
- delete serverSocket;
+ delete socket;
}
}
return false;
}
+ _certificateExpires = untestedCert.expiryDate();
+ if (_metricsServer) {
+ _metricsServer->setCertificateExpires(_certificateExpires);
+ }
+
_isCertValid = true;
// All keys are valid, update the externally visible copy used for new connections.
return key;
}
-#endif // HAVE_SSL
+void SslServer::setMetricsServer(MetricsServer* metricsServer) {
+ _metricsServer = metricsServer;
+ if (_metricsServer) {
+ _metricsServer->setCertificateExpires(_certificateExpires);
+ }
+}