Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix renaming extension key name in Database Settings #11354

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+46 −23
Open

Fix renaming extension key name in Database Settings #11354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10786de
Fix renaming extension key name in Database Settings
varjolintu Oct 12, 2024
84a0e0e
Add CustomData::getKeyWithPrefix()
varjolintu Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/browser/BrowserService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,8 @@ QString BrowserService::storeKey(const QString& key)
return {};
}

contains = db->metadata()->customData()->contains(CustomData::BrowserKeyPrefix + id);
contains =
db->metadata()->customData()->contains(CustomData::getKeyWithPrefix(CustomData::BrowserKeyPrefix, id));
if (contains) {
dialogResult = MessageBox::warning(m_currentDatabaseWidget,
tr("KeePassXC - Overwrite existing key?"),
Expand All @@ -610,8 +611,8 @@ QString BrowserService::storeKey(const QString& key)
} while (contains && dialogResult == MessageBox::Cancel);

hideWindow();
db->metadata()->customData()->set(CustomData::BrowserKeyPrefix + id, key);
db->metadata()->customData()->set(QString("%1_%2").arg(CustomData::Created, id),
db->metadata()->customData()->set(CustomData::getKeyWithPrefix(CustomData::BrowserKeyPrefix, id), key);
db->metadata()->customData()->set(CustomData::getKeyWithPrefix(CustomData::Created, id),
QLocale::system().toString(Clock::currentDateTime(), QLocale::ShortFormat));
return id;
}
Expand All @@ -623,7 +624,7 @@ QString BrowserService::getKey(const QString& id)
return {};
}

return db->metadata()->customData()->value(CustomData::BrowserKeyPrefix + id);
return db->metadata()->customData()->value(CustomData::getKeyWithPrefix(CustomData::BrowserKeyPrefix, id));
}

#ifdef WITH_XC_BROWSER_PASSKEYS
Expand Down Expand Up @@ -1065,7 +1066,8 @@ QList<Entry*> BrowserService::searchEntries(const QString& siteUrl,
// Check if database is connected with KeePassXC-Browser. If so, return browser key (otherwise empty)
auto databaseConnected = [&](const QSharedPointer<Database>& db) {
for (const StringPair& keyPair : keyList) {
QString key = db->metadata()->customData()->value(CustomData::BrowserKeyPrefix + keyPair.first);
const auto key = db->metadata()->customData()->value(
CustomData::getKeyWithPrefix(CustomData::BrowserKeyPrefix, keyPair.first));
if (!key.isEmpty() && keyPair.second == key) {
return keyPair.first;
}
Expand Down
14 changes: 11 additions & 3 deletions src/core/CustomData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018 KeePassXC Team <[email protected]>
* Copyright (C) 2024 KeePassXC Team <[email protected]>
*
* 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
Expand All @@ -21,9 +21,8 @@
#include "core/Global.h"

const QString CustomData::LastModified = QStringLiteral("_LAST_MODIFIED");
const QString CustomData::Created = QStringLiteral("_CREATED");
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");
const QString CustomData::RandomSlug = QStringLiteral("KPXC_RANDOM_SLUG");
Expand Down Expand Up @@ -52,6 +51,15 @@ QString CustomData::value(const QString& key) const
return m_data.value(key).value;
}

QString CustomData::getKeyWithPrefix(const QString& prefix, const QString& key)
{
QString keyWithPrefix;
keyWithPrefix.reserve(prefix.length() + key.length());
keyWithPrefix.append(prefix);
keyWithPrefix.append(key);
return keyWithPrefix;
}

const CustomData::CustomDataItem& CustomData::item(const QString& key) const
{
auto item = m_data.find(key);
Expand Down
5 changes: 3 additions & 2 deletions src/core/CustomData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018 KeePassXC Team <[email protected]>
* Copyright (C) 2024 KeePassXC Team <[email protected]>
*
* 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
Expand Down Expand Up @@ -64,11 +64,12 @@ class CustomData : public ModifiableObject
bool operator==(const CustomData& other) const;
bool operator!=(const CustomData& other) const;

static QString getKeyWithPrefix(const QString& prefix, const QString& key);

// Pre-defined keys
static const QString LastModified;
static const QString Created;
static const QString BrowserKeyPrefix;
static const QString BrowserLegacyKeyPrefix;
static const QString FdoSecretsExposedGroup;
static const QString RandomSlug;
static const QString RemoteProgramSettings;
Expand Down
35 changes: 23 additions & 12 deletions src/gui/dbsettings/DatabaseSettingsWidgetBrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022 KeePassXC Team <[email protected]>
* Copyright (C) 2024 KeePassXC Team <[email protected]>
* Copyright (C) 2018 Sami Vänttinen <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -102,9 +102,10 @@ void DatabaseSettingsWidgetBrowser::removeSelectedKey()
const QItemSelectionModel* itemSelectionModel = m_ui->customDataTable->selectionModel();
if (itemSelectionModel) {
for (const QModelIndex& index : itemSelectionModel->selectedRows(0)) {
QString key = index.data().toString();
key.insert(0, CustomData::BrowserKeyPrefix);
const auto key = CustomData::getKeyWithPrefix(CustomData::BrowserKeyPrefix, index.data().toString());
const auto createdKey = CustomData::getKeyWithPrefix(CustomData::Created, index.data().toString());
customData()->remove(key);
customData()->remove(createdKey);
}
updateModel();
}
Expand All @@ -124,7 +125,7 @@ void DatabaseSettingsWidgetBrowser::updateModel()
if (key.startsWith(CustomData::BrowserKeyPrefix)) {
QString strippedKey = key;
strippedKey.remove(CustomData::BrowserKeyPrefix);
auto created = customData()->value(QString("%1_%2").arg(CustomData::Created, strippedKey));
auto created = customData()->value(CustomData::getKeyWithPrefix(CustomData::Created, strippedKey));
auto createdItem = new QStandardItem(created);
createdItem->setEditable(false);
m_customDataModel->appendRow(QList<QStandardItem*>()
Expand Down Expand Up @@ -267,18 +268,16 @@ void DatabaseSettingsWidgetBrowser::editFinished(QStandardItem* item)

if (itemSelectionModel) {
auto indexList = itemSelectionModel->selectedRows(item->column());
if (indexList.length() > 0) {
QString newValue = item->index().data().toString();
if (!indexList.isEmpty()) {
auto newValue = item->index().data().toString();

// The key is edited
if (item->column() == 0) {
// Get the old key/value pair, remove it and replace it
m_valueInEdit.insert(0, CustomData::BrowserKeyPrefix);
auto tempValue = customData()->value(m_valueInEdit);
newValue.insert(0, CustomData::BrowserKeyPrefix);
// Update created timestamp with the new key
replaceKey(CustomData::Created, m_valueInEdit, newValue);

m_db->metadata()->customData()->remove(m_valueInEdit);
m_db->metadata()->customData()->set(newValue, tempValue);
// Get the old key/value pair, remove it and replace it
replaceKey(CustomData::BrowserKeyPrefix, m_valueInEdit, newValue);
} else {
// Replace just the value
for (const QString& key : m_db->metadata()->customData()->keys()) {
Expand All @@ -301,3 +300,15 @@ void DatabaseSettingsWidgetBrowser::updateSharedKeyList()
{
updateModel();
}

// Replaces a key and the created timestamp for it
void DatabaseSettingsWidgetBrowser::replaceKey(const QString& prefix,
const QString& oldName,
const QString& newName) const
{
const auto oldKey = CustomData::getKeyWithPrefix(prefix, oldName);
const auto newKey = CustomData::getKeyWithPrefix(prefix, newName);
const auto tempValue = customData()->value(oldKey);
m_db->metadata()->customData()->remove(oldKey);
m_db->metadata()->customData()->set(newKey, tempValue);
}
3 changes: 2 additions & 1 deletion src/gui/dbsettings/DatabaseSettingsWidgetBrowser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 KeePassXC Team <[email protected]>
* Copyright (C) 2024 KeePassXC Team <[email protected]>
* Copyright (C) 2018 Sami Vänttinen <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -62,6 +62,7 @@ private slots:
private:
void updateModel();
void settingsWarning();
void replaceKey(const QString& prefix, const QString& oldName, const QString& newName) const;

protected:
void showEvent(QShowEvent* event) override;
Expand Down