From 2187a4de8c1731d8621a4b056baf84ee29e0ff00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Wed, 12 Jun 2024 11:34:41 +0200 Subject: qt: Allow specifying import options when importing keys * lang/qt/src/importjob.cpp, lang/qt/src/importjob.h (class ImportJob): Add member functions setImportOptions and importOptions. * lang/qt/src/importjob_p.h (struct ImportJobPrivate): Add member m_importOptions. * lang/qt/src/qgpgmeimportjob.cpp (import_qba): Add arg importOptions and adjust the callers. Set import options context flag. * lang/qt/tests/t-import.cpp (ImportTest): Add member function testImportWithImportOptions. -- GnuPG-bug-id: 7152 --- lang/qt/tests/t-import.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'lang/qt/tests/t-import.cpp') diff --git a/lang/qt/tests/t-import.cpp b/lang/qt/tests/t-import.cpp index 91d5bcbd..79edf4d1 100644 --- a/lang/qt/tests/t-import.cpp +++ b/lang/qt/tests/t-import.cpp @@ -121,6 +121,48 @@ private Q_SLOTS: QCOMPARE(key.userID(0).id(), "importWithImportFilter@example.net"); } + void testImportWithImportOptions() + { + if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.1.23") { + QSKIP("gpg does not yet support --import-options show-only"); + } + + // pub ed25519 2024-06-12 [SC] + // A52F4947AF1506F3A7572EFC140278B773CA7C16 + // uid importOptions@example.net + static const char keyFpr[] = "A52F4947AF1506F3A7572EFC140278B773CA7C16"; + static const char keyData[] = + "-----BEGIN PGP PUBLIC KEY BLOCK-----\n" + "\n" + "mDMEZmlpmBYJKwYBBAHaRw8BAQdAZaSopKwccTwnMlJBVCWMT6et1T1WF9EkXdJi\n" + "gzI74xW0GWltcG9ydE9wdGlvbnNAZXhhbXBsZS5uZXSIkwQTFgoAOxYhBKUvSUev\n" + "FQbzp1cu/BQCeLdzynwWBQJmaWmYAhsDBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4H\n" + "AheAAAoJEBQCeLdzynwWjmQBAP4dQEN/M4/dKIAlxNAbWzIkV+eSoUFLJszOJ/xx\n" + "FwJzAP43gkdXkUsHZt/U3mLZqtiHJFd7JxVm7hKRoAVBhZZYDw==\n" + "=7Z1j\n" + "-----END PGP PUBLIC KEY BLOCK-----\n"; + + auto *job = openpgp()->importJob(); + job->setImportOptions(QLatin1String{"show-only"}); + connect(job, &ImportJob::result, this, + [this](ImportResult result, QString, Error) + { + QVERIFY(!result.error()); + QCOMPARE(result.numConsidered(), 0); + QCOMPARE(result.numImported(), 0); + QVERIFY(result.imports().empty()); + Q_EMIT asyncDone(); + }); + job->start(QByteArray{keyData}); + QSignalSpy spy (this, SIGNAL(asyncDone())); + QVERIFY(spy.wait()); + + auto ctx = std::unique_ptr(Context::createForProtocol(GpgME::OpenPGP)); + GpgME::Error err; + const auto key = ctx->key(keyFpr, err, false); + QVERIFY(key.isNull()); + } + void testImportWithKeyOrigin() { if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.1.22") { -- cgit v1.2.3