From c4270001842512084e670c07eb68dbde00ffb170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfram=20R=C3=B6sler?= <wolfram@roesler-ac.de>
Date: Thu, 30 Jan 2020 21:09:29 +0100
Subject: [PATCH] Remove result cache from the HealthChecker class
The way the class is currently being used, the cache never does
anything (because evaluate is never invoked twice for the same
entry), so according to YAGNI it has to go.
Fixes #551
---
src/core/PasswordHealth.cpp | 10 +++-------
src/core/PasswordHealth.h | 6 ++----
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/core/PasswordHealth.cpp b/src/core/PasswordHealth.cpp
index 58e4e42af..c179db77c 100644
--- a/src/core/PasswordHealth.cpp
+++ b/src/core/PasswordHealth.cpp
@@ -116,17 +116,13 @@ HealthChecker::HealthChecker(QSharedPointer<Database> db)
* Returns the health of the password in `entry`, considering
* password entropy, re-use, expiration, etc.
*/
-QSharedPointer<PasswordHealth> HealthChecker::evaluate(const Entry* entry)
+QSharedPointer<PasswordHealth> HealthChecker::evaluate(const Entry* entry) const
{
+ // Pointer sanity check
if (!entry) {
return {};
}
- // Return from cache if we saw it before
- if (m_cache.contains(entry->uuid())) {
- return m_cache[entry->uuid()];
- }
-
// First analyse the password itself
const auto pwd = entry->password();
auto health = QSharedPointer<PasswordHealth>(new PasswordHealth(pwd));
@@ -184,5 +180,5 @@ QSharedPointer<PasswordHealth> HealthChecker::evaluate(const Entry* entry)
}
// Return the result
- return m_cache.insert(entry->uuid(), health).value();
+ return health;
}
diff --git a/src/core/PasswordHealth.h b/src/core/PasswordHealth.h
index ca7f0236e..70f83eee7 100644
--- a/src/core/PasswordHealth.h
+++ b/src/core/PasswordHealth.h
@@ -101,12 +101,10 @@ public:
explicit HealthChecker(QSharedPointer<Database>);
// Get the health status of an entry in the database
- QSharedPointer<PasswordHealth> evaluate(const Entry* entry);
+ QSharedPointer<PasswordHealth> evaluate(const Entry* entry) const;
private:
- // Result cache (first=entry UUID)
- QHash<QUuid, QSharedPointer<PasswordHealth>> m_cache;
- // first = password, second = entries that use it
+ // To determine password re-use: first = password, second = entries that use it
QHash<QString, QStringList> m_reuse;
};