From c90808142134a6e2282a0562752308b83df91c0f Mon Sep 17 00:00:00 2001
From: Stefan Forstenlechner <stefan@forstenlechner.dev>
Date: Mon, 17 Jun 2024 23:41:56 +0200
Subject: [PATCH] Add KeePass header check for testing remote download (#10910)

---
 share/translations/keepassxc_en.ts              | 12 ++++++++----
 src/gui/remote/DatabaseSettingsWidgetRemote.cpp | 17 ++++++++++++++++-
 src/gui/remote/DatabaseSettingsWidgetRemote.h   |  2 ++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
index 0cf445a86..9c2a6f9f8 100644
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@@ -2409,10 +2409,6 @@ removed from the database.</source>
         <source>Download failed with error: %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Download finished, but file %1 could not be found.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Download successful.</source>
         <translation type="unfinished"></translation>
@@ -2445,6 +2441,14 @@ The command has to exit. In case of `sftp` as last command `exit` has to be sent
             </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Command finished, but downloaded file does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download finished, but file failed KeePass header check. File is not a KeePass file or it&apos;s an unsupported version</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Timeout:</source>
         <translation type="unfinished"></translation>
diff --git a/src/gui/remote/DatabaseSettingsWidgetRemote.cpp b/src/gui/remote/DatabaseSettingsWidgetRemote.cpp
index f66edba7e..31a019d3c 100644
--- a/src/gui/remote/DatabaseSettingsWidgetRemote.cpp
+++ b/src/gui/remote/DatabaseSettingsWidgetRemote.cpp
@@ -18,6 +18,7 @@
 #include "DatabaseSettingsWidgetRemote.h"
 #include "ui_DatabaseSettingsWidgetRemote.h"
 
+#include "core/Database.h"
 #include "core/Global.h"
 #include "core/Metadata.h"
 
@@ -200,10 +201,24 @@ void DatabaseSettingsWidgetRemote::testDownload()
     }
 
     if (!QFile::exists(result.filePath)) {
-        m_ui->messageWidget->showMessage(tr("Download finished, but file %1 could not be found.").arg(result.filePath),
+        m_ui->messageWidget->showMessage(tr("Command finished, but downloaded file does not exist."),
+                                         MessageWidget::Error);
+        return;
+    }
+
+    if (!hasValidPublicHeaders(result.filePath)) {
+        m_ui->messageWidget->showMessage(tr("Download finished, but file failed KeePass header check. File is not a "
+                                            "KeePass file or it's an unsupported version"),
                                          MessageWidget::Error);
         return;
     }
 
     m_ui->messageWidget->showMessage(tr("Download successful."), MessageWidget::Positive);
 }
+
+bool DatabaseSettingsWidgetRemote::hasValidPublicHeaders(QString& filePath) {
+    // Read public headers
+    QString error;
+    QScopedPointer<Database> db(new Database());
+    return db->open(filePath, nullptr, &error);
+}
diff --git a/src/gui/remote/DatabaseSettingsWidgetRemote.h b/src/gui/remote/DatabaseSettingsWidgetRemote.h
index 6184e4bd9..44a27fd5a 100644
--- a/src/gui/remote/DatabaseSettingsWidgetRemote.h
+++ b/src/gui/remote/DatabaseSettingsWidgetRemote.h
@@ -56,6 +56,8 @@ private:
     QListWidgetItem* findItemByName(const QString& name);
     void clearFields();
 
+    bool hasValidPublicHeaders(QString& filePath);
+
     QScopedPointer<RemoteSettings> m_remoteSettings;
     const QScopedPointer<Ui::DatabaseSettingsWidgetRemote> m_ui;
     bool m_modified = false;