diff --git a/lang/qt/tests/t-config.cpp b/lang/qt/tests/t-config.cpp index afbb4d1b..9ec95669 100644 --- a/lang/qt/tests/t-config.cpp +++ b/lang/qt/tests/t-config.cpp @@ -1,127 +1,97 @@ /* t-config.cpp This file is part of qgpgme, the Qt API binding for gpgme 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 #include #include #include "t-support.h" #include "protocol.h" #include "cryptoconfig.h" #include "engineinfo.h" #include using namespace QGpgME; class CryptoConfigTest: public QGpgMETest { Q_OBJECT private Q_SLOTS: - void testKeyserver() - { - // Repeatedly set a config value and clear it - // this was broken at some point so it gets a - // unit test. - for (int i = 0; i < 10; i++) { - auto conf = cryptoConfig(); - QVERIFY(conf); - auto entry = conf->entry(QStringLiteral("gpg"), - QStringLiteral("Keyserver"), - QStringLiteral("keyserver")); - QVERIFY(entry); - const QString url(QStringLiteral("hkp://foo.bar.baz")); - entry->setStringValue(url); - conf->sync(false); - conf->clear(); - entry = conf->entry(QStringLiteral("gpg"), - QStringLiteral("Keyserver"), - QStringLiteral("keyserver")); - QCOMPARE (entry->stringValue(), url); - entry->setStringValue(QString()); - conf->sync(false); - conf->clear(); - entry = conf->entry(QStringLiteral("gpg"), - QStringLiteral("Keyserver"), - QStringLiteral("keyserver")); - QCOMPARE (entry->stringValue(), QString()); - } - } - void testDefault() { if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.2.0") { // We are using compliance here and other options might also // be unsupported in older versions. return; } // First set compliance to de-vs auto conf = cryptoConfig(); QVERIFY(conf); auto entry = conf->entry(QStringLiteral("gpg"), QStringLiteral("Configuration"), QStringLiteral("compliance")); QVERIFY(entry); entry->setStringValue("de-vs"); conf->sync(true); conf->clear(); entry = conf->entry(QStringLiteral("gpg"), QStringLiteral("Configuration"), QStringLiteral("compliance")); QCOMPARE(entry->stringValue(), QStringLiteral("de-vs")); entry->resetToDefault(); conf->sync(true); conf->clear(); entry = conf->entry(QStringLiteral("gpg"), QStringLiteral("Configuration"), QStringLiteral("compliance")); QCOMPARE(entry->stringValue(), QStringLiteral("gnupg")); } void initTestCase() { QGpgMETest::initTestCase(); const QString gpgHome = qgetenv("GNUPGHOME"); qputenv("GNUPGHOME", mDir.path().toUtf8()); QVERIFY(mDir.isValid()); } private: QTemporaryDir mDir; }; QTEST_MAIN(CryptoConfigTest) #include "t-config.moc" diff --git a/tests/gpg/t-gpgconf.c b/tests/gpg/t-gpgconf.c index d7a5f1ee..8e2bb3e1 100644 --- a/tests/gpg/t-gpgconf.c +++ b/tests/gpg/t-gpgconf.c @@ -1,389 +1,389 @@ /* t-gpgconf.c - Regression test. * Copyright (C) 2001, 2004, 2007 g10 Code GmbH * * This file is part of GPGME. * * GPGME is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. * * GPGME 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, see . * SPDX-License-Identifier: LGPL-2.1-or-later */ #ifdef HAVE_CONFIG_H #include #endif #include #include #include #include #include #ifdef HAVE_W32_SYSTEM #include #endif #include #include "t-support.h" static char * spaces (char *str, int extra) { static char buf[80]; int len = str ? strlen (str) : 0; int n; #define TABSTOP 30 n = TABSTOP - len - extra; memset (buf, ' ', sizeof (buf)); if (n < 1 || n > (sizeof (buf) - 1)) { buf[0] = '\n'; n = TABSTOP + 1; } buf[n] = '\0'; return buf; } void dump_arg (int type, gpgme_conf_arg_t arg) { if (!arg) { printf ("(none)"); return; } while (arg) { switch (type) { case GPGME_CONF_STRING: case GPGME_CONF_PATHNAME: case GPGME_CONF_LDAP_SERVER: case GPGME_CONF_KEY_FPR: case GPGME_CONF_PUB_KEY: case GPGME_CONF_SEC_KEY: case GPGME_CONF_ALIAS_LIST: printf ("`%s'", arg->value.string); break; case GPGME_CONF_UINT32: printf ("%u", arg->value.uint32); break; case GPGME_CONF_INT32: printf ("%i", arg->value.int32); break; case GPGME_CONF_NONE: printf ("%i (times)", arg->value.count); break; default: printf ("(unknown type)"); } arg = arg->next; if (arg) printf (" "); } } void dump_opt (gpgme_conf_opt_t opt) { char level; char runtime = (opt->flags & GPGME_CONF_RUNTIME) ? 'r' : ' '; switch (opt->level) { case GPGME_CONF_BASIC: level = 'b'; break; case GPGME_CONF_ADVANCED: level = 'a'; break; case GPGME_CONF_EXPERT: level = 'e'; break; case GPGME_CONF_INVISIBLE: level = 'i'; break; case GPGME_CONF_INTERNAL: level = '#'; break; default: level = '?'; } if (opt->flags & GPGME_CONF_GROUP) { printf ("\n"); printf ("%c%c [%s]%s%s\n", level, runtime, opt->name, spaces (opt->name, 5), opt->description ? opt->description : ""); } else { if (opt->argname) { const char *more = (opt->flags & GPGME_CONF_LIST) ? "..." : ""; if (opt->flags & GPGME_CONF_OPTIONAL) { printf ("%c%c --%s [%s%s] %s", level, runtime, opt->name, opt->argname, more, spaces (opt->name, 9 + strlen (opt->argname) + strlen (more))); } else { printf ("%c%c --%s %s%s %s", level, runtime, opt->name, opt->argname, more, spaces (opt->name, 7 + strlen (opt->argname) + strlen (more))); } } else printf ("%c%c --%s%s", level, runtime, opt->name, spaces (opt->name, 5)); if (opt->description) printf ("%s", opt->description); printf ("\n"); if (opt->flags & GPGME_CONF_DEFAULT) { printf ("%s%s = ", spaces (NULL, 0), opt->argname ? opt->argname : "(default)"); dump_arg (opt->type, opt->default_value); printf ("\n"); } else if (opt->flags & GPGME_CONF_DEFAULT_DESC) printf ("%s%s = %s\n", spaces (NULL, 0), opt->argname ? opt->argname : "(default)", opt->default_description); if (opt->no_arg_value) { printf ("%sNo Arg Def = ", spaces (NULL, 0)); dump_arg (opt->type, opt->no_arg_value); printf ("\n"); } if (opt->value) { printf ("%sCurrent = ", spaces (NULL, 0)); dump_arg (opt->type, opt->value); printf ("\n"); } } #if 0 arg = comp->options; while (opt) { dump_opt (opt); opt = opt->next; } #endif } void dump_comp (gpgme_conf_comp_t comp) { gpgme_conf_opt_t opt; printf ("COMPONENT\n"); printf ("=========\n"); printf (" Name: %s\n", comp->name); if (comp->description) printf (" Desc: %s\n", comp->description); if (comp->program_name) printf (" Path: %s\n", comp->program_name); printf ("\n"); opt = comp->options; while (opt) { dump_opt (opt); opt = opt->next; } } int lookup (gpgme_conf_comp_t conf, const char *component, const char *option, gpgme_conf_comp_t *comp, gpgme_conf_opt_t *opt) { *comp = conf; while (*comp && strcmp ((*comp)->name, component)) *comp = (*comp)->next; if (*comp) { *opt = (*comp)->options; while (*opt && strcmp ((*opt)->name, option)) *opt = (*opt)->next; /* Allow for the option not to be there. */ if (*opt) return 1; /* Found. */ } return 0; /* Not found. */ } #include int main (void) { gpgme_ctx_t ctx; gpgme_error_t err; gpgme_conf_comp_t conf; gpgme_conf_comp_t comp; int first; int i, N = 10; init_gpgme (GPGME_PROTOCOL_GPGCONF); err = gpgme_new (&ctx); fail_if_err (err); { /* Let's check getting the agent-socket directory for different homedirs. */ char *result1 = NULL; char *result2 = NULL; err = gpgme_ctx_set_engine_info (ctx, GPGME_PROTOCOL_GPGCONF, NULL, "/tmp/foo"); fail_if_err (err); err = gpgme_op_conf_dir (ctx, "agent-socket", &result1); fail_if_err (err); err = gpgme_ctx_set_engine_info (ctx, GPGME_PROTOCOL_GPGCONF, NULL, NULL); fail_if_err (err); err = gpgme_op_conf_dir (ctx, "agent-socket", &result2); fail_if_err (err); /* They have to be different. */ test (strcmp(result1, result2)); gpgme_free (result1); gpgme_free (result2); } err = gpgme_op_conf_load (ctx, &conf); fail_if_err (err); comp = conf; first = 1; while (comp) { if (!first) printf ("\n"); else first = 0; dump_comp (comp); comp = comp->next; } /* Now change something. */ fprintf (stderr, " dirmngr.verbose "); for (i = 0; i < N; i++) { unsigned int count = i % 4 + 1; /* counts must not be zero */ gpgme_conf_arg_t arg; gpgme_conf_opt_t opt; err = gpgme_conf_arg_new (&arg, GPGME_CONF_NONE, &count); fail_if_err (err); if (lookup (conf, "dirmngr", "verbose", &comp, &opt)) { /* Found. */ err = gpgme_conf_opt_change (opt, 0, arg); fail_if_err (err); err = gpgme_op_conf_save (ctx, comp); fail_if_err (err); } else { fprintf (stderr, "Skipping test, option dirmngr.verbose not found.\n"); break; } /* Reload config and verify that the value was updated. */ gpgme_conf_release (conf); err = gpgme_op_conf_load (ctx, &conf); fail_if_err (err); if (lookup (conf, "dirmngr", "verbose", &comp, &opt)) { /* Found. */ test (opt->alt_type == GPGME_CONF_NONE); test (opt->value); test ((unsigned long) opt->value->value.count == count); } fprintf (stderr, "."); fflush (stderr); } /* Now change something else. */ - fprintf (stderr, " gpg.keyserver "); + fprintf (stderr, " dirmngr.keyserver "); for (i = 0; i < N; i++) { const char *values[2] = { "hkp://foo.bar", "hkps://bar.foo" }; gpgme_conf_arg_t arg; gpgme_conf_opt_t opt; err = gpgme_conf_arg_new (&arg, GPGME_CONF_STRING, values[i%2]); fail_if_err (err); - if (lookup (conf, "gpg", "keyserver", &comp, &opt)) + if (lookup (conf, "dirmngr", "keyserver", &comp, &opt)) { /* Found. */ test (opt->alt_type == GPGME_CONF_STRING); err = gpgme_conf_opt_change (opt, 0, arg); fail_if_err (err); err = gpgme_op_conf_save (ctx, comp); fail_if_err (err); } else { - fprintf (stderr, "Skipping test, option gpg.keyserver not found.\n"); + fprintf (stderr, "Skipping test, option dirmngr.keyserver not found.\n"); break; } /* Reload config and verify that the value was updated. */ gpgme_conf_release (conf); err = gpgme_op_conf_load (ctx, &conf); fail_if_err (err); - if (lookup (conf, "gpg", "keyserver", &comp, &opt)) + if (lookup (conf, "dirmngr", "keyserver", &comp, &opt)) { /* Found. */ test (opt->alt_type == GPGME_CONF_STRING); test (opt->value); test (opt->value->value.string); test (strcmp (opt->value->value.string, values[i%2]) == 0); } fprintf (stderr, "."); fflush (stderr); } fprintf (stderr, "\n"); gpgme_conf_release (conf); gpgme_release (ctx); return 0; }