From 40ca3d58963884a876c826dcf5c32673b8ddc084 Mon Sep 17 00:00:00 2001 From: Ingo Klöcker Date: Wed, 16 Aug 2023 14:23:15 +0200 Subject: 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 --- lang/qt/src/qgpgmeencryptarchivejob.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'lang/qt/src/qgpgmeencryptarchivejob.cpp') diff --git a/lang/qt/src/qgpgmeencryptarchivejob.cpp b/lang/qt/src/qgpgmeencryptarchivejob.cpp index c7f84182..ceab5909 100644 --- a/lang/qt/src/qgpgmeencryptarchivejob.cpp +++ b/lang/qt/src/qgpgmeencryptarchivejob.cpp @@ -43,6 +43,7 @@ #include "dataprovider.h" #include "encryptarchivejob_p.h" #include "filelistdataprovider.h" +#include "qgpgme_debug.h" #include @@ -101,10 +102,21 @@ static QGpgMEEncryptArchiveJob::result_type encrypt(Context *ctx, } flags = static_cast(flags | Context::EncryptArchive); - const EncryptionResult res = ctx->encrypt(recipients, indata, outdata, flags); + const auto encryptionResult = ctx->encrypt(recipients, indata, outdata, flags); + + const auto outputFileName = QFile::decodeName(outdata.fileName()); + if (!outputFileName.isEmpty() && 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, log, ae); + return std::make_tuple(encryptionResult, log, ae); } static QGpgMEEncryptArchiveJob::result_type encrypt_to_io_device(Context *ctx, -- cgit