[PATCH 2/2] gitweb: support to globally enable/disable a snapshot format

From

Mark A Rada <marada@uwaterloo.ca>

Date

Aug 1, 2009, 17:46 UTC

Message-ID

<8E0889CB-8A0A-45A5-AF34-9643D4EEFCEF@uwaterloo.ca>

On 1-Aug-09, at 4:14 AM, Jakub Narebski wrote:

> "J.H." <warthog19@eaglescrag.net> writes:
>
>> Well you can always call xz with -[1-9] to change the compression
>> level (same as gzip and bzip2) though I think a full disabling would
>> be 'more' preferable, though I'm not sure I like Jakub's suggestion  
>> of
>> just deleting it after the fact, it would work.
> [...]
>
> The problem is that 'keys %known_snapshot_formats' serves also as list
> of allowed snapshot formats, if project specific override is enabled.
> We can add another optional flag ('disabled' => 1) if you don't want
> to delete from %known_snapshot_formats in $GITWEB_CONFIG, though I
> don't know if it is worth it.  Anyway such mechanism can be added, and
> IMHO should be added, in a separate commit.

Is this correct?

----------->8--------------
From: Mark Rada <marada@uwaterloo.ca>
Date: Sat, 1 Aug 2009 13:24:03 -0400
Subject: [PATCH 2/2] gitweb: support to globally enable/disable a  
snapshot format

Signed-off-by: Mark Rada <marada@uwaterloo.ca>
---
  gitweb/gitweb.perl |   14 ++++++++++----
  1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 3398163..0a9cec6 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'],
+		'enabled' => 1},

  	'tbz2' => {
  		'display' => 'tar.bz2',
  		'type' => 'application/x-bzip2',
  		'suffix' => '.tar.bz2',
  		'format' => 'tar',
-		'compressor' => ['bzip2']},
+		'compressor' => ['bzip2'],
+		'enabled' => 1},

  	'txz' => {
  		'display' => 'tar.xz',
  		'type' => 'application/x-xz',
  		'suffix' => '.tar.xz',
  		'format' => 'tar',
-		'compressor' => ['xz']},
+		'compressor' => ['xz'],
+		'enabled' => 1},

  	'zip' => {
  		'display' => 'zip',
  		'type' => 'application/x-zip',
  		'suffix' => '.zip',
-		'format' => 'zip'},
+		'format' => 'zip',
+		'enabled' => 1},
  );

  # Aliases so we understand old gitweb.snapshot values in repository
@@ -5171,6 +5175,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}{'enabled'}) {
+		die_error(403, "Snapshot format not allowed");
  	}

  	if (!defined $hash) {

-- 
1.6.4