qt: Clean up after failure or cancel of sign/encrypt archive operation

* lang/qt/src/qgpgmeencryptarchivejob.cpp (encrypt): Remove output file
if operation was canceled or failed.
* lang/qt/src/qgpgmesignarchivejob.cpp (sign): Ditto.
* lang/qt/src/qgpgmesignencryptarchivejob.cpp (sign_encrypt): Ditto.

* lang/qt/tests/run-encryptarchivejob.cpp (CommandLineOptions): Add
field cancelTimeout.
(parseCommandLine): Add option --cancel-after. Parse option value.
(main): Check for invalid cancel timeout. Start timer for canceling
the job.
* lang/qt/tests/run-signarchivejob.cpp (CommandLineOptions): Add
field cancelTimeout.
(parseCommandLine): Add option --cancel-after. Parse option value.
(main): Check for invalid cancel timeout. Start timer for canceling
the job.
--

This change ensures that the output file is removed if the creation of
a signed or encrypted archive was canceled or failed. The new option
of the test runners enables testing the cancelation of the jobs.

GnuPG-bug-id: 6584

1 files changed, 15 insertions, 1 deletions

diff --git a/lang/qt/src/qgpgmesignencryptarchivejob.cpp b/lang/qt/src/qgpgmesignencryptarchivejob.cpp
index e47bfa0c..6670b702 100644
--- a/lang/qt/src/qgpgmesignencryptarchivejob.cpp
+++ b/lang/qt/src/qgpgmesignencryptarchivejob.cpp
@@ -43,6 +43,7 @@
 #include "dataprovider.h"
 #include "signencryptarchivejob_p.h"
 #include "filelistdataprovider.h"
+#include "qgpgme_debug.h"
 
 #include <QFile>
 
@@ -112,9 +113,22 @@ static QGpgMESignEncryptArchiveJob::result_type sign_encrypt(Context *ctx,
 
     encryptionFlags = static_cast<Context::EncryptionFlags>(encryptionFlags | Context::EncryptArchive);
     const auto res = ctx->signAndEncrypt(recipients, indata, outdata, encryptionFlags);
+    const auto &signingResult = res.first;
+    const auto &encryptionResult = res.second;
+
+    const auto outputFileName = QFile::decodeName(outdata.fileName());
+    if (!outputFileName.isEmpty() && (signingResult.error().code() || encryptionResult.error().code())) {
+        // ensure that the output file is removed if the operation was canceled or failed
+        if (QFile::exists(outputFileName)) {
+            qCDebug(QGPGME_LOG) << __func__ << "Removing output file" << outputFileName << "after error or cancel";
+            if (!QFile::remove(outputFileName)) {
+                qCDebug(QGPGME_LOG) << __func__ << "Removing output file" << outputFileName << "failed";
+            }
+        }
+    }
     Error ae;
     const QString log = _detail::audit_log_as_html(ctx, ae);
-    return std::make_tuple(res.first, res.second, log, ae);
+    return std::make_tuple(signingResult, encryptionResult, log, ae);
 }
 
 static QGpgMESignEncryptArchiveJob::result_type sign_encrypt_to_io_device(Context *ctx,