From: Junio C Hamano <gitster@pobox•com>
To: git@vger•kernel.org
Subject: Re: [PATCH v5 00/23] Signed push
Date: Tue, 16 Sep 2014 11:40:21 -0700 [thread overview]
Message-ID: <xmqq7g132yui.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: 1410819864-22967-1-git-send-email-gitster@pobox.com
Junio C Hamano <gitster@pobox•com> writes:
> A failing test has been added at the end for smart HTTP. It appears
> that somewhere in the callchain "--signed" is forgotten and the
> sending end not to send the certificate for some reason. If
> somebody with a fresh set of eyes can look into it, that would be
> very much appreciated, as I do not expect I would have sufficient
> concentration to dig it quickly for several days at least.
I lied. This is to replace the patch at the end (23/23).
-- >8 --
From: Junio C Hamano <gitster@pobox•com>
Date: Mon, 15 Sep 2014 14:59:00 -0700
Subject: [PATCH] push: teach smart-HTTP to pass "git push --signed" around
The "--signed" option received by "git push" is first passed to the
transport layer, which the native transport directly uses to notice
that a push certificate needs to be sent. When the transport-helper
is involved, however, the option needs to be told to the helper with
set_helper_option(), and the helepr needs to take necessary action.
For the smart-HTTP helper, the "necessary action" involves spawning
the "git send-pack" subprocess with the "--signed" option.
Once the above all gets wired in, the smart-HTTP transport now can
use the push certificate mechanism to authenticate its pushes.
Add a test that is modeled after tests for the native transport in
t5534-push-signed.sh to t5541-http-push-smart.sh. Update the test
Apache configuration to pass GNUPGHOME environment variable through.
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
* Unconditional addition of "PassEnv GNUPGHOME" may give warnings
from Apache in other tests that do not do GPG, but I left it
as-is because I didn't think of a good way to squelch it.
Perhaps define it as an empty in test-lib.sh, to be overriden by
lib-gpg.sh?
builtin/send-pack.c | 4 ++++
remote-curl.c | 13 ++++++++++++-
t/lib-httpd/apache.conf | 1 +
t/t5541-http-push-smart.sh | 38 ++++++++++++++++++++++++++++++++++++++
transport-helper.c | 9 ++++++++-
5 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index f420b74..ca28d8d 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -153,6 +153,10 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
args.verbose = 1;
continue;
}
+ if (!strcmp(arg, "--signed")) {
+ args.push_cert = 1;
+ continue;
+ }
if (!strcmp(arg, "--progress")) {
progress = 1;
continue;
diff --git a/remote-curl.c b/remote-curl.c
index 0fcf2ce..1ea4e95 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -25,7 +25,8 @@ struct options {
update_shallow : 1,
followtags : 1,
dry_run : 1,
- thin : 1;
+ thin : 1,
+ push_cert : 1;
};
static struct options options;
static struct string_list cas_options = STRING_LIST_INIT_DUP;
@@ -106,6 +107,14 @@ static int set_option(const char *name, const char *value)
else
return -1;
return 0;
+ } else if (!strcmp(name, "pushcert")) {
+ if (!strcmp(value, "true"))
+ options.push_cert = 1;
+ else if (!strcmp(value, "false"))
+ options.push_cert = 0;
+ else
+ return -1;
+ return 0;
} else {
return 1 /* unsupported */;
}
@@ -872,6 +881,8 @@ static int push_git(struct discovery *heads, int nr_spec, char **specs)
argv_array_push(&args, "--thin");
if (options.dry_run)
argv_array_push(&args, "--dry-run");
+ if (options.push_cert)
+ argv_array_push(&args, "--signed");
if (options.verbosity == 0)
argv_array_push(&args, "--quiet");
else if (options.verbosity > 1)
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index b384d79..7713dd2 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -68,6 +68,7 @@ LockFile accept.lock
PassEnv GIT_VALGRIND
PassEnv GIT_VALGRIND_OPTIONS
+PassEnv GNUPGHOME
Alias /dumb/ www/
Alias /auth/dumb/ www/auth/dumb/
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index 73af16f..6552366 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -12,6 +12,7 @@ if test -n "$NO_CURL"; then
fi
ROOT_PATH="$PWD"
+. "$TEST_DIRECTORY"/lib-gpg.sh
. "$TEST_DIRECTORY"/lib-httpd.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
start_httpd
@@ -323,5 +324,42 @@ test_expect_success 'push into half-auth-complete requires password' '
test_cmp expect actual
'
+test_expect_success GPG 'push with post-receive to inspect certificate' '
+ (
+ cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
+ mkdir -p hooks &&
+ write_script hooks/post-receive <<-\EOF &&
+ # discard the update list
+ cat >/dev/null
+ # record the push certificate
+ if test -n "${GIT_PUSH_CERT-}"
+ then
+ git cat-file blob $GIT_PUSH_CERT >../push-cert
+ fi &&
+ cat >../push-cert-status <<E_O_F
+ SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
+ KEY=${GIT_PUSH_CERT_KEY-nokey}
+ STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
+ NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+ E_O_F
+ EOF
+
+ git config receive.certnonceseed sekrit
+ ) &&
+ cd "$ROOT_PATH/test_repo_clone" &&
+ test_commit cert-test &&
+ git push --signed "$HTTPD_URL/smart/test_repo.git" &&
+ (
+ cd "$HTTPD_DOCUMENT_ROOT_PATH" &&
+ cat <<-\EOF &&
+ SIGNER=C O Mitter <committer@example•com>
+ KEY=13B6F51ECDDE430D
+ STATUS=G
+ EOF
+ sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" push-cert
+ ) >expect &&
+ test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH/push-cert-status"
+'
+
stop_httpd
test_done
diff --git a/transport-helper.c b/transport-helper.c
index 3d8fe7d..4b1a261 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -259,7 +259,8 @@ static const char *unsupported_options[] = {
static const char *boolean_options[] = {
TRANS_OPT_THIN,
TRANS_OPT_KEEP,
- TRANS_OPT_FOLLOWTAGS
+ TRANS_OPT_FOLLOWTAGS,
+ TRANS_OPT_PUSH_CERT
};
static int set_helper_option(struct transport *transport,
@@ -835,6 +836,9 @@ static int push_refs_with_push(struct transport *transport,
if (flags & TRANSPORT_PUSH_DRY_RUN) {
if (set_helper_option(transport, "dry-run", "true") != 0)
die("helper %s does not support dry-run", data->name);
+ } else if (flags & TRANSPORT_PUSH_CERT) {
+ if (set_helper_option(transport, TRANS_OPT_PUSH_CERT, "true") != 0)
+ die("helper %s does not support --signed", data->name);
}
strbuf_addch(&buf, '\n');
@@ -859,6 +863,9 @@ static int push_refs_with_export(struct transport *transport,
if (flags & TRANSPORT_PUSH_DRY_RUN) {
if (set_helper_option(transport, "dry-run", "true") != 0)
die("helper %s does not support dry-run", data->name);
+ } else if (flags & TRANSPORT_PUSH_CERT) {
+ if (set_helper_option(transport, TRANS_OPT_PUSH_CERT, "true") != 0)
+ die("helper %s does not support dry-run", data->name);
}
if (flags & TRANSPORT_PUSH_FORCE) {
--
2.1.0-420-g23b5121
next prev parent reply other threads:[~2014-09-16 18:40 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-15 22:24 [PATCH v5 00/23] Signed push Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 01/23] receive-pack: do not overallocate command structure Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 02/23] receive-pack: parse feature request a bit earlier Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 03/23] receive-pack: do not reuse old_sha1[] for other things Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 04/23] receive-pack: factor out queueing of command Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 05/23] send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higher Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 06/23] send-pack: refactor decision to send update per ref Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 07/23] send-pack: always send capabilities Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 08/23] send-pack: factor out capability string generation Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 09/23] receive-pack: " Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 10/23] send-pack: rename "new_refs" to "need_pack_data" Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 11/23] send-pack: refactor inspecting and resetting status and sending commands Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 12/23] send-pack: clarify that cmds_sent is a boolean Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 13/23] gpg-interface: move parse_gpg_output() to where it should be Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 14/23] gpg-interface: move parse_signature() " Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 15/23] pack-protocol doc: typofix for PKT-LINE Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 16/23] push: the beginning of "git push --signed" Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 17/23] receive-pack: GPG-validate push certificates Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 18/23] send-pack: send feature request on push-cert packet Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 19/23] signed push: remove duplicated protocol info Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 20/23] signed push: add "pushee" header to push certificate Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 21/23] signed push: fortify against replay attacks Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 22/23] signed push: allow stale nonce in stateless mode Junio C Hamano
2014-09-15 22:24 ` [PATCH v5 23/23] t5541: test push --signed to smart HTTP server Junio C Hamano
2014-09-16 18:16 ` [PATCH v5 00/23] Signed push Jaime Soriano Pastor
2014-09-16 18:40 ` Junio C Hamano [this message]
2014-09-16 20:33 ` Eric Sunshine
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=xmqq7g132yui.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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