From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id A6E4B1F953 for ; Sun, 31 Oct 2021 09:26:58 +0000 (UTC) Date: Sun, 31 Oct 2021 09:26:58 +0000 From: Eric Wong To: meta@public-inbox.org Subject: [PATCH v2] lei_input: disallow uppercase characters for labels Message-ID: <20211031092658.M569433@dcvr> References: <20211031091017.11274-1-e@80x24.org> <20211031091017.11274-3-e@80x24.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20211031091017.11274-3-e@80x24.org> List-Id: Xapian boolean terms rely on upper-case prefixes, so the terms themselves need to be all lowercase. --- v2: with test updates, all caps labels never worked for search lib/PublicInbox/LeiInput.pm | 2 +- t/lei-tag.t | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm index 84fc579dc480..a1dcc907252f 100644 --- a/lib/PublicInbox/LeiInput.pm +++ b/lib/PublicInbox/LeiInput.pm @@ -30,7 +30,7 @@ my %ERR = ( my ($label) = @_; length($label) >= $L_MAX and return "`$label' too long (must be <= $L_MAX)"; - $label =~ m{\A[a-z0-9_](?:[a-z0-9_\-\./\@,]*[a-z0-9])?\z}i ? + $label =~ m{\A[a-z0-9_](?:[a-z0-9_\-\./\@,]*[a-z0-9])?\z} ? undef : "`$label' is invalid"; }, kw => sub { diff --git a/t/lei-tag.t b/t/lei-tag.t index 44e4659fc226..5941cd0f3da7 100644 --- a/t/lei-tag.t +++ b/t/lei-tag.t @@ -84,11 +84,19 @@ test_lei(sub { lei_ok(qw(ls-label)); is($lei_out, "nope\nqp\nurgent\n", 'ls-label shows qp'); - lei_ok qw(tag -F eml t/utf8.eml +L:INBOX +L:x); + lei_ok qw(tag -F eml t/utf8.eml +L:inbox +L:x); lei_ok qw(q m:testmessage@example.com); - $check_kw->([qw(answered seen)], L => [qw(INBOX nope urgent x)]); + $check_kw->([qw(answered seen)], L => [qw(inbox nope urgent x)]); lei_ok(qw(ls-label)); - is($lei_out, "INBOX\nnope\nqp\nurgent\nx\n", 'ls-label shows qp'); + is($lei_out, "inbox\nnope\nqp\nurgent\nx\n", 'ls-label shows qp'); + + lei_ok qw(q L:inbox); + is(json_utf8->decode($lei_out)->[0]->{blob}, + $r2->[0]->{blob}, 'label search works'); + + ok(!lei(qw(tag -F eml t/utf8.eml +L:ALLCAPS)), '+L:ALLCAPS fails'); + lei_ok(qw(ls-label)); + is($lei_out, "inbox\nnope\nqp\nurgent\nx\n", 'ls-label unchanged'); if (0) { # TODO label+kw search w/ externals lei_ok(qw(q L:qp), "mid:$mid", '--only', "$ro_home/t2");