Skip to content

Commit

Permalink
Merge branch 'jc/push-cert' into maint
Browse files Browse the repository at this point in the history
The "git push --signed" protocol extension did not limit what the
"nonce" that is a server-chosen string can contain or how long it
can be, which was unnecessarily lax.  Limit both the length and the
alphabet to a reasonably small space that can still have enough
entropy.

* jc/push-cert:
  push --signed: tighten what the receiving end can ask to sign
  • Loading branch information
Junio C Hamano committed Apr 27, 2015
2 parents ba63bfa + afcb6ee commit 631f6f1
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions send-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,28 @@ static int generate_push_cert(struct strbuf *req_buf,
return update_seen;
}

#define NONCE_LEN_LIMIT 256

static void reject_invalid_nonce(const char *nonce, int len)
{
int i = 0;

if (NONCE_LEN_LIMIT <= len)
die("the receiving end asked to sign an invalid nonce <%.*s>",
len, nonce);

for (i = 0; i < len; i++) {
int ch = nonce[i] & 0xFF;
if (isalnum(ch) ||
ch == '-' || ch == '.' ||
ch == '/' || ch == '+' ||
ch == '=' || ch == '_')
continue;
die("the receiving end asked to sign an invalid nonce <%.*s>",
len, nonce);
}
}

int send_pack(struct send_pack_args *args,
int fd[], struct child_process *conn,
struct ref *remote_refs,
Expand Down Expand Up @@ -323,6 +345,7 @@ int send_pack(struct send_pack_args *args,
push_cert_nonce = server_feature_value("push-cert", &len);
if (!push_cert_nonce)
die(_("the receiving end does not support --signed push"));
reject_invalid_nonce(push_cert_nonce, len);
push_cert_nonce = xmemdupz(push_cert_nonce, len);
}

Expand Down

0 comments on commit 631f6f1

Please sign in to comment.