Add CustomData from KDBX4 to Group and Entry

src/CMakeLists.txt

@@ -42,6 +42,7 @@ set(keepassx_SOURCES
     core/AutoTypeMatch.cpp
     core/Config.cpp
     core/CsvParser.cpp
+    core/CustomData.cpp
     core/Database.cpp
     core/DatabaseIcons.cpp
     core/Entry.cpp

src/core/CustomData.cpp

@@ -0,0 +1,156 @@
+/*
+ *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
+ *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CustomData.h"
+
+CustomData::CustomData(QObject* parent)
+    : QObject(parent)
+{
+}
+
+QList<QString> CustomData::keys() const
+{
+    return m_data.keys();
+}
+
+bool CustomData::hasKey(const QString& key) const
+{
+    return m_data.contains(key);
+}
+
+QString CustomData::value(const QString& key) const
+{
+    return m_data.value(key);
+}
+
+bool CustomData::contains(const QString& key) const
+{
+    return m_data.contains(key);
+}
+
+bool CustomData::containsValue(const QString& value) const
+{
+    return m_data.values().contains(value);
+}
+
+void CustomData::set(const QString& key, const QString& value)
+{
+    bool emitModified = false;
+
+    bool addAttribute = !m_data.contains(key);
+    bool changeValue = !addAttribute && (m_data.value(key) != value);
+
+    if (addAttribute ) {
+        emit aboutToBeAdded(key);
+    }
+
+    if (addAttribute || changeValue) {
+        m_data.insert(key, value);
+        emitModified = true;
+    }
+
+    if (emitModified) {
+        emit modified();
+    }
+
+    if (addAttribute) {
+        emit added(key);
+    }
+}
+
+void CustomData::remove(const QString& key)
+{
+    emit aboutToBeRemoved(key);
+
+    m_data.remove(key);
+
+    emit removed(key);
+    emit modified();
+}
+
+void CustomData::rename(const QString& oldKey, const QString& newKey)
+{
+    if (!m_data.contains(oldKey)) {
+        Q_ASSERT(false);
+        return;
+    }
+
+    if (m_data.contains(newKey)) {
+        Q_ASSERT(false);
+        return;
+    }
+
+    QString data = value(oldKey);
+
+    emit aboutToRename(oldKey, newKey);
+
+    m_data.remove(oldKey);
+    m_data.insert(newKey, data);
+
+    emit modified();
+    emit renamed(oldKey, newKey);
+}
+
+void CustomData::copyDataFrom(const CustomData* other)
+{
+    if (*this != *other) {
+        emit aboutToBeReset();
+
+        m_data = other->m_data;
+
+        emit reset();
+        emit modified();
+    }
+}
+
+bool CustomData::operator==(const CustomData& other) const
+{
+    return (m_data == other.m_data);
+}
+
+bool CustomData::operator!=(const CustomData& other) const
+{
+    return (m_data != other.m_data);
+}
+
+void CustomData::clear()
+{
+    emit aboutToBeReset();
+
+    m_data.clear();
+
+    emit reset();
+    emit modified();
+}
+
+bool CustomData::isEmpty() const
+{
+    return m_data.isEmpty();
+}
+
+int CustomData::dataSize()
+{
+    int size = 0;
+
+    QHashIterator<QString, QString> i(m_data);
+    while (i.hasNext()) {
+        i.next();
+        size += i.key().toUtf8().size() + i.value().toUtf8().size();
+    }
+    return size;
+}

src/core/CustomData.h

@@ -0,0 +1,64 @@
+/*
+ *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
+ *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_CUSTOMDATA_H
+#define KEEPASSX_CUSTOMDATA_H
+
+#include <QMap>
+#include <QObject>
+#include <QSet>
+#include <QStringList>
+
+class CustomData : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit CustomData(QObject* parent = nullptr);
+    QList<QString> keys() const;
+    bool hasKey(const QString& key) const;
+    QString value(const QString& key) const;
+    bool contains(const QString& key) const;
+    bool containsValue(const QString& value) const;
+    void set(const QString& key, const QString& value);
+    void remove(const QString& key);
+    void rename(const QString& oldKey, const QString& newKey);
+    void clear();
+    bool isEmpty() const;
+    int dataSize();
+    void copyDataFrom(const CustomData* other);
+    bool operator==(const CustomData& other) const;
+    bool operator!=(const CustomData& other) const;
+
+
+signals:
+    void modified();
+    void aboutToBeAdded(const QString& key);
+    void added(const QString& key);
+    void aboutToBeRemoved(const QString& key);
+    void removed(const QString& key);
+    void aboutToRename(const QString& oldKey, const QString& newKey);
+    void renamed(const QString& oldKey, const QString& newKey);
+    void aboutToBeReset();
+    void reset();
+
+private:
+    QHash<QString, QString> m_data;
+};
+
+#endif // KEEPASSX_CUSTOMDATA_H

src/core/Entry.cpp

@@ -37,6 +37,7 @@ Entry::Entry()
     : m_attributes(new EntryAttributes(this))
     , m_attachments(new EntryAttachments(this))
     , m_autoTypeAssociations(new AutoTypeAssociations(this))
+    , m_customData(new CustomData(this))
     , m_tmpHistoryItem(nullptr)
     , m_modifiedSinceBegin(false)
     , m_updateTimeinfo(true)
@@ -52,6 +53,7 @@ Entry::Entry()
     connect(m_attributes, SIGNAL(defaultKeyModified()), SLOT(emitDataChanged()));
     connect(m_attachments, SIGNAL(modified()), this, SIGNAL(modified()));
     connect(m_autoTypeAssociations, SIGNAL(modified()), SIGNAL(modified()));
+    connect(m_customData, SIGNAL(modified()), this, SIGNAL(modified()));
 
     connect(this, SIGNAL(modified()), SLOT(updateTimeinfo()));
     connect(this, SIGNAL(modified()), SLOT(updateModifiedSinceBegin()));
@@ -340,6 +342,16 @@ const EntryAttachments* Entry::attachments() const
     return m_attachments;
 }
 
+CustomData *Entry::customData()
+{
+    return m_customData;
+}
+
+const CustomData *Entry::customData() const
+{
+    return m_customData;
+}
+
 bool Entry::hasTotp() const
 {
     return m_attributes->hasKey("TOTP Seed") || m_attributes->hasKey("otp");
@@ -606,6 +618,7 @@ void Entry::truncateHistory()
                 size += historyItem->attributes()->attributesSize();
                 size += historyItem->autoTypeAssociations()->associationsSize();
                 size += historyItem->attachments()->attachmentsSize();
+                size += historyItem->customData()->dataSize();
                 const QStringList tags = historyItem->tags().split(delimiter, QString::SkipEmptyParts);
                 for (const QString& tag : tags) {
                     size += tag.toUtf8().size();
@@ -632,6 +645,7 @@ Entry* Entry::clone(CloneFlags flags) const
         entry->m_uuid = m_uuid;
     }
     entry->m_data = m_data;
+    entry->m_customData->copyDataFrom(m_customData);
     entry->m_attributes->copyDataFrom(m_attributes);
     entry->m_attachments->copyDataFrom(m_attachments);
 
@@ -676,6 +690,7 @@ void Entry::copyDataFrom(const Entry* other)
 {
     setUpdateTimeinfo(false);
     m_data = other->m_data;
+    m_customData->copyDataFrom(other->m_customData);
     m_attributes->copyDataFrom(other->m_attributes);
     m_attachments->copyDataFrom(other->m_attachments);
     m_autoTypeAssociations->copyDataFrom(other->m_autoTypeAssociations);

src/core/Entry.h

@@ -28,6 +28,7 @@
 #include <QUrl>
 
 #include "core/AutoTypeAssociations.h"
+#include "core/CustomData.h"
 #include "core/EntryAttachments.h"
 #include "core/EntryAttributes.h"
 #include "core/TimeInfo.h"
@@ -107,6 +108,8 @@ class Entry : public QObject
     const EntryAttributes* attributes() const;
     EntryAttachments* attachments();
     const EntryAttachments* attachments() const;
+    CustomData *customData();
+    const CustomData *customData() const;
 
     static const int DefaultIconNumber;
     static const int ResolveMaximumDepth;
@@ -232,6 +235,8 @@ private slots:
     EntryAttachments* const m_attachments;
     AutoTypeAssociations* const m_autoTypeAssociations;
 
+    CustomData* const m_customData;
+
     QList<Entry*> m_history;
     Entry* m_tmpHistoryItem;
     bool m_modifiedSinceBegin;