diff --git a/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp b/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp index 3187a0cd..3e430ad7 100644 --- a/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp +++ b/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp @@ -1,253 +1,253 @@ /* qgpgmerefreshsmimekeysjob.cpp This file is part of qgpgme, the Qt API binding for gpgme Copyright (c) 2004 Klarävdalens Datakonsult AB Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik Software engineering by Intevation GmbH 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. */ #define MAX_CMD_LENGTH 32768 #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "qgpgmerefreshsmimekeysjob.h" #include "util.h" #include #include "qgpgme_debug.h" #include "context.h" #include #include #include #include #include #include #include using namespace QGpgME; QGpgMERefreshSMIMEKeysJob::QGpgMERefreshSMIMEKeysJob() : RefreshKeysJob(nullptr), mProcess(nullptr), mError(0) { } QGpgMERefreshSMIMEKeysJob::~QGpgMERefreshSMIMEKeysJob() { } GpgME::Error QGpgMERefreshSMIMEKeysJob::start(const QStringList &patterns) { assert(mPatternsToDo.empty()); mPatternsToDo = patterns; if (mPatternsToDo.empty()) { mPatternsToDo.push_back(QStringLiteral(" ")); // empty list means all -> mae } // sure to fail the first // startAProcess() guard clause return startAProcess(); } GpgME::Error QGpgMERefreshSMIMEKeysJob::start(const std::vector &keys) { if (keys.empty()) { QMetaObject::invokeMethod(this, [this]() { Q_EMIT slotProcessExited(0, QProcess::NormalExit); }, Qt::QueuedConnection); return {}; } - const bool gotWrongKeys = std::any_of(std::begin(keys), std::end(keys), [](const auto &k) { + const bool gotWrongKeys = std::any_of(std::begin(keys), std::end(keys), [](const GpgME::Key &k) { return k.protocol() != GpgME::CMS; }); if (gotWrongKeys) { qCDebug(QGPGME_LOG) << "Error: At least one of the keys is not an S/MIME key"; return GpgME::Error::fromCode(GPG_ERR_INV_VALUE); } return start(toFingerprints(keys)); } #if MAX_CMD_LENGTH < 65 + 128 #error MAX_CMD_LENGTH is too low #endif GpgME::Error QGpgMERefreshSMIMEKeysJob::startAProcess() { if (mPatternsToDo.empty()) { return GpgME::Error(); } // create and start gpgsm process: mProcess = new QProcess(this); mProcess->setObjectName(QStringLiteral("gpgsm -k --with-validation --force-crl-refresh --enable-crl-checks")); // FIXME: obbtain the path to gpgsm from gpgme, so we use the same instance. mProcess->setProgram(QStringLiteral("gpgsm")); QStringList arguments; arguments << QStringLiteral("-k") << QStringLiteral("--with-validation") << QStringLiteral("--force-crl-refresh") << QStringLiteral("--enable-crl-checks"); unsigned int commandLineLength = MAX_CMD_LENGTH; commandLineLength -= strlen("gpgsm") + 1 + strlen("-k") + 1 + strlen("--with-validation") + 1 + strlen("--force-crl-refresh") + 1 + strlen("--enable-crl-checks") + 1; while (!mPatternsToDo.empty()) { const QByteArray pat = mPatternsToDo.front().toUtf8().trimmed(); const unsigned int patLength = pat.length(); if (patLength >= commandLineLength) { break; } mPatternsToDo.pop_front(); if (pat.isEmpty()) { continue; } arguments << QLatin1String(pat); commandLineLength -= patLength + 1; } mProcess->setArguments(arguments); connect(mProcess, SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(slotProcessExited(int,QProcess::ExitStatus))); connect(mProcess, &QProcess::readyReadStandardOutput, this, [this]() { qCDebug(QGPGME_LOG) << "stdout:" << mProcess->readAllStandardOutput(); }); connect(mProcess, &QProcess::readyReadStandardError, this, [this]() { qCDebug(QGPGME_LOG) << "stderr:" << mProcess->readAllStandardError(); }); mProcess->start(); if (!mProcess->waitForStarted()) { mError = GpgME::Error::fromCode(GPG_ERR_ENOENT, GPG_ERR_SOURCE_GPGSM); // what else? deleteLater(); return mError; } else { return GpgME::Error(); } } void QGpgMERefreshSMIMEKeysJob::slotCancel() { if (mProcess) { mProcess->kill(); } mProcess = nullptr; mError = GpgME::Error::fromCode(GPG_ERR_CANCELED, GPG_ERR_SOURCE_GPGSM); } void QGpgMERefreshSMIMEKeysJob::slotStatus(QProcess *proc, const QString &type, const QStringList &args) { if (proc != mProcess) { return; } QStringList::const_iterator it = args.begin(); bool ok = false; if (type == QLatin1String("ERROR")) { if (args.size() < 2) { qCDebug(QGPGME_LOG) << "not recognising ERROR with < 2 args!"; return; } const int source = (*++it).toInt(&ok); if (!ok) { qCDebug(QGPGME_LOG) << "expected number for first ERROR arg, got something else"; return; } ok = false; const int code = (*++it).toInt(&ok); if (!ok) { qCDebug(QGPGME_LOG) << "expected number for second ERROR arg, got something else"; return; } mError = GpgME::Error::fromCode(code, source); } else if (type == QLatin1String("PROGRESS")) { if (args.size() < 4) { qCDebug(QGPGME_LOG) << "not recognising PROGRESS with < 4 args!"; return; } const QString what = *++it; ok = false; (*++it).toInt(&ok); if (!ok) { qCDebug(QGPGME_LOG) << "expected number for \"type\", got something else"; return; } ok = false; const int cur = (*++it).toInt(&ok); if (!ok) { qCDebug(QGPGME_LOG) << "expected number for \"cur\", got something else"; return; } ok = false; const int total = (*++it).toInt(&ok); if (!ok) { qCDebug(QGPGME_LOG) << "expected number for \"total\", got something else"; return; } // TODO port Q_EMIT progress(QString(), cur, total); } } void QGpgMERefreshSMIMEKeysJob::slotProcessExited(int exitCode, QProcess::ExitStatus exitStatus) { if (!mError && !mPatternsToDo.empty()) { if (const GpgME::Error err = startAProcess()) { mError = err; } else { return; } } Q_EMIT done(); if (!mError && (exitStatus != QProcess::NormalExit || exitCode != 0)) { mError = GpgME::Error::fromCode(GPG_ERR_GENERAL, GPG_ERR_SOURCE_GPGSM); } Q_EMIT result(mError); deleteLater(); } #include "qgpgmerefreshsmimekeysjob.moc" diff --git a/lang/qt/src/qgpgmesignkeyjob.cpp b/lang/qt/src/qgpgmesignkeyjob.cpp index 506d64a1..1693a5be 100644 --- a/lang/qt/src/qgpgmesignkeyjob.cpp +++ b/lang/qt/src/qgpgmesignkeyjob.cpp @@ -1,233 +1,242 @@ /* qgpgmesignkeyjob.cpp This file is part of qgpgme, the Qt API binding for gpgme Copyright (c) 2008 Klarälvdalens Datakonsult AB Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik Software engineering by Intevation GmbH 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 "qgpgmesignkeyjob.h" #include #include #include "dataprovider.h" #include "context.h" #include "data.h" #include "gpgsignkeyeditinteractor.h" #include "qgpgme_debug.h" #include using namespace QGpgME; using namespace GpgME; namespace { struct TrustSignatureProperties { + TrustSignatureProperties() = default; + // needed for C++11 because until C++14 "aggregate initialization requires + // class type, that has no default member initializers" + TrustSignatureProperties(TrustSignatureTrust trust_, unsigned int depth_, const QString &scope_) + : trust{trust_} + , depth{depth_} + , scope{scope_} + {} + TrustSignatureTrust trust = TrustSignatureTrust::None; unsigned int depth = 0; QString scope; }; } class QGpgMESignKeyJob::Private { public: Private() = default; std::vector m_userIDsToSign; GpgME::Key m_signingKey; unsigned int m_checkLevel = 0; bool m_exportable = false; bool m_nonRevocable = false; bool m_started = false; bool m_dupeOk = false; QString m_remark; TrustSignatureProperties m_trustSignature; QDate m_expiration; }; QGpgMESignKeyJob::QGpgMESignKeyJob(Context *context) : mixin_type(context) , d{std::unique_ptr(new Private())} { lateInitialization(); } QGpgMESignKeyJob::~QGpgMESignKeyJob() {} static QGpgMESignKeyJob::result_type sign_key(Context *ctx, const Key &key, const std::vector &uids, unsigned int checkLevel, const Key &signer, unsigned int opts, bool dupeOk, const QString &remark, const TrustSignatureProperties &trustSignature, const QDate &expirationDate) { QGpgME::QByteArrayDataProvider dp; Data data(&dp); GpgSignKeyEditInteractor *skei(new GpgSignKeyEditInteractor); skei->setUserIDsToSign(uids); skei->setCheckLevel(checkLevel); skei->setSigningOptions(opts); skei->setKey(key); if (dupeOk) { ctx->setFlag("extended-edit", "1"); skei->setDupeOk(true); } if (!remark.isEmpty()) { ctx->addSignatureNotation("rem@gnupg.org", remark.toUtf8().constData()); } if (opts & GpgSignKeyEditInteractor::Trust) { skei->setTrustSignatureTrust(trustSignature.trust); skei->setTrustSignatureDepth(trustSignature.depth); skei->setTrustSignatureScope(trustSignature.scope.toUtf8().toStdString()); } if (!signer.isNull()) { if (const Error err = ctx->addSigningKey(signer)) { return std::make_tuple(err, QString(), Error()); } } if (expirationDate.isValid()) { // on 2106-02-07, the Unix time will reach 0xFFFFFFFF; since gpg uses uint32 internally // for the expiration date clip it at 2106-02-05 to avoid problems with negative time zones static const QDate maxAllowedDate{2106, 2, 5}; const auto clippedExpirationDate = expirationDate <= maxAllowedDate ? expirationDate : maxAllowedDate; if (clippedExpirationDate != expirationDate) { qCDebug(QGPGME_LOG) << "Expiration of certification has been changed to" << clippedExpirationDate; } // use the "days from now" format to specify the expiration date of the certification; // this format is the most appropriate regardless of the local timezone const auto daysFromNow = QDate::currentDate().daysTo(clippedExpirationDate); if (daysFromNow > 0) { const auto certExpire = std::to_string(daysFromNow) + "d"; ctx->setFlag("cert-expire", certExpire.c_str()); } } else { // explicitly set "cert-expire" to "0" (no expiration) to override default-cert-expire set in gpg.conf ctx->setFlag("cert-expire", "0"); } const Error err = ctx->edit(key, std::unique_ptr (skei), data); Error ae; const QString log = _detail::audit_log_as_html(ctx, ae); return std::make_tuple(err, log, ae); } Error QGpgMESignKeyJob::start(const Key &key) { unsigned int opts = 0; if (d->m_nonRevocable) { opts |= GpgSignKeyEditInteractor::NonRevocable; } if (d->m_exportable) { opts |= GpgSignKeyEditInteractor::Exportable; } switch (d->m_trustSignature.trust) { case TrustSignatureTrust::Partial: case TrustSignatureTrust::Complete: opts |= GpgSignKeyEditInteractor::Trust; break; default: opts &= ~GpgSignKeyEditInteractor::Trust; break; } run(std::bind(&sign_key, std::placeholders::_1, key, d->m_userIDsToSign, d->m_checkLevel, d->m_signingKey, opts, d->m_dupeOk, d->m_remark, d->m_trustSignature, d->m_expiration)); d->m_started = true; return Error(); } void QGpgMESignKeyJob::setUserIDsToSign(const std::vector &idsToSign) { assert(!d->m_started); d->m_userIDsToSign = idsToSign; } void QGpgMESignKeyJob::setCheckLevel(unsigned int checkLevel) { assert(!d->m_started); d->m_checkLevel = checkLevel; } void QGpgMESignKeyJob::setExportable(bool exportable) { assert(!d->m_started); d->m_exportable = exportable; } void QGpgMESignKeyJob::setSigningKey(const Key &key) { assert(!d->m_started); d->m_signingKey = key; } void QGpgMESignKeyJob::setNonRevocable(bool nonRevocable) { assert(!d->m_started); d->m_nonRevocable = nonRevocable; } void QGpgMESignKeyJob::setRemark(const QString &remark) { assert(!d->m_started); d->m_remark = remark; } void QGpgMESignKeyJob::setDupeOk(bool value) { assert(!d->m_started); d->m_dupeOk = value; } void QGpgMESignKeyJob::setTrustSignature(GpgME::TrustSignatureTrust trust, unsigned short depth, const QString &scope) { assert(!d->m_started); assert(depth <= 255); d->m_trustSignature = {trust, depth, scope}; } void QGpgMESignKeyJob::setExpirationDate(const QDate &expiration) { assert(!d->m_started); d->m_expiration = expiration; } #include "qgpgmesignkeyjob.moc" diff --git a/lang/qt/src/util.cpp b/lang/qt/src/util.cpp index c6e1a6ae..d4190eb8 100644 --- a/lang/qt/src/util.cpp +++ b/lang/qt/src/util.cpp @@ -1,63 +1,63 @@ /* util.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 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 "util.h" #include #include #include std::vector toStrings(const QStringList &l) { std::vector v; v.reserve(l.size()); std::transform(std::begin(l), std::end(l), std::back_inserter(v), std::mem_fn(&QString::toStdString)); return v; } QStringList toFingerprints(const std::vector &keys) { QStringList fprs; fprs.reserve(keys.size()); - std::transform(std::begin(keys), std::end(keys), std::back_inserter(fprs), [](const auto &k) { + std::transform(std::begin(keys), std::end(keys), std::back_inserter(fprs), [](const GpgME::Key &k) { return QString::fromLatin1(k.primaryFingerprint()); }); return fprs; } diff --git a/lang/qt/tests/run-exportjob.cpp b/lang/qt/tests/run-exportjob.cpp index 0f8fd8fd..40072c85 100644 --- a/lang/qt/tests/run-exportjob.cpp +++ b/lang/qt/tests/run-exportjob.cpp @@ -1,119 +1,119 @@ /* run-exportjob.cpp This file is part of QGpgME's test suite. Copyright (c) 2022 by g10 Code GmbH Software engineering by Ingo Klöcker QGpgME is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as published by the Free Software Foundation. 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 #include #include #include #include using namespace GpgME; using std::cout; using std::cerr; static void showUsageAndExitWithCode(int exitCode) { cerr << "Usage: run-exportjob [OPTION]... [PATTERN]...\n" "Options:\n" " --secret export secret keys instead of public keys\n" " --secret-subkey export secret subkeys instead of public keys\n"; exit(exitCode); } -static auto createExportJob(unsigned int mode) +static QGpgME::ExportJob *createExportJob(unsigned int mode) { if (mode & Context::ExportSecretSubkey) { return QGpgME::openpgp()->secretSubkeyExportJob(/*armor=*/true); } else if (mode & Context::ExportSecret) { return QGpgME::openpgp()->secretKeyExportJob(/*armor=*/true); } return QGpgME::openpgp()->publicKeyExportJob(/*armor=*/true); } int main(int argc, char *argv[]) { GpgME::initializeLibrary(); QCoreApplication app{argc, argv}; unsigned int exportMode = 0; auto arguments = app.arguments(); if (!arguments.isEmpty()) { arguments.pop_front(); // remove program name } while (!arguments.isEmpty()) { const auto &arg = arguments.front(); if (!arg.startsWith(QLatin1String{"--"})) { break; } if (arg == QLatin1String{"--"}) { arguments.pop_front(); break; } if (arg == QLatin1String{"--help"}) { showUsageAndExitWithCode(0); } else if (arg == QLatin1String{"--secret"}) { exportMode = Context::ExportSecret; arguments.pop_front(); } else if (arg == QLatin1String{"--secret-subkey"}) { exportMode = Context::ExportSecretSubkey; arguments.pop_front(); } else { cerr << "Error: Invalid option " << arg.toStdString() << std::endl; showUsageAndExitWithCode(1); } } auto job = createExportJob(exportMode); QObject::connect(job, &QGpgME::ExportJob::result, &app, [&app] (const GpgME::Error &err, const QByteArray &keyData, const QString &, const GpgME::Error &) { if (err) { cerr << "The ChangeExpiryJob failed with" << err.asString() << "."; app.exit(1); return; } cout << "Begin Result:\n" << keyData.toStdString() << "End Result:\n"; app.exit(); }); job->start(arguments); return app.exec(); }