aboutsummaryrefslogtreecommitdiffstats
path: root/lang/qt/src
diff options
context:
space:
mode:
Diffstat (limited to 'lang/qt/src')
-rw-r--r--lang/qt/src/Makefile.am2
-rw-r--r--lang/qt/src/decryptverifyjob.cpp74
-rw-r--r--lang/qt/src/decryptverifyjob.h30
-rw-r--r--lang/qt/src/decryptverifyjob_p.h50
-rw-r--r--lang/qt/src/job.cpp3
-rw-r--r--lang/qt/src/qgpgmedecryptverifyjob.cpp91
6 files changed, 240 insertions, 10 deletions
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 5e16373e..ef625d89 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -36,6 +36,7 @@ qgpgme_sources = \
dataprovider.cpp \
debug.cpp \
decryptverifyarchivejob.cpp \
+ decryptverifyjob.cpp \
encryptarchivejob.cpp \
filelistdataprovider.cpp \
job.cpp multideletejob.cpp qgpgmeadduseridjob.cpp \
@@ -180,6 +181,7 @@ private_qgpgme_headers = \
changeexpiryjob_p.h \
cleaner.h \
decryptverifyarchivejob_p.h \
+ decryptverifyjob_p.h \
encryptarchivejob_p.h \
encryptjob_p.h \
importjob_p.h \
diff --git a/lang/qt/src/decryptverifyjob.cpp b/lang/qt/src/decryptverifyjob.cpp
new file mode 100644
index 00000000..f369f1d5
--- /dev/null
+++ b/lang/qt/src/decryptverifyjob.cpp
@@ -0,0 +1,74 @@
+/*
+ decryptverifyjob.cpp
+
+ This file is part of qgpgme, the Qt API binding for gpgme
+ Copyright (c) 2023 g10 Code GmbH
+ Software engineering by Ingo Klöcker <[email protected]>
+
+ QGpgME is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ QGpgME is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of this program with any edition of
+ the Qt library by Trolltech AS, Norway (or with modified versions
+ of Qt that use the same license as Qt), and distribute linked
+ combinations including the two. You must obey the GNU General
+ Public License in all respects for all of the code used other than
+ Qt. If you modify this file, you may extend this exception to
+ your version of the file, but you are not obligated to do so. If
+ you do not wish to do so, delete this exception statement from
+ your version.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include "decryptverifyjob.h"
+#include "decryptverifyjob_p.h"
+
+using namespace QGpgME;
+
+DecryptVerifyJob::DecryptVerifyJob(QObject *parent)
+ : Job{parent}
+{
+}
+
+DecryptVerifyJob::~DecryptVerifyJob() = default;
+
+void DecryptVerifyJob::setInputFile(const QString &path)
+{
+ auto d = jobPrivate<DecryptVerifyJobPrivate>(this);
+ d->m_inputFilePath = path;
+}
+
+QString DecryptVerifyJob::inputFile() const
+{
+ auto d = jobPrivate<DecryptVerifyJobPrivate>(this);
+ return d->m_inputFilePath;
+}
+
+void DecryptVerifyJob::setOutputFile(const QString &path)
+{
+ auto d = jobPrivate<DecryptVerifyJobPrivate>(this);
+ d->m_outputFilePath = path;
+}
+
+QString DecryptVerifyJob::outputFile() const
+{
+ auto d = jobPrivate<DecryptVerifyJobPrivate>(this);
+ return d->m_outputFilePath;
+}
+
+#include "decryptverifyjob.moc"
diff --git a/lang/qt/src/decryptverifyjob.h b/lang/qt/src/decryptverifyjob.h
index 8444e4d0..710fc80e 100644
--- a/lang/qt/src/decryptverifyjob.h
+++ b/lang/qt/src/decryptverifyjob.h
@@ -62,6 +62,14 @@ namespace QGpgME
DecryptVerifyJob instance will have scheduled it's own destruction with
a call to QObject::deleteLater().
+ Alternatively, the job can be started with startIt() after setting
+ an input file and an output file. If the job is started this way then
+ the backend reads the input and writes the output directly from/to the
+ specified input file and output file. In this case the plainText value of
+ the result signal will always be empty. This direct IO mode is currently
+ only supported for OpenPGP. Note that startIt() does not schedule the job's
+ destruction if starting the job failed.
+
After result() is emitted, the DecryptVerifyJob will schedule it's own
destruction by calling QObject::deleteLater().
*/
@@ -71,7 +79,27 @@ class QGPGME_EXPORT DecryptVerifyJob : public Job
protected:
explicit DecryptVerifyJob(QObject *parent);
public:
- ~DecryptVerifyJob();
+ ~DecryptVerifyJob() override;
+
+ /**
+ * Sets the path of the file to decrypt (and verify).
+ *
+ * Used if the job is started with startIt().
+ */
+ void setInputFile(const QString &path);
+ QString inputFile() const;
+
+ /**
+ * Sets the path of the file to write the result to.
+ *
+ * Used if the job is started with startIt().
+ *
+ * \note If a file with this path exists, then the job will fail, i.e. you
+ * need to delete an existing file that shall be overwritten before you
+ * start the job.
+ */
+ void setOutputFile(const QString &path);
+ QString outputFile() const;
/**
Starts the combined decryption and verification operation.
diff --git a/lang/qt/src/decryptverifyjob_p.h b/lang/qt/src/decryptverifyjob_p.h
new file mode 100644
index 00000000..bbd30b59
--- /dev/null
+++ b/lang/qt/src/decryptverifyjob_p.h
@@ -0,0 +1,50 @@
+/*
+ decryptverifyjob_p.h
+
+ This file is part of qgpgme, the Qt API binding for gpgme
+ Copyright (c) 2023 g10 Code GmbH
+ Software engineering by Ingo Klöcker <[email protected]>
+
+ QGpgME is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ QGpgME is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of this program with any edition of
+ the Qt library by Trolltech AS, Norway (or with modified versions
+ of Qt that use the same license as Qt), and distribute linked
+ combinations including the two. You must obey the GNU General
+ Public License in all respects for all of the code used other than
+ Qt. If you modify this file, you may extend this exception to
+ your version of the file, but you are not obligated to do so. If
+ you do not wish to do so, delete this exception statement from
+ your version.
+*/
+
+#ifndef __QGPGME_DECRYPTVERIFYJOB_P_H__
+#define __QGPGME_DECRYPTVERIFYJOB_P_H__
+
+#include "job_p.h"
+
+namespace QGpgME
+{
+
+struct DecryptVerifyJobPrivate : public JobPrivate
+{
+ QString m_inputFilePath;
+ QString m_outputFilePath;
+};
+
+}
+
+#endif // __QGPGME_DECRYPTVERIFYJOB_P_H__
diff --git a/lang/qt/src/job.cpp b/lang/qt/src/job.cpp
index 3c9422bb..56088ce3 100644
--- a/lang/qt/src/job.cpp
+++ b/lang/qt/src/job.cpp
@@ -44,7 +44,6 @@
#include "keylistjob.h"
#include "listallkeysjob.h"
#include "decryptjob.h"
-#include "decryptverifyjob.h"
#include "signkeyjob.h"
#include "verifydetachedjob.h"
#include "verifyopaquejob.h"
@@ -162,7 +161,6 @@ void QGpgME::Job::startNow()
make_job_subclass(KeyListJob)
make_job_subclass(ListAllKeysJob)
make_job_subclass(DecryptJob)
-make_job_subclass(DecryptVerifyJob)
make_job_subclass(SignKeyJob)
make_job_subclass(VerifyDetachedJob)
make_job_subclass(VerifyOpaqueJob)
@@ -197,7 +195,6 @@ make_job_subclass(SetPrimaryUserIDJob)
#include "keylistjob.moc"
#include "listallkeysjob.moc"
#include "decryptjob.moc"
-#include "decryptverifyjob.moc"
#include "signkeyjob.moc"
#include "verifydetachedjob.moc"
#include "verifyopaquejob.moc"
diff --git a/lang/qt/src/qgpgmedecryptverifyjob.cpp b/lang/qt/src/qgpgmedecryptverifyjob.cpp
index 256160b5..bc135147 100644
--- a/lang/qt/src/qgpgmedecryptverifyjob.cpp
+++ b/lang/qt/src/qgpgmedecryptverifyjob.cpp
@@ -39,25 +39,55 @@
#include "qgpgmedecryptverifyjob.h"
#include "dataprovider.h"
+#include "decryptverifyjob_p.h"
+#include "util.h"
-#include "context.h"
-#include "decryptionresult.h"
-#include "verificationresult.h"
-#include "data.h"
+#include <context.h>
+#include <decryptionresult.h>
+#include <verificationresult.h>
+#include <data.h>
#include <QDebug>
#include "qgpgme_debug.h"
#include <QBuffer>
+#include <QFile>
#include <cassert>
using namespace QGpgME;
using namespace GpgME;
+namespace
+{
+
+class QGpgMEDecryptVerifyJobPrivate : public DecryptVerifyJobPrivate
+{
+ QGpgMEDecryptVerifyJob *q = nullptr;
+
+public:
+ QGpgMEDecryptVerifyJobPrivate(QGpgMEDecryptVerifyJob *qq)
+ : q{qq}
+ {
+ }
+
+ ~QGpgMEDecryptVerifyJobPrivate() override = default;
+
+private:
+ GpgME::Error startIt() override;
+
+ void startNow() override
+ {
+ q->run();
+ }
+};
+
+}
+
QGpgMEDecryptVerifyJob::QGpgMEDecryptVerifyJob(Context *context)
: mixin_type(context)
{
+ setJobPrivate(this, std::unique_ptr<QGpgMEDecryptVerifyJobPrivate>{new QGpgMEDecryptVerifyJobPrivate{this}});
lateInitialization();
}
@@ -112,6 +142,43 @@ static QGpgMEDecryptVerifyJob::result_type decrypt_verify_qba(Context *ctx, cons
return decrypt_verify(ctx, nullptr, buffer, std::shared_ptr<QIODevice>());
}
+static QGpgMEDecryptVerifyJob::result_type decrypt_verify_from_filename(Context *ctx,
+ const QString &inputFilePath,
+ const QString &outputFilePath)
+{
+ Data indata;
+#ifdef Q_OS_WIN
+ indata.setFileName(inputFilePath().toUtf8().constData());
+#else
+ indata.setFileName(QFile::encodeName(inputFilePath).constData());
+#endif
+
+ PartialFileGuard partFileGuard{outputFilePath};
+ if (partFileGuard.tempFileName().isEmpty()) {
+ return std::make_tuple(DecryptionResult{Error::fromCode(GPG_ERR_EEXIST)}, VerificationResult{Error::fromCode(GPG_ERR_EEXIST)}, QByteArray{}, QString{}, Error{});
+ }
+
+ Data outdata;
+#ifdef Q_OS_WIN
+ outdata.setFileName(partFileGuard.tempFileName().toUtf8().constData());
+#else
+ outdata.setFileName(QFile::encodeName(partFileGuard.tempFileName()).constData());
+#endif
+
+ const auto results = ctx->decryptAndVerify(indata, outdata);
+ const auto &decryptionResult = results.first;
+ const auto &verificationResult = results.second;
+
+ if (!decryptionResult.error().code() && !verificationResult.error().code()) {
+ // the operation succeeded -> save the result under the requested file name
+ partFileGuard.commit();
+ }
+
+ Error ae;
+ const QString log = _detail::audit_log_as_html(ctx, ae);
+ return std::make_tuple(decryptionResult, verificationResult, QByteArray{}, log, ae);
+}
+
Error QGpgMEDecryptVerifyJob::start(const QByteArray &cipherText)
{
run(std::bind(&decrypt_verify_qba, std::placeholders::_1, cipherText));
@@ -132,10 +199,22 @@ QGpgME::QGpgMEDecryptVerifyJob::exec(const QByteArray &cipherText, QByteArray &p
return mResult;
}
-//PENDING(marc) implement showErrorDialog()
-
void QGpgMEDecryptVerifyJob::resultHook(const result_type &tuple)
{
mResult = std::make_pair(std::get<0>(tuple), std::get<1>(tuple));
}
+
+GpgME::Error QGpgMEDecryptVerifyJobPrivate::startIt()
+{
+ if (m_inputFilePath.isEmpty() || m_outputFilePath.isEmpty()) {
+ return Error::fromCode(GPG_ERR_INV_VALUE);
+ }
+
+ q->run([=](Context *ctx) {
+ return decrypt_verify_from_filename(ctx, m_inputFilePath, m_outputFilePath);
+ });
+
+ return {};
+}
+
#include "qgpgmedecryptverifyjob.moc"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-17 21:39:16 +0000