This stores the GPG signed push certificate in the receiving repository
using the notes mechanism. The certificate is appended to a note in the
refs/notes/signed-push tree for each object that appears on the right
hand side of the push certificate, i.e. the object that was pushed to
update the tip of a ref.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
* This is largely untested, so take it with a large grain of salt.
This concludes tonight's hacking session for me.
builtin/receive-pack.c | 74 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 307fc3b..257f2a5 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -11,6 +11,11 @@
#include "transport.h"
#include "string-list.h"
#include "sha1-array.h"
+#include "gpg-interface.h"
+#include "notes.h"
+#include "notes-merge.h"
+#include "blob.h"
+#include "tag.h"
static const char receive_pack_usage[] = "git receive-pack <git-dir>";
@@ -156,6 +161,7 @@ struct command {
};
static const char pre_receive_hook[] = "hooks/pre-receive";
+static const char pre_receive_signature_hook[] = "hooks/pre-receive-signature";
static const char post_receive_hook[] = "hooks/post-receive";
static void rp_error(const char *err, ...) __attribute__((format (printf, 1, 2)));
@@ -581,6 +587,22 @@ static void check_aliased_updates(struct command *commands)
string_list_clear(&ref_list, 0);
}
+static void get_note_text(struct strbuf *buf, struct notes_tree *t,
+ const unsigned char *object)
+{
+ const unsigned char *sha1 = get_note(t, object);
+ char *text;
+ unsigned long len;
+ enum object_type type;
+
+ if (!sha1)
+ return;
+ text = read_sha1_file(sha1, &type, &len);
+ if (text && len && type == OBJ_BLOB)
+ strbuf_add(buf, text, len);
+ free(text);
+}
+
static int record_signed_push(char *cert)
{
/*
@@ -591,19 +613,57 @@ static int record_signed_push(char *cert)
*
* You could also feed the signed push certificate to GPG,
* verify the signer identity, and all the other fun stuff,
- * including feeding it to "pre-push-verify-signature" hook.
- *
- * Here we just throw it to stderr to demonstrate that the
- * codepath is being exercised.
+ * including feeding it to "pre-receive-signature" hook.
*/
+ size_t total, payload;
char *cp, *ep;
- for (cp = cert; *cp; cp = ep) {
+ int ret = 0;
+ struct notes_tree *t;
+ struct strbuf nbuf = STRBUF_INIT;
+
+ init_notes(NULL, "refs/notes/signed-push", NULL, 0);
+ t = &default_notes_tree;
+
+ total = strlen(cert);
+ payload = parse_signature(cert, total);
+ for (cp = cert; cp < cert + payload; cp = ep) {
+ unsigned char sha1[20], nsha1[20];
+
ep = strchrnul(cp, '\n');
if (*ep == '\n')
ep++;
- fprintf(stderr, "RSP: %.*s", (int)(ep - cp), cp);
+ if (prefixcmp(cp, "Update: "))
+ continue;
+ cp += strlen("Update: ");
+ if (get_sha1_hex(cp, sha1) || cp[40] != ' ')
+ continue;
+ cp += 41;
+ if (get_sha1_hex(cp, sha1) || cp[40] != ' ')
+ continue;
+
+ get_note_text(&nbuf, t, sha1);
+ if (nbuf.len)
+ strbuf_addch(&nbuf, '\n');
+ strbuf_add(&nbuf, cert, total);
+ if (write_sha1_file(nbuf.buf, nbuf.len, blob_type, nsha1) ||
+ add_note(t, sha1, nsha1, NULL))
+ ret = error(_("unable to write note object"));
+ strbuf_reset(&nbuf);
}
- return 0;
+
+ if (!ret) {
+ unsigned char commit[20];
+ unsigned char parent[20];
+ struct ref_lock *lock;
+
+ resolve_ref(t->ref, parent, 0, NULL);
+ lock = lock_any_ref_for_update(t->ref, parent, 0);
+ create_notes_commit(t, NULL, "push", commit);
+ ret = write_ref_sha1(lock, commit, "push");
+ }
+ free_notes(t);
+
+ return ret;
}
static void execute_commands(struct command *commands, const char *unpacker_error)
--
1.7.7.rc0.188.g3793ac
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html