HIBP: Display error message in table if download from HIBP failed

Fixes keepassxreboot#1083
wolframroesler · Mar 14, 2020 · 9909334 · 9909334
1 parent 1802f66
commit 9909334
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/src/core/HibpDownloader.cpp b/src/core/HibpDownloader.cpp
@@ -137,6 +137,7 @@ void HibpDownloader::fetchReadyRead()
 void HibpDownloader::fetchFinished()
 {
     const auto ok = m_reply->error() == QNetworkReply::NoError;
+    const auto err = m_reply->errorString();
 
     m_reply->deleteLater();
     m_reply = nullptr;
@@ -145,8 +146,10 @@ void HibpDownloader::fetchFinished()
     if (ok) {
         emit finished(m_password, pwnCount(m_password, m_bytesReceived));
     } else {
-
-        // TODO: Get the error message
-        emit failed(m_password, "Error message goes here");
+        auto msg = tr("Online password validation failed") + ":\n" + err;
+        if (!m_bytesReceived.isEmpty()) {
+            msg += "\n" + m_bytesReceived;
+        }
+        emit failed(m_password, msg);
     }
 }
diff --git a/src/gui/reports/ReportsWidgetHibp.cpp b/src/gui/reports/ReportsWidgetHibp.cpp
@@ -50,6 +50,7 @@ void ReportsWidgetHibp::loadSettings(QSharedPointer<Database> db)
     m_referencesModel->clear();
     m_pwQueue.clear();
     m_pwPwned.clear();
+    m_error.clear();
     m_rowToEntry.clear();
     m_edEntry = nullptr;
     m_ui->progressBar->hide();
@@ -112,6 +113,14 @@ void ReportsWidgetHibp::makeHibpTable() {
         }
     }
 
+    // If there was an error, append the error message to the table
+    if (!m_error.isEmpty()) {
+        auto row = QList<QStandardItem*>();
+        row << new QStandardItem(m_error);
+        m_referencesModel->appendRow(row);
+        row[0]->setForeground(QBrush(QColor("red")));
+    }
+
     m_ui->hibpTableView->resizeRowsToContents();
 }
 
@@ -139,10 +148,16 @@ void ReportsWidgetHibp::checkFinished(const QString& password, int count)
 
 /*
  * Invoked when a query to the HIBP server fails.
+ *
+ * Displays the table with the current findings and quits the online activity.
  */
-void ReportsWidgetHibp::checkFailed(const QString& password, const QString& error)
+void ReportsWidgetHibp::checkFailed(const QString& /*password*/, const QString& error)
 {
-    // TODO: Display the error message
+    m_error = error;
+    m_pwQueue.clear();
+    m_downloader.reset();
+    m_ui->progressBar->hide();
+    makeHibpTable();
 }
 
 /*
@@ -173,6 +188,10 @@ void ReportsWidgetHibp::checkNext()
             SIGNAL(finished(const QString&, int)),
             this,
             SLOT(checkFinished(const QString&, int)));
+    connect(&*m_downloader,
+            SIGNAL(failed(const QString&, const QString&)),
+            this,
+            SLOT(checkFailed(const QString&, const QString&)));
 }
 
 void ReportsWidgetHibp::showEvent(QShowEvent* event)

diff --git a/src/gui/reports/ReportsWidgetHibp.h b/src/gui/reports/ReportsWidgetHibp.h
@@ -70,6 +70,7 @@ public slots:
     int m_qMax = 0;                                             // Max number of items in the queue (for progress bar)
     QSet<QString> m_pwQueue;                                    // Passwords we still need to check
     QMap<QString, int> m_pwPwned;                               // Passwords we found to have been pwned (value is pwn count)
+    QString m_error;                                            // Error message if download failed, else empty
     QList<QPair<const Group*, const Entry*>> m_rowToEntry;      // List index is table row
     const Entry *m_edEntry = nullptr;                           // The entry we're currently editing
     QString m_edPw;                                             // The old password of the entry we're editing