qt: Support writing signed/encrypted archives directly to a file

* lang/qt/src/encryptarchivejob.cpp, lang/qt/src/encryptarchivejob.h
(EncryptArchiveJob): Add member functions setRecipients, recipients,
setInputPaths, inputPaths, setOutputFile, outputFile,
setEncryptionFlags, encryptionFlags.
* lang/qt/src/encryptarchivejob_p.h (EncryptArchiveJobPrivate): Add
members m_recipients, m_inputPaths, m_outputFilePath, m_encryptionFlags.
* lang/qt/src/qgpgmeencryptarchivejob.cpp (encrypt): Move creation of
outdata to encrypt_to_io_device.
(encrypt_to_io_device, encrypt_to_filename): New.
(QGpgMEEncryptArchiveJob::start): Use encrypt_to_io_device instead of
encrypt.
(QGpgMEEncryptArchiveJobPrivate::startIt): Start the job with the
values from member variables.
* lang/qt/src/qgpgmesignarchivejob.cpp (sign): Move creation of
outdata to sign_to_io_device.
(sign_to_io_device, sign_to_filename): New.
(QGpgMESignArchiveJob::start): Use sign_to_io_device instead of sign.
(QGpgMESignArchiveJobPrivate::startIt): Start the job with the
values from member variables.
* lang/qt/src/qgpgmesignencryptarchivejob.cpp (sign_encrypt): Move
creation of outdata to sign_encrypt_to_io_device.
(sign_encrypt_to_io_device, sign_encrypt_to_filename): New.
(QGpgMESignEncryptArchiveJob::start): Use sign_encrypt_to_io_device
instead of sign_encrypt.
(QGpgMESignEncryptArchiveJobPrivate::startIt): Start the job with the
values from member variables.
* lang/qt/src/signarchivejob.cpp, lang/qt/src/signarchivejob.h
(SignArchiveJob): Add member functions setSigner, signers,
setInputPaths, inputPaths, setOutputFile, outputFile.
* lang/qt/src/signarchivejob_p.h (SignArchiveJobPrivate): Add
members m_signers, m_inputPaths, m_outputFilePath.
* lang/qt/src/signencryptarchivejob.cpp,
lang/qt/src/signencryptarchivejob.h (SignEncryptArchiveJob): Add
member functions setSigner, signers, setRecipients, recipients,
setInputPaths, inputPaths, setOutputFile, outputFile,
setEncryptionFlags, encryptionFlags.
* lang/qt/src/signencryptarchivejob_p.h (SignEncryptArchiveJobPrivate):
Add members m_signers, m_recipients, m_inputPaths, m_outputFilePath,
m_encryptionFlags.

* lang/qt/tests/run-encryptarchivejob.cpp (createOutput): Remove.
(checkOutputFilePath): New.
(main): Create file output writing to stdout if no archive name (or "-")
is given. Exit if file with given archive name already exists. Make
the jobs write the created archive directly to the given archive name.
* lang/qt/tests/run-signarchivejob.cpp (createOutput): Remove.
(checkOutputFilePath): New.
(main): Create file output writing to stdout if no archive name (or "-")
is given. Exit if file with given archive name already exists. Make
the jobs write the created archive directly to the given archive name.
--

This makes it possible to tell gpgtar to write the created archive
directly to a specified file bypassing GpgME's Data IO.

GnuPG-bug-id: 6530

1 files changed, 49 insertions, 21 deletions

diff --git a/lang/qt/src/qgpgmesignencryptarchivejob.cpp b/lang/qt/src/qgpgmesignencryptarchivejob.cpp
index 2c029a25..e47bfa0c 100644
--- a/lang/qt/src/qgpgmesignencryptarchivejob.cpp
+++ b/lang/qt/src/qgpgmesignencryptarchivejob.cpp
@@ -44,14 +44,9 @@
 #include "signencryptarchivejob_p.h"
 #include "filelistdataprovider.h"
 
-// #include <context.h>
+#include <QFile>
+
 #include <data.h>
-// #include <encryptionresult.h>
-//
-// #include <QBuffer>
-// #include <QFileInfo>
-//
-// #include <cassert>
 
 using namespace QGpgME;
 using namespace GpgME;
@@ -72,11 +67,7 @@ public:
     ~QGpgMESignEncryptArchiveJobPrivate() override = default;
 
 private:
-    GpgME::Error startIt() override
-    {
-        Q_ASSERT(!"Not supported by this Job class.");
-        return Error::fromCode(GPG_ERR_NOT_SUPPORTED);
-    }
+    GpgME::Error startIt() override;
 
     void startNow() override
     {
@@ -97,26 +88,19 @@ QGpgMESignEncryptArchiveJob::QGpgMESignEncryptArchiveJob(Context *context)
 }
 
 static QGpgMESignEncryptArchiveJob::result_type sign_encrypt(Context *ctx,
-                                                             QThread *thread,
                                                              const std::vector<GpgME::Key> &signers,
                                                              const std::vector<Key> &recipients,
                                                              const std::vector<QString> &paths,
-                                                             const std::weak_ptr<QIODevice> &cipherText_,
+                                                             GpgME::Data &outdata,
                                                              Context::EncryptionFlags encryptionFlags,
                                                              const QString &baseDirectory)
 {
-    const std::shared_ptr<QIODevice> cipherText = cipherText_.lock();
-    const _detail::ToThreadMover ctMover(cipherText, thread);
-
     QGpgME::FileListDataProvider in{paths};
     Data indata(&in);
     if (!baseDirectory.isEmpty()) {
         indata.setFileName(baseDirectory.toStdString());
     }
 
-    QGpgME::QIODeviceDataProvider out{cipherText};
-    Data outdata(&out);
-
     ctx->clearSigningKeys();
     for (const Key &signer : signers) {
         if (!signer.isNull()) {
@@ -133,6 +117,37 @@ static QGpgMESignEncryptArchiveJob::result_type sign_encrypt(Context *ctx,
     return std::make_tuple(res.first, res.second, log, ae);
 }
 
+static QGpgMESignEncryptArchiveJob::result_type sign_encrypt_to_io_device(Context *ctx,
+                                                                          QThread *thread,
+                                                                          const std::vector<GpgME::Key> &signers,
+                                                                          const std::vector<Key> &recipients,
+                                                                          const std::vector<QString> &paths,
+                                                                          const std::weak_ptr<QIODevice> &cipherText_,
+                                                                          Context::EncryptionFlags encryptionFlags,
+                                                                          const QString &baseDirectory)
+{
+    const std::shared_ptr<QIODevice> cipherText = cipherText_.lock();
+    const _detail::ToThreadMover ctMover(cipherText, thread);
+    QGpgME::QIODeviceDataProvider out{cipherText};
+    Data outdata(&out);
+
+    return sign_encrypt(ctx, signers, recipients, paths, outdata, encryptionFlags, baseDirectory);
+}
+
+static QGpgMESignEncryptArchiveJob::result_type sign_encrypt_to_filename(Context *ctx,
+                                                                         const std::vector<GpgME::Key> &signers,
+                                                                         const std::vector<Key> &recipients,
+                                                                         const std::vector<QString> &paths,
+                                                                         const QString &outputFile,
+                                                                         Context::EncryptionFlags encryptionFlags,
+                                                                         const QString &baseDirectory)
+{
+    Data outdata;
+    outdata.setFileName(QFile::encodeName(outputFile).constData());
+
+    return sign_encrypt(ctx, signers, recipients, paths, outdata, encryptionFlags, baseDirectory);
+}
+
 GpgME::Error QGpgMESignEncryptArchiveJob::start(const std::vector<GpgME::Key> &signers,
                                                 const std::vector<GpgME::Key> &recipients,
                                                 const std::vector<QString> &paths,
@@ -143,7 +158,7 @@ GpgME::Error QGpgMESignEncryptArchiveJob::start(const std::vector<GpgME::Key> &s
         return Error::fromCode(GPG_ERR_INV_VALUE);
     }
 
-    run(std::bind(&sign_encrypt,
+    run(std::bind(&sign_encrypt_to_io_device,
                   std::placeholders::_1,
                   std::placeholders::_2,
                   signers,
@@ -156,4 +171,17 @@ GpgME::Error QGpgMESignEncryptArchiveJob::start(const std::vector<GpgME::Key> &s
     return {};
 }
 
+GpgME::Error QGpgMESignEncryptArchiveJobPrivate::startIt()
+{
+    if (m_outputFilePath.isEmpty()) {
+        return Error::fromCode(GPG_ERR_INV_VALUE);
+    }
+
+    q->run([=](Context *ctx) {
+        return sign_encrypt_to_filename(ctx, m_signers, m_recipients, m_inputPaths, m_outputFilePath, m_encryptionFlags, m_baseDirectory);
+    });
+
+    return {};
+}
+
 #include "qgpgmesignencryptarchivejob.moc"