From: Mark A Rada Date: Thu, 06 Aug 2009 04:24:53 GMT Subject: [PATCHv5 1/3] gitweb: support to globally disable a snapshot format Message-ID: <35210404-7E4C-4CB9-881C-45C9E61ACECE@uwaterloo.ca> Re-ordered, as suggested by Junio. -- Mark A Rada (ferrous26) marada@uwaterloo.ca --->8--- From: Mark Rada Date: Wed, 5 Aug 2009 21:02:54 -0400 Subject: [PATCH 1/3] gitweb: support to globally disable a snapshot format I added an optional variable, 'disabled', to to the $known_snapshot_formats keys so that a Gitweb administrator can globally enable or disable a specific format for snapshots. All formats are enabled by default because project specific overriding is disabled by default. Signed-off-by: Mark Rada --- gitweb/gitweb.perl | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 37120a3..a0cdf31 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -160,7 +160,8 @@ our %known_snapshot_formats = ( # 'suffix' => filename suffix, # 'format' => --format for git-archive, # 'compressor' => [compressor command and arguments] - # (array reference, optional)} + # (array reference, optional) + # 'disabled' => boolean (optional)} # 'tgz' => { 'display' => 'tar.gz', @@ -494,7 +495,8 @@ sub filter_snapshot_fmts { exists $known_snapshot_format_aliases{$_} ? $known_snapshot_format_aliases{$_} : $_} @fmts; @fmts = grep { - exists $known_snapshot_formats{$_} } @fmts; + exists $known_snapshot_formats{$_} && + !$known_snapshot_formats{$_}{'disabled'}} @fmts; } our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++"; @@ -5166,6 +5168,8 @@ sub git_snapshot { die_error(400, "Unknown snapshot format"); } elsif (!grep($_ eq $format, @snapshot_fmts)) { die_error(403, "Unsupported snapshot format"); + } elsif ($known_snapshot_formats{$format}{'disabled'}) { + die_error(403, "Snapshot format not allowed"); } if (!defined $hash) { -- 1.6.4