ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent unspecific warnings during certificate loading

Browse Source
This commit is contained in:
Simon Stürz 2021-08-17 09:23:36 +02:00
parent 685450fdb3
commit d16792e943
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libnymea-core/servermanager.cpp
View File

@ -367,19 +367,31 @@ void ServerManager::unregisterZeroConfService(const QString &configId, const QSt
bool ServerManager::loadCertificate(const QString &certificateKeyFileName, const QString &certificateFileName) bool ServerManager::loadCertificate(const QString &certificateKeyFileName, const QString &certificateFileName)
{ {
QFile certificateKeyFile(certificateKeyFileName); QFile certificateKeyFile(certificateKeyFileName);
if (!certificateKeyFile.exists() || certificateKeyFileName.isEmpty()) {
qCWarning(dcServerManager()) << "Could not load certificate key file" << certificateKeyFile.fileName() << "because the file does not exist.";
return false;
}
if (!certificateKeyFile.open(QIODevice::ReadOnly)) { if (!certificateKeyFile.open(QIODevice::ReadOnly)) {
qCWarning(dcServerManager()) << "Could not open" << certificateKeyFile.fileName() << ":" << certificateKeyFile.errorString(); qCWarning(dcServerManager()) << "Could not open" << certificateKeyFile.fileName() << ":" << certificateKeyFile.errorString();
return false; return false;
} }
m_certificateKey = QSslKey(certificateKeyFile.readAll(), QSsl::Rsa); m_certificateKey = QSslKey(certificateKeyFile.readAll(), QSsl::Rsa);
qCDebug(dcServerManager()) << "Loaded private certificate key " << certificateKeyFileName; qCDebug(dcServerManager()) << "Loaded private certificate key " << certificateKeyFileName;
certificateKeyFile.close(); certificateKeyFile.close();
QFile certificateFile(certificateFileName); QFile certificateFile(certificateFileName);
if (!certificateFile.exists() || certificateFileName.isEmpty()) {
qCWarning(dcServerManager()) << "Could not load certificate file" << certificateFile.fileName() << "because the file does not exist.";
return false;
}
if (!certificateFile.open(QIODevice::ReadOnly)) { if (!certificateFile.open(QIODevice::ReadOnly)) {
qCWarning(dcServerManager()) << "Could not open" << certificateFile.fileName() << ":" << certificateFile.errorString(); qCWarning(dcServerManager()) << "Could not open" << certificateFile.fileName() << ":" << certificateFile.errorString();
return false; return false;
} }
m_certificate = QSslCertificate(certificateFile.readAll()); m_certificate = QSslCertificate(certificateFile.readAll());
qCDebug(dcServerManager()) << "Loaded certificate file " << certificateFileName; qCDebug(dcServerManager()) << "Loaded certificate file " << certificateFileName;
certificateFile.close(); certificateFile.close();