diff --git a/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp b/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp index 1cb7abe3..81257d55 100644 --- a/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp +++ b/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp @@ -1,232 +1,260 @@ /* 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 #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) { + 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); + } + + QStringList fprs; + fprs.reserve(keys.size()); + std::transform(std::begin(keys), std::end(keys), std::back_inserter(fprs), [](const auto &k) { + return QString::fromLatin1(k.primaryFingerprint()); + }); + return start(fprs); +} + #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, SIGNAL(readyReadStandardOutput()), SLOT(slotStdout())); connect(mProcess, &QProcess::readyReadStandardError, this, &QGpgMERefreshSMIMEKeysJob::slotStderr); 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::slotStderr() { // implement? or not? } 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/qgpgmerefreshsmimekeysjob.h b/lang/qt/src/qgpgmerefreshsmimekeysjob.h index 8ed0b379..aa2d5b73 100644 --- a/lang/qt/src/qgpgmerefreshsmimekeysjob.h +++ b/lang/qt/src/qgpgmerefreshsmimekeysjob.h @@ -1,80 +1,82 @@ /* qgpgmerefreshsmimekeysjob.h This file is part of qgpgme, the Qt API binding for gpgme Copyright (c) 2004 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. */ #ifndef __QGPGME_QGPGMEREFRESHSMIMEKEYSJOB_H__ #define __QGPGME_QGPGMEREFRESHSMIMEKEYSJOB_H__ #include "refreshkeysjob.h" #ifdef BUILDING_QGPGME # include "context.h" #else #include "gpgme++/context.h" #endif #include #include namespace QGpgME { class QGpgMERefreshSMIMEKeysJob : public RefreshKeysJob { Q_OBJECT public: QGpgMERefreshSMIMEKeysJob(); ~QGpgMERefreshSMIMEKeysJob(); /* from RefreshKeysJob */ GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE; + GpgME::Error start(const std::vector &keys) override; + private Q_SLOTS: /* from Job */ void slotCancel() Q_DECL_OVERRIDE; void slotStatus(QProcess *, const QString &, const QStringList &); void slotStderr(); void slotProcessExited(int exitCode, QProcess::ExitStatus exitStatus); private: GpgME::Error startAProcess(); private: QProcess *mProcess; GpgME::Error mError; QStringList mPatternsToDo; }; } #endif // __QGPGME_QGPGMEREFRESHSMIMEKEYSJOB_H__ diff --git a/lang/qt/src/refreshkeysjob.h b/lang/qt/src/refreshkeysjob.h index c4ba74a0..b6978060 100644 --- a/lang/qt/src/refreshkeysjob.h +++ b/lang/qt/src/refreshkeysjob.h @@ -1,95 +1,96 @@ /* refreshkeysjob.h This file is part of qgpgme, the Qt API binding for gpgme Copyright (c) 2004 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. */ #ifndef __KLEO_REFRESHKEYSJOB_H__ #define __KLEO_REFRESHKEYSJOB_H__ #include "job.h" #include "qgpgme_export.h" #include namespace GpgME { class Error; class Key; } class QStringList; namespace QGpgME { /** @short An abstract base class for asynchronous key refreshers. To use a RefreshKeysJob, first obtain an instance from the CryptoBackend implementation, connect the progress() and result() signals to suitable slots and then start the key refresh with a call to start(). This call might fail, in which case the RefreshKeysJob instance will have scheduled its own destruction with a call to QObject::deleteLater(). After result() is emitted, the KeyListJob will schedule it's own destruction by calling QObject::deleteLater(). */ class QGPGME_EXPORT RefreshKeysJob : public Job { Q_OBJECT protected: explicit RefreshKeysJob(QObject *parent); public: ~RefreshKeysJob(); /** - Starts the keylist operation. \a pattern is a list of patterns + Starts the refresh operation. \a pattern is a list of patterns used to restrict the list of keys returned. Empty patterns are ignored. If \a pattern is empty or contains only empty strings, - all keys are returned (however, the backend is free to truncate - the result and should do so; when this happens, it will be - reported by the reult object). + all keys are refreshed. - If \a secretOnly is true, only keys for which the secret key is - also available are returned. Use this if you need to select a - key for signing. + Only implemented for S/MIME. */ virtual GpgME::Error start(const QStringList &patterns) = 0; + /** + Starts a refresh of the \a keys. + */ + virtual GpgME::Error start(const std::vector &keys) = 0; + Q_SIGNALS: void result(const GpgME::Error &error); }; } #endif // __KLEO_REFRESHKEYSJOB_H__