From: Mark Walters Date: Sat, 15 Dec 2012 17:49:55 +0000 (+0000) Subject: Re: [Patch v7 05/14] quote_and_decode_query: new function to quote hex-decoded queries X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8d8c0dee289d8e631655713f4793d1686f80036f;p=notmuch-archives.git Re: [Patch v7 05/14] quote_and_decode_query: new function to quote hex-decoded queries --- diff --git a/c0/5eb8f58d677016048ef49b3ed73049027feea8 b/c0/5eb8f58d677016048ef49b3ed73049027feea8 new file mode 100644 index 000000000..5f6b46a8e --- /dev/null +++ b/c0/5eb8f58d677016048ef49b3ed73049027feea8 @@ -0,0 +1,177 @@ +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 20623431FB6 + for ; Sat, 15 Dec 2012 09:50:05 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 kK3xDGp7cipu for ; + Sat, 15 Dec 2012 09:50:01 -0800 (PST) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 28925431FBC + for ; Sat, 15 Dec 2012 09:50:01 -0800 (PST) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1Tjvs2-0004Vc-Gh; Sat, 15 Dec 2012 17:49:56 +0000 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1Tjvs2-00001O-3Q; Sat, 15 Dec 2012 17:49:54 +0000 +From: Mark Walters +To: david@tethera.net, notmuch@notmuchmail.org +Subject: Re: [Patch v7 05/14] quote_and_decode_query: new function to quote + hex-decoded queries +In-Reply-To: <1355492062-7546-6-git-send-email-david@tethera.net> +References: <1355492062-7546-1-git-send-email-david@tethera.net> + <1355492062-7546-6-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.14+155~g7edfdc3 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Sat, 15 Dec 2012 17:49:55 +0000 +Message-ID: <87zk1f8at8.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 38bb0874714125ffc2484fd026037717 (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +Cc: David Bremner +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, 15 Dec 2012 17:50:05 -0000 + + +On Fri, 14 Dec 2012, david@tethera.net wrote: +> From: David Bremner +> +> The query is split into tokens, with ' ' and ':' as delimiters. Any +> token containing some hex-escaped character is quoted according to +> Xapian rules. This maps id:foo%20%22bar to id:"foo ""bar". +> This intentionally does not quote prefixes, so they still work as prefixes. +> --- +> tag-util.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ +> 1 file changed, 50 insertions(+) +> +> diff --git a/tag-util.c b/tag-util.c +> index f89669a..e1181f8 100644 +> --- a/tag-util.c +> +++ b/tag-util.c +> @@ -56,6 +56,56 @@ illegal_tag (const char *tag, notmuch_bool_t remove) +> return NULL; +> } +> +> +static tag_parse_status_t +> +quote_and_decode_query (void *ctx, char *encoded, const char *line_for_error, +> + char **query_string) +> +{ + +Would decode_and_quote_query be a better name given the order these two +happen? Also a comment describing the function would be nice. + +> + char *tok = encoded; +> + size_t tok_len = 0; +> + char *buf = NULL; +> + size_t buf_len = 0; +> + tag_parse_status_t ret = TAG_PARSE_SUCCESS; +> + +> + *query_string = talloc_strdup (ctx, ""); +> + +> + while (*query_string && +> + (tok = strtok_len (tok + tok_len, ": ", &tok_len)) != NULL) { +> + char delim = tok[tok_len]; +> + +> + *(tok + tok_len++) = '\0'; + +These two look a little odd: I would prefer either array or pointer in +both cases. + +> + +> + if (strcspn (tok, "%") < tok_len - 1) { +> + /* something to decode */ +> + if (hex_decode_inplace (tok) != HEX_SUCCESS) { +> + ret = line_error (TAG_PARSE_INVALID, line_for_error, +> + "hex decoding of token '%s' failed", tok); +> + goto DONE; +> + } +> + +> + if (double_quote_str (ctx, tok, &buf, &buf_len)) { +> + ret = line_error (TAG_PARSE_OUT_OF_MEMORY, +> + line_for_error, "aborting"); +> + goto DONE; +> + } +> + *query_string = talloc_asprintf_append_buffer ( +> + *query_string, "%s%c", buf, delim); +> + +> + } else { +> + /* This is not just an optimization, but used to preserve +> + * prefixes like id:, which cannot be quoted. +> + */ +> + *query_string = talloc_asprintf_append_buffer ( +> + *query_string, "%s%c", tok, delim); +> + } + +What happens if a message id (for example) contains a ':'? Is a query of +the form + +id:stuff"encoded_stuff" + +acceptable? (As far as I can see from the man page ':' does not need to +be in hex.) + +Best wishes + +Mark + + +> + +> + } +> + +> + DONE: +> + if (ret != TAG_PARSE_SUCCESS && *query_string) +> + talloc_free (*query_string); +> + return ret; +> +} +> + +> tag_parse_status_t +> parse_tag_line (void *ctx, char *line, +> tag_op_flag_t flags, +> -- +> 1.7.10.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch