# [PATCH] gitweb: More detailed error messages for snapshot format 3 messages from 2007-07-24 to 2007-07-24. Participants: Jakub Narebski, Matt McCutchen. Thread: https://gitlist.dev/t/9210 ## Jakub Narebski, 2007-07-24 21:00 Subject: [PATCH] gitweb: More detailed error messages for snapshot format Message-ID: <11853108372532-git-send-email-jnareb@gmail.com> URL: https://gitlist.dev/e/11853108372532-git-send-email-jnareb%40gmail.com ``` 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 --- gitweb/gitweb.perl | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index fdfce31..708448c 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -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"); } -- 1.5.2.4 ``` ## Matt McCutchen, 2007-07-24 21:50 Subject: Re: [PATCH] gitweb: More detailed error messages for snapshot format Message-ID: <3bbc18d20707241450y48ef0485i2809c632ac2e643@mail.gmail.com> URL: https://gitlist.dev/e/3bbc18d20707241450y48ef0485i2809c632ac2e643%40mail.gmail.com In-Reply-To: <11853108372532-git-send-email-jnareb@gmail.com> ``` On 7/24/07, Jakub Narebski wrote: > 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. I tested the patch and it worked properly: the errors appeared at the appropriate times and the first supported format was used as the default. I also noticed that the check for an "invalid" format requires that it contain at least one good character, not that it contain no bad characters, which was what I originally meant. It would be nice to fix the check, or the check could even be removed altogether since gitweb refuses any format that isn't in %known_snapshot_formats . (I think I was misguidedly paranoid to add it in the first place.) ``` ## Jakub Narebski, 2007-07-24 23:19 Subject: [PATCH (amend)] gitweb: More detailed error messages for snapshot format Message-ID: <200707250119.59260.jnareb@gmail.com> URL: https://gitlist.dev/e/200707250119.59260.jnareb%40gmail.com In-Reply-To: <3bbc18d20707241450y48ef0485i2809c632ac2e643@mail.gmail.com> ``` 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 --- Matt McCutchen wrote: > On 7/24/07, Jakub Narebski wrote: > > Improve error messages for snapshot format in git_snapshot: > > distinguish between situation where snapshots are turned off, where > > snapshot format ('sf') parameter is invalid, [...] > I also noticed that the check for an "invalid" format requires that it > contain at least one good character, not that it contain no bad > characters, which was what I originally meant. It would be nice to > fix the check, or the check could even be removed altogether since > gitweb refuses any format that isn't in %known_snapshot_formats . (I > think I was misguidedly paranoid to add it in the first place.) This fixes the check (although perhaps the check should be removed). gitweb/gitweb.perl | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index fdfce31..0acd0ca 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -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"); } -- 1.5.2.4 ```