From: Jani Nikula Date: Sat, 4 Feb 2012 17:59:58 +0000 (+0200) Subject: Re: [PATCH 1/2] cli: add --from option to reply to restrict guessing of the From... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c40d11e506dee7041a40badadb3159681fd738a7;p=notmuch-archives.git Re: [PATCH 1/2] cli: add --from option to reply to restrict guessing of the From: header. --- diff --git a/f2/cc108c814f1670dcedbcc84fb54e74c97c615e b/f2/cc108c814f1670dcedbcc84fb54e74c97c615e new file mode 100644 index 000000000..cd8b75ba8 --- /dev/null +++ b/f2/cc108c814f1670dcedbcc84fb54e74c97c615e @@ -0,0 +1,199 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 861A6431FBC + for ; Sat, 4 Feb 2012 10:00:06 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id gFmbbhrFt0GP for ; + Sat, 4 Feb 2012 10:00:05 -0800 (PST) +Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com + [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 40EB2431FAF + for ; Sat, 4 Feb 2012 10:00:05 -0800 (PST) +Received: by lahd3 with SMTP id d3so2606224lah.26 + for ; Sat, 04 Feb 2012 10:00:03 -0800 (PST) +Received: by 10.152.132.133 with SMTP id ou5mr6097211lab.46.1328378403520; + Sat, 04 Feb 2012 10:00:03 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi. + [84.248.80.253]) + by mx.google.com with ESMTPS id fl2sm8108488lbb.4.2012.02.04.10.00.00 + (version=SSLv3 cipher=OTHER); Sat, 04 Feb 2012 10:00:02 -0800 (PST) +From: Jani Nikula +To: Mark Walters , notmuch@notmuchmail.org +Subject: Re: [PATCH 1/2] cli: add --from option to reply to restrict guessing + of the From: header. +In-Reply-To: <1328375350-10352-2-git-send-email-markwalters1009@gmail.com> +References: <1328375350-10352-1-git-send-email-markwalters1009@gmail.com> + <1328375350-10352-2-git-send-email-markwalters1009@gmail.com> +User-Agent: Notmuch/0.11+139~g4340989 (http://notmuchmail.org) Emacs/23.3.1 + (i686-pc-linux-gnu) +Date: Sat, 04 Feb 2012 19:59:58 +0200 +Message-ID: <87lioio4wx.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Sat, 04 Feb 2012 18:00:06 -0000 + +On Sat, 4 Feb 2012 17:09:09 +0000, Mark Walters wrote: +> Add an option --from= to notmuch-reply.c to restrict guessing of the +> From: header. The existing logic looks as the main headers, then at +> the delivery headers, and finally defaults to the config file address. +> +> This patch allows the user to restrict which of these guesses are +> made. Currently the supported values are: +> default|fallback-all current behaviour +> fallback-received fallback to delivery headers but not config file +> fallback-none only look at from/reply-to/to/cc/ headers +> none From: header is always left empty + +As discussed on IRC, --from=primary is a natural extension to always use +the primary address from config, but that can be a later patch. + +> +> If the code does not find an allowed address it outputs an empty From: +> line and the caller can decide how to respond. +> --- +> notmuch-reply.c | 39 ++++++++++++++++++++++++++++++--------- +> 1 files changed, 30 insertions(+), 9 deletions(-) +> +> diff --git a/notmuch-reply.c b/notmuch-reply.c +> index f55b1d2..f660749 100644 +> --- a/notmuch-reply.c +> +++ b/notmuch-reply.c +> @@ -24,6 +24,13 @@ +> #include "gmime-filter-reply.h" +> #include "gmime-filter-headers.h" +> + +I think it would be good to have a comment here reminding later +developers that the order matters in this enum. + +> +enum { +> + FROM_FALLBACK_ALL, +> + FROM_FALLBACK_RECEIVED, +> + FROM_FALLBACK_NONE, +> + FROM_NONE +> +}; +> + +> static void +> reply_headers_message_part (GMimeMessage *message); +> +> @@ -510,7 +517,8 @@ notmuch_reply_format_default(void *ctx, +> notmuch_config_t *config, +> notmuch_query_t *query, +> notmuch_show_params_t *params, +> - notmuch_bool_t reply_all) +> + notmuch_bool_t reply_all, +> + int from_guess) + +Hrmh, I'd like this to sound more deterministic than +"guessing". from_select? from_use? from? + +> { +> GMimeMessage *reply; +> notmuch_messages_t *messages; +> @@ -542,15 +550,19 @@ notmuch_reply_format_default(void *ctx, +> from_addr = add_recipients_from_message (reply, config, message, +> reply_all); +> +> - if (from_addr == NULL) +> + if ((from_addr == NULL) && (from_guess <= FROM_FALLBACK_RECEIVED)) + +Please drop the extra braces here and below. + +> from_addr = guess_from_received_header (config, message); +> +> - if (from_addr == NULL) +> + if ((from_addr == NULL) && (from_guess <= FROM_FALLBACK_ALL )) +> from_addr = notmuch_config_get_user_primary_email (config); +> +> - from_addr = talloc_asprintf (ctx, "%s <%s>", +> - notmuch_config_get_user_name (config), +> - from_addr); +> + if ((from_addr != NULL) || (from_guess = FROM_NONE)) { + +Should that be (from_addr != NULL && from_guess != FROM_NONE)? +Definitely the assignment is an error! + +> + from_addr = talloc_asprintf (ctx, "%s <%s>", +> + notmuch_config_get_user_name (config), +> + from_addr); +> + } else { +> + from_addr = talloc_strdup (ctx, ""); +> + } +> g_mime_object_set_header (GMIME_OBJECT (reply), +> "From", from_addr); +> +> @@ -590,7 +602,8 @@ notmuch_reply_format_headers_only(void *ctx, +> notmuch_config_t *config, +> notmuch_query_t *query, +> unused (notmuch_show_params_t *params), +> - notmuch_bool_t reply_all) +> + notmuch_bool_t reply_all, +> + unused (int from_guess)) +> { +> GMimeMessage *reply; +> notmuch_messages_t *messages; +> @@ -657,10 +670,11 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) +> notmuch_query_t *query; +> char *query_string; +> int opt_index, ret = 0; +> - int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_show_params_t *params, notmuch_bool_t reply_all); +> + int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_show_params_t *params, notmuch_bool_t reply_all, int from_guess); +> notmuch_show_params_t params = { .part = -1 }; +> int format = FORMAT_DEFAULT; +> int reply_all = TRUE; +> + int from_guess = FROM_FALLBACK_ALL; +> notmuch_bool_t decrypt = FALSE; +> +> notmuch_opt_desc_t options[] = { +> @@ -672,6 +686,13 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) +> (notmuch_keyword_t []){ { "all", TRUE }, +> { "sender", FALSE }, +> { 0, 0 } } }, +> + { NOTMUCH_OPT_KEYWORD, &from_guess, "from", 'F', +> + (notmuch_keyword_t []){ { "default", FROM_FALLBACK_ALL }, +> + { "fallback-all", FROM_FALLBACK_ALL }, +> + { "fallback-received", FROM_FALLBACK_RECEIVED }, +> + { "fallback-none", FROM_FALLBACK_NONE }, +> + { "none", FROM_NONE }, +> + { 0, 0 } } }, +> { NOTMUCH_OPT_BOOLEAN, &decrypt, "decrypt", 'd', 0 }, +> { 0, 0, 0, 0, 0 } +> }; +> @@ -732,7 +753,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) +> return 1; +> } +> +> - if (reply_format_func (ctx, config, query, ¶ms, reply_all) != 0) +> + if (reply_format_func (ctx, config, query, ¶ms, reply_all, from_guess) != 0) +> return 1; +> +> notmuch_query_destroy (query); +> -- +> 1.7.2.3 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch