Use XDG Desktop Portal to autostart the flatpak v2

keepassxreboot · Apr 18, 2024 · 66f0ef5 · 66f0ef5
1 parent 194409a
commit 66f0ef5
Show file tree

Hide file tree

Showing 10 changed files with 101 additions and 24 deletions.
diff --git a/src/core/Config.cpp b/src/core/Config.cpp
@@ -97,6 +97,9 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
     {Config::GUI_HidePreviewPanel, {QS("GUI/HidePreviewPanel"), Roaming, false}},
     {Config::GUI_AlwaysOnTop, {QS("GUI/GUI_AlwaysOnTop"), Local, false}},
     {Config::GUI_ToolButtonStyle, {QS("GUI/ToolButtonStyle"), Roaming, Qt::ToolButtonIconOnly}},
+#ifdef KEEPASSXC_DIST_FLATPAK
+    {Config::GUI_LaunchAtStartup, {QS("GUI/LaunchAtStartup"), Roaming, false}},
+#endif
     {Config::GUI_ShowTrayIcon, {QS("GUI/ShowTrayIcon"), Roaming, false}},
     {Config::GUI_TrayIconAppearance, {QS("GUI/TrayIconAppearance"), Roaming, {}}},
     {Config::GUI_MinimizeToTray, {QS("GUI/MinimizeToTray"), Roaming, false}},

diff --git a/src/core/Config.h b/src/core/Config.h
@@ -79,6 +79,9 @@ class Config : public QObject
         GUI_HidePreviewPanel,
         GUI_AlwaysOnTop,
         GUI_ToolButtonStyle,
+#ifdef KEEPASSXC_DIST_FLATPAK
+        GUI_LaunchAtStartup,
+#endif
         GUI_ShowTrayIcon,
         GUI_TrayIconAppearance,
         GUI_MinimizeToTray,

diff --git a/src/core/Database.cpp b/src/core/Database.cpp
@@ -412,6 +412,9 @@ bool Database::performSave(const QString& filePath, SaveAction action, const QSt
 
 bool Database::writeDatabase(QIODevice* device, QString* error)
 {
+    Q_ASSERT(m_data.key);
+    Q_ASSERT(m_data.transformedDatabaseKey);
+
     PasswordKey oldTransformedKey;
     if (m_data.key->isEmpty()) {
         oldTransformedKey.setRawKey(m_data.transformedDatabaseKey->rawKey());
@@ -767,18 +770,29 @@ Database::CompressionAlgorithm Database::compressionAlgorithm() const
 
 QByteArray Database::transformedDatabaseKey() const
 {
+    Q_ASSERT(m_data.transformedDatabaseKey);
+    if (!m_data.transformedDatabaseKey) {
+        return {};
+    }
     return m_data.transformedDatabaseKey->rawKey();
 }
 
 QByteArray Database::challengeResponseKey() const
 {
+    Q_ASSERT(m_data.challengeResponseKey);
+    if (!m_data.challengeResponseKey) {
+        return {};
+    }
     return m_data.challengeResponseKey->rawKey();
 }
 
 bool Database::challengeMasterSeed(const QByteArray& masterSeed)
 {
+    Q_ASSERT(m_data.key);
+    Q_ASSERT(m_data.masterSeed);
+
     m_keyError.clear();
-    if (m_data.key) {
+    if (m_data.key && m_data.masterSeed) {
         m_data.masterSeed->setRawKey(masterSeed);
         QByteArray response;
         bool ok = m_data.key->challenge(masterSeed, response, &m_keyError);
@@ -824,8 +838,7 @@ bool Database::setKey(const QSharedPointer<const CompositeKey>& key,
     m_keyError.clear();
 
     if (!key) {
-        m_data.key.reset();
-        m_data.transformedDatabaseKey.reset(new PasswordKey());
+        m_data.resetKeys();
         return true;
     }
 

diff --git a/src/core/Database.h b/src/core/Database.h
@@ -188,30 +188,33 @@ public slots:
         QScopedPointer<PasswordKey> challengeResponseKey;
 
         QSharedPointer<const CompositeKey> key;
-        QSharedPointer<Kdf> kdf = QSharedPointer<AesKdf>::create(true);
+        QSharedPointer<Kdf> kdf;
 
         QVariantMap publicCustomData;
 
         DatabaseData()
-            : masterSeed(new PasswordKey())
-            , transformedDatabaseKey(new PasswordKey())
-            , challengeResponseKey(new PasswordKey())
         {
-            kdf->randomizeSeed();
+            clear();
         }
 
         void clear()
         {
+            resetKeys();
             filePath.clear();
+            publicCustomData.clear();
+        }
 
-            masterSeed.reset();
-            transformedDatabaseKey.reset();
-            challengeResponseKey.reset();
+        void resetKeys()
+        {
+            masterSeed.reset(new PasswordKey());
+            transformedDatabaseKey.reset(new PasswordKey());
+            challengeResponseKey.reset(new PasswordKey());
 
             key.reset();
-            kdf.reset();
 
-            publicCustomData.clear();
+            // Default to AES KDF, KDBX4 databases overwrite this
+            kdf.reset(new AesKdf(true));
+            kdf->randomizeSeed();
         }
     };
 

diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
@@ -264,9 +264,7 @@ void DatabaseOpenWidget::clearForms()
     m_ui->hardwareKeyCombo->clear();
     toggleQuickUnlockScreen();
 
-    QString error;
-    m_db.reset(new Database());
-    m_db->open(m_filename, nullptr, &error);
+    m_db.reset(new Database(m_filename));
 }
 
 QSharedPointer<Database> DatabaseOpenWidget::database()

diff --git a/src/gui/csvImport/CsvImportWidget.cpp b/src/gui/csvImport/CsvImportWidget.cpp
@@ -41,7 +41,7 @@ namespace
 
         auto nameList = groupPath.split("/", QString::SkipEmptyParts);
         // Skip over first group name if root
-        if (nameList.first().compare("root", Qt::CaseInsensitive)) {
+        if (nameList.first().compare("root", Qt::CaseInsensitive) == 0) {
             nameList.removeFirst();
         }
 

diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp
@@ -101,22 +101,23 @@ void DatabaseSettingsWidgetEncryption::initialize()
     }
 
     auto version = KDBX4;
-    if (m_db->kdf()) {
+    if (m_db->key() && m_db->kdf()) {
         version = (m_db->kdf()->uuid() == KeePass2::KDF_AES_KDBX3) ? KDBX3 : KDBX4;
     }
     m_ui->compatibilitySelection->setCurrentIndex(version);
 
     bool isNewDatabase = false;
 
-    if (!m_db->kdf()) {
-        m_db->setKdf(KeePass2::uuidToKdf(KeePass2::KDF_ARGON2D));
-        isNewDatabase = true;
-    }
     if (!m_db->key()) {
         m_db->setKey(QSharedPointer<CompositeKey>::create(), true, false, false);
+        m_db->setKdf(KeePass2::uuidToKdf(KeePass2::KDF_ARGON2D));
         m_db->setCipher(KeePass2::CIPHER_AES256);
         isNewDatabase = true;
+    } else if (!m_db->kdf()) {
+        m_db->setKdf(KeePass2::uuidToKdf(KeePass2::KDF_ARGON2D));
+        isNewDatabase = true;
     }
+
     bool kdbx3Enabled = KeePass2Writer::kdbxVersionRequired(m_db.data(), true, true) <= KeePass2::FILE_VERSION_3_1;
 
     // check if the DB's custom data has a decryption time setting stored

diff --git a/src/gui/osutils/nixutils/NixUtils.cpp b/src/gui/osutils/nixutils/NixUtils.cpp
@@ -27,6 +27,10 @@
 #include <QStandardPaths>
 #include <QStyle>
 #include <QTextStream>
+#ifdef KEEPASSXC_DIST_FLATPAK
+#include <QRandomGenerator>
+#include "core/Config.h"
+#endif
 #ifdef WITH_XC_X11
 #include <QX11Info>
 
@@ -123,12 +127,17 @@ QString NixUtils::getAutostartDesktopFilename(bool createDirs) const
 
 bool NixUtils::isLaunchAtStartupEnabled() const
 {
+#if !defined(KEEPASSXC_DIST_FLATPAK)
     return QFile::exists(getAutostartDesktopFilename());
     ;
+#else
+    return config()->get(Config::GUI_LaunchAtStartup).toBool();
+#endif
 }
 
 void NixUtils::setLaunchAtStartup(bool enable)
 {
+#if !defined(KEEPASSXC_DIST_FLATPAK)
     if (enable) {
         QFile desktopFile(getAutostartDesktopFilename(true));
         if (!desktopFile.open(QIODevice::WriteOnly)) {
@@ -163,8 +172,50 @@ void NixUtils::setLaunchAtStartup(bool enable)
     } else if (isLaunchAtStartupEnabled()) {
         QFile::remove(getAutostartDesktopFilename());
     }
+#else
+    QDBusConnection sessionBus = QDBusConnection::sessionBus();
+    QDBusMessage msg = QDBusMessage::createMethodCall(
+        "org.freedesktop.portal.Desktop", "/org/freedesktop/portal/desktop", "org.freedesktop.portal.Background", "RequestBackground");
+
+    QMap<QString, QVariant> options;
+    options["autostart"] = QVariant(enable);
+    options["reason"] = QVariant("Launch KeePassXC at startup");
+    int token = QRandomGenerator::global()->bounded(1000, 9999);
+    options["handle_token"] = QVariant(QString("org/keepassxc/KeePassXC/%1").arg(token));
+
+    msg << "" << options;
+
+    QDBusMessage response = sessionBus.call(msg);
+
+    QDBusObjectPath handle = response.arguments().at(0).value<QDBusObjectPath>();
+
+    bool res = sessionBus.connect("org.freedesktop.portal.Desktop",
+                                  handle.path(),
+                                  "org.freedesktop.portal.Request",
+                                  "Response",
+                                  this,
+                                  SLOT(launchAtStartupRequested(uint, QVariantMap)));
+
+    if (!res) {
+        qDebug() << "Could not connect to org.freedesktop.portal.Request::Response signal";
+    }
+#endif
 }
 
+
+void NixUtils::launchAtStartupRequested(uint response, const QVariantMap &results) {
+    if (response > 0) {
+        qDebug() << "The interection was cancelled";
+        return;
+    }
+    bool isLauchedAtStartup = results["autostart"].value<bool>();
+    qDebug() << "The autostart value is set to:" << isLauchedAtStartup;
+#if defined(KEEPASSXC_DIST_FLATPAK)
+    config()->set(Config::GUI_LaunchAtStartup, isLauchedAtStartup);
+#endif
+}
+
+
 bool NixUtils::isCapslockEnabled()
 {
 #ifdef WITH_XC_X11

diff --git a/src/gui/osutils/nixutils/NixUtils.h b/src/gui/osutils/nixutils/NixUtils.h
@@ -54,6 +54,7 @@ class NixUtils : public OSUtilsBase, QAbstractNativeEventFilter
 private slots:
     void handleColorSchemeRead(QDBusVariant value);
     void handleColorSchemeChanged(QString ns, QString key, QDBusVariant value);
+    void launchAtStartupRequested(uint response, const QVariantMap &results);
 
 private:
     explicit NixUtils(QObject* parent = nullptr);

diff --git a/tests/TestKeePass2Format.cpp b/tests/TestKeePass2Format.cpp
@@ -582,7 +582,9 @@ void TestKeePass2Format::testKdbxKeyChange()
 
     db->setKey(key1);
     writeKdbx(&buffer, db.data(), hasError, errorString);
-    QVERIFY(!hasError);
+    if (hasError) {
+        QFAIL(qPrintable(QStringLiteral("Error while reading database: ").append(errorString)));
+    }
 
     // read database
     db = QSharedPointer<Database>::create();
@@ -599,7 +601,9 @@ void TestKeePass2Format::testKdbxKeyChange()
     // write database
     buffer.seek(0);
     writeKdbx(&buffer, db.data(), hasError, errorString);
-    QVERIFY(!hasError);
+    if (hasError) {
+        QFAIL(qPrintable(QStringLiteral("Error while reading database: ").append(errorString)));
+    }
 
     // read database
     db = QSharedPointer<Database>::create();