From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id E2B036DE1457 for ; Wed, 1 May 2019 22:17:19 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.133 X-Spam-Level: X-Spam-Status: No, score=-0.133 tagged_above=-999 required=5 tests=[AWL=0.068, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5Z6jKvVuJgcy for ; Wed, 1 May 2019 22:17:17 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id 2EFD76DE136E for ; Wed, 1 May 2019 22:17:12 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1556774230; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=AkylE0BNrztjYN/2Ays9BiL73fmiI1YNIJwWMeCyfzU=; b=aEUI4kAScJBV5IatDSYe82SZR6r6nysMk3Ykknmca9vQaIcIcD9JI5PE BlXdLgdFAJbYzP3z1WKIFUr0KClHBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1556774230; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=AkylE0BNrztjYN/2Ays9BiL73fmiI1YNIJwWMeCyfzU=; b=HUEavx/2OsQCkWLyzC8EiApuudwjSm9tbT1muFSRY5yAOvMnQG2Ct/g/ E3odornhQw2vihH84x6cTDeIt6aBjXVixjUzv7cj17PBsQphphZ6Xazb9z YOhAbFvqCvfB1m8XK+UF5uqAu9rrRNd/w3487Vb7ib03TGgYx1Zi5Fa417 607qduXapCg1aQX+pTO2NMNRsnSI0RfBQ1ZGe4m9JkMmGELjI7ukdGBDjH 8RA3Klm3biitXLyFA/pYX705x5GaM3XBCPMHu4YSTBBbbJcryr6WNBnaRY /8SjN3LLIZaM5U+MYPiD5qWkQBIKD5daWjCVNrZ150KLlY4ct6Bv8w== Received: from fifthhorseman.net (ool-6c3a0662.static.optonline.net [108.58.6.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 7D1D6F9A2 for ; Thu, 2 May 2019 01:17:09 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 480B420BDB; Thu, 2 May 2019 01:17:04 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH 03/16] gmime-cleanup: remove obsolete gpg_path configuration option and crypto contexts Date: Thu, 2 May 2019 01:16:40 -0400 Message-Id: <20190502051653.8502-4-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502051653.8502-1-dkg@fifthhorseman.net> References: <20190501104643.5836-1-david@tethera.net> <20190502051653.8502-1-dkg@fifthhorseman.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 May 2019 05:17:20 -0000 Note that we do keep ignoring the gpg_path configuration option, though, to avoid breakage of existing installations. signed-off-by: Daniel Kahn Gillmor --- mime-node.c | 16 ------ notmuch-client.h | 9 ---- notmuch-config.c | 29 ----------- notmuch-reply.c | 4 -- notmuch-show.c | 4 -- notmuch.c | 8 --- test/T030-config.sh | 7 +-- test/T040-setup.sh | 6 --- util/crypto.c | 118 -------------------------------------------- util/crypto.h | 12 ----- 10 files changed, 1 insertion(+), 212 deletions(-) diff --git a/mime-node.c b/mime-node.c index 1bfb479b..bb18d678 100644 --- a/mime-node.c +++ b/mime-node.c @@ -284,22 +284,6 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part) return NULL; } -#if (GMIME_MAJOR_VERSION < 3) - if ((GMIME_IS_MULTIPART_ENCRYPTED (part) && (node->ctx->crypto->decrypt != NOTMUCH_DECRYPT_FALSE)) - || (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify)) { - GMimeContentType *content_type = g_mime_object_get_content_type (part); - const char *protocol = g_mime_content_type_get_parameter (content_type, "protocol"); - notmuch_status_t status; - status = _notmuch_crypto_get_gmime_ctx_for_protocol (node->ctx->crypto, - protocol, &cryptoctx); - if (status) /* this is a warning, not an error */ - fprintf (stderr, "Warning: %s (%s).\n", notmuch_status_to_string (status), - protocol ? protocol : "NULL"); - if (!cryptoctx) - return node; - } -#endif - /* Handle PGP/MIME parts */ if (GMIME_IS_MULTIPART_ENCRYPTED (part) && (node->ctx->crypto->decrypt != NOTMUCH_DECRYPT_FALSE)) { if (node->nchildren != 2) { diff --git a/notmuch-client.h b/notmuch-client.h index 6c84ecc0..fba28242 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -276,15 +276,6 @@ void notmuch_config_set_database_path (notmuch_config_t *config, const char *database_path); -#if (GMIME_MAJOR_VERSION < 3) -const char * -notmuch_config_get_crypto_gpg_path (notmuch_config_t *config); - -void -notmuch_config_set_crypto_gpg_path (notmuch_config_t *config, - const char *gpg_path); -#endif - const char * notmuch_config_get_user_name (notmuch_config_t *config); diff --git a/notmuch-config.c b/notmuch-config.c index bf77cc9d..e029e306 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -104,19 +104,11 @@ static const char search_config_comment[] = static const char crypto_config_comment[] = " Cryptography related configuration\n" "\n" -#if (GMIME_MAJOR_VERSION < 3) - " The following *deprecated* option is currently supported:\n" - "\n" - "\tgpg_path\n" - "\t\tbinary name or full path to invoke gpg.\n" - "\t\tNOTE: In a future build, this option will be ignored.\n" -#else " The following old option is now ignored:\n" "\n" "\tgpgpath\n" "\t\tThis option was used by older builds of notmuch to choose\n" "\t\tthe version of gpg to use.\n" -#endif "\t\tSetting $PATH is a better approach.\n"; struct _notmuch_config { @@ -470,12 +462,6 @@ notmuch_config_open (void *ctx, g_error_free (error); } -#if (GMIME_MAJOR_VERSION < 3) - if (notmuch_config_get_crypto_gpg_path (config) == NULL) { - notmuch_config_set_crypto_gpg_path (config, "gpg"); - } -#endif - /* Whenever we know of configuration sections that don't appear in * the configuration file, we add some comments to help the user * understand what can be done. */ @@ -776,21 +762,6 @@ notmuch_config_set_search_exclude_tags (notmuch_config_t *config, &(config->search_exclude_tags)); } -#if (GMIME_MAJOR_VERSION < 3) -const char * -notmuch_config_get_crypto_gpg_path (notmuch_config_t *config) -{ - return _config_get (config, &config->crypto_gpg_path, "crypto", "gpg_path"); -} - -void -notmuch_config_set_crypto_gpg_path (notmuch_config_t *config, - const char *gpg_path) -{ - _config_set (config, &config->crypto_gpg_path, "crypto", "gpg_path", gpg_path); -} -#endif - /* Given a configuration item of the form . return the * component group and key. If any error occurs, print a message on diff --git a/notmuch-reply.c b/notmuch-reply.c index d87ec06d..9fd6e9c7 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -754,10 +754,6 @@ notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[]) return EXIT_FAILURE; } -#if (GMIME_MAJOR_VERSION < 3) - params.crypto.gpgpath = notmuch_config_get_crypto_gpg_path (config); -#endif - if (notmuch_database_open (notmuch_config_get_database_path (config), NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much)) return EXIT_FAILURE; diff --git a/notmuch-show.c b/notmuch-show.c index b03cda9e..cc0ff63a 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -1213,10 +1213,6 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) return EXIT_FAILURE; } -#if (GMIME_MAJOR_VERSION < 3) - params.crypto.gpgpath = notmuch_config_get_crypto_gpg_path (config); -#endif - notmuch_database_mode_t mode = NOTMUCH_DATABASE_MODE_READ_ONLY; if (params.crypto.decrypt == NOTMUCH_DECRYPT_TRUE) mode = NOTMUCH_DATABASE_MODE_READ_WRITE; diff --git a/notmuch.c b/notmuch.c index 7810b685..c11e4cb1 100644 --- a/notmuch.c +++ b/notmuch.c @@ -129,14 +129,6 @@ notmuch_process_shared_indexing_options (notmuch_database_t *notmuch, g_mime_3_u return status; } } -#if (GMIME_MAJOR_VERSION < 3) - if (indexing_cli_choices.opts && notmuch_indexopts_get_decrypt_policy (indexing_cli_choices.opts) != NOTMUCH_DECRYPT_FALSE) { - const char* gpg_path = notmuch_config_get_crypto_gpg_path (config); - if (gpg_path && strcmp(gpg_path, "gpg")) - fprintf (stderr, "Warning: deprecated crypto.gpg_path is set to '%s'\n" - "\tbut ignoring (use $PATH instead)\n", gpg_path); - } -#endif return NOTMUCH_STATUS_SUCCESS; } diff --git a/test/T030-config.sh b/test/T030-config.sh index eba2e0e7..883541d5 100755 --- a/test/T030-config.sh +++ b/test/T030-config.sh @@ -46,11 +46,6 @@ test_begin_subtest "List all items" notmuch config list > STDOUT 2> STDERR printf "%s\n====\n%s\n" "$(< STDOUT)" "$(< STDERR)" | notmuch_config_sanitize > OUTPUT -if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then - config_gpg_path="crypto.gpg_path=gpg -" -fi - cat < EXPECTED database.path=MAIL_DIR user.name=Notmuch Test Suite @@ -60,7 +55,7 @@ new.tags=unread;inbox; new.ignore= search.exclude_tags= maildir.synchronize_flags=true -${config_gpg_path}foo.string=this is another string value +foo.string=this is another string value foo.list=this;is another;list value; built_with.compact=something built_with.field_processor=something diff --git a/test/T040-setup.sh b/test/T040-setup.sh index 56efe1d5..fbfe200a 100755 --- a/test/T040-setup.sh +++ b/test/T040-setup.sh @@ -20,11 +20,6 @@ foo bar baz EOF -if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then - config_gpg_path="crypto.gpg_path=gpg -" -fi - output=$(notmuch --config=new-notmuch-config config list | notmuch_built_with_sanitize) test_expect_equal "$output" "\ database.path=/path/to/maildir @@ -35,7 +30,6 @@ new.tags=foo;bar; new.ignore= search.exclude_tags=baz; maildir.synchronize_flags=true -""${config_gpg_path}""\ built_with.compact=something built_with.field_processor=something built_with.retry_lock=something" diff --git a/util/crypto.c b/util/crypto.c index 9d3b6dad..da9256f2 100644 --- a/util/crypto.c +++ b/util/crypto.c @@ -24,120 +24,9 @@ #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0])) -#if (GMIME_MAJOR_VERSION < 3) -/* Create or pass on a GPG context (GMime 2.6) */ -static notmuch_status_t -get_gpg_context (_notmuch_crypto_t *crypto, GMimeCryptoContext **ctx) -{ - if (ctx == NULL || crypto == NULL) - return NOTMUCH_STATUS_NULL_POINTER; - - if (crypto->gpgctx) { - *ctx = crypto->gpgctx; - return NOTMUCH_STATUS_SUCCESS; - } - - /* TODO: GMimePasswordRequestFunc */ - crypto->gpgctx = g_mime_gpg_context_new (NULL, crypto->gpgpath ? crypto->gpgpath : "gpg"); - if (! crypto->gpgctx) { - return NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION; - } - - g_mime_gpg_context_set_use_agent ((GMimeGpgContext *) crypto->gpgctx, true); - g_mime_gpg_context_set_always_trust ((GMimeGpgContext *) crypto->gpgctx, false); - - *ctx = crypto->gpgctx; - return NOTMUCH_STATUS_SUCCESS; -} - -/* Create or pass on a PKCS7 context (GMime 2.6) */ -static notmuch_status_t -get_pkcs7_context (_notmuch_crypto_t *crypto, GMimeCryptoContext **ctx) -{ - if (ctx == NULL || crypto == NULL) - return NOTMUCH_STATUS_NULL_POINTER; - - if (crypto->pkcs7ctx) { - *ctx = crypto->pkcs7ctx; - return NOTMUCH_STATUS_SUCCESS; - } - - /* TODO: GMimePasswordRequestFunc */ - crypto->pkcs7ctx = g_mime_pkcs7_context_new (NULL); - if (! crypto->pkcs7ctx) { - return NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION; - } - - g_mime_pkcs7_context_set_always_trust ((GMimePkcs7Context *) crypto->pkcs7ctx, - false); - - *ctx = crypto->pkcs7ctx; - return NOTMUCH_STATUS_SUCCESS; -} -static const struct { - const char *protocol; - notmuch_status_t (*get_context) (_notmuch_crypto_t *crypto, GMimeCryptoContext **ctx); -} protocols[] = { - { - .protocol = "application/pgp-signature", - .get_context = get_gpg_context, - }, - { - .protocol = "application/pgp-encrypted", - .get_context = get_gpg_context, - }, - { - .protocol = "application/pkcs7-signature", - .get_context = get_pkcs7_context, - }, - { - .protocol = "application/x-pkcs7-signature", - .get_context = get_pkcs7_context, - }, -}; - -/* for the specified protocol return the context pointer (initializing - * if needed) */ -notmuch_status_t -_notmuch_crypto_get_gmime_ctx_for_protocol (_notmuch_crypto_t *crypto, - const char *protocol, - GMimeCryptoContext **ctx) -{ - if (! protocol) - return NOTMUCH_STATUS_MALFORMED_CRYPTO_PROTOCOL; - - /* As per RFC 1847 section 2.1: "the [protocol] value token is - * comprised of the type and sub-type tokens of the Content-Type". - * As per RFC 1521 section 2: "Content-Type values, subtypes, and - * parameter names as defined in this document are - * case-insensitive." Thus, we use strcasecmp for the protocol. - */ - for (size_t i = 0; i < ARRAY_SIZE (protocols); i++) { - if (strcasecmp (protocol, protocols[i].protocol) == 0) - return protocols[i].get_context (crypto, ctx); - } - - return NOTMUCH_STATUS_UNKNOWN_CRYPTO_PROTOCOL; -} - -void -_notmuch_crypto_cleanup (_notmuch_crypto_t *crypto) -{ - if (crypto->gpgctx) { - g_object_unref (crypto->gpgctx); - crypto->gpgctx = NULL; - } - - if (crypto->pkcs7ctx) { - g_object_unref (crypto->pkcs7ctx); - crypto->pkcs7ctx = NULL; - } -} -#else void _notmuch_crypto_cleanup (unused(_notmuch_crypto_t *crypto)) { } -#endif GMimeObject * _notmuch_crypto_decrypt (bool *attempted, @@ -165,17 +54,10 @@ _notmuch_crypto_decrypt (bool *attempted, } if (attempted) *attempted = true; -#if (GMIME_MAJOR_VERSION < 3) - ret = g_mime_multipart_encrypted_decrypt_session (part, - crypto_ctx, - notmuch_message_properties_value (list), - decrypt_result, err); -#else ret = g_mime_multipart_encrypted_decrypt (part, GMIME_DECRYPT_NONE, notmuch_message_properties_value (list), decrypt_result, err); -#endif if (ret) break; } diff --git a/util/crypto.h b/util/crypto.h index 1a90f0e0..dbb333eb 100644 --- a/util/crypto.h +++ b/util/crypto.h @@ -12,11 +12,6 @@ extern "C" { typedef struct _notmuch_crypto { bool verify; notmuch_decryption_policy_t decrypt; -#if (GMIME_MAJOR_VERSION < 3) - GMimeCryptoContext* gpgctx; - GMimeCryptoContext* pkcs7ctx; - const char *gpgpath; -#endif } _notmuch_crypto_t; GMimeObject * @@ -28,13 +23,6 @@ _notmuch_crypto_decrypt (bool *attempted, GMimeDecryptResult **decrypt_result, GError **err); -#if (GMIME_MAJOR_VERSION < 3) -notmuch_status_t -_notmuch_crypto_get_gmime_ctx_for_protocol (_notmuch_crypto_t *crypto, - const char *protocol, - GMimeCryptoContext **ctx); -#endif - void _notmuch_crypto_cleanup (_notmuch_crypto_t *crypto); -- 2.20.1