зеркало из https://github.com/microsoft/git.git
Merge branch 'jn/maint-gitweb-invalid-regexp'
* jn/maint-gitweb-invalid-regexp: gitweb: Handle invalid regexp in regexp search
This commit is contained in:
Коммит
6a3a3db73f
|
@ -1081,7 +1081,16 @@ sub evaluate_and_validate_params {
|
|||
if (length($searchtext) < 2) {
|
||||
die_error(403, "At least two characters are required for search parameter");
|
||||
}
|
||||
$search_regexp = $search_use_regexp ? $searchtext : quotemeta $searchtext;
|
||||
if ($search_use_regexp) {
|
||||
$search_regexp = $searchtext;
|
||||
if (!eval { qr/$search_regexp/; 1; }) {
|
||||
(my $error = $@) =~ s/ at \S+ line \d+.*\n?//;
|
||||
die_error(400, "Invalid search regexp '$search_regexp'",
|
||||
esc_html($error));
|
||||
}
|
||||
} else {
|
||||
$search_regexp = quotemeta $searchtext;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -134,4 +134,14 @@ our $maxload = undef;
|
|||
EOF
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# invalid arguments
|
||||
|
||||
test_expect_success 'invalid arguments: invalid regexp (in project search)' '
|
||||
gitweb_run "a=project_list;s=*\.git;sr=1" &&
|
||||
grep "Status: 400" gitweb.headers &&
|
||||
grep "400 - Invalid.*regexp" gitweb.body
|
||||
'
|
||||
test_debug 'cat gitweb.headers'
|
||||
|
||||
test_done
|
||||
|
|
Загрузка…
Ссылка в новой задаче