Load WebUI certificate & key from file path

This allow users to update certificate & key more easily, i.e. without the need to import them
into qbt.

Closes #6675, #7547, #8315, #8564.
This commit is contained in:
Chocobo1 2019-01-17 09:42:01 +08:00
parent 48d358872f
commit 5cdb3b6a2d
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
12 changed files with 212 additions and 277 deletions

View file

@ -633,24 +633,24 @@ void Preferences::setWebUiHttpsEnabled(bool enabled)
setValue("Preferences/WebUI/HTTPS/Enabled", enabled);
}
QByteArray Preferences::getWebUiHttpsCertificate() const
QString Preferences::getWebUIHttpsCertificatePath() const
{
return value("Preferences/WebUI/HTTPS/Certificate").toByteArray();
return value("Preferences/WebUI/HTTPS/CertificatePath").toString();
}
void Preferences::setWebUiHttpsCertificate(const QByteArray &data)
void Preferences::setWebUIHttpsCertificatePath(const QString &path)
{
setValue("Preferences/WebUI/HTTPS/Certificate", data);
setValue("Preferences/WebUI/HTTPS/CertificatePath", path);
}
QByteArray Preferences::getWebUiHttpsKey() const
QString Preferences::getWebUIHttpsKeyPath() const
{
return value("Preferences/WebUI/HTTPS/Key").toByteArray();
return value("Preferences/WebUI/HTTPS/KeyPath").toString();
}
void Preferences::setWebUiHttpsKey(const QByteArray &data)
void Preferences::setWebUIHttpsKeyPath(const QString &path)
{
setValue("Preferences/WebUI/HTTPS/Key", data);
setValue("Preferences/WebUI/HTTPS/KeyPath", path);
}
bool Preferences::isAltWebUiEnabled() const