From e608315392cc5b7ddf51e16dce5fe7e99b83f011 Mon Sep 17 00:00:00 2001 From: Ingo Klöcker Date: Mon, 19 Jun 2023 17:52:30 +0200 Subject: 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 --- lang/qt/src/qgpgmesignarchivejob.cpp | 60 +++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 14 deletions(-) (limited to 'lang/qt/src/qgpgmesignarchivejob.cpp') diff --git a/lang/qt/src/qgpgmesignarchivejob.cpp b/lang/qt/src/qgpgmesignarchivejob.cpp index c25ea89f..005b3e44 100644 --- a/lang/qt/src/qgpgmesignarchivejob.cpp +++ b/lang/qt/src/qgpgmesignarchivejob.cpp @@ -44,6 +44,8 @@ #include "signarchivejob_p.h" #include "filelistdataprovider.h" +#include + #include using namespace QGpgME; @@ -65,11 +67,7 @@ public: ~QGpgMESignArchiveJobPrivate() 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 { @@ -90,24 +88,17 @@ QGpgMESignArchiveJob::QGpgMESignArchiveJob(Context *context) } static QGpgMESignArchiveJob::result_type sign(Context *ctx, - QThread *thread, const std::vector &signers, const std::vector &paths, - const std::weak_ptr &output_, + GpgME::Data &outdata, const QString &baseDirectory) { - const std::shared_ptr output = output_.lock(); - const _detail::ToThreadMover ctMover(output, thread); - QGpgME::FileListDataProvider in{paths}; Data indata(&in); if (!baseDirectory.isEmpty()) { indata.setFileName(baseDirectory.toStdString()); } - QGpgME::QIODeviceDataProvider out{output}; - Data outdata(&out); - ctx->clearSigningKeys(); for (const Key &signer : signers) { if (!signer.isNull()) { @@ -123,6 +114,33 @@ static QGpgMESignArchiveJob::result_type sign(Context *ctx, return std::make_tuple(res, log, ae); } +static QGpgMESignArchiveJob::result_type sign_to_io_device(Context *ctx, + QThread *thread, + const std::vector &signers, + const std::vector &paths, + const std::weak_ptr &output_, + const QString &baseDirectory) +{ + const std::shared_ptr output = output_.lock(); + const _detail::ToThreadMover ctMover(output, thread); + QGpgME::QIODeviceDataProvider out{output}; + Data outdata(&out); + + return sign(ctx, signers, paths, outdata, baseDirectory); +} + +static QGpgMESignArchiveJob::result_type sign_to_filename(Context *ctx, + const std::vector &signers, + const std::vector &paths, + const QString &outputFile, + const QString &baseDirectory) +{ + Data outdata; + outdata.setFileName(QFile::encodeName(outputFile).constData()); + + return sign(ctx, signers, paths, outdata, baseDirectory); +} + GpgME::Error QGpgMESignArchiveJob::start(const std::vector &signers, const std::vector &paths, const std::shared_ptr &output) @@ -131,7 +149,7 @@ GpgME::Error QGpgMESignArchiveJob::start(const std::vector &signers, return Error::fromCode(GPG_ERR_INV_VALUE); } - run(std::bind(&sign, + run(std::bind(&sign_to_io_device, std::placeholders::_1, std::placeholders::_2, signers, @@ -142,4 +160,18 @@ GpgME::Error QGpgMESignArchiveJob::start(const std::vector &signers, return {}; } + +GpgME::Error QGpgMESignArchiveJobPrivate::startIt() +{ + if (m_outputFilePath.isEmpty()) { + return Error::fromCode(GPG_ERR_INV_VALUE); + } + + q->run([=](Context *ctx) { + return sign_to_filename(ctx, m_signers, m_inputPaths, m_outputFilePath, m_baseDirectory); + }); + + return {}; +} + #include "qgpgmesignarchivejob.moc" -- cgit