about summary refs log tree commit diff
path: root/ui-snapshot.c
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2018-06-07 21:31:28 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-07-03 20:37:44 +0200
commit7ba41963dde175581ae7b395045fd51678237930 (patch)
tree72df4e03388644a243d3a4d18b055f45b707d860 /ui-snapshot.c
parentextra-head-content: introduce another option for meta tags (diff)
downloadcgit-pink-7ba41963dde175581ae7b395045fd51678237930.tar.gz
cgit-pink-7ba41963dde175581ae7b395045fd51678237930.zip
snapshot: support tar signature for compressed tar
This adds support for kernel.org style signatures where the uncompressed
tar archive is signed and compressed later. The signature is valid for
all tar* snapshots.

We have a filter which snapshots may be generated and downloaded. This has
to allow tar signatures now even if tar itself is not allowed. To simplify
things we allow all signatures.

Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'ui-snapshot.c')
-rw-r--r--ui-snapshot.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 92c3277..fa3ceaf 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -86,6 +86,7 @@ static int write_tar_xz_archive(const char *hex, const char *prefix)
 }
 
 const struct cgit_snapshot_format cgit_snapshot_formats[] = {
+	/* .tar must remain the 0 index */
 	{ ".tar",	"application/x-tar",	write_tar_archive	},
 	{ ".tar.gz",	"application/x-gzip",	write_tar_gzip_archive	},
 	{ ".tar.bz2",	"application/x-bzip2",	write_tar_bzip2_archive	},
@@ -268,7 +269,7 @@ void cgit_print_snapshot(const char *head, const char *hex,
 	}
 
 	f = get_format(filename);
-	if (!f || !(ctx.repo->snapshots & cgit_snapshot_format_bit(f))) {
+	if (!f || (!sig_filename && !(ctx.repo->snapshots & cgit_snapshot_format_bit(f)))) {
 		cgit_print_error_page(400, "Bad request",
 				"Unsupported snapshot format: %s", filename);
 		return;