@matheusbsbs / matheus-bagliano / commits / 3473e7df5f
Fork 0

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>

Jakub Narebski committed Jul 25, 2007 at 01:19 UTC 3473e7df5f8c7f8dc3e2c3f2fdc99a1d1a719c16
1 file changed +10 -3
gitweb/gitweb.perl
+10 -3
@@ -4317,9 +4317,16 @@ sub git_snapshot {
4317 @supported_fmts = filter_snapshot_fmts(@supported_fmts);
4318
4319 my $format = $cgi->param('sf');
4320 - unless ($format =~ m/[a-z0-9]+/
4321 - && exists($known_snapshot_formats{$format})
4322 - && grep($_ eq $format, @supported_fmts)) {
4320 + if (!@supported_fmts) {
4321 + die_error('403 Permission denied', "Permission denied");
4322 + }
4323 + # default to first supported snapshot format
4324 + $format ||= $supported_fmts[0];
4325 + if ($format !~ m/^[a-z0-9]+$/) {
4326 + die_error(undef, "Invalid snapshot format parameter");
4327 + } elsif (!exists($known_snapshot_formats{$format})) {
4328 + die_error(undef, "Unknown snapshot format");
4329 + } elsif (!grep($_ eq $format, @supported_fmts)) {
4330 die_error(undef, "Unsupported snapshot format");
4331 }
4332