[PATCHv2 2/2] gitweb: support to globally enable/disable a snapshot format
From: Mark A Rada <hidden>
Date: 2016-06-15 22:47:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
Comments? I've integrated Jakub Narebski's suggestions. -- Mark A Rada (ferrous26) marada@uwaterloo.ca ------->8------------- From: Mark Rada <redacted> Date: Sat, 1 Aug 2009 13:24:03 -0400 Subject: [PATCH 2/2] gitweb: support to globally enable/disable a snapshot format I added a 'disabled' variable 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 <redacted> --- gitweb/gitweb.perl | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 3398163..a59569f 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl@@ -167,27 +167,31 @@ our %known_snapshot_formats = ( 'type' => 'application/x-gzip', 'suffix' => '.tar.gz', 'format' => 'tar', - 'compressor' => ['gzip']}, + 'compressor' => ['gzip'], + 'disabled' => 0}, 'tbz2' => { 'display' => 'tar.bz2', 'type' => 'application/x-bzip2', 'suffix' => '.tar.bz2', 'format' => 'tar', - 'compressor' => ['bzip2']}, + 'compressor' => ['bzip2'], + 'disabled' => 0}, 'txz' => { 'display' => 'tar.xz', 'type' => 'application/x-xz', 'suffix' => '.tar.xz', 'format' => 'tar', - 'compressor' => ['xz']}, + 'compressor' => ['xz'], + 'disabled' => 0}, 'zip' => { 'display' => 'zip', 'type' => 'application/x-zip', 'suffix' => '.zip', - 'format' => 'zip'}, + 'format' => 'zip', + 'disabled' => 0}, ); # Aliases so we understand old gitweb.snapshot values in repository
@@ -502,7 +506,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++";
@@ -5171,6 +5176,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