From: john at keeping.me.uk (John Keeping)
Subject: [PATCH 1/1] snapshot: support tar signature for compressed tar
Date: Thu, 7 Jun 2018 14:17:14 +0100 [thread overview]
Message-ID: <20180607131714.GE1922@john.keeping.me.uk> (raw)
In-Reply-To: <20180607121534.20416-1-list@eworm.de>
On Thu, Jun 07, 2018 at 02:15:34PM +0200, Christian Hesse wrote:
> From: Christian Hesse <mail at eworm.de>
>
> 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.
>
> Signed-off-by: Christian Hesse <mail at eworm.de>
> ---
> ui-shared.c | 8 ++++++++
> ui-snapshot.c | 2 +-
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/ui-shared.c b/ui-shared.c
> index 8a786e0..40935ae 100644
> --- a/ui-shared.c
> +++ b/ui-shared.c
> @@ -1139,6 +1139,14 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref,
> cgit_snapshot_link("sig", NULL, NULL, NULL, NULL,
> filename.buf);
> html(")");
> + } else if (f->bit & 0x16 && cgit_snapshot_get_sig(ref, &cgit_snapshot_formats[3])) {
This works, but it feels far too magic and likely to break in the
future. I'd rather add a new field for base snapshot type, either as a
const char * set that to ".tar" for the relevant archive formats or as a
bitmask which is set to 0x08 for now to allow fallback to tar. If we do
that, we should extract at least that bit value to a named constant to
make it clear what is going on.
> + int suf_len = strlen(f->suffix);
> + strbuf_remove(&filename, strlen(filename.buf) - suf_len, suf_len);
> + strbuf_addstr(&filename, ".tar.asc");
> + html(" (");
> + cgit_snapshot_link("sig", NULL, NULL, NULL, NULL,
> + filename.buf);
> + html(")");
> }
> html(separator);
> }
> diff --git a/ui-snapshot.c b/ui-snapshot.c
> index c7611e8..76d0573 100644
> --- a/ui-snapshot.c
> +++ b/ui-snapshot.c
> @@ -263,7 +263,7 @@ void cgit_print_snapshot(const char *head, const char *hex,
> }
>
> f = get_format(filename);
> - if (!f || !(ctx.repo->snapshots & f->bit)) {
> + if (!f || (!sig_filename && !(ctx.repo->snapshots & f->bit))) {
This bypasses the permitted snapshots configuration, but I guess that's
ok because signature lookup is cheap unlike archive creation.
> cgit_print_error_page(400, "Bad request",
> "Unsupported snapshot format: %s", filename);
> return;
next prev parent reply other threads:[~2018-06-07 13:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-07 12:12 Custom snapshot prefix & Snapshot signatures list
2018-06-07 12:15 ` [PATCH 1/1] snapshot: support tar signature for compressed tar list
2018-06-07 13:17 ` john [this message]
2018-06-07 15:13 ` list
2018-06-07 15:14 ` [PATCH v2 1/2] ui-snapshot: use named constants for snapshot formats list
2018-06-07 15:14 ` [PATCH v2 2/2] snapshot: support tar signature for compressed tar list
2018-06-07 15:21 ` john
2018-06-07 19:36 ` list
2018-06-07 19:38 ` [PATCH v3 1/1] " list
2018-06-27 16:34 ` Jason
2018-06-27 20:14 ` john
2018-07-02 7:10 ` list
2018-07-03 18:56 ` Jason
2018-06-08 22:11 ` [PATCH 1/1] snapshot: strip bit from struct cgit_snapshot_format list
2018-06-09 11:16 ` john
2018-06-11 6:51 ` list
2018-06-11 6:53 ` [PATCH v2 " list
2018-06-07 13:10 ` Custom snapshot prefix & Snapshot signatures john
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180607131714.GE1922@john.keeping.me.uk \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).