From 27015c3365fd069013e58c6cc06e7be38f4fbe4f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 31 Oct 2021 09:26:58 +0000 Subject: lei_input: disallow uppercase characters for labels Xapian boolean terms rely on upper-case prefixes, so the terms themselves need to be all lowercase. --- 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 84fc579d..a1dcc907 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 44e4659f..5941cd0f 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"); -- cgit v1.2.3-24-ge0c7