Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 28316: screen unquoted semicolons and all followup colons

Browse source 
Currently searches like: "book:", ":book" and "host-item:test:n"
cause internal server errors.

This patch adds additional regexes that remove the colons at the start
and end of the query, and another regex that screens all follow-up
colons that go after the first colon to avoid errors when searching for
"host-item:test:n".

To reproduce:
1) using ES, search for the book with title that contains
semicolon at the start or at the end of the line, separated with spaces,
this should cause internal server error.
2) try doing the same with something like "host-item:test:n", it should
result in error as well.
3) apply the patch.
4) repeat steps 1-2, ensure that it works now.

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Petro Vashchuk 2021-06-18 10:43:14 +03:00 committed by Kyle M Hall
parent 405812b407
commit 5b4b14e493
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
View file

@ -938,14 +938,20 @@ sub _clean_search_term {
if ($count % 2 == 1) {
$term = $unquoted;
}
# Remove unquoted colons that have whitespace on either side of them
$term =~ s/(:+)(\s+)$lookahead/$2/g;
$term =~ s/(\s+)(:+)$lookahead/$1/g;
$term =~ s/^://;
$term = $self->_query_regex_escape_process($term);
# remove leading and trailing colons mixed with optional slashes and spaces
$term =~ s/^([\s\\]*:\s*)+//;
$term =~ s/([\s\\]*:\s*)+$//;
# remove unquoted colons that have whitespace on either side of them
$term =~ s/([\s\\]*:\s*)+(\s+)$lookahead/$2/g;
$term =~ s/(\s+)([\s\\]*:\s*)+$lookahead/$1/g;
# replace with spaces all repeated colons no matter how they surrounded with spaces and slashes
$term =~ s/([\s\\]*:\s*){2,}$lookahead/ /g;
# screen all followups for colons after first colon,
# and correctly ignore unevenly backslashed:
$term =~ s/((?<!\\)(?:[\\]{2})*:[^:\s]+(?<!\\)(?:[\\]{2})*)(?=:)/$1\\/g;
return $term;
}