Fix attribute lookup when the key contains ':'

keepassxreboot · Mar 5, 2019 · ce0bf35 · ce0bf35
1 parent d3b8324
commit ce0bf35
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/src/fdosecrets/objects/Collection.cpp b/src/fdosecrets/objects/Collection.cpp
@@ -237,7 +237,7 @@ namespace FdoSecrets
             if (it.key() == EntryAttributes::PasswordKey) {
                 continue;
             }
-            auto field = attrKeyToField.value(it.key(), QStringLiteral("_") + it.key());
+            auto field = attrKeyToField.value(it.key(), QStringLiteral("_") + Item::encodeAttributeKey(it.key()));
             terms << QStringLiteral(R"raw(+%1:"%2")raw").arg(field, it.value());
         }
 

diff --git a/src/fdosecrets/objects/Item.cpp b/src/fdosecrets/objects/Item.cpp
@@ -99,7 +99,10 @@ namespace FdoSecrets
         // add custom attributes
         const auto customKeys = entryAttrs->customKeys();
         for (const auto& attr : customKeys) {
-            attrs[attr] = entryAttrs->value(attr);
+            // decode attr key
+            auto decoded = decodeAttributeKey(attr);
+
+            attrs[decoded] = entryAttrs->value(attr);
         }
 
         // add some informative and readonly attributes
@@ -131,7 +134,8 @@ namespace FdoSecrets
                 continue;
             }
 
-            entryAttrs->set(it.key(), it.value());
+            auto encoded = encodeAttributeKey(it.key());
+            entryAttrs->set(encoded, it.value());
         }
 
         m_backend->endUpdate();
@@ -350,6 +354,16 @@ namespace FdoSecrets
         return pathComponents.join('/');
     }
 
+    QString Item::encodeAttributeKey(const QString &key)
+    {
+        return QUrl::toPercentEncoding(key, "", "_:").replace('%', '_');
+    }
+
+    QString Item::decodeAttributeKey(const QString &key)
+    {
+        return QString::fromUtf8(QByteArray::fromPercentEncoding(key.toLatin1(), '_'));
+    }
+
     void setEntrySecret(Entry* entry, const QByteArray& data, const QString& contentType)
     {
         auto mimeName = contentType.split(';').takeFirst().trimmed();

diff --git a/src/fdosecrets/objects/Item.h b/src/fdosecrets/objects/Item.h
@@ -67,6 +67,16 @@ namespace FdoSecrets
     public:
         static const QSet<QString> ReadOnlyAttributes;
 
+        /**
+         * Due to the limitation in EntrySearcher, custom attr key cannot contain ':',
+         * Thus we encode the key when saving and decode it when returning.
+         * @param key
+         * @return
+         */
+        static QString encodeAttributeKey(const QString& key);
+        static QString decodeAttributeKey(const QString& key);
+
+
         DBusReturn<void> setProperties(const QVariantMap& properties);
 
         Entry* backend() const;