Merge 85ed0e0f70 into af2479da8d

share/translations/keepassxc_en.ts

@@ -2453,10 +2453,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>
@@ -2489,6 +2485,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>Downloaded file is not a KeePass file or it&apos;s an unsupported version: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Timeout:</source>
         <translation type="unfinished"></translation>

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"
 
@@ -186,12 +187,12 @@ void DatabaseSettingsWidgetRemote::testDownload()
     params->downloadInput = m_ui->inputForDownload->toPlainText();
     params->downloadTimeoutMsec = m_ui->downloadTimeoutSec->value() * 1000;
 
-    QScopedPointer<RemoteHandler> remoteHandler(new RemoteHandler(this));
     if (params->downloadCommand.isEmpty()) {
         m_ui->messageWidget->showMessage(tr("Download command cannot be empty."), MessageWidget::Warning);
         return;
     }
 
+    QScopedPointer<RemoteHandler> remoteHandler(new RemoteHandler(this));
     RemoteHandler::RemoteResult result = remoteHandler->download(params);
     if (!result.success) {
         m_ui->messageWidget->showMessage(tr("Download failed with error: %1").arg(result.errorMessage),
@@ -200,10 +201,25 @@ 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;
     }
 
+    QString error;
+    if (!hasValidPublicHeader(result.filePath, &error)) {
+        m_ui->messageWidget->showMessage(
+            tr("Downloaded file is not a KeePass file or it's an unsupported version: %1").arg(error),
+            MessageWidget::Error);
+        return;
+    }
+
     m_ui->messageWidget->showMessage(tr("Download successful."), MessageWidget::Positive);
 }
+
+bool DatabaseSettingsWidgetRemote::hasValidPublicHeader(QString& filePath, QString* error)
+{
+    // Read public headers
+    QScopedPointer<Database> db(new Database());
+    return db->open(filePath, nullptr, error);
+}

src/gui/remote/DatabaseSettingsWidgetRemote.h

@@ -56,6 +56,8 @@ private:
     QListWidgetItem* findItemByName(const QString& name);
     void clearFields();
 
+    bool hasValidPublicHeader(QString& filePath, QString* error);
+
     QScopedPointer<RemoteSettings> m_remoteSettings;
     const QScopedPointer<Ui::DatabaseSettingsWidgetRemote> m_ui;
     bool m_modified = false;