зеркало из https://github.com/microsoft/git.git
gitweb: More detailed error messages for snapshot format
Improve error messages for snapshot format in git_snapshot: distinguish between situation where snapshots are turned off, where snapshot format ('sf') parameter is invalid, where given snapshot format does not exist in %known_snapshot_formats hash, and where gitweb was given unsupported snapshot format. While at it, use first from all supported snapshots format as default, if no snapshot format was provided. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
93c22eeb30
Коммит
3473e7df5f
|
@ -4317,9 +4317,16 @@ sub git_snapshot {
|
|||
@supported_fmts = filter_snapshot_fmts(@supported_fmts);
|
||||
|
||||
my $format = $cgi->param('sf');
|
||||
unless ($format =~ m/[a-z0-9]+/
|
||||
&& exists($known_snapshot_formats{$format})
|
||||
&& grep($_ eq $format, @supported_fmts)) {
|
||||
if (!@supported_fmts) {
|
||||
die_error('403 Permission denied', "Permission denied");
|
||||
}
|
||||
# default to first supported snapshot format
|
||||
$format ||= $supported_fmts[0];
|
||||
if ($format !~ m/^[a-z0-9]+$/) {
|
||||
die_error(undef, "Invalid snapshot format parameter");
|
||||
} elsif (!exists($known_snapshot_formats{$format})) {
|
||||
die_error(undef, "Unknown snapshot format");
|
||||
} elsif (!grep($_ eq $format, @supported_fmts)) {
|
||||
die_error(undef, "Unsupported snapshot format");
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче