qt: Allow setting the file name of signed and encrypted data
* lang/qt/src/Makefile.am (qgpgme_sources): Add signencryptjob.cpp. * lang/qt/src/signencryptjob.cpp: New. * lang/qt/src/signencryptjob.h (class SignEncryptJob): Add member functions setFileName, fileName. * lang/qt/src/qgpgmesignencryptjob.cpp (sign_encrypt): Set file name of input. (sign_encrypt_qba, QGpgMESignEncryptJob::exec, QGpgMESignEncryptJob::start): Pass file name to sign_encrypt resp. sign_encrypt_qba. -- This makes it possible to store the original name of a signed and encrypted file in the resulting data. GnuPG-bug-id: 6056
This commit is contained in:
Ingo Klöcker
parent
bc10169724
commit
5436b309fe
@ -45,6 +45,7 @@ qgpgme_sources = \
|
||||
qgpgmetofupolicyjob.cpp qgpgmequickjob.cpp \
|
||||
defaultkeygenerationjob.cpp qgpgmewkspublishjob.cpp \
|
||||
qgpgmegpgcardjob.cpp changeexpiryjob.cpp encryptjob.cpp importjob.cpp \
|
||||
signencryptjob.cpp \
|
||||
dn.cpp cryptoconfig.cpp wkdlookupresult.cpp \
|
||||
util.cpp
|
||||
|
||||
|
||||
@ -5,6 +5,8 @@
|
||||
Copyright (c) 2004, 2007 Klarälvdalens Datakonsult AB
|
||||
Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik
|
||||
Software engineering by Intevation GmbH
|
||||
Copyright (c) 2022 g10 Code GmbH
|
||||
Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
|
||||
|
||||
QGpgME is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License as
|
||||
@ -46,7 +48,7 @@
|
||||
#include "exception.h"
|
||||
|
||||
#include <QBuffer>
|
||||
|
||||
#include <QFileInfo>
|
||||
|
||||
#include <cassert>
|
||||
|
||||
@ -69,7 +71,7 @@ void QGpgMESignEncryptJob::setOutputIsBase64Encoded(bool on)
|
||||
|
||||
static QGpgMESignEncryptJob::result_type sign_encrypt(Context *ctx, QThread *thread, const std::vector<Key> &signers,
|
||||
const std::vector<Key> &recipients, const std::weak_ptr<QIODevice> &plainText_,
|
||||
const std::weak_ptr<QIODevice> &cipherText_, const Context::EncryptionFlags eflags, bool outputIsBsse64Encoded)
|
||||
const std::weak_ptr<QIODevice> &cipherText_, const Context::EncryptionFlags eflags, bool outputIsBsse64Encoded, const QString &fileName)
|
||||
{
|
||||
const std::shared_ptr<QIODevice> &plainText = plainText_.lock();
|
||||
const std::shared_ptr<QIODevice> &cipherText = cipherText_.lock();
|
||||
@ -78,7 +80,12 @@ static QGpgMESignEncryptJob::result_type sign_encrypt(Context *ctx, QThread *thr
|
||||
const _detail::ToThreadMover ptMover(plainText, thread);
|
||||
|
||||
QGpgME::QIODeviceDataProvider in(plainText);
|
||||
const Data indata(&in);
|
||||
Data indata(&in);
|
||||
|
||||
const auto pureFileName = QFileInfo{fileName}.fileName().toStdString();
|
||||
if (!pureFileName.empty()) {
|
||||
indata.setFileName(pureFileName.c_str());
|
||||
}
|
||||
|
||||
ctx->clearSigningKeys();
|
||||
Q_FOREACH (const Key &signer, signers)
|
||||
@ -116,26 +123,26 @@ static QGpgMESignEncryptJob::result_type sign_encrypt(Context *ctx, QThread *thr
|
||||
}
|
||||
|
||||
static QGpgMESignEncryptJob::result_type sign_encrypt_qba(Context *ctx, const std::vector<Key> &signers,
|
||||
const std::vector<Key> &recipients, const QByteArray &plainText, const Context::EncryptionFlags eflags, bool outputIsBsse64Encoded)
|
||||
const std::vector<Key> &recipients, const QByteArray &plainText, const Context::EncryptionFlags eflags, bool outputIsBsse64Encoded, const QString &fileName)
|
||||
{
|
||||
const std::shared_ptr<QBuffer> buffer(new QBuffer);
|
||||
buffer->setData(plainText);
|
||||
if (!buffer->open(QIODevice::ReadOnly)) {
|
||||
assert(!"This should never happen: QBuffer::open() failed");
|
||||
}
|
||||
return sign_encrypt(ctx, nullptr, signers, recipients, buffer, std::shared_ptr<QIODevice>(), eflags, outputIsBsse64Encoded);
|
||||
return sign_encrypt(ctx, nullptr, signers, recipients, buffer, std::shared_ptr<QIODevice>(), eflags, outputIsBsse64Encoded, fileName);
|
||||
}
|
||||
|
||||
Error QGpgMESignEncryptJob::start(const std::vector<Key> &signers, const std::vector<Key> &recipients, const QByteArray &plainText, bool alwaysTrust)
|
||||
{
|
||||
run(std::bind(&sign_encrypt_qba, std::placeholders::_1, signers, recipients, plainText, alwaysTrust ? Context::AlwaysTrust : Context::None, mOutputIsBase64Encoded));
|
||||
run(std::bind(&sign_encrypt_qba, std::placeholders::_1, signers, recipients, plainText, alwaysTrust ? Context::AlwaysTrust : Context::None, mOutputIsBase64Encoded, fileName()));
|
||||
return Error();
|
||||
}
|
||||
|
||||
void QGpgMESignEncryptJob::start(const std::vector<Key> &signers, const std::vector<Key> &recipients,
|
||||
const std::shared_ptr<QIODevice> &plainText, const std::shared_ptr<QIODevice> &cipherText, const Context::EncryptionFlags eflags)
|
||||
{
|
||||
run(std::bind(&sign_encrypt, std::placeholders::_1, std::placeholders::_2, signers, recipients, std::placeholders::_3, std::placeholders::_4, eflags, mOutputIsBase64Encoded), plainText, cipherText);
|
||||
run(std::bind(&sign_encrypt, std::placeholders::_1, std::placeholders::_2, signers, recipients, std::placeholders::_3, std::placeholders::_4, eflags, mOutputIsBase64Encoded, fileName()), plainText, cipherText);
|
||||
}
|
||||
|
||||
void QGpgMESignEncryptJob::start(const std::vector<Key> &signers, const std::vector<Key> &recipients, const std::shared_ptr<QIODevice> &plainText, const std::shared_ptr<QIODevice> &cipherText, bool alwaysTrust)
|
||||
@ -145,7 +152,7 @@ void QGpgMESignEncryptJob::start(const std::vector<Key> &signers, const std::vec
|
||||
|
||||
std::pair<SigningResult, EncryptionResult> QGpgMESignEncryptJob::exec(const std::vector<Key> &signers, const std::vector<Key> &recipients, const QByteArray &plainText, const Context::EncryptionFlags eflags, QByteArray &cipherText)
|
||||
{
|
||||
const result_type r = sign_encrypt_qba(context(), signers, recipients, plainText, eflags, mOutputIsBase64Encoded);
|
||||
const result_type r = sign_encrypt_qba(context(), signers, recipients, plainText, eflags, mOutputIsBase64Encoded, fileName());
|
||||
cipherText = std::get<2>(r);
|
||||
resultHook(r);
|
||||
return mResult;
|
||||
|
||||
61
lang/qt/src/signencryptjob.cpp
Normal file
61
lang/qt/src/signencryptjob.cpp
Normal file
@ -0,0 +1,61 @@
|
||||
/*
|
||||
signencryptjob.cpp
|
||||
|
||||
This file is part of qgpgme, the Qt API binding for gpgme
|
||||
Copyright (c) 2022 g10 Code GmbH
|
||||
Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
|
||||
|
||||
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 "signencryptjob.h"
|
||||
#include "job_p.h"
|
||||
|
||||
using namespace QGpgME;
|
||||
|
||||
namespace
|
||||
{
|
||||
struct SignEncryptJobPrivate : public JobPrivate
|
||||
{
|
||||
QString m_fileName;
|
||||
};
|
||||
}
|
||||
|
||||
void SignEncryptJob::setFileName(const QString &fileName)
|
||||
{
|
||||
auto d = jobPrivate<SignEncryptJobPrivate>(this);
|
||||
d->m_fileName = fileName;
|
||||
}
|
||||
|
||||
QString SignEncryptJob::fileName() const
|
||||
{
|
||||
auto d = jobPrivate<SignEncryptJobPrivate>(this);
|
||||
return d->m_fileName;
|
||||
}
|
||||
@ -5,6 +5,8 @@
|
||||
Copyright (c) 2004, 2007 Klarälvdalens Datakonsult AB
|
||||
Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik
|
||||
Software engineering by Intevation GmbH
|
||||
Copyright (c) 2022 g10 Code GmbH
|
||||
Software engineering by Ingo Klöcker <dev@ingo-kloecker.de>
|
||||
|
||||
QGpgME is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License as
|
||||
@ -85,6 +87,9 @@ protected:
|
||||
public:
|
||||
~SignEncryptJob();
|
||||
|
||||
void setFileName(const QString &fileName);
|
||||
QString fileName() const;
|
||||
|
||||
/**
|
||||
Starts the combined signing and encrypting operation. \a signers
|
||||
is the list of keys to sign \a plainText with. \a recipients is
|
||||
|
||||
Loading…
Reference in New Issue
Block a user