mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-22 01:06:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #21658 from Chocobo1/ssl_setup

Browse source 
Simplify SSL parameters setup
This commit is contained in:
Chocobo1 2024-11-01 04:03:51 +08:00 committed by GitHub
commit 7af6ac18aa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/base/http/server.cpp
View file

@ -37,8 +37,9 @@
#include <QtLogging> #include <QtLogging>
#include <QNetworkProxy> #include <QNetworkProxy>
#include <QSslCertificate>
#include <QSslCipher> #include <QSslCipher>
#include <QSslConfiguration> #include <QSslKey>
#include <QSslSocket> #include <QSslSocket>
#include <QStringList> #include <QStringList>
#include <QTimer> #include <QTimer>
@ -100,13 +101,12 @@ using namespace Http;
Server::Server(IRequestHandler *requestHandler, QObject *parent) Server::Server(IRequestHandler *requestHandler, QObject *parent)
: QTcpServer(parent) : QTcpServer(parent)
, m_requestHandler(requestHandler) , m_requestHandler(requestHandler)
, m_sslConfig {QSslConfiguration::defaultConfiguration()}
{ {
setProxy(QNetworkProxy::NoProxy); setProxy(QNetworkProxy::NoProxy);
QSslConfiguration sslConf {QSslConfiguration::defaultConfiguration()}; m_sslConfig.setCiphers(safeCipherList());
sslConf.setProtocol(QSsl::TlsV1_2OrLater); m_sslConfig.setPeerVerifyMode(QSslSocket::VerifyNone);
sslConf.setCiphers(safeCipherList());
QSslConfiguration::setDefaultConfiguration(sslConf);
auto *dropConnectionTimer = new QTimer(this); auto *dropConnectionTimer = new QTimer(this);
connect(dropConnectionTimer, &QTimer::timeout, this, &Server::dropTimedOutConnection); connect(dropConnectionTimer, &QTimer::timeout, this, &Server::dropTimedOutConnection);
@ -115,7 +115,7 @@ Server::Server(IRequestHandler *requestHandler, QObject *parent)
void Server::incomingConnection(const qintptr socketDescriptor) void Server::incomingConnection(const qintptr socketDescriptor)
{ {
std::unique_ptr<QTcpSocket> serverSocket = m_https ? std::make_unique<QSslSocket>(this) : std::make_unique<QTcpSocket>(this); std::unique_ptr<QTcpSocket> serverSocket = isHttps() ? std::make_unique<QSslSocket>(this) : std::make_unique<QTcpSocket>(this);
if (!serverSocket->setSocketDescriptor(socketDescriptor)) if (!serverSocket->setSocketDescriptor(socketDescriptor))
return; return;
@ -127,13 +127,10 @@ void Server::incomingConnection(const qintptr socketDescriptor)
try try
{ {
if (m_https) if (isHttps())
{ {
auto *sslSocket = static_cast<QSslSocket *>(serverSocket.get()); auto *sslSocket = static_cast<QSslSocket *>(serverSocket.get());
sslSocket->setProtocol(QSsl::SecureProtocols); sslSocket->setSslConfiguration(m_sslConfig);
sslSocket->setPrivateKey(m_key);
sslSocket->setLocalCertificateChain(m_certificates);
sslSocket->setPeerVerifyMode(QSslSocket::VerifyNone);
sslSocket->startServerEncryption(); sslSocket->startServerEncryption();
} }
@ -178,17 +175,17 @@ bool Server::setupHttps(const QByteArray &certificates, const QByteArray &privat
return false; return false;
} }
m_key = key; m_sslConfig.setLocalCertificateChain(certs);
m_certificates = certs; m_sslConfig.setPrivateKey(key);
m_https = true; m_https = true;
return true; return true;
} }
void Server::disableHttps() void Server::disableHttps()
{ {
m_sslConfig.setLocalCertificateChain({});
m_sslConfig.setPrivateKey({});
m_https = false; m_https = false;
m_certificates.clear();
m_key.clear();
} }
bool Server::isHttps() const bool Server::isHttps() const

6
src/base/http/server.h
View file

@ -31,8 +31,7 @@
#pragma once #pragma once
#include <QSet> #include <QSet>
#include <QSslCertificate> #include <QSslConfiguration>
#include <QSslKey>
#include <QTcpServer> #include <QTcpServer>
namespace Http namespace Http
@ -63,7 +62,6 @@ namespace Http
QSet<Connection *> m_connections; // for tracking persistent connections QSet<Connection *> m_connections; // for tracking persistent connections
bool m_https = false; bool m_https = false;
QList<QSslCertificate> m_certificates; QSslConfiguration m_sslConfig;
QSslKey m_key;
}; };
} }