From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wIRUJR/3A2FIgwEAgWs5BA (envelope-from ) for ; Fri, 30 Jul 2021 14:57:03 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id mN/aIB/3A2FDNAAAbx9fmQ (envelope-from ) for ; Fri, 30 Jul 2021 12:57:03 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 40C6910E11 for ; Fri, 30 Jul 2021 14:57:03 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id A325829205; Fri, 30 Jul 2021 08:56:34 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 8AA41291ED for ; Fri, 30 Jul 2021 08:56:18 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 70C8A5FD17; Fri, 30 Jul 2021 08:56:18 -0400 (EDT) Received: (nullmailer pid 2166916 invoked by uid 1000); Fri, 30 Jul 2021 12:56:10 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 25/27] lib/parse-sexp: parse user headers Date: Fri, 30 Jul 2021 09:56:05 -0300 Message-Id: <20210730125607.2165433-26-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210730125607.2165433-1-david@tethera.net> References: <20210730125607.2165433-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: VDRSXLTQF52WWM3HQPMF2H5VYAVT5NBA X-Message-ID-Hash: VDRSXLTQF52WWM3HQPMF2H5VYAVT5NBA X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627649823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qXHneUHAadRw/CkDcDg29EcF1ukQcRBzCAIBEYmlU5Y=; b=RtakTtdBOAqf6iPW3JrfJa0yUqthaNHa8nL1eXLKHPTis4srtDeI65DIabQ0tc+Vfvfv/H Q1QklSuH2vGx29kRM/aU4YliVAHxsApNYy911SB1bLzehyObZPNNRMyR60Y8dkH63xjZFI DyhZOdhwAcTqz4CdSDUMJ9mBfl+ZtUxOCnHliLdIQGXjYgAdr3h+la0UF16ERGt4USkJGi QvHo6XjhPqlYfwMktFcAL82s4+APfEwoLgmQcbcKubihWdgq5uYN8x0UvfJsvsxJOGp5UY UhKxHOERRFSe4N9XMZVAwF94RbzMFNfJhExAeMmH7jgwrP1TpYpgs/Ff/mf6ZA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627649823; a=rsa-sha256; cv=none; b=uAM1LCQShzK/oX1BxHy0KwUYYKQ3MWXs/ZDIR7pUP01aCxiTWE805nxOww7A5Lkod46EDF 3Xo1lf5qHXZlP9zDMliG0CfjnnDcnzNODpLr5VppJvlXpeiAL1veSAbJ+57Bggy+XSV5T4 k5f181FsCRYUazmEZGu12kQAFA2lV2zRQRn9Rzif9ch+CutodzlgRUiOf0uz0w4CRDY/41 XZb7jA6pjXUTibPhktYwHZ8C0S4SDsO8mN+bcbWhWRyBobn9nxccbcHKW0QqnKbQhEKXq3 J4eqqTDA36CC80USiF38Oxkqe7Ok5+M73ZYLaiV1HppFCuVWXjrdvZGNMOndyA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 0.52 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 40C6910E11 X-Spam-Score: 0.52 X-Migadu-Scanner: scn0.migadu.com X-TUID: lmbxv1X+i88w One subtle aspect is the replacement of _find_prefix with _notmuch_database_prefix, which understands user headers. Otherwise the code mainly consists of creating a fake prefix record (since the user prefixes are not in the prefix table) and error handling. --- doc/man7/notmuch-sexp-queries.rst | 4 +++ lib/parse-sexp.cc | 34 +++++++++++++++++++++--- test/T081-sexpr-search.sh | 44 +++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 4 deletions(-) diff --git a/doc/man7/notmuch-sexp-queries.rst b/doc/man7/notmuch-sexp-queries.rst index fc8621b8..44d8eb8a 100644 --- a/doc/man7/notmuch-sexp-queries.rst +++ b/doc/man7/notmuch-sexp-queries.rst @@ -224,6 +224,10 @@ EXAMPLES ``(not (to *))`` Match messages with an empty or invalid 'To' and 'Cc' field. +``(List *)`` + Match messages with a non-empty List-Id header, assuming + configuration ``index.header.List=List-Id`` + NOTES ===== diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc index 61dd8f7d..a1783f86 100644 --- a/lib/parse-sexp.cc +++ b/lib/parse-sexp.cc @@ -166,7 +166,7 @@ _sexp_parse_wildcard (notmuch_database_t *notmuch, Xapian::Query &output) { - std::string term_prefix = parent ? _find_prefix (parent->name) : ""; + std::string term_prefix = parent ? _notmuch_database_prefix (notmuch, parent->name) : ""; if (parent && ! (parent->flags & SEXP_FLAG_WILDCARD)) { _notmuch_database_log (notmuch, "'%s' does not support wildcard queries\n", parent->name); @@ -272,6 +272,27 @@ _sexp_parse_infix (notmuch_database_t *notmuch, const _sexp_prefix_t *parent, return NOTMUCH_STATUS_SUCCESS; } +static notmuch_status_t +_sexp_parse_header (notmuch_database_t *notmuch, const _sexp_prefix_t *parent, + const sexp_t *sx, Xapian::Query &output) +{ + _sexp_prefix_t user_prefix; + + user_prefix.name = sx->list->val; + user_prefix.flags = SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD; + + if (parent) { + _notmuch_database_log (notmuch, "nested field: '%s' inside '%s'\n", + sx->list->val, parent->name); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } + + parent = &user_prefix; + + return _sexp_combine_query (notmuch, parent, Xapian::Query::OP_AND, Xapian::Query::MatchAll, + sx->list->next, output); +} + /* Here we expect the s-expression to be a proper list, with first * element defining and operation, or as a special case the empty * list */ @@ -281,7 +302,7 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent Xapian::Query &output) { if (sx->ty == SEXP_VALUE) { - std::string term_prefix = parent ? _find_prefix (parent->name) : ""; + std::string term_prefix = parent ? _notmuch_database_prefix (notmuch, parent->name) : ""; if (sx->aty == SEXP_BASIC && strcmp (sx->val, "*") == 0) { return _sexp_parse_wildcard (notmuch, parent, "", output); @@ -291,6 +312,7 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent output = Xapian::Query (term_prefix + sx->val); return NOTMUCH_STATUS_SUCCESS; } + if (parent) { return _sexp_parse_one_term (notmuch, term_prefix, sx, output); } else { @@ -299,7 +321,7 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent if (prefix->flags & SEXP_FLAG_FIELD) { notmuch_status_t status; Xapian::Query subquery; - term_prefix = _find_prefix (prefix->name); + term_prefix = _notmuch_database_prefix (notmuch, prefix->name); status = _sexp_parse_one_term (notmuch, term_prefix, sx, subquery); if (status) return status; @@ -323,6 +345,11 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; } + /* Check for user defined field */ + if (_notmuch_string_map_get (notmuch->user_prefix, sx->list->val)) { + return _sexp_parse_header (notmuch, parent, sx, output); + } + for (_sexp_prefix_t *prefix = prefixes; prefix && prefix->name; prefix++) { if (strcmp (prefix->name, sx->list->val) == 0) { if (prefix->flags & SEXP_FLAG_FIELD) { @@ -362,7 +389,6 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent } _notmuch_database_log (notmuch, "unknown prefix '%s'\n", sx->list->val); - return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; } diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh index 145038b5..04aa6150 100755 --- a/test/T081-sexpr-search.sh +++ b/test/T081-sexpr-search.sh @@ -736,4 +736,48 @@ notmuch search date:2009-11-18..2009-11-18 and tag:unread > EXPECTED notmuch search --query-syntax=sexp '(and (infix "date:2009-11-18..2009-11-18") (infix "tag:unread"))' > OUTPUT test_expect_equal_file EXPECTED OUTPUT +test_begin_subtest "user header (unknown header)" +notmuch search --query-syntax=sexp '(FooBar)' >& OUTPUT +cat < EXPECTED +notmuch search: Syntax error in query +unknown prefix 'FooBar' +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "adding user header" +test_expect_code 0 "notmuch config set index.header.List \"List-Id\"" + +test_begin_subtest "reindexing" +test_expect_code 0 'notmuch reindex "*"' + +test_begin_subtest "wildcard search for user header" +grep -Ril List-Id ${MAIL_DIR} | sort | notmuch_dir_sanitize > EXPECTED +notmuch search --output=files --query-syntax=sexp '(List *)' | sort | notmuch_dir_sanitize > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "wildcard search for user header 2" +grep -Ril List-Id ${MAIL_DIR} | sort | notmuch_dir_sanitize > EXPECTED +notmuch search --output=files --query-syntax=sexp '(List (starts-with not))' | sort | notmuch_dir_sanitize > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "search for user header" +notmuch search List:notmuch | notmuch_search_sanitize > EXPECTED +notmuch search --query-syntax=sexp '(List notmuch)' | notmuch_search_sanitize > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "search for user header (list token)" +notmuch search List:notmuch | notmuch_search_sanitize > EXPECTED +notmuch search --query-syntax=sexp '(List notmuch.notmuchmail.org)' | notmuch_search_sanitize > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "search for user header (quoted string)" +notmuch search 'List:"notmuch notmuchmail org"' | notmuch_search_sanitize > EXPECTED +notmuch search --query-syntax=sexp '(List "notmuch notmuchmail org")' | notmuch_search_sanitize > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "search for user header (atoms)" +notmuch search 'List:"notmuch notmuchmail org"' | notmuch_search_sanitize > EXPECTED +notmuch search --query-syntax=sexp '(List notmuch notmuchmail org)' | notmuch_search_sanitize > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + test_done -- 2.30.2