rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Require a working secrets storage

Browse Source
This commit is contained in:
Nicolas Werner 2021-08-31 01:51:03 +02:00
parent ded926cdf9
commit 79ecad5a09
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Cache.cpp
View File

@ -13,6 +13,7 @@
#include <QFile> #include <QFile>
#include <QHash> #include <QHash>
#include <QMap> #include <QMap>
#include <QMessageBox>
#include <QStandardPaths> #include <QStandardPaths>
#if __has_include(<keychain.h>) #if __has_include(<keychain.h>)
@ -754,6 +755,24 @@ Cache::backupVersion()
} }
} }
static void
fatalSecretError()
{
QMessageBox::critical(
ChatPage::instance(),
QCoreApplication::translate("SecretStorage", "Failed to connect to secret storage"),
QCoreApplication::translate(
"SecretStorage",
"Nheko could not connect to the secure storage to save encryption secrets to. "
"This can have multiple reasons. Check if your D-Bus service is running and "
"you have configured a service like KWallet, Gnome Secrets or the equivalent "
"for your platform. If you are having trouble, feel free to open an issue "
"here: https://github.com/Nheko-Reborn/nheko/issues"));
QCoreApplication::exit(1);
exit(1);
}
void void
Cache::storeSecret(const std::string name, const std::string secret) Cache::storeSecret(const std::string name, const std::string secret)
{ {
@ -780,6 +799,7 @@ Cache::storeSecret(const std::string name, const std::string secret)
nhlog::db()->warn("Storing secret '{}' failed: {}", nhlog::db()->warn("Storing secret '{}' failed: {}",
name, name,
job->errorString().toStdString()); job->errorString().toStdString());
fatalSecretError();
} else { } else {
// if we emit the signal directly, qtkeychain breaks and won't execute new // if we emit the signal directly, qtkeychain breaks and won't execute new
// jobs. You can't start a job from the finish signal of a job. // jobs. You can't start a job from the finish signal of a job.
@ -840,8 +860,14 @@ Cache::secret(const std::string name)
const QString secret = job.textData(); const QString secret = job.textData();
if (job.error()) { if (job.error()) {
nhlog::db()->debug( if (job.error() == QKeychain::Error::EntryNotFound)
"Restoring secret '{}' failed: {}", name, job.errorString().toStdString()); return std::nullopt;
nhlog::db()->error("Restoring secret '{}' failed ({}): {}",
name,
job.error(),
job.errorString().toStdString());
fatalSecretError();
return std::nullopt; return std::nullopt;
} }
if (secret.isEmpty()) { if (secret.isEmpty()) {