rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Database merge confirmation dialog (#10173)

Browse Source 
* Add Entry::calculateDifference()

This new function contains the logic that was previously in
EntryHistoryModel::calculateHistoryModifications().
It allows the re-use to display the differences in case of a merge.

* Introduce Database Merge Confirmation Dialog

Adds a dialog allowing a user to review the changes of a merge operation.
This dialog displays the changes and allows the user to abort the merge
without modifying the database.

Fixes #1152

* Added dry run option to Merger
* Changed behavior when actual merge differs from dry run to just output a warning to console
* Fixed KeeShare conflicting with merge operations in the middle of a merge

---------

Co-authored-by: Jonathan White <support@dmapps.us>
This commit is contained in:
Tamino Bauknecht
2025-09-14 18:02:22 +02:00
committed by Jonathan White
parent ac5e3fbe0d
commit e0833e3ddc
20 changed files with 945 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

291
share/translations/keepassxc_en.ts
View File

@@ -2586,14 +2586,6 @@ This is definitely a bug, please report it to the developers.</source>
<source>No source database, nothing to do.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Successfully merged the database files.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Database was not modified by merge operation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Results (%1)</source>
<translation type="unfinished"></translation>
@@ -2690,21 +2682,6 @@ Disable safe saves and try again?</source>
<source>Do you want to remove the passkey from this entry?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Searches and Tags</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<source>Entries expiring within %1 day(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The database file &quot;%1&quot; was modified externally</source>
<translation type="unfinished"></translation>
@@ -2713,10 +2690,6 @@ Disable safe saves and try again?</source>
<source>Do you want to load the changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reload database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reloading database…</source>
<translation type="unfinished"></translation>
@@ -2741,6 +2714,10 @@ Disable safe saves and try again?</source>
<source>The database file &quot;%1&quot; was modified externally.&lt;br&gt;How would you like to proceed?&lt;br&gt;&lt;br&gt;Merge all changes then save&lt;br&gt;Overwrite the changes on disk&lt;br&gt;Discard unsaved changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reload database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Database file overwritten.</source>
<translation type="unfinished"></translation>
@@ -2753,10 +2730,6 @@ Disable safe saves and try again?</source>
<source>Failed to save backup database: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save Database Backup</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Confirm Delete Group</source>
<translation type="unfinished"></translation>
@@ -2769,6 +2742,37 @@ Disable safe saves and try again?</source>
<source>Confirm Recycle Group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save Database Backup</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Successfully merged the selected database.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No changes were made by the merge operation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Merge canceled, no changes were made.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Searches and Tags</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<source>Entries expiring within %1 day(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
</context>
<context>
<name>EditEntryAttachmentsDialog</name>
@@ -3835,6 +3839,62 @@ This may cause the affected plugins to malfunction.</source>
%2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Username</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom Attributes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Icon</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Expiration</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TOTP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom Data</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Attachments</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto-Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tags</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EntryAttachments</name>
@@ -4039,62 +4099,6 @@ Would you like to overwrite the existing attachment?</source>
<source>Size</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Username</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom Attributes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Icon</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Expiration</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TOTP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom Data</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Attachments</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto-Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tags</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EntryModel</name>
@@ -6122,32 +6126,43 @@ Expect some bugs and minor issues, this version is meant for testing purposes.</
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MergeDialog</name>
<message>
<source>Database Merge Confirmation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UUID</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Change</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Merger</name>
<message>
<source>Creating missing %1 [%2]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Relocating %1 [%2]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Overwriting %1 [%2]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting orphan %1 [%2]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Changed deleted objects</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Adding missing icon %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Removed custom data %1 [%2]</source>
<translation type="unfinished"></translation>
@@ -6157,15 +6172,71 @@ Expect some bugs and minor issues, this version is meant for testing purposes.</
<translation type="unfinished"></translation>
</message>
<message>
<source>Synchronizing from newer source %1 [%2]</source>
<source>Added</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Synchronizing from older source %1 [%2]</source>
<source>Modified</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleting child %1 [%2]</source>
<source>Moved</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Previous location: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Number of entries in group: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Group name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Icon (UUID)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Icon (Number)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Expiry time</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Modification time</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 (Add local modifications to new entry)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 (Add new modifications to existing entry)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Explicit deletion</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Implicit deletion (e.g. removal of parent group)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Adding new icon %1</source>
<translation type="unfinished"></translation>
</message>
</context>

1
src/CMakeLists.txt
View File

@@ -109,6 +109,7 @@ set(keepassx_SOURCES
gui/IconModels.cpp
gui/KMessageWidget.cpp
gui/MainWindow.cpp
gui/MergeDialog.cpp
gui/MessageBox.cpp
gui/MessageWidget.cpp
gui/PasswordWidget.cpp

6
src/cli/Merge.cpp
View File

@@ -87,10 +87,10 @@ int Merge::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer
}
Merger merger(db2.data(), database.data());
QStringList changeList = merger.merge();
auto changeList = merger.merge();
for (auto& mergeChange : changeList) {
out << "\t" << mergeChange << Qt::endl;
for (const auto& mergeChange : changeList) {
out << "\t" << mergeChange.toString() << Qt::endl;
}
if (!changeList.isEmpty() && !parser->isSet(Merge::DryRunOption)) {

62
src/core/Entry.cpp
View File

@@ -950,6 +950,68 @@ bool Entry::equals(const Entry* other, CompareItemOptions options) const
return true;
}
QStringList Entry::calculateDifference(const Entry* other)
{
QStringList modifiedFields;
if (*attributes() != *other->attributes()) {
bool foundAttribute = false;
if (title() != other->title()) {
modifiedFields << tr("Title");
foundAttribute = true;
}
if (username() != other->username()) {
modifiedFields << tr("Username");
foundAttribute = true;
}
if (password() != other->password()) {
modifiedFields << tr("Password");
foundAttribute = true;
}
if (url() != other->url()) {
modifiedFields << tr("URL");
foundAttribute = true;
}
if (notes() != other->notes()) {
modifiedFields << tr("Notes");
foundAttribute = true;
}
if (!foundAttribute) {
modifiedFields << tr("Custom Attributes");
}
}
if (iconNumber() != other->iconNumber() || iconUuid() != other->iconUuid()) {
modifiedFields << tr("Icon");
}
if (foregroundColor() != other->foregroundColor() || backgroundColor() != other->backgroundColor()) {
modifiedFields << tr("Color");
}
if (timeInfo().expires() != other->timeInfo().expires()
|| timeInfo().expiryTime() != other->timeInfo().expiryTime()) {
modifiedFields << tr("Expiration");
}
if (totp() != other->totp()) {
modifiedFields << tr("TOTP");
}
if (*customData() != *other->customData()) {
modifiedFields << tr("Custom Data");
}
if (*attachments() != *other->attachments()) {
modifiedFields << tr("Attachments");
}
if (*autoTypeAssociations() != *other->autoTypeAssociations() || autoTypeEnabled() != other->autoTypeEnabled()
|| defaultAutoTypeSequence() != other->defaultAutoTypeSequence()) {
modifiedFields << tr("Auto-Type");
}
if (tags() != other->tags()) {
modifiedFields << tr("Tags");
}
return modifiedFields;
}
Entry* Entry::clone(CloneFlags flags) const
{
Entry* entry = new Entry();

7
src/core/Entry.h
View File

@@ -177,6 +177,13 @@ public:
bool equals(const Entry* other, CompareItemOptions options = CompareItemDefault) const;
/**
* Determine differences between attributes of this and another entry.
*
* @return The list of attribute names that are different between the two entries
*/
QStringList calculateDifference(const Entry* other);
enum CloneFlag
{
CloneNoFlags = 0,

1
src/core/Group.cpp
View File

@@ -443,6 +443,7 @@ const Group* Group::parentGroup() const
void Group::setParent(Group* parent, int index, bool trackPrevious)
{
Q_ASSERT(parent);
Q_ASSERT(this != parent);
Q_ASSERT(index >= -1 && index <= parent->children().size());
// setting a new parent for root groups is not allowed
Q_ASSERT(!m_db || (m_db->rootGroup() != this));

378
src/core/Merger.cpp
View File

@@ -21,6 +21,107 @@
#include "core/Metadata.h"
#include "core/Tools.h"
Merger::Change::Change(Type type, QString details)
: m_type{type}
, m_details{std::move(details)}
{
}
Merger::Change::Change(Type type, const Group& group, QString details)
: m_type{type}
, m_group{group.fullPath()}
, m_uuid{group.uuid()}
, m_details{std::move(details)}
{
}
Merger::Change::Change(Type type, const Entry& entry, QString details)
: m_type{type}
, m_title{entry.title()}
, m_uuid{entry.uuid()}
, m_details{std::move(details)}
{
if (const auto* group = entry.group()) {
m_group = group->fullPath();
}
}
Merger::Change::Change(QString details)
: m_details{std::move(details)}
{
}
bool Merger::Change::operator==(const Merger::Change& other) const
{
return m_type == other.m_type && m_group == other.m_group && m_title == other.m_title && m_uuid == other.m_uuid
&& m_details == other.m_details;
}
bool Merger::Change::operator!=(const Merger::Change& other) const
{
return !(*this == other);
}
Merger::Change::Type Merger::Change::type() const
{
return m_type;
}
const QString& Merger::Change::title() const
{
return m_title;
}
const QString& Merger::Change::group() const
{
return m_group;
}
const QUuid& Merger::Change::uuid() const
{
return m_uuid;
}
const QString& Merger::Change::details() const
{
return m_details;
}
QString Merger::Change::typeString() const
{
switch (m_type) {
case Type::Added:
return tr("Added");
case Type::Modified:
return tr("Modified");
case Type::Moved:
return tr("Moved");
case Type::Deleted:
return tr("Deleted");
case Type::Metadata:
return "Metadata";
case Type::Unspecified:
return "";
default:
return "?";
}
}
QString Merger::Change::toString() const
{
QString result;
if (m_type != Type::Unspecified) {
result += QString("%1: ").arg(typeString());
}
if (!m_group.isEmpty()) {
result += QString("'%1'").arg(m_group);
}
if (!m_title.isEmpty()) {
result += QString("/'%1'").arg(m_title);
}
if (!m_uuid.isNull()) {
result += QString(" [%1]").arg(m_uuid.toString());
}
if (!m_details.isEmpty()) {
result += QString(" (%1)").arg(m_details);
}
return result;
}
Merger::Merger(const Database* sourceDb, Database* targetDb)
: m_mode(Group::Default)
{
@@ -64,8 +165,9 @@ void Merger::setSkipDatabaseCustomData(bool state)
m_skipCustomData = state;
}
QStringList Merger::merge()
Merger::ChangeList Merger::merge(bool dryRun)
{
m_dryRun = dryRun;
// Order of merge steps is important - it is possible that we
// create some items before deleting them afterwards
ChangeList changes;
@@ -74,9 +176,10 @@ QStringList Merger::merge()
changes << mergeMetadata(m_context);
// At this point we have a list of changes we may want to show the user
if (!changes.isEmpty()) {
if (!changes.isEmpty() && !dryRun) {
m_context.m_targetDb->markAsModified();
}
m_dryRun = false;
return changes;
}
@@ -88,43 +191,59 @@ Merger::ChangeList Merger::mergeGroup(const MergeContext& context)
for (Entry* sourceEntry : sourceEntries) {
Entry* targetEntry = context.m_targetRootGroup->findEntryByUuid(sourceEntry->uuid());
if (!targetEntry) {
changes << tr("Creating missing %1 [%2]").arg(sourceEntry->title(), sourceEntry->uuidToHex());
// This entry does not exist at all. Create it.
targetEntry = sourceEntry->clone(Entry::CloneIncludeHistory);
moveEntry(targetEntry, context.m_targetGroup);
changes << Change(Change::Type::Added, *sourceEntry);
if (!m_dryRun) {
targetEntry = sourceEntry->clone(Entry::CloneIncludeHistory);
moveEntry(targetEntry, context.m_targetGroup);
}
} else {
// Entry is already present in the database. Update it.
const bool locationChanged =
targetEntry->timeInfo().locationChanged() < sourceEntry->timeInfo().locationChanged();
if (locationChanged && targetEntry->group() != context.m_targetGroup) {
changes << tr("Relocating %1 [%2]").arg(sourceEntry->title(), sourceEntry->uuidToHex());
moveEntry(targetEntry, context.m_targetGroup);
changes << Change(
Change::Type::Moved, *sourceEntry, tr("Previous location: %1").arg(targetEntry->group()->name()));
if (!m_dryRun) {
moveEntry(targetEntry, context.m_targetGroup);
}
}
changes << resolveEntryConflict(context, sourceEntry, targetEntry);
}
}
// merge groups recursively
// merge child groups recursively
const QList<Group*> sourceChildGroups = context.m_sourceGroup->children();
for (Group* sourceChildGroup : sourceChildGroups) {
bool groupCreated = false;
Group* targetChildGroup = context.m_targetRootGroup->findGroupByUuid(sourceChildGroup->uuid());
if (!targetChildGroup) {
changes << tr("Creating missing %1 [%2]").arg(sourceChildGroup->name(), sourceChildGroup->uuidToHex());
changes << Change(
Change::Type::Added,
*sourceChildGroup,
tr("Number of entries in group: %1").arg(QString::number(sourceChildGroup->entries().size())));
// Create the target group, it will be cleaned up later if in dry run mode
targetChildGroup = sourceChildGroup->clone(Entry::CloneNoFlags, Group::CloneNoFlags);
moveGroup(targetChildGroup, context.m_targetGroup);
TimeInfo timeinfo = targetChildGroup->timeInfo();
timeinfo.setLocationChanged(sourceChildGroup->timeInfo().locationChanged());
targetChildGroup->setTimeInfo(timeinfo);
} else {
bool locationChanged =
targetChildGroup->timeInfo().locationChanged() < sourceChildGroup->timeInfo().locationChanged();
if (locationChanged && targetChildGroup->parent() != context.m_targetGroup) {
changes << tr("Relocating %1 [%2]").arg(sourceChildGroup->name(), sourceChildGroup->uuidToHex());
groupCreated = true;
if (!m_dryRun) {
moveGroup(targetChildGroup, context.m_targetGroup);
TimeInfo timeinfo = targetChildGroup->timeInfo();
timeinfo.setLocationChanged(sourceChildGroup->timeInfo().locationChanged());
targetChildGroup->setTimeInfo(timeinfo);
}
} else {
bool locationChanged =
targetChildGroup->timeInfo().locationChanged() < sourceChildGroup->timeInfo().locationChanged();
if (locationChanged && targetChildGroup->parent() != context.m_targetGroup) {
changes << Change(
Change::Type::Moved, *sourceChildGroup, tr("Previous location: %1").arg(targetChildGroup->name()));
if (!m_dryRun) {
moveGroup(targetChildGroup, context.m_targetGroup);
TimeInfo timeinfo = targetChildGroup->timeInfo();
timeinfo.setLocationChanged(sourceChildGroup->timeInfo().locationChanged());
targetChildGroup->setTimeInfo(timeinfo);
}
}
changes << resolveGroupConflict(context, sourceChildGroup, targetChildGroup);
}
MergeContext subcontext{context.m_sourceDb,
@@ -134,6 +253,10 @@ Merger::ChangeList Merger::mergeGroup(const MergeContext& context)
sourceChildGroup,
targetChildGroup};
changes << mergeGroup(subcontext);
// Cleanup the temporary target group structure
if (m_dryRun && groupCreated) {
delete subcontext.m_targetGroup;
}
}
return changes;
}
@@ -149,24 +272,68 @@ Merger::resolveGroupConflict(const MergeContext& context, const Group* sourceChi
// only if the other group is newer, update the existing one.
if (timeExisting < timeOther) {
changes << tr("Overwriting %1 [%2]").arg(sourceChildGroup->name(), sourceChildGroup->uuidToHex());
targetChildGroup->setName(sourceChildGroup->name());
targetChildGroup->setNotes(sourceChildGroup->notes());
QStringList modifications;
auto updateIfNecessary = [&modifications, this](const auto& targetValue,
const auto& sourceValue,
auto&& updateFunction,
const QString& modification) {
if (targetValue != sourceValue) {
modifications << modification;
if (!m_dryRun) {
updateFunction(sourceValue);
}
return true;
}
return false;
};
updateIfNecessary(
targetChildGroup->name(),
sourceChildGroup->name(),
[&](auto&& newValue) { targetChildGroup->setName(newValue); },
tr("Group name"));
updateIfNecessary(
targetChildGroup->notes(),
sourceChildGroup->notes(),
[&](auto&& newValue) { targetChildGroup->setNotes(newValue); },
tr("Notes"));
if (sourceChildGroup->iconNumber() == 0) {
targetChildGroup->setIcon(sourceChildGroup->iconUuid());
updateIfNecessary(
targetChildGroup->iconUuid(),
sourceChildGroup->iconUuid(),
[&](auto&& newValue) { targetChildGroup->setIcon(newValue); },
tr("Icon (UUID)"));
} else {
targetChildGroup->setIcon(sourceChildGroup->iconNumber());
updateIfNecessary(
targetChildGroup->iconNumber(),
sourceChildGroup->iconNumber(),
[&](auto&& newValue) { targetChildGroup->setIcon(newValue); },
tr("Icon (Number)"));
}
targetChildGroup->setExpiryTime(sourceChildGroup->timeInfo().expiryTime());
TimeInfo timeInfo = targetChildGroup->timeInfo();
timeInfo.setLastModificationTime(timeOther);
targetChildGroup->setTimeInfo(timeInfo);
updateIfNecessary(
targetChildGroup->timeInfo().expiryTime(),
sourceChildGroup->timeInfo().expiryTime(),
[&](auto&& newValue) { targetChildGroup->setExpiryTime(newValue); },
tr("Expiry time"));
updateIfNecessary(
timeExisting,
timeOther,
[&](auto&& newValue) {
TimeInfo timeInfo = targetChildGroup->timeInfo();
timeInfo.setLastModificationTime(newValue);
targetChildGroup->setTimeInfo(timeInfo);
},
tr("Modification time"));
changes << Change(Change::Type::Modified, *sourceChildGroup, modifications.join(", "));
}
return changes;
}
void Merger::moveEntry(Entry* entry, Group* targetGroup)
{
if (m_dryRun) {
return;
}
Q_ASSERT(entry);
Group* sourceGroup = entry->group();
if (sourceGroup == targetGroup) {
@@ -196,6 +363,10 @@ void Merger::moveEntry(Entry* entry, Group* targetGroup)
void Merger::moveGroup(Group* group, Group* targetGroup)
{
if (m_dryRun) {
return;
}
Q_ASSERT(group);
Group* sourceGroup = group->parentGroup();
if (sourceGroup == targetGroup) {
@@ -225,6 +396,10 @@ void Merger::moveGroup(Group* group, Group* targetGroup)
void Merger::eraseEntry(Entry* entry)
{
if (m_dryRun) {
return;
}
Database* database = entry->database();
// most simple method to remove an item from DeletedObjects :(
const QList<DeletedObject> deletions = database->deletedObjects();
@@ -242,6 +417,10 @@ void Merger::eraseEntry(Entry* entry)
void Merger::eraseGroup(Group* group)
{
if (m_dryRun) {
return;
}
Database* database = group->database();
// most simple method to remove an item from DeletedObjects :(
const QList<DeletedObject> deletions = database->deletedObjects();
@@ -268,6 +447,8 @@ Merger::ChangeList Merger::resolveEntryConflict_MergeHistories(const MergeContex
const int comparison = compare(targetEntry->timeInfo().lastModificationTime(),
sourceEntry->timeInfo().lastModificationTime(),
CompareItemIgnoreMilliseconds);
auto differences = targetEntry->calculateDifference(sourceEntry);
differences += "History";
const int maxItems = targetEntry->database()->metadata()->historyMaxItems();
if (comparison < 0) {
Group* currentGroup = targetEntry->group();
@@ -276,7 +457,9 @@ Merger::ChangeList Merger::resolveEntryConflict_MergeHistories(const MergeContex
qPrintable(targetEntry->title()),
qPrintable(sourceEntry->title()),
qPrintable(currentGroup->name()));
changes << tr("Synchronizing from newer source %1 [%2]").arg(targetEntry->title(), targetEntry->uuidToHex());
changes << Change(Change::Type::Modified,
*targetEntry,
tr("%1 (Add local modifications to new entry)").arg(differences.join(", ")));
mergeHistory(targetEntry, clonedEntry, mergeMethod, maxItems);
eraseEntry(targetEntry);
moveEntry(clonedEntry, currentGroup);
@@ -287,8 +470,9 @@ Merger::ChangeList Merger::resolveEntryConflict_MergeHistories(const MergeContex
qPrintable(targetEntry->group()->name()));
const bool changed = mergeHistory(sourceEntry, targetEntry, mergeMethod, maxItems);
if (changed) {
changes
<< tr("Synchronizing from older source %1 [%2]").arg(targetEntry->title(), targetEntry->uuidToHex());
changes << Change(Change::Type::Modified,
*targetEntry,
tr("%1 (Add new modifications to existing entry)").arg(differences.join(", ")));
}
}
return changes;
@@ -300,34 +484,11 @@ Merger::resolveEntryConflict(const MergeContext& context, const Entry* sourceEnt
// We need to cut off the milliseconds since the persistent format only supports times down to seconds
// so when we import data from a remote source, it may represent the (or even some msec newer) data
// which may be discarded due to higher runtime precision
Group::MergeMode mergeMode = m_mode == Group::Default ? context.m_targetGroup->mergeMode() : m_mode;
switch (mergeMode) {
case Group::Duplicate:
changes << resolveEntryConflict_Duplicate(context, sourceEntry, targetEntry);
break;
case Group::KeepLocal:
changes << resolveEntryConflict_KeepLocal(context, sourceEntry, targetEntry);
changes << resolveEntryConflict_MergeHistories(context, sourceEntry, targetEntry, mergeMode);
break;
case Group::KeepRemote:
changes << resolveEntryConflict_KeepRemote(context, sourceEntry, targetEntry);
changes << resolveEntryConflict_MergeHistories(context, sourceEntry, targetEntry, mergeMode);
break;
case Group::Synchronize:
case Group::KeepNewer:
// nothing special to do since resolveEntryConflictMergeHistories takes care to use the newest entry
changes << resolveEntryConflict_MergeHistories(context, sourceEntry, targetEntry, mergeMode);
break;
default:
// do nothing
break;
Group::MergeMode mergeMode = m_mode;
if (mergeMode == Group::Default && context.m_targetGroup) {
mergeMode = context.m_targetGroup->mergeMode();
}
return changes;
return resolveEntryConflict_MergeHistories(context, sourceEntry, targetEntry, mergeMode);
}
bool Merger::mergeHistory(const Entry* sourceEntry,
@@ -349,11 +510,11 @@ bool Merger::mergeHistory(const Entry* sourceEntry,
const QDateTime modificationTime = Clock::serialized(historyItem->timeInfo().lastModificationTime());
if (merged.contains(modificationTime)
&& !merged[modificationTime]->equals(historyItem, CompareItemIgnoreMilliseconds)) {
::qWarning("Inconsistent history entry of %s[%s] at %s contains conflicting changes - conflict resolution "
"may lose data!",
qPrintable(sourceEntry->title()),
qPrintable(sourceEntry->uuidToHex()),
qPrintable(modificationTime.toString("yyyy-MM-dd HH-mm-ss-zzz")));
qWarning("Inconsistent history entry of %s[%s] at %s contains conflicting changes - conflict resolution "
"may lose data!",
qPrintable(sourceEntry->title()),
qPrintable(sourceEntry->uuidToHex()),
qPrintable(modificationTime.toString("yyyy-MM-dd HH-mm-ss-zzz")));
}
merged[modificationTime] = historyItem->clone(Entry::CloneNoFlags);
}
@@ -362,11 +523,10 @@ bool Merger::mergeHistory(const Entry* sourceEntry,
const QDateTime modificationTime = Clock::serialized(historyItem->timeInfo().lastModificationTime());
if (merged.contains(modificationTime)
&& !merged[modificationTime]->equals(historyItem, CompareItemIgnoreMilliseconds)) {
::qWarning(
"History entry of %s[%s] at %s contains conflicting changes - conflict resolution may lose data!",
qPrintable(sourceEntry->title()),
qPrintable(sourceEntry->uuidToHex()),
qPrintable(modificationTime.toString("yyyy-MM-dd HH-mm-ss-zzz")));
qWarning("History entry of %s[%s] at %s contains conflicting changes - conflict resolution may lose data!",
qPrintable(sourceEntry->title()),
qPrintable(sourceEntry->uuidToHex()),
qPrintable(modificationTime.toString("yyyy-MM-dd HH-mm-ss-zzz")));
}
if (preferRemote && merged.contains(modificationTime)) {
// forcefully apply the remote history item
@@ -382,9 +542,9 @@ bool Merger::mergeHistory(const Entry* sourceEntry,
if (targetModificationTime == sourceModificationTime
&& !targetEntry->equals(sourceEntry,
CompareItemIgnoreMilliseconds | CompareItemIgnoreHistory | CompareItemIgnoreLocation)) {
::qWarning("Entry of %s[%s] contains conflicting changes - conflict resolution may lose data!",
qPrintable(sourceEntry->title()),
qPrintable(sourceEntry->uuidToHex()));
qWarning("Entry of %s[%s] contains conflicting changes - conflict resolution may lose data!",
qPrintable(sourceEntry->title()),
qPrintable(sourceEntry->uuidToHex()));
}
if (targetModificationTime < sourceModificationTime) {
@@ -423,22 +583,24 @@ bool Merger::mergeHistory(const Entry* sourceEntry,
qDeleteAll(updatedHistoryItems);
return false;
}
// We need to prevent any modification to the database since every change should be tracked either
// in a clone history item or in the Entry itself
const TimeInfo timeInfo = targetEntry->timeInfo();
const bool blockedSignals = targetEntry->blockSignals(true);
bool updateTimeInfo = targetEntry->canUpdateTimeinfo();
targetEntry->setUpdateTimeinfo(false);
targetEntry->removeHistoryItems(targetHistoryItems);
for (Entry* historyItem : merged) {
Q_ASSERT(!historyItem->parent());
targetEntry->addHistoryItem(historyItem);
if (!m_dryRun) {
// We need to prevent any modification to the database since every change should be tracked either
// in a clone history item or in the Entry itself
const TimeInfo timeInfo = targetEntry->timeInfo();
const bool blockedSignals = targetEntry->blockSignals(true);
bool updateTimeInfo = targetEntry->canUpdateTimeinfo();
targetEntry->setUpdateTimeinfo(false);
targetEntry->removeHistoryItems(targetHistoryItems);
for (Entry* historyItem : merged) {
Q_ASSERT(!historyItem->parent());
targetEntry->addHistoryItem(historyItem);
}
targetEntry->truncateHistory();
targetEntry->blockSignals(blockedSignals);
targetEntry->setUpdateTimeinfo(updateTimeInfo);
Q_ASSERT(timeInfo == targetEntry->timeInfo());
Q_UNUSED(timeInfo);
}
targetEntry->truncateHistory();
targetEntry->blockSignals(blockedSignals);
targetEntry->setUpdateTimeinfo(updateTimeInfo);
Q_ASSERT(timeInfo == targetEntry->timeInfo());
Q_UNUSED(timeInfo);
return true;
}
@@ -462,7 +624,6 @@ Merger::ChangeList Merger::mergeDeletions(const MergeContext& context)
for (const auto& object : (targetDeletions + sourceDeletions)) {
if (!mergedDeletions.contains(object.uuid)) {
mergedDeletions[object.uuid] = object;
auto* entry = context.m_targetRootGroup->findEntryByUuid(object.uuid);
if (entry) {
entries << entry;
@@ -490,17 +651,18 @@ Merger::ChangeList Merger::mergeDeletions(const MergeContext& context)
}
deletions << object;
if (entry->group()) {
changes << tr("Deleting child %1 [%2]").arg(entry->title(), entry->uuidToHex());
changes << Change(Change::Type::Deleted, *entry, tr("Explicit deletion"));
} else {
changes << tr("Deleting orphan %1 [%2]").arg(entry->title(), entry->uuidToHex());
changes << Change(Change::Type::Deleted, *entry, tr("Implicit deletion (e.g. removal of parent group)"));
}
if (!m_dryRun) {
eraseEntry(entry);
}
// Entry is inserted into deletedObjects after deletions are processed
eraseEntry(entry);
}
while (!groups.isEmpty()) {
auto* group = groups.takeFirst();
if (Tools::asSet(group->children()).intersects(Tools::asSet(groups))) {
if (!(group->children().toSet() & groups.toSet()).isEmpty()) {
// we need to finish all children before we are able to determine if the group can be removed
groups << group;
continue;
@@ -516,17 +678,22 @@ Merger::ChangeList Merger::mergeDeletions(const MergeContext& context)
}
deletions << object;
if (group->parentGroup()) {
changes << tr("Deleting child %1 [%2]").arg(group->name(), group->uuidToHex());
changes << Change(Change::Type::Deleted, *group, tr("Explicit deletion"));
} else {
changes << tr("Deleting orphan %1 [%2]").arg(group->name(), group->uuidToHex());
changes << Change(Change::Type::Deleted, *group, tr("Implicit deletion (e.g. removal of parent group)"));
}
if (!m_dryRun) {
eraseGroup(group);
}
eraseGroup(group);
}
// Put every deletion to the earliest date of deletion
if (deletions != context.m_targetDb->deletedObjects()) {
changes << tr("Changed deleted objects");
changes << Change(Change::Type::Metadata, tr("Changed deleted objects"));
if (!m_dryRun) {
context.m_targetDb->setDeletedObjects(deletions);
}
}
context.m_targetDb->setDeletedObjects(deletions);
return changes;
}
@@ -541,8 +708,11 @@ Merger::ChangeList Merger::mergeMetadata(const MergeContext& context)
for (const auto& iconUuid : sourceMetadata->customIconsOrder()) {
if (!targetMetadata->hasCustomIcon(iconUuid)) {
targetMetadata->addCustomIcon(iconUuid, sourceMetadata->customIcon(iconUuid));
changes << tr("Adding missing icon %1").arg(QString::fromLatin1(iconUuid.toRfc4122().toHex()));
changes << Change(Change::Type::Metadata,
tr("Adding new icon %1").arg(QString::fromLatin1(iconUuid.toRfc4122().toHex())));
if (!m_dryRun) {
targetMetadata->addCustomIcon(iconUuid, sourceMetadata->customIcon(iconUuid));
}
}
}
@@ -565,8 +735,10 @@ Merger::ChangeList Merger::mergeMetadata(const MergeContext& context)
// Do not remove protected custom data
if (!sourceMetadata->customData()->contains(key) && !sourceMetadata->customData()->isProtected(key)) {
auto value = targetMetadata->customData()->value(key);
targetMetadata->customData()->remove(key);
changes << tr("Removed custom data %1 [%2]").arg(key, value);
changes << Change(Change::Type::Metadata, tr("Removed custom data %1 [%2]").arg(key, value));
if (!m_dryRun) {
targetMetadata->customData()->remove(key);
}
}
}
@@ -581,8 +753,10 @@ Merger::ChangeList Merger::mergeMetadata(const MergeContext& context)
auto targetValue = targetMetadata->customData()->value(key);
// Merge only if the values are not the same.
if (sourceValue != targetValue) {
targetMetadata->customData()->set(key, sourceValue);
changes << tr("Adding custom data %1 [%2]").arg(key, sourceValue);
changes << Change(Change::Type::Metadata, tr("Adding custom data %1 [%2]").arg(key, sourceValue));
if (!m_dryRun) {
targetMetadata->customData()->set(key, sourceValue);
}
}
}
}

49
src/core/Merger.h
View File

@@ -32,12 +32,51 @@ public:
void setForcedMergeMode(Group::MergeMode mode);
void resetForcedMergeMode();
void setSkipDatabaseCustomData(bool state);
QStringList merge();
class Change
{
public:
enum class Type
{
Unspecified,
Added,
Modified,
Moved,
Deleted,
Metadata,
};
Change(Type type, QString details);
Change(Type type, const Group& group, QString details = "");
Change(Type type, const Entry& entry, QString details = "");
explicit Change(QString details = "");
[[nodiscard]] Type type() const;
[[nodiscard]] QString typeString() const;
[[nodiscard]] const QString& title() const;
[[nodiscard]] const QString& group() const;
[[nodiscard]] const QUuid& uuid() const;
[[nodiscard]] const QString& details() const;
[[nodiscard]] QString toString() const;
void merge();
bool operator==(const Change& other) const;
bool operator!=(const Change& other) const;
private:
Type m_type{Type::Unspecified};
QString m_title;
QString m_group;
QUuid m_uuid;
QString m_details;
};
using ChangeList = QList<Change>;
ChangeList merge(bool dryRun = false);
private:
typedef QString Change;
typedef QStringList ChangeList;
struct MergeContext
{
QPointer<const Database> m_sourceDb;
@@ -47,6 +86,7 @@ private:
QPointer<const Group> m_sourceGroup;
QPointer<Group> m_targetGroup;
};
ChangeList mergeGroup(const MergeContext& context);
ChangeList mergeDeletions(const MergeContext& context);
ChangeList mergeMetadata(const MergeContext& context);
@@ -68,6 +108,7 @@ private:
MergeContext m_context;
Group::MergeMode m_mode;
bool m_skipCustomData = false;
bool m_dryRun = false;
};
#endif // KEEPASSXC_MERGER_H

33
src/gui/DatabaseWidget.cpp
View File

@@ -43,6 +43,7 @@
#include "gui/FileDialog.h"
#include "gui/GuiTools.h"
#include "gui/MainWindow.h"
#include "gui/MergeDialog.h"
#include "gui/MessageBox.h"
#include "gui/TotpDialog.h"
#include "gui/TotpExportSettingsDialog.h"
@@ -1301,18 +1302,30 @@ void DatabaseWidget::mergeDatabase(bool accepted)
return;
}
Merger merger(srcDb.data(), m_db.data());
QStringList changeList = merger.merge();
#ifdef WITH_XC_KEESHARE
// Disable KeeShare while merging to avoid conflicts with incoming changes
KeeShare::instance()->setSharingEnabled(m_db, false);
#endif
if (!changeList.isEmpty()) {
showMessage(tr("Successfully merged the database files."), MessageWidget::Information);
} else {
showMessage(tr("Database was not modified by merge operation."), MessageWidget::Information);
}
auto* mergeDialog = new MergeDialog(srcDb, m_db, this);
connect(mergeDialog, &MergeDialog::databaseMerged, [this](bool changed) {
if (changed) {
showMessage(tr("Successfully merged the selected database."), MessageWidget::Positive);
emit databaseMerged(m_db);
} else {
showMessage(tr("No changes were made by the merge operation."), MessageWidget::Information);
}
});
connect(mergeDialog, &MergeDialog::finished, [this](int result) {
if (result == QDialog::Rejected) {
showMessage(tr("Merge canceled, no changes were made."), MessageWidget::Information);
}
#ifdef WITH_XC_KEESHARE
KeeShare::instance()->setSharingEnabled(m_db, true);
#endif
});
mergeDialog->open();
}
switchToMainView();
emit databaseMerged(m_db);
}
/**

199
src/gui/MergeDialog.cpp Normal file
View File

@@ -0,0 +1,199 @@
/*
* Copyright (C) 2025 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 "MergeDialog.h"
#include "ui_MergeDialog.h"
#include "core/Database.h"
#include <QPushButton>
#include <QShortcut>
MergeDialog::MergeDialog(QSharedPointer<Database> source, QSharedPointer<Database> target, QWidget* parent)
: QDialog(parent)
, m_ui(new Ui::MergeDialog())
, m_headerContextMenu(new QMenu())
, m_sourceDatabase(std::move(source))
, m_targetDatabase(std::move(target))
{
setAttribute(Qt::WA_DeleteOnClose);
// block input to other windows since other interactions can lead to unexpected merge results
setWindowModality(Qt::WindowModality::ApplicationModal);
m_ui->setupUi(this);
m_ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Merge"));
m_ui->buttonBox->button(QDialogButtonBox::Ok)->setFocus();
connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &MergeDialog::cancelMerge);
connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &MergeDialog::performMerge);
setupChangeTable();
updateChangeTable();
}
MergeDialog::MergeDialog(const Merger::ChangeList& changes, QWidget* parent)
: QDialog(parent)
, m_ui(new Ui::MergeDialog())
, m_headerContextMenu(new QMenu())
, m_changes(changes)
{
setAttribute(Qt::WA_DeleteOnClose);
m_ui->setupUi(this);
m_ui->buttonBox->button(QDialogButtonBox::Ok)->setFocus();
m_ui->buttonBox->button(QDialogButtonBox::Abort)->hide();
connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &MergeDialog::close);
setupChangeTable();
}
MergeDialog::~MergeDialog() = default;
QVector<MergeDialog::MergeDialogColumns> MergeDialog::columns()
{
return {MergeDialogColumns::Group,
MergeDialogColumns::Title,
MergeDialogColumns::Uuid,
MergeDialogColumns::Type,
MergeDialogColumns::Details};
}
int MergeDialog::columnIndex(MergeDialogColumns column)
{
return columns().indexOf(column);
}
QString MergeDialog::columnName(MergeDialogColumns column)
{
switch (column) {
case MergeDialogColumns::Group:
return tr("Group");
case MergeDialogColumns::Title:
return tr("Title");
case MergeDialogColumns::Uuid:
return tr("UUID");
case MergeDialogColumns::Type:
return tr("Change");
case MergeDialogColumns::Details:
return tr("Details");
}
return {};
}
QString MergeDialog::cellValue(const Merger::Change& change, MergeDialogColumns column)
{
switch (column) {
case MergeDialogColumns::Group:
return change.group();
case MergeDialogColumns::Title:
return change.title();
case MergeDialogColumns::Uuid:
if (!change.uuid().isNull()) {
return change.uuid().toString();
}
break;
case MergeDialogColumns::Type:
return change.typeString();
case MergeDialogColumns::Details:
return change.details();
}
return {};
}
bool MergeDialog::isColumnHiddenByDefault(MergeDialogColumns column)
{
return column == MergeDialogColumns::Uuid;
}
void MergeDialog::setupChangeTable()
{
Q_ASSERT(m_ui);
Q_ASSERT(m_ui->changeTable);
m_ui->changeTable->verticalHeader()->setVisible(false);
m_ui->changeTable->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeMode::Interactive);
m_ui->changeTable->horizontalHeader()->setContextMenuPolicy(Qt::ActionsContextMenu);
m_ui->changeTable->setShowGrid(false);
m_ui->changeTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
m_ui->changeTable->setSelectionBehavior(QAbstractItemView::SelectRows);
m_ui->changeTable->setSelectionMode(QAbstractItemView::SingleSelection);
// Create the header context menu
for (auto column : columns()) {
auto* action = new QAction(columnName(column), this);
action->setCheckable(true);
action->setChecked(!isColumnHiddenByDefault(column));
connect(action, &QAction::toggled, [this, column](bool checked) {
m_ui->changeTable->setColumnHidden(columnIndex(column), !checked);
m_ui->changeTable->horizontalHeader()->resizeSections(QHeaderView::ResizeMode::ResizeToContents);
});
m_ui->changeTable->horizontalHeader()->addAction(action);
}
}
void MergeDialog::updateChangeTable()
{
Q_ASSERT(m_ui);
Q_ASSERT(m_ui->changeTable);
Q_ASSERT(m_sourceDatabase.get());
Q_ASSERT(m_targetDatabase.get());
m_changes = Merger(m_sourceDatabase.data(), m_targetDatabase.get()).merge(true);
m_ui->changeTable->clear();
auto allColumns = columns();
m_ui->changeTable->setColumnCount(allColumns.size());
m_ui->changeTable->setRowCount(m_changes.size());
for (auto column : allColumns) {
auto name = columnName(column);
auto index = columnIndex(column);
m_ui->changeTable->setHorizontalHeaderItem(index, new QTableWidgetItem(name));
m_ui->changeTable->setColumnHidden(index, isColumnHiddenByDefault(column));
}
for (int row = 0; row < m_changes.size(); ++row) {
const auto& change = m_changes[row];
for (auto column : allColumns) {
m_ui->changeTable->setItem(row, columnIndex(column), new QTableWidgetItem(cellValue(change, column)));
}
}
m_ui->changeTable->horizontalHeader()->resizeSections(QHeaderView::ResizeMode::ResizeToContents);
}
void MergeDialog::performMerge()
{
auto changes = Merger(m_sourceDatabase.data(), m_targetDatabase.data()).merge();
if (changes != m_changes) {
qWarning("Merge results differed from the expected changes. Expected: %d, Actual: %d",
m_changes.size(),
changes.size());
}
emit databaseMerged(!changes.isEmpty());
done(QDialog::Accepted);
}
void MergeDialog::cancelMerge()
{
done(QDialog::Rejected);
}

83
src/gui/MergeDialog.h Normal file
View File

@@ -0,0 +1,83 @@
/*
* Copyright (C) 2025 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_MERGEDIALOG_H
#define KEEPASSX_MERGEDIALOG_H
#include "core/Merger.h"
#include <QDialog>
#include <QMenu>
namespace Ui
{
class MergeDialog;
}
class Database;
class MergeDialog : public QDialog
{
Q_OBJECT
public:
/**
* Merge source into copy of target and display changes.
* On user confirmation, merge source into target.
*/
explicit MergeDialog(QSharedPointer<Database> source, QSharedPointer<Database> target, QWidget* parent = nullptr);
/**
* Display given changes.
*/
explicit MergeDialog(const Merger::ChangeList& changes, QWidget* parent = nullptr);
~MergeDialog() override;
signals:
// Signal will be emitted when a normal merge operation has been performed.
void databaseMerged(bool databaseChanged);
private slots:
void performMerge();
void cancelMerge();
private:
enum class MergeDialogColumns
{
Group,
Title,
Uuid,
Type,
Details
};
static QVector<MergeDialogColumns> columns();
static int columnIndex(MergeDialogColumns column);
static QString columnName(MergeDialogColumns column);
static QString cellValue(const Merger::Change& change, MergeDialogColumns column);
static bool isColumnHiddenByDefault(MergeDialogColumns column);
void setupChangeTable();
void updateChangeTable();
QScopedPointer<Ui::MergeDialog> m_ui;
QScopedPointer<QMenu> m_headerContextMenu;
Merger::ChangeList m_changes;
QSharedPointer<Database> m_sourceDatabase;
QSharedPointer<Database> m_targetDatabase;
};
#endif // KEEPASSX_MERGEDIALOG_H

31
src/gui/MergeDialog.ui Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MergeDialog</class>
<widget class="QWidget" name="MergeDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>800</width>
<height>450</height>
</rect>
</property>
<property name="windowTitle">
<string>Database Merge Confirmation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTableWidget" name="changeTable"/>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Abort|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

59
src/gui/entry/EntryHistoryModel.cpp
View File

@@ -193,64 +193,7 @@ void EntryHistoryModel::calculateHistoryModifications()
continue;
}
QStringList modifiedFields;
if (*curr->attributes() != *compare->attributes()) {
bool foundAttribute = false;
if (curr->title() != compare->title()) {
modifiedFields << tr("Title");
foundAttribute = true;
}
if (curr->username() != compare->username()) {
modifiedFields << tr("Username");
foundAttribute = true;
}
if (curr->password() != compare->password()) {
modifiedFields << tr("Password");
foundAttribute = true;
}
if (curr->url() != compare->url()) {
modifiedFields << tr("URL");
foundAttribute = true;
}
if (curr->notes() != compare->notes()) {
modifiedFields << tr("Notes");
foundAttribute = true;
}
if (!foundAttribute) {
modifiedFields << tr("Custom Attributes");
}
}
if (curr->iconNumber() != compare->iconNumber() || curr->iconUuid() != compare->iconUuid()) {
modifiedFields << tr("Icon");
}
if (curr->foregroundColor() != compare->foregroundColor()
|| curr->backgroundColor() != compare->backgroundColor()) {
modifiedFields << tr("Color");
}
if (curr->timeInfo().expires() != compare->timeInfo().expires()
|| curr->timeInfo().expiryTime() != compare->timeInfo().expiryTime()) {
modifiedFields << tr("Expiration");
}
if (curr->totp() != compare->totp()) {
modifiedFields << tr("TOTP");
}
if (*curr->customData() != *compare->customData()) {
modifiedFields << tr("Custom Data");
}
if (*curr->attachments() != *compare->attachments()) {
modifiedFields << tr("Attachments");
}
if (*curr->autoTypeAssociations() != *compare->autoTypeAssociations()
|| curr->autoTypeEnabled() != compare->autoTypeEnabled()
|| curr->defaultAutoTypeSequence() != compare->defaultAutoTypeSequence()) {
modifiedFields << tr("Auto-Type");
}
if (curr->tags() != compare->tags()) {
modifiedFields << tr("Tags");
}
auto modifiedFields = curr->calculateDifference(compare);
m_historyModifications << modifiedFields.join(", ");

11
src/keeshare/KeeShare.cpp
View File

@@ -217,6 +217,17 @@ void KeeShare::connectDatabase(QSharedPointer<Database> newDb, QSharedPointer<Da
}
}
bool KeeShare::setSharingEnabled(QSharedPointer<Database> db, bool enabled)
{
if (!db || !m_observersByDatabase.contains(db->uuid())) {
return false;
}
auto observer = m_observersByDatabase.value(db->uuid());
observer->setEnabled(enabled);
return true;
}
const QString KeeShare::signedContainerFileType()
{
static const QString filetype("kdbx.share");

1
src/keeshare/KeeShare.h
View File

@@ -65,6 +65,7 @@ public:
static QString referenceTypeLabel(const KeeShareSettings::Reference& reference);
void connectDatabase(QSharedPointer<Database> newDb, QSharedPointer<Database> oldDb);
bool setSharingEnabled(QSharedPointer<Database> db, bool enabled);
static const QString signedContainerFileType();
static const QString unsignedContainerFileType();

7
src/keeshare/ShareObserver.cpp
View File

@@ -57,6 +57,11 @@ ShareObserver::~ShareObserver()
m_db->disconnect(this);
}
void ShareObserver::setEnabled(bool enabled)
{
m_enabled = enabled;
}
void ShareObserver::deinitialize()
{
m_groupToReference.clear();
@@ -177,7 +182,7 @@ void ShareObserver::handleDatabaseChanged()
return;
}
const auto active = KeeShare::active();
if (!active.out && !active.in) {
if (!m_enabled || (!active.out && !active.in)) {
deinitialize();
} else {
reinitialize();

2
src/keeshare/ShareObserver.h
View File

@@ -37,6 +37,7 @@ public:
~ShareObserver();
QSharedPointer<Database> database();
void setEnabled(bool enabled);
struct Result
{
@@ -82,6 +83,7 @@ private:
QMap<QString, QPointer<Group>> m_shareToGroup;
QMap<QString, QSharedPointer<FileWatcher>> m_fileWatchers;
bool m_inFileUpdate = false;
bool m_enabled = true;
};
#endif // KEEPASSXC_SHAREOBSERVER_H

10
tests/TestCli.cpp
View File

@@ -1679,8 +1679,9 @@ void TestCli::testMerge()
m_stderr->readLine(); // Skip password prompt
QCOMPARE(m_stderr->readAll(), QByteArray());
QList<QByteArray> outLines1 = m_stdout->readAll().split('\n');
QVERIFY(outLines1.at(0).contains("Overwriting Internet"));
QVERIFY(outLines1.at(1).contains("Creating missing Some Website"));
QVERIFY(outLines1.at(0).contains("Modified"));
QVERIFY(outLines1.at(0).contains("Modification time"));
QVERIFY(outLines1.at(1).contains("Added"));
QCOMPARE(outLines1.at(2),
QString("Successfully merged %1 into %2.").arg(sourceFile.fileName(), targetFile1.fileName()).toUtf8());
@@ -1696,8 +1697,9 @@ void TestCli::testMerge()
setInput("a");
execCmd(mergeCmd, {"merge", "--dry-run", "-s", targetFile2.fileName(), sourceFile.fileName()});
QList<QByteArray> outLines2 = m_stdout->readAll().split('\n');
QVERIFY(outLines2.at(0).contains("Overwriting Internet"));
QVERIFY(outLines2.at(1).contains("Creating missing Some Website"));
QVERIFY(outLines1.at(0).contains("Modified"));
QVERIFY(outLines1.at(0).contains("Modification time"));
QVERIFY(outLines2.at(1).contains("Added"));
QCOMPARE(outLines2.at(2), QByteArray("Database was not modified by merge operation."));
mergedDb = QSharedPointer<Database>::create();

4
tests/TestMerge.cpp
View File

@@ -1146,7 +1146,7 @@ void TestMerge::testCustomData()
m_clock->advanceSecond(1);
Merger merger(dbSource.data(), dbDestination.data());
QStringList changes = merger.merge();
auto changes = merger.merge();
QVERIFY(!changes.isEmpty());
@@ -1167,7 +1167,7 @@ void TestMerge::testCustomData()
dbSource->metadata()->customData()->set("key3", "oldValue");
dbSource->metadata()->customData()->set("key3", "newValue");
Merger merger2(dbSource.data(), dbDestination.data());
QStringList changes2 = merger2.merge();
auto changes2 = merger2.merge();
QVERIFY(changes2.isEmpty());
Merger merger3(dbSource2.data(), dbDestination2.data());

4
tests/gui/TestGui.cpp
View File

@@ -353,6 +353,10 @@ void TestGui::testMergeDatabase()
QTest::keyClicks(editPasswordMerge, "a");
QTest::keyClick(editPasswordMerge, Qt::Key_Enter);
// confirm merge in confirmation dialog
QTRY_VERIFY(QApplication::focusWindow()->title().contains("Merge"));
QTest::keyClick(QApplication::focusWidget(), Qt::Key_Enter);
QTRY_COMPARE(dbMergeSpy.count(), 1);
QTRY_VERIFY(m_tabWidget->tabText(m_tabWidget->currentIndex()).contains("*"));