{"thread":{"id":"9210","subject":"[PATCH] gitweb: More detailed error messages for snapshot format","startedAt":"2007-07-24T21:00:37Z","lastAt":"2007-07-24T23:19:58Z","messageCount":3,"participants":["Jakub Narebski","Matt McCutchen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"48518","messageId":"11853108372532-git-send-email-jnareb@gmail.com","threadId":"9210","inReplyTo":null,"subject":"[PATCH] gitweb: More detailed error messages for snapshot format","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-07-24T21:00:37Z","receivedAt":"2007-07-24T21:00:37Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Improve error messages for snapshot format in git_snapshot:\ndistinguish between situation where snapshots are turned off, where\nsnapshot format ('sf') parameter is invalid, where given snapshot\nformat does not exist in %known_snapshot_formats hash, and where\ngitweb was given unsupported snapshot format.\n\nWhile at it, use first from all supported snapshots format as default,\nif no snapshot format was provided.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\n gitweb/gitweb.perl |   13 ++++++++++---\n 1 files changed, 10 insertions(+), 3 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex fdfce31..708448c 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -4317,9 +4317,16 @@ sub git_snapshot {\n \t@supported_fmts = filter_snapshot_fmts(@supported_fmts);\n \n \tmy $format = $cgi->param('sf');\n-\tunless ($format =~ m/[a-z0-9]+/\n-\t        && exists($known_snapshot_formats{$format})\n-\t        && grep($_ eq $format, @supported_fmts)) {\n+\tif (!@supported_fmts) {\n+\t\tdie_error('403 Permission denied', \"Permission denied\");\n+\t}\n+\t# default to first supported snapshot format\n+\t$format ||= $supported_fmts[0];\n+\tif ($format !~ m/[a-z0-9]+/) {\n+\t\tdie_error(undef, \"Invalid snapshot format parameter\");\n+\t} elsif (!exists($known_snapshot_formats{$format})) {\n+\t\tdie_error(undef, \"Unknown snapshot format\");\n+\t} elsif (!grep($_ eq $format, @supported_fmts)) {\n \t\tdie_error(undef, \"Unsupported snapshot format\");\n \t}\n \n-- \n1.5.2.4\n"},{"id":"48524","messageId":"3bbc18d20707241450y48ef0485i2809c632ac2e643@mail.gmail.com","threadId":"9210","inReplyTo":"11853108372532-git-send-email-jnareb@gmail.com","subject":"Re: [PATCH] gitweb: More detailed error messages for snapshot format","fromName":"Matt McCutchen","fromEmail":"hashproduct@gmail.com","sentAt":"2007-07-24T21:50:29Z","receivedAt":"2007-07-24T21:50:29Z","isPatch":true,"sender":{"key":"matt@mattmccutchen.net","avatar":"https://avatars.githubusercontent.com/u/8885753?v=4"},"body":"On 7/24/07, Jakub Narebski <jnareb@gmail.com> wrote:\n> Improve error messages for snapshot format in git_snapshot:\n> distinguish between situation where snapshots are turned off, where\n> snapshot format ('sf') parameter is invalid, where given snapshot\n> format does not exist in %known_snapshot_formats hash, and where\n> gitweb was given unsupported snapshot format.\n>\n> While at it, use first from all supported snapshots format as default,\n> if no snapshot format was provided.\n\nI tested the patch and it worked properly: the errors appeared at the\nappropriate times and the first supported format was used as the\ndefault.\n\nI also noticed that the check for an \"invalid\" format requires that it\ncontain at least one good character, not that it contain no bad\ncharacters, which was what I originally meant.  It would be nice to\nfix the check, or the check could even be removed altogether since\ngitweb refuses any format that isn't in %known_snapshot_formats .  (I\nthink I was misguidedly paranoid to add it in the first place.)\n"},{"id":"48530","messageId":"200707250119.59260.jnareb@gmail.com","threadId":"9210","inReplyTo":"3bbc18d20707241450y48ef0485i2809c632ac2e643@mail.gmail.com","subject":"[PATCH (amend)] gitweb: More detailed error messages for snapshot format","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-07-24T23:19:58Z","receivedAt":"2007-07-24T23:19:58Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Improve error messages for snapshot format in git_snapshot:\ndistinguish between situation where snapshots are turned off, where\nsnapshot format ('sf') parameter is invalid, where given snapshot\nformat does not exist in %known_snapshot_formats hash, and where\ngitweb was given unsupported snapshot format.\n\nWhile at it, use first from all supported snapshots format as default,\nif no snapshot format was provided.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nMatt McCutchen wrote:\n> On 7/24/07, Jakub Narebski <jnareb@gmail.com> wrote:\n> > Improve error messages for snapshot format in git_snapshot:\n> > distinguish between situation where snapshots are turned off, where\n> > snapshot format ('sf') parameter is invalid,\n[...]\n> I also noticed that the check for an \"invalid\" format requires that it\n> contain at least one good character, not that it contain no bad\n> characters, which was what I originally meant.  It would be nice to\n> fix the check, or the check could even be removed altogether since\n> gitweb refuses any format that isn't in %known_snapshot_formats .  (I\n> think I was misguidedly paranoid to add it in the first place.)\n\nThis fixes the check (although perhaps the check should be removed).\n\n gitweb/gitweb.perl |   13 ++++++++++---\n 1 files changed, 10 insertions(+), 3 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex fdfce31..0acd0ca 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -4317,9 +4317,16 @@ sub git_snapshot {\n \t@supported_fmts = filter_snapshot_fmts(@supported_fmts);\n \n \tmy $format = $cgi->param('sf');\n-\tunless ($format =~ m/[a-z0-9]+/\n-\t        && exists($known_snapshot_formats{$format})\n-\t        && grep($_ eq $format, @supported_fmts)) {\n+\tif (!@supported_fmts) {\n+\t\tdie_error('403 Permission denied', \"Permission denied\");\n+\t}\n+\t# default to first supported snapshot format\n+\t$format ||= $supported_fmts[0];\n+\tif ($format !~ m/^[a-z0-9]+$/) {\n+\t\tdie_error(undef, \"Invalid snapshot format parameter\");\n+\t} elsif (!exists($known_snapshot_formats{$format})) {\n+\t\tdie_error(undef, \"Unknown snapshot format\");\n+\t} elsif (!grep($_ eq $format, @supported_fmts)) {\n \t\tdie_error(undef, \"Unsupported snapshot format\");\n \t}\n \n-- \n1.5.2.4\n"}]}