Preserve Secret Service exposed group setting on merge

* Fixes #9371 - adds secret service custom data key to the list of protected custom data (will not be overwritten on merge)
keepassxreboot · Apr 28, 2024 · 0e3d6f4 · 0e3d6f4
1 parent 9b2379b
commit 0e3d6f4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/src/core/CustomData.cpp b/src/core/CustomData.cpp
@@ -25,6 +25,7 @@ const QString CustomData::Created = QStringLiteral("_CREATED");
 const QString CustomData::BrowserKeyPrefix = QStringLiteral("KPXC_BROWSER_");
 const QString CustomData::BrowserLegacyKeyPrefix = QStringLiteral("Public Key: ");
 const QString CustomData::ExcludeFromReportsLegacy = QStringLiteral("KnownBad");
+const QString CustomData::FdoSecretsExposedGroup = QStringLiteral("FDO_SECRETS_EXPOSED_GROUP");
 
 // Fallback item for return by reference
 static const CustomData::CustomDataItem NULL_ITEM{};
@@ -188,7 +189,7 @@ void CustomData::updateLastModified(QDateTime lastModified)
 
 bool CustomData::isProtected(const QString& key) const
 {
-    return key.startsWith(CustomData::BrowserKeyPrefix) || key.startsWith(CustomData::Created);
+    return key.startsWith(BrowserKeyPrefix) || key == Created || key == FdoSecretsExposedGroup;
 }
 
 bool CustomData::operator==(const CustomData& other) const

diff --git a/src/core/CustomData.h b/src/core/CustomData.h
@@ -68,6 +68,7 @@ class CustomData : public ModifiableObject
     static const QString Created;
     static const QString BrowserKeyPrefix;
     static const QString BrowserLegacyKeyPrefix;
+    static const QString FdoSecretsExposedGroup;
 
     // Pre-KDBX 4.1
     static const QString ExcludeFromReportsLegacy;

diff --git a/src/fdosecrets/FdoSecretsSettings.cpp b/src/fdosecrets/FdoSecretsSettings.cpp
@@ -21,15 +21,6 @@
 #include "core/Database.h"
 #include "core/Metadata.h"
 
-namespace Keys
-{
-    namespace Db
-    {
-        constexpr auto FdoSecretsExposedGroup = "FDO_SECRETS_EXPOSED_GROUP";
-    } // namespace Db
-
-} // namespace Keys
-
 namespace FdoSecrets
 {
 
@@ -98,20 +89,19 @@ namespace FdoSecrets
         return exposedGroup(db.data());
     }
 
-    void FdoSecretsSettings::setExposedGroup(const QSharedPointer<Database>& db,
-                                             const QUuid& group) // clazy:exclude=function-args-by-value
+    void FdoSecretsSettings::setExposedGroup(const QSharedPointer<Database>& db, const QUuid& group)
     {
         setExposedGroup(db.data(), group);
     }
 
     QUuid FdoSecretsSettings::exposedGroup(Database* db) const
     {
-        return {db->metadata()->customData()->value(Keys::Db::FdoSecretsExposedGroup)};
+        return {db->metadata()->customData()->value(CustomData::FdoSecretsExposedGroup)};
     }
 
-    void FdoSecretsSettings::setExposedGroup(Database* db, const QUuid& group) // clazy:exclude=function-args-by-value
+    void FdoSecretsSettings::setExposedGroup(Database* db, const QUuid& group)
     {
-        db->metadata()->customData()->set(Keys::Db::FdoSecretsExposedGroup, group.toString());
+        db->metadata()->customData()->set(CustomData::FdoSecretsExposedGroup, group.toString());
     }
 
 } // namespace FdoSecrets