github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-14 01:03:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Refactor: move the validation of certificates & key functions under Server class

Browse source 
Rename method
Add log messages
This commit is contained in:
Chocobo1 2017-04-10 20:04:02 +08:00
parent 05d8c46bb0
commit 7f346b49a7
3 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,11 +61,27 @@ Server::~Server()
} }
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
void Server::enableHttps(const QList<QSslCertificate> &certificates, const QSslKey &key) bool Server::setupHttps(const QByteArray &certificates, const QByteArray &key)
{ {
m_certificates = certificates; QSslKey sslKey(key, QSsl::Rsa);
m_key = key; if (sslKey.isNull())
sslKey = QSslKey(key, QSsl::Ec);
const QList<QSslCertificate> certs = QSslCertificate::fromData(certificates);
const bool areCertsValid = !certs.empty() && std::all_of(certs.begin(), certs.end(), [](const QSslCertificate &c) { return !c.isNull(); });
if (!sslKey.isNull() && areCertsValid)
{
m_key = sslKey;
m_certificates = certs;
m_https = true; m_https = true;
return true;
}
else
{
disableHttps();
return false;
}
} }
void Server::disableHttps() void Server::disableHttps()

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

@ -55,7 +55,7 @@ namespace Http
~Server(); ~Server();
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
void enableHttps(const QList<QSslCertificate> &certificates, const QSslKey &key); bool setupHttps(const QByteArray &certificates, const QByteArray &key);
void disableHttps(); void disableHttps();
#endif #endif

17
src/webui/webui.cpp
View file

@ -75,18 +75,13 @@ void WebUI::init()
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
if (pref->isWebUiHttpsEnabled()) { if (pref->isWebUiHttpsEnabled()) {
const QByteArray keyRaw = pref->getWebUiHttpsKey(); const QByteArray certs = pref->getWebUiHttpsCertificate();
QSslKey key(keyRaw, QSsl::Rsa); const QByteArray key = pref->getWebUiHttpsKey();
if (key.isNull()) bool success = m_httpServer->setupHttps(certs, key);
key = QSslKey(keyRaw, QSsl::Ec); if (success)
logger->addMessage(tr("Web UI: https setup successful"));
const QList<QSslCertificate> certs = QSslCertificate::fromData(pref->getWebUiHttpsCertificate());
const bool areCertsValid = !certs.empty() && std::all_of(certs.begin(), certs.end(), [](QSslCertificate c) { return !c.isNull(); });
if (!key.isNull() && areCertsValid)
m_httpServer->enableHttps(certs, key);
else else
m_httpServer->disableHttps(); logger->addMessage(tr("Web UI: https setup failed, fallback to http"), Log::CRITICAL);
} }
else { else {
m_httpServer->disableHttps(); m_httpServer->disableHttps();