From e888fec0703d0fb2e00faecfc9fd40249809634c Mon Sep 17 00:00:00 2001 From: ryain11 Date: Tue, 21 Jul 2026 19:58:23 +0300 Subject: [PATCH] Fix password strength evaluation for referenced passwords (#13479) * Also fix password strength in entry view --------- Co-authored-by: Jonathan White --- src/core/Entry.cpp | 4 ++-- src/gui/PasswordWidget.cpp | 7 ++++++- src/gui/PasswordWidget.h | 1 + src/gui/entry/EditEntryWidget.cpp | 11 +++++++++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp index 92404ab3d..34c96d0d5 100644 --- a/src/core/Entry.cpp +++ b/src/core/Entry.cpp @@ -231,7 +231,7 @@ QString Entry::defaultAutoTypeSequence() const const QSharedPointer Entry::passwordHealth() { if (!m_data.passwordHealth) { - m_data.passwordHealth.reset(new PasswordHealth(resolvePlaceholder(password()))); + m_data.passwordHealth.reset(new PasswordHealth(resolveMultiplePlaceholders(password()))); } return m_data.passwordHealth; } @@ -239,7 +239,7 @@ const QSharedPointer Entry::passwordHealth() const QSharedPointer Entry::passwordHealth() const { if (!m_data.passwordHealth) { - return QSharedPointer::create(resolvePlaceholder(password())); + return QSharedPointer::create(resolveMultiplePlaceholders(password())); } return m_data.passwordHealth; } diff --git a/src/gui/PasswordWidget.cpp b/src/gui/PasswordWidget.cpp index 2568ff67b..bf4def3de 100644 --- a/src/gui/PasswordWidget.cpp +++ b/src/gui/PasswordWidget.cpp @@ -95,7 +95,12 @@ PasswordWidget::PasswordWidget(QWidget* parent) m_ui->qualityProgressBar->setVisible(false); connect(m_ui->passwordEdit, &QLineEdit::textChanged, this, [this](const QString& pwd) { - updatePasswordStrength(pwd); + QString resolvedPwd = pwd; + + // Making a request to dereference the password + emit requestPlaceholderResolution(pwd, resolvedPwd); + + updatePasswordStrength(resolvedPwd); emit textChanged(pwd); }); } diff --git a/src/gui/PasswordWidget.h b/src/gui/PasswordWidget.h index 6049d2908..3530d9888 100644 --- a/src/gui/PasswordWidget.h +++ b/src/gui/PasswordWidget.h @@ -48,6 +48,7 @@ public: signals: void textChanged(QString text); + void requestPlaceholderResolution(const QString& rawText, QString& resolvedText); public slots: void setText(const QString& text); diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index 3a665c5cf..4a122ea01 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -40,6 +40,7 @@ #include "core/Metadata.h" #include "core/PasswordGenerator.h" #include "core/TimeDelta.h" +#include "gui/PasswordWidget.h" #ifdef KPXC_FEATURE_SSHAGENT #include "sshagent/OpenSSHKey.h" #include "sshagent/OpenSSHKeyGenDialog.h" @@ -138,6 +139,16 @@ EditEntryWidget::EditEntryWidget(QWidget* parent) m_editWidgetProperties->setCustomData(m_customData.data()); m_mainUi->passwordEdit->setQualityVisible(true); + + connect(m_mainUi->passwordEdit, + &PasswordWidget::requestPlaceholderResolution, + this, + [this](const QString& rawText, QString& resolvedText) { + if (m_entry) { + // Dereferencing the password of the entry + resolvedText = m_entry->resolveMultiplePlaceholders(rawText); + } + }); } EditEntryWidget::~EditEntryWidget() = default;