[PATCH 4/2] push -s: send signed push certificate
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 8, 2011, 04:38 UTC
- Message-ID
- <7vehzrzm0e.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <7vbouw2hqg.fsf@alter.siamese.dyndns.org>
And this uses the GPG interface to sign the push certificate. The format of the signed certificate is very similar to a signed tag, in that the result is a concatenation of the payload, immediately followed by a detached signature.
This places the same constraint as an annotated tag on the push certificate payload; it has to be a text file and the final line must not be an incomplete line.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/send-pack.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 3193f34..298e181 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -8,6 +8,7 @@ #include "send-pack.h" #include "quote.h" #include "transport.h" +#include "gpg-interface.h" static const char send_pack_usage[] = "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n" @@ -237,25 +238,18 @@ static int sideband_demux(int in, int out, void *data) return ret; } -static void sign_push_certificate(struct strbuf *cert) +/* + * Take the contents of cert->buf, and have the user GPG sign it, and + * read it back in the strbuf. + */ +static int sign_push_certificate(struct strbuf *cert) { /* - * Here, take the contents of cert->buf, and have the user GPG - * sign it, and read it back in the strbuf. - * - * You may want to append some extra info to cert before giving - * it to GPG, possibly via a hook. - * - * Here we upcase them just to demonstrate that the codepath - * is being exercised. + * You may want to append some extra info to cert before + * giving it to GPG, possibly via a hook, here. */ - char *cp; - for (cp = cert->buf; *cp; cp++) { - int ch = *cp; - if ('a' <= ch && ch <= 'z') - *cp = toupper(ch); - } - return; + + return sign_buffer(cert, git_committer_info(IDENT_NO_DATE)); } int send_pack(struct send_pack_args *args, @@ -370,7 +364,8 @@ int send_pack(struct send_pack_args *args, if (signed_push) { char *cp, *ep; - sign_push_certificate(&push_cert); + if (sign_push_certificate(&push_cert)) + return error(_("failed to sign push certificate")); strbuf_reset(&req_buf); for (cp = push_cert.buf; *cp; cp = ep) { ep = strchrnul(cp, '\n');
-- 1.7.7.rc0.188.g3793ac