* [PATCH v4 1/7] gpg-interface: add new config to select how to sign a commit
2018-07-17 12:50 [PATCH v4 0/7] X509 (gpgsm) commit signing support Henning Schild
@ 2018-07-17 12:50 ` Henning Schild
2018-07-17 12:50 ` [PATCH v4 2/7] t/t7510: check the validation of the new config gpg.format Henning Schild
` (5 subsequent siblings)
6 siblings, 0 replies; 24+ messages in thread
From: Henning Schild @ 2018-07-17 12:50 UTC (permalink / raw)
To: git
Cc: Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson, Henning Schild
Add "gpg.format" where the user can specify which type of signature to
use for commits. At the moment only "openpgp" is supported and the value is
not even used. This commit prepares for a new types of signatures.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
Documentation/config.txt | 4 ++++
gpg-interface.c | 10 ++++++++++
2 files changed, 14 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1cc18a828..ac373e3f4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1828,6 +1828,10 @@ gpg.program::
signed, and the program is expected to send the result to its
standard output.
+gpg.format::
+ Specifies which key format to use when signing with `--gpg-sign`.
+ Default is "openpgp", that is also the only supported value.
+
gui.commitMsgWidth::
Defines how wide the commit message window is in the
linkgit:git-gui[1]. "75" is the default.
diff --git a/gpg-interface.c b/gpg-interface.c
index 09ddfbc26..b39a27980 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -7,6 +7,7 @@
#include "tempfile.h"
static char *configured_signing_key;
+static const char *gpg_format = "openpgp";
static const char *gpg_program = "gpg";
#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
@@ -138,6 +139,15 @@ int git_gpg_config(const char *var, const char *value, void *cb)
return 0;
}
+ if (!strcmp(var, "gpg.format")) {
+ if (!value)
+ return config_error_nonbool(var);
+ if (strcmp(value, "openpgp"))
+ return error("unsupported value for %s: %s",
+ var, value);
+ return git_config_string(&gpg_format, var, value);
+ }
+
if (!strcmp(var, "gpg.program")) {
if (!value)
return config_error_nonbool(var);
--
2.16.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v4 2/7] t/t7510: check the validation of the new config gpg.format
2018-07-17 12:50 [PATCH v4 0/7] X509 (gpgsm) commit signing support Henning Schild
2018-07-17 12:50 ` [PATCH v4 1/7] gpg-interface: add new config to select how to sign a commit Henning Schild
@ 2018-07-17 12:50 ` Henning Schild
2018-07-17 21:31 ` Junio C Hamano
2018-07-18 9:30 ` [PATCH v5 " Henning Schild
2018-07-17 12:50 ` [PATCH v4 3/7] gpg-interface: introduce an abstraction for multiple gpg formats Henning Schild
` (4 subsequent siblings)
6 siblings, 2 replies; 24+ messages in thread
From: Henning Schild @ 2018-07-17 12:50 UTC (permalink / raw)
To: git
Cc: Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson, Henning Schild
Test setting gpg.format to both invalid and valid values.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
t/t7510-signed-commit.sh | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 6e2015ed9..7bdad570c 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -227,4 +227,13 @@ test_expect_success GPG 'log.showsignature behaves like --show-signature' '
grep "gpg: Good signature" actual
'
+test_expect_success GPG 'check config gpg.format values' '
+ test_config gpg.format openpgp &&
+ git commit -S --amend -m "success" &&
+ test_config gpg.format OpEnPgP &&
+ test_must_fail git commit -S --amend -m "fail" &&
+ test_config gpg.format malformed &&
+ test_must_fail git commit -S --amend -m "fail"
+'
+
test_done
--
2.16.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH v4 2/7] t/t7510: check the validation of the new config gpg.format
2018-07-17 12:50 ` [PATCH v4 2/7] t/t7510: check the validation of the new config gpg.format Henning Schild
@ 2018-07-17 21:31 ` Junio C Hamano
2018-07-18 10:36 ` Henning Schild
2018-07-18 9:30 ` [PATCH v5 " Henning Schild
1 sibling, 1 reply; 24+ messages in thread
From: Junio C Hamano @ 2018-07-17 21:31 UTC (permalink / raw)
To: Henning Schild
Cc: git, Eric Sunshine, Martin Ågren, Ben Toews, Jeff King,
Taylor Blau, brian m . carlson
Henning Schild <henning.schild@siemens.com> writes:
> Test setting gpg.format to both invalid and valid values.
>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
> t/t7510-signed-commit.sh | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
> index 6e2015ed9..7bdad570c 100755
> --- a/t/t7510-signed-commit.sh
> +++ b/t/t7510-signed-commit.sh
> @@ -227,4 +227,13 @@ test_expect_success GPG 'log.showsignature behaves like --show-signature' '
> grep "gpg: Good signature" actual
> '
>
> +test_expect_success GPG 'check config gpg.format values' '
> + test_config gpg.format openpgp &&
> + git commit -S --amend -m "success" &&
> + test_config gpg.format OpEnPgP &&
> + test_must_fail git commit -S --amend -m "fail" &&
This second one is a good demonstration that the value for this
variable is case sensitive.
> + test_config gpg.format malformed &&
> + test_must_fail git commit -S --amend -m "fail"
And there is no longer a good reason to try another one. Let's drop
this last/third case.
> +'
> +
> test_done
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v4 2/7] t/t7510: check the validation of the new config gpg.format
2018-07-17 21:31 ` Junio C Hamano
@ 2018-07-18 10:36 ` Henning Schild
0 siblings, 0 replies; 24+ messages in thread
From: Henning Schild @ 2018-07-18 10:36 UTC (permalink / raw)
To: Junio C Hamano
Cc: git, Eric Sunshine, Martin Ågren, Ben Toews, Jeff King,
Taylor Blau, brian m . carlson
Am Tue, 17 Jul 2018 14:31:56 -0700
schrieb Junio C Hamano <gitster@pobox.com>:
> Henning Schild <henning.schild@siemens.com> writes:
>
> > Test setting gpg.format to both invalid and valid values.
> >
> > Signed-off-by: Henning Schild <henning.schild@siemens.com>
> > ---
> > t/t7510-signed-commit.sh | 9 +++++++++
> > 1 file changed, 9 insertions(+)
> >
> > diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
> > index 6e2015ed9..7bdad570c 100755
> > --- a/t/t7510-signed-commit.sh
> > +++ b/t/t7510-signed-commit.sh
> > @@ -227,4 +227,13 @@ test_expect_success GPG 'log.showsignature
> > behaves like --show-signature' ' grep "gpg: Good signature" actual
> > '
> >
> > +test_expect_success GPG 'check config gpg.format values' '
> > + test_config gpg.format openpgp &&
> > + git commit -S --amend -m "success" &&
> > + test_config gpg.format OpEnPgP &&
> > + test_must_fail git commit -S --amend -m "fail" &&
>
> This second one is a good demonstration that the value for this
> variable is case sensitive.
>
> > + test_config gpg.format malformed &&
> > + test_must_fail git commit -S --amend -m "fail"
>
> And there is no longer a good reason to try another one. Let's drop
> this last/third case.
Done.
Henning
> > +'
> > +
> > test_done
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v5 2/7] t/t7510: check the validation of the new config gpg.format
2018-07-17 12:50 ` [PATCH v4 2/7] t/t7510: check the validation of the new config gpg.format Henning Schild
2018-07-17 21:31 ` Junio C Hamano
@ 2018-07-18 9:30 ` Henning Schild
1 sibling, 0 replies; 24+ messages in thread
From: Henning Schild @ 2018-07-18 9:30 UTC (permalink / raw)
To: git
Cc: Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson, Henning Schild
Test setting gpg.format to both invalid and valid values.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
t/t7510-signed-commit.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 6e2015ed9..4e37ff8f1 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -227,4 +227,11 @@ test_expect_success GPG 'log.showsignature behaves like --show-signature' '
grep "gpg: Good signature" actual
'
+test_expect_success GPG 'check config gpg.format values' '
+ test_config gpg.format openpgp &&
+ git commit -S --amend -m "success" &&
+ test_config gpg.format OpEnPgP &&
+ test_must_fail git commit -S --amend -m "fail"
+'
+
test_done
--
2.16.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v4 3/7] gpg-interface: introduce an abstraction for multiple gpg formats
2018-07-17 12:50 [PATCH v4 0/7] X509 (gpgsm) commit signing support Henning Schild
2018-07-17 12:50 ` [PATCH v4 1/7] gpg-interface: add new config to select how to sign a commit Henning Schild
2018-07-17 12:50 ` [PATCH v4 2/7] t/t7510: check the validation of the new config gpg.format Henning Schild
@ 2018-07-17 12:50 ` Henning Schild
2018-07-17 20:56 ` Junio C Hamano
2018-07-17 12:50 ` [PATCH v4 4/7] gpg-interface: do not hardcode the key string len anymore Henning Schild
` (3 subsequent siblings)
6 siblings, 1 reply; 24+ messages in thread
From: Henning Schild @ 2018-07-17 12:50 UTC (permalink / raw)
To: git
Cc: Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson, Henning Schild
Create a struct that holds the format details for the supported formats.
At the moment that is still just "openpgp". This commit prepares for the
introduction of more formats, that might use other programs and match
other signatures.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
gpg-interface.c | 88 +++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 67 insertions(+), 21 deletions(-)
diff --git a/gpg-interface.c b/gpg-interface.c
index b39a27980..a02db7658 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -7,11 +7,52 @@
#include "tempfile.h"
static char *configured_signing_key;
-static const char *gpg_format = "openpgp";
-static const char *gpg_program = "gpg";
+struct gpg_format {
+ const char *name;
+ const char *program;
+ const char **verify_args;
+ const char **sigs;
+};
+
+static const char *openpgp_verify_args[] = {
+ "--keyid-format=long",
+ NULL
+};
+static const char *openpgp_sigs[] = {
+ "-----BEGIN PGP SIGNATURE-----",
+ "-----BEGIN PGP MESSAGE-----",
+ NULL
+};
+
+static struct gpg_format gpg_format[] = {
+ { .name = "openpgp", .program = "gpg",
+ .verify_args = openpgp_verify_args,
+ .sigs = openpgp_sigs
+ },
+};
+
+static struct gpg_format *use_format = &gpg_format[0];
-#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
-#define PGP_MESSAGE "-----BEGIN PGP MESSAGE-----"
+static struct gpg_format *get_format_by_name(const char *str)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(gpg_format); i++)
+ if (!strcmp(gpg_format[i].name, str))
+ return gpg_format + i;
+ return NULL;
+}
+
+static struct gpg_format *get_format_by_sig(const char *sig)
+{
+ int i, j;
+
+ for (i = 0; i < ARRAY_SIZE(gpg_format); i++)
+ for (j = 0; gpg_format[i].sigs[j]; j++)
+ if (starts_with(sig, gpg_format[i].sigs[j]))
+ return gpg_format + i;
+ return NULL;
+}
void signature_check_clear(struct signature_check *sigc)
{
@@ -102,12 +143,6 @@ void print_signature_buffer(const struct signature_check *sigc, unsigned flags)
fputs(output, stderr);
}
-static int is_gpg_start(const char *line)
-{
- return starts_with(line, PGP_SIGNATURE) ||
- starts_with(line, PGP_MESSAGE);
-}
-
size_t parse_signature(const char *buf, size_t size)
{
size_t len = 0;
@@ -115,7 +150,7 @@ size_t parse_signature(const char *buf, size_t size)
while (len < size) {
const char *eol;
- if (is_gpg_start(buf + len))
+ if (get_format_by_sig(buf + len))
match = len;
eol = memchr(buf + len, '\n', size - len);
@@ -132,6 +167,9 @@ void set_signing_key(const char *key)
int git_gpg_config(const char *var, const char *value, void *cb)
{
+ struct gpg_format *fmt = NULL;
+ char *fmtname = NULL;
+
if (!strcmp(var, "user.signingkey")) {
if (!value)
return config_error_nonbool(var);
@@ -142,17 +180,20 @@ int git_gpg_config(const char *var, const char *value, void *cb)
if (!strcmp(var, "gpg.format")) {
if (!value)
return config_error_nonbool(var);
- if (strcmp(value, "openpgp"))
+ fmt = get_format_by_name(value);
+ if (!fmt)
return error("unsupported value for %s: %s",
var, value);
- return git_config_string(&gpg_format, var, value);
+ use_format = fmt;
+ return 0;
}
- if (!strcmp(var, "gpg.program")) {
- if (!value)
- return config_error_nonbool(var);
- gpg_program = xstrdup(value);
- return 0;
+ if (!strcmp(var, "gpg.program"))
+ fmtname = "openpgp";
+
+ if (fmtname) {
+ fmt = get_format_by_name(fmtname);
+ return git_config_string(&fmt->program, var, value);
}
return 0;
@@ -173,7 +214,7 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *sig
struct strbuf gpg_status = STRBUF_INIT;
argv_array_pushl(&gpg.args,
- gpg_program,
+ use_format->program,
"--status-fd=2",
"-bsau", signing_key,
NULL);
@@ -211,6 +252,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
struct strbuf *gpg_output, struct strbuf *gpg_status)
{
struct child_process gpg = CHILD_PROCESS_INIT;
+ struct gpg_format *fmt;
struct tempfile *temp;
int ret;
struct strbuf buf = STRBUF_INIT;
@@ -226,10 +268,14 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
return -1;
}
+ fmt = get_format_by_sig(signature);
+ if (!fmt)
+ BUG("bad signature '%s'", signature);
+
+ argv_array_push(&gpg.args, fmt->program);
+ argv_array_pushv(&gpg.args, fmt->verify_args);
argv_array_pushl(&gpg.args,
- gpg_program,
"--status-fd=1",
- "--keyid-format=long",
"--verify", temp->filename.buf, "-",
NULL);
--
2.16.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v4 4/7] gpg-interface: do not hardcode the key string len anymore
2018-07-17 12:50 [PATCH v4 0/7] X509 (gpgsm) commit signing support Henning Schild
` (2 preceding siblings ...)
2018-07-17 12:50 ` [PATCH v4 3/7] gpg-interface: introduce an abstraction for multiple gpg formats Henning Schild
@ 2018-07-17 12:50 ` Henning Schild
2018-07-17 20:56 ` Junio C Hamano
2018-07-17 12:50 ` [PATCH v4 5/7] gpg-interface: introduce new config to select per gpg format program Henning Schild
` (2 subsequent siblings)
6 siblings, 1 reply; 24+ messages in thread
From: Henning Schild @ 2018-07-17 12:50 UTC (permalink / raw)
To: git
Cc: Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson, Henning Schild
gnupg does print the keyid followed by a space and the signer comes
next. The same pattern is also used in gpgsm, but there the key length
would be 40 instead of 16. Instead of hardcoding the expected length,
find the first space and calculate it.
Input that does not match the expected format will be ignored now,
before we jumped to found+17 which might have been behind the end of an
unexpected string.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
gpg-interface.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gpg-interface.c b/gpg-interface.c
index a02db7658..51cad9081 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -95,10 +95,11 @@ static void parse_gpg_output(struct signature_check *sigc)
sigc->result = sigcheck_gpg_status[i].result;
/* The trust messages are not followed by key/signer information */
if (sigc->result != 'U') {
- sigc->key = xmemdupz(found, 16);
+ next = strchrnul(found, ' ');
+ sigc->key = xmemdupz(found, next - found);
/* The ERRSIG message is not followed by signer information */
- if (sigc-> result != 'E') {
- found += 17;
+ if (*next && sigc-> result != 'E') {
+ found = next + 1;
next = strchrnul(found, '\n');
sigc->signer = xmemdupz(found, next - found);
}
--
2.16.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH v4 4/7] gpg-interface: do not hardcode the key string len anymore
2018-07-17 12:50 ` [PATCH v4 4/7] gpg-interface: do not hardcode the key string len anymore Henning Schild
@ 2018-07-17 20:56 ` Junio C Hamano
0 siblings, 0 replies; 24+ messages in thread
From: Junio C Hamano @ 2018-07-17 20:56 UTC (permalink / raw)
To: Henning Schild
Cc: git, Eric Sunshine, Martin Ågren, Ben Toews, Jeff King,
Taylor Blau, brian m . carlson
Henning Schild <henning.schild@siemens.com> writes:
> gnupg does print the keyid followed by a space and the signer comes
> next. The same pattern is also used in gpgsm, but there the key length
> would be 40 instead of 16. Instead of hardcoding the expected length,
> find the first space and calculate it.
> Input that does not match the expected format will be ignored now,
> before we jumped to found+17 which might have been behind the end of an
> unexpected string.
>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
> gpg-interface.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
Again, really nice.
>
> diff --git a/gpg-interface.c b/gpg-interface.c
> index a02db7658..51cad9081 100644
> --- a/gpg-interface.c
> +++ b/gpg-interface.c
> @@ -95,10 +95,11 @@ static void parse_gpg_output(struct signature_check *sigc)
> sigc->result = sigcheck_gpg_status[i].result;
> /* The trust messages are not followed by key/signer information */
> if (sigc->result != 'U') {
> - sigc->key = xmemdupz(found, 16);
> + next = strchrnul(found, ' ');
> + sigc->key = xmemdupz(found, next - found);
> /* The ERRSIG message is not followed by signer information */
> - if (sigc-> result != 'E') {
> - found += 17;
> + if (*next && sigc-> result != 'E') {
> + found = next + 1;
> next = strchrnul(found, '\n');
> sigc->signer = xmemdupz(found, next - found);
> }
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v4 5/7] gpg-interface: introduce new config to select per gpg format program
2018-07-17 12:50 [PATCH v4 0/7] X509 (gpgsm) commit signing support Henning Schild
` (3 preceding siblings ...)
2018-07-17 12:50 ` [PATCH v4 4/7] gpg-interface: do not hardcode the key string len anymore Henning Schild
@ 2018-07-17 12:50 ` Henning Schild
2018-07-17 12:50 ` [PATCH v4 6/7] gpg-interface: introduce new signature format "x509" using gpgsm Henning Schild
2018-07-17 12:50 ` [PATCH v4 7/7] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
6 siblings, 0 replies; 24+ messages in thread
From: Henning Schild @ 2018-07-17 12:50 UTC (permalink / raw)
To: git
Cc: Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson, Henning Schild
Supporting multiple signing formats we will have the need to configure a
custom program each. Add a new config value to cater for that.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
Documentation/config.txt | 5 +++++
gpg-interface.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ac373e3f4..0e871346a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1832,6 +1832,11 @@ gpg.format::
Specifies which key format to use when signing with `--gpg-sign`.
Default is "openpgp", that is also the only supported value.
+gpg.<format>.program::
+ Use this to customize the program used for the signing format you
+ chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
+ be used as a legacy synonym for `gpg.openpgp.program`.
+
gui.commitMsgWidth::
Defines how wide the commit message window is in the
linkgit:git-gui[1]. "75" is the default.
diff --git a/gpg-interface.c b/gpg-interface.c
index 51cad9081..a158f08c1 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -189,7 +189,7 @@ int git_gpg_config(const char *var, const char *value, void *cb)
return 0;
}
- if (!strcmp(var, "gpg.program"))
+ if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program"))
fmtname = "openpgp";
if (fmtname) {
--
2.16.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v4 6/7] gpg-interface: introduce new signature format "x509" using gpgsm
2018-07-17 12:50 [PATCH v4 0/7] X509 (gpgsm) commit signing support Henning Schild
` (4 preceding siblings ...)
2018-07-17 12:50 ` [PATCH v4 5/7] gpg-interface: introduce new config to select per gpg format program Henning Schild
@ 2018-07-17 12:50 ` Henning Schild
2018-07-17 12:50 ` [PATCH v4 7/7] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
6 siblings, 0 replies; 24+ messages in thread
From: Henning Schild @ 2018-07-17 12:50 UTC (permalink / raw)
To: git
Cc: Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson, Henning Schild
This commit allows git to create and check x509 type signatures using
gpgsm.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
Documentation/config.txt | 5 +++--
gpg-interface.c | 15 +++++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0e871346a..ff1d4a76c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1830,12 +1830,13 @@ gpg.program::
gpg.format::
Specifies which key format to use when signing with `--gpg-sign`.
- Default is "openpgp", that is also the only supported value.
+ Default is "openpgp" and another possible value is "x509".
gpg.<format>.program::
Use this to customize the program used for the signing format you
chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
- be used as a legacy synonym for `gpg.openpgp.program`.
+ be used as a legacy synonym for `gpg.openpgp.program`. The default
+ value for `gpg.x509.program` is "gpgsm".
gui.commitMsgWidth::
Defines how wide the commit message window is in the
diff --git a/gpg-interface.c b/gpg-interface.c
index a158f08c1..bb8ea668b 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -24,11 +24,23 @@ static const char *openpgp_sigs[] = {
NULL
};
+static const char *x509_verify_args[] = {
+ NULL
+};
+static const char *x509_sigs[] = {
+ "-----BEGIN SIGNED MESSAGE-----",
+ NULL
+};
+
static struct gpg_format gpg_format[] = {
{ .name = "openpgp", .program = "gpg",
.verify_args = openpgp_verify_args,
.sigs = openpgp_sigs
},
+ { .name = "x509", .program = "gpgsm",
+ .verify_args = x509_verify_args,
+ .sigs = x509_sigs
+ },
};
static struct gpg_format *use_format = &gpg_format[0];
@@ -192,6 +204,9 @@ int git_gpg_config(const char *var, const char *value, void *cb)
if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program"))
fmtname = "openpgp";
+ if (!strcmp(var, "gpg.x509.program"))
+ fmtname = "x509";
+
if (fmtname) {
fmt = get_format_by_name(fmtname);
return git_config_string(&fmt->program, var, value);
--
2.16.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v4 7/7] gpg-interface t: extend the existing GPG tests with GPGSM
2018-07-17 12:50 [PATCH v4 0/7] X509 (gpgsm) commit signing support Henning Schild
` (5 preceding siblings ...)
2018-07-17 12:50 ` [PATCH v4 6/7] gpg-interface: introduce new signature format "x509" using gpgsm Henning Schild
@ 2018-07-17 12:50 ` Henning Schild
2018-07-17 21:31 ` Junio C Hamano
2018-07-18 9:31 ` [PATCH v5 7/7] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
6 siblings, 2 replies; 24+ messages in thread
From: Henning Schild @ 2018-07-17 12:50 UTC (permalink / raw)
To: git
Cc: Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson, Henning Schild
Add test cases to cover the new X509/gpgsm support. Most of them
resemble existing ones. They just switch the format to x509 and set the
signingkey when creating signatures. Validation of signatures does not
need any configuration of git, it does need gpgsm to be configured to
trust the key(-chain).
Several of the testcases build on top of existing gpg testcases.
The commit ships a self-signed key for committer@example.com and
configures gpgsm to trust it.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
t/lib-gpg.sh | 28 +++++++++++++++++++++++-
t/lib-gpg/gpgsm-gen-key.in | 8 +++++++
t/lib-gpg/gpgsm_cert.p12 | Bin 0 -> 2652 bytes
t/t4202-log.sh | 39 ++++++++++++++++++++++++++++++++++
t/t5534-push-signed.sh | 52 +++++++++++++++++++++++++++++++++++++++++++++
t/t7004-tag.sh | 13 ++++++++++++
t/t7030-verify-tag.sh | 33 ++++++++++++++++++++++++++++
7 files changed, 172 insertions(+), 1 deletion(-)
create mode 100644 t/lib-gpg/gpgsm-gen-key.in
create mode 100644 t/lib-gpg/gpgsm_cert.p12
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index a5d3b2cba..3fe02876c 100755
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -38,7 +38,33 @@ then
"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null 2>&1 \
--sign -u committer@example.com &&
- test_set_prereq GPG
+ test_set_prereq GPG &&
+ # Available key info:
+ # * see t/lib-gpg/gpgsm-gen-key.in
+ # To generate new certificate:
+ # * no passphrase
+ # gpgsm --homedir /tmp/gpghome/ \
+ # -o /tmp/gpgsm.crt.user \
+ # --generate-key \
+ # --batch t/lib-gpg/gpgsm-gen-key.in
+ # To import certificate:
+ # gpgsm --homedir /tmp/gpghome/ \
+ # --import /tmp/gpgsm.crt.user
+ # To export into a .p12 we can later import:
+ # gpgsm --homedir /tmp/gpghome/ \
+ # -o t/lib-gpg/gpgsm_cert.p12 \
+ # --export-secret-key-p12 "committer@example.com"
+ echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
+ --passphrase-fd 0 --pinentry-mode loopback \
+ --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
+ gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K \
+ | grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
+ ${GNUPGHOME}/trustlist.txt &&
+ echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
+ (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
+ echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
+ -u committer@example.com -o /dev/null --sign - 2>&1 &&
+ test_set_prereq GPGSM
;;
esac
fi
diff --git a/t/lib-gpg/gpgsm-gen-key.in b/t/lib-gpg/gpgsm-gen-key.in
new file mode 100644
index 000000000..a7fd87c06
--- /dev/null
+++ b/t/lib-gpg/gpgsm-gen-key.in
@@ -0,0 +1,8 @@
+Key-Type: RSA
+Key-Length: 2048
+Key-Usage: sign
+Serial: random
+Name-DN: CN=C O Mitter, O=Example, SN=C O, GN=Mitter
+Name-Email: committer@example.com
+Not-Before: 1970-01-01 00:00:00
+Not-After: 3000-01-01 00:00:00
diff --git a/t/lib-gpg/gpgsm_cert.p12 b/t/lib-gpg/gpgsm_cert.p12
new file mode 100644
index 0000000000000000000000000000000000000000..94ffad0d31a3b6c4e849b29d960762e485ba7ea8
GIT binary patch
literal 2652
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
literal 0
HcmV?d00001
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 25b1f8cc7..f57781e39 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -1556,12 +1556,28 @@ test_expect_success GPG 'setup signed branch' '
git commit -S -m signed_commit
'
+test_expect_success GPGSM 'setup signed branch x509' '
+ test_when_finished "git reset --hard && git checkout master" &&
+ git checkout -b signed-x509 master &&
+ echo foo >foo &&
+ git add foo &&
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git commit -S -m signed_commit
+'
+
test_expect_success GPG 'log --graph --show-signature' '
git log --graph --show-signature -n1 signed >actual &&
grep "^| gpg: Signature made" actual &&
grep "^| gpg: Good signature" actual
'
+test_expect_success GPGSM 'log --graph --show-signature x509' '
+ git log --graph --show-signature -n1 signed-x509 >actual &&
+ grep "^| gpgsm: Signature made" actual &&
+ grep "^| gpgsm: Good signature" actual
+'
+
test_expect_success GPG 'log --graph --show-signature for merged tag' '
test_when_finished "git reset --hard && git checkout master" &&
git checkout -b plain master &&
@@ -1581,6 +1597,29 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
grep "^| | gpg: Good signature" actual
'
+test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
+ test_when_finished "git reset --hard && git checkout master" &&
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git checkout -b plain-x509 master &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-x509 master &&
+ echo bbb >baz &&
+ git add baz &&
+ git commit -m baz_commit &&
+ git tag -s -m signed_tag_msg signed_tag_x509 &&
+ git checkout plain-x509 &&
+ git merge --no-ff -m msg signed_tag_x509 &&
+ git log --graph --show-signature -n1 plain-x509 >actual &&
+ grep "^|\\\ merged tag" actual &&
+ grep "^| | gpgsm: Signature made" actual &&
+ grep "^| | gpgsm: Good signature" actual &&
+ git config --unset gpg.format &&
+ git config --unset user.signingkey
+'
+
test_expect_success GPG '--no-show-signature overrides --show-signature' '
git log -1 --show-signature --no-show-signature signed >actual &&
! grep "^gpg:" actual
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 1cea758f7..a3a12bd05 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -218,4 +218,56 @@ test_expect_success GPG 'fail without key and heed user.signingkey' '
test_cmp expect dst/push-cert-status
'
+test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
+ test_config gpg.format x509 &&
+ env | grep GIT > envfile &&
+ prepare_dst &&
+ mkdir -p dst/.git/hooks &&
+ git -C dst config receive.certnonceseed sekrit &&
+ write_script dst/.git/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_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+ NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+ E_O_F
+
+ EOF
+ unset GIT_COMMITTER_EMAIL &&
+ git config user.email hasnokey@nowhere.com &&
+ git config user.signingkey "" &&
+ test_must_fail git push --signed dst noop ff +noff &&
+ git config user.signingkey committer@example.com &&
+ git push --signed dst noop ff +noff &&
+
+ (
+ cat <<-\EOF &&
+ SIGNER=/CN=C O Mitter/O=Example/SN=C O/GN=Mitter
+ KEY=
+ STATUS=G
+ NONCE_STATUS=OK
+ EOF
+ sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+ ) >expect.in &&
+ key=$(cat "${GNUPGHOME}/trustlist.txt" | cut -d" " -f1 | tr -d ":") &&
+ sed -e "s/^KEY=/KEY=${key}/" expect.in > expect &&
+
+ noop=$(git rev-parse noop) &&
+ ff=$(git rev-parse ff) &&
+ noff=$(git rev-parse noff) &&
+ grep "$noop $ff refs/heads/ff" dst/push-cert &&
+ grep "$noop $noff refs/heads/noff" dst/push-cert &&
+ test_cmp expect dst/push-cert-status
+'
+
+
test_done
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index d7b319e91..2147938aa 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1354,6 +1354,19 @@ test_expect_success GPG \
'test_config gpg.program echo &&
test_must_fail git tag -s -m tail tag-gpg-failure'
+# try to sign with bad user.signingkey
+test_expect_success GPGSM \
+ 'git tag -s fails if gpgsm is misconfigured (bad key)' \
+ 'test_config user.signingkey BobTheMouse &&
+ test_config gpg.format x509 &&
+ test_must_fail git tag -s -m tail tag-gpg-failure'
+
+# try to produce invalid signature
+test_expect_success GPGSM \
+ 'git tag -s fails if gpgsm is misconfigured (bad signature format)' \
+ 'test_config gpg.x509.program echo &&
+ test_config gpg.format x509 &&
+ test_must_fail git tag -s -m tail tag-gpg-failure'
# try to verify without gpg:
diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index 291a1e2b0..db6295d65 100755
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -41,6 +41,13 @@ test_expect_success GPG 'create signed tags' '
git tag -uB7227189 -m eighth eighth-signed-alt
'
+test_expect_success GPGSM 'create signed tags x509 ' '
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ echo 9 >file && test_tick && git commit -a -m "nineth gpgsm-signed" &&
+ git tag -s -m nineth nineth-signed-x509
+'
+
test_expect_success GPG 'verify and show signatures' '
(
for tag in initial second merge fourth-signed sixth-signed seventh-signed
@@ -72,6 +79,13 @@ test_expect_success GPG 'verify and show signatures' '
)
'
+test_expect_success GPGSM 'verify and show signatures x509' '
+ git verify-tag nineth-signed-x509 2>actual &&
+ grep "Good signature from" actual &&
+ ! grep "BAD signature from" actual &&
+ echo nineth-signed-x509 OK
+'
+
test_expect_success GPG 'detect fudged signature' '
git cat-file tag seventh-signed >raw &&
sed -e "/^tag / s/seventh/7th forged/" raw >forged1 &&
@@ -112,6 +126,12 @@ test_expect_success GPG 'verify signatures with --raw' '
)
'
+test_expect_success GPGSM 'verify signatures with --raw x509' '
+ git verify-tag --raw nineth-signed-x509 2>actual &&
+ grep "GOODSIG" actual &&
+ ! grep "BADSIG" actual &&
+ echo nineth-signed-x509 OK
+'
test_expect_success GPG 'verify multiple tags' '
tags="fourth-signed sixth-signed seventh-signed" &&
for i in $tags
@@ -125,6 +145,19 @@ test_expect_success GPG 'verify multiple tags' '
test_cmp expect.stderr actual.stderr
'
+test_expect_success GPGSM 'verify multiple tags x509' '
+ tags="seventh-signed nineth-signed-x509" &&
+ for i in $tags
+ do
+ git verify-tag -v --raw $i || return 1
+ done >expect.stdout 2>expect.stderr.1 &&
+ grep "^.GNUPG:." <expect.stderr.1 >expect.stderr &&
+ git verify-tag -v --raw $tags >actual.stdout 2>actual.stderr.1 &&
+ grep "^.GNUPG:." <actual.stderr.1 >actual.stderr &&
+ test_cmp expect.stdout actual.stdout &&
+ test_cmp expect.stderr actual.stderr
+'
+
test_expect_success GPG 'verifying tag with --format' '
cat >expect <<-\EOF &&
tagname : fourth-signed
--
2.16.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH v4 7/7] gpg-interface t: extend the existing GPG tests with GPGSM
2018-07-17 12:50 ` [PATCH v4 7/7] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
@ 2018-07-17 21:31 ` Junio C Hamano
2018-07-18 10:36 ` Henning Schild
2018-07-18 9:31 ` [PATCH v5 7/7] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
1 sibling, 1 reply; 24+ messages in thread
From: Junio C Hamano @ 2018-07-17 21:31 UTC (permalink / raw)
To: Henning Schild
Cc: git, Eric Sunshine, Martin Ågren, Ben Toews, Jeff King,
Taylor Blau, brian m . carlson
Henning Schild <henning.schild@siemens.com> writes:
> diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
> index a5d3b2cba..3fe02876c 100755
> --- a/t/lib-gpg.sh
> +++ b/t/lib-gpg.sh
> @@ -38,7 +38,33 @@ then
> "$TEST_DIRECTORY"/lib-gpg/ownertrust &&
> gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null 2>&1 \
> --sign -u committer@example.com &&
> - test_set_prereq GPG
> + test_set_prereq GPG &&
We do not mind making GPGSM dependent on GPG, hence this && is justified.
> + # Available key info:
> + # * see t/lib-gpg/gpgsm-gen-key.in
> + # To generate new certificate:
> + # * no passphrase
> + # gpgsm --homedir /tmp/gpghome/ \
> + # -o /tmp/gpgsm.crt.user \
> + # --generate-key \
> + # --batch t/lib-gpg/gpgsm-gen-key.in
> + # To import certificate:
> + # gpgsm --homedir /tmp/gpghome/ \
> + # --import /tmp/gpgsm.crt.user
> + # To export into a .p12 we can later import:
> + # gpgsm --homedir /tmp/gpghome/ \
> + # -o t/lib-gpg/gpgsm_cert.p12 \
> + # --export-secret-key-p12 "committer@example.com"
> + echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
> + --passphrase-fd 0 --pinentry-mode loopback \
> + --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
> + gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K \
> + | grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
> + ${GNUPGHOME}/trustlist.txt &&
> + echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
> + (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
> + echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
> + -u committer@example.com -o /dev/null --sign - 2>&1 &&
> + test_set_prereq GPGSM
And when any of the above fails, we refrain from setting GPGSM
prereq. Otherwise we are prepared to perform tests with gpgsm
and get the prereq.
> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
> index 25b1f8cc7..f57781e39 100755
> --- a/t/t4202-log.sh
> +++ b/t/t4202-log.sh
> @@ -1556,12 +1556,28 @@ test_expect_success GPG 'setup signed branch' '
> git commit -S -m signed_commit
> '
>
> +test_expect_success GPGSM 'setup signed branch x509' '
> + test_when_finished "git reset --hard && git checkout master" &&
> + git checkout -b signed-x509 master &&
> + echo foo >foo &&
> + git add foo &&
> + test_config gpg.format x509 &&
> + test_config user.signingkey $GIT_COMMITTER_EMAIL &&
> + git commit -S -m signed_commit
> +'
OK.
> +test_expect_success GPGSM 'log --graph --show-signature x509' '
> + git log --graph --show-signature -n1 signed-x509 >actual &&
> + grep "^| gpgsm: Signature made" actual &&
> + grep "^| gpgsm: Good signature" actual
> +'
OK.
> @@ -1581,6 +1597,29 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
> grep "^| | gpg: Good signature" actual
> '
>
> +test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
> + test_when_finished "git reset --hard && git checkout master" &&
> + test_config gpg.format x509 &&
> + test_config user.signingkey $GIT_COMMITTER_EMAIL &&
> + git checkout -b plain-x509 master &&
> + echo aaa >bar &&
> + git add bar &&
> + git commit -m bar_commit &&
> + git checkout -b tagged-x509 master &&
> + echo bbb >baz &&
> + git add baz &&
> + git commit -m baz_commit &&
> + git tag -s -m signed_tag_msg signed_tag_x509 &&
> + git checkout plain-x509 &&
> + git merge --no-ff -m msg signed_tag_x509 &&
> + git log --graph --show-signature -n1 plain-x509 >actual &&
> + grep "^|\\\ merged tag" actual &&
> + grep "^| | gpgsm: Signature made" actual &&
> + grep "^| | gpgsm: Good signature" actual &&
> + git config --unset gpg.format &&
> + git config --unset user.signingkey
You are using test_config early enough in this test; doesn't that
take care of the last two steps for you, even when an earlier step
failed? If that is the case, then remove the last two line (and &&
at the end of the line before).
> diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
> index 1cea758f7..a3a12bd05 100755
> --- a/t/t5534-push-signed.sh
> +++ b/t/t5534-push-signed.sh
> @@ -218,4 +218,56 @@ test_expect_success GPG 'fail without key and heed user.signingkey' '
> test_cmp expect dst/push-cert-status
> '
>
> +test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
> + test_config gpg.format x509 &&
> + env | grep GIT > envfile &&
The "envfile" is unused, no? Remove this line.
> + prepare_dst &&
> + mkdir -p dst/.git/hooks &&
> + git -C dst config receive.certnonceseed sekrit &&
> + write_script dst/.git/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_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
> + NONCE=${GIT_PUSH_CERT_NONCE-nononce}
> + E_O_F
> +
> + EOF
OK, so up to this are what is done by post-receive, including the
overwriting of ../push-cert (which is one level above the receiving
repository's .git/, i.e. dst/push-cert) and ../push-cert-status.
> + unset GIT_COMMITTER_EMAIL &&
> + git config user.email hasnokey@nowhere.com &&
> + git config user.signingkey "" &&
> + test_must_fail git push --signed dst noop ff +noff &&
This is OK for a test that is known to be always at the end, but
also forbids others to further update this script to add more tests
at the end, as the standard setting of environment is blown away
(the config is probably OK, but test_config to arrange them to be
cleaned up would have been nicer), which is not very nice. I think
it should be easy to fix it when it becomes necessary, but at the
same time if it is easy to fix, then probably we shouldn't introduce
a breakage in the first place, so I am on the fence.
> + git config user.signingkey committer@example.com &&
> + git push --signed dst noop ff +noff &&
So,... this is run without resetting user.email and demonstrates
that signingkey is the only thing that matters, which makes sense.
> + (
> + cat <<-\EOF &&
> + SIGNER=/CN=C O Mitter/O=Example/SN=C O/GN=Mitter
> + KEY=
> + STATUS=G
> + NONCE_STATUS=OK
> + EOF
> + sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
> + ) >expect.in &&
> + key=$(cat "${GNUPGHOME}/trustlist.txt" | cut -d" " -f1 | tr -d ":") &&
> + sed -e "s/^KEY=/KEY=${key}/" expect.in > expect &&
s/> expect/>expect/;
> + noop=$(git rev-parse noop) &&
> + ff=$(git rev-parse ff) &&
> + noff=$(git rev-parse noff) &&
> + grep "$noop $ff refs/heads/ff" dst/push-cert &&
> + grep "$noop $noff refs/heads/noff" dst/push-cert &&
> + test_cmp expect dst/push-cert-status
> +'
> +
> +
> test_done
> diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
> index d7b319e91..2147938aa 100755
> --- a/t/t7004-tag.sh
> +++ b/t/t7004-tag.sh
> @@ -1354,6 +1354,19 @@ test_expect_success GPG \
> 'test_config gpg.program echo &&
> test_must_fail git tag -s -m tail tag-gpg-failure'
>
> +# try to sign with bad user.signingkey
> +test_expect_success GPGSM \
> + 'git tag -s fails if gpgsm is misconfigured (bad key)' \
> + 'test_config user.signingkey BobTheMouse &&
> + test_config gpg.format x509 &&
> + test_must_fail git tag -s -m tail tag-gpg-failure'
> +
> +# try to produce invalid signature
> +test_expect_success GPGSM \
> + 'git tag -s fails if gpgsm is misconfigured (bad signature format)' \
> + 'test_config gpg.x509.program echo &&
> + test_config gpg.format x509 &&
> + test_must_fail git tag -s -m tail tag-gpg-failure'
I can see that it is a gpgsm parallel of the earlier test we can see
in the precontext of this hunk done for gpg, but how does the last
one (and the original this one was modeled after) fail?
We say "echo" is the program that signs for the chosen format, "tag
-s" tries to run "echo" instead of "gpgsm" with "--status-fd=2
-bsau" or whatever args we usually give, and...?
I would guess you would either get "I don't know what you wanted me
to do with --status-fd=2 option, I am erroring out" from "echo", or
the "echo" command exiting without consuming any input, causing the
feeder in "tag -s" to get SIGPIPE (or write(2) error), but the latter
happens only when the payload to be signed is large enough. On a
platform whose "echo" pays no attention to unknown option, "echo"
itself may not even error out. And then we try to read from "echo"
and we do not get anything (which is expected).
And then who in "git tag -s" notice the breakage?
... goes and looks at gpg-interface.c::sign_buffer() ...
Ah, we check the status-fd output for "[GnuPG:] SIG_CREATED", which
would never happen if we are talking to "echo". OK, that is how
this thing is expected to fail.
What I have been getting at is if this is really trying to trigger
the "(bad signature format)" breakage. The test uses a wrong
program to simulate the case where a configured gpg/gpgsm failed to
report "SIG_CREATED". "bad signature format" does not sound exactly
like that, but you inherited the badness from the original, so let's
leave it as is.
Thanks. Modulo a few nits I pointed out above, buried in all the
other good bits, this looks reasonable to me.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH v4 7/7] gpg-interface t: extend the existing GPG tests with GPGSM
2018-07-17 21:31 ` Junio C Hamano
@ 2018-07-18 10:36 ` Henning Schild
2018-07-18 17:06 ` Junio C Hamano
0 siblings, 1 reply; 24+ messages in thread
From: Henning Schild @ 2018-07-18 10:36 UTC (permalink / raw)
To: Junio C Hamano
Cc: git, Eric Sunshine, Martin Ågren, Ben Toews, Jeff King,
Taylor Blau, brian m . carlson
Am Tue, 17 Jul 2018 14:31:36 -0700
schrieb Junio C Hamano <gitster@pobox.com>:
> Henning Schild <henning.schild@siemens.com> writes:
>
> > diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
> > index a5d3b2cba..3fe02876c 100755
> > --- a/t/lib-gpg.sh
> > +++ b/t/lib-gpg.sh
> > @@ -38,7 +38,33 @@ then
> > "$TEST_DIRECTORY"/lib-gpg/ownertrust &&
> > gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null
> > 2>&1 \ --sign -u committer@example.com &&
> > - test_set_prereq GPG
> > + test_set_prereq GPG &&
>
> We do not mind making GPGSM dependent on GPG, hence this && is
> justified.
>
> > + # Available key info:
> > + # * see t/lib-gpg/gpgsm-gen-key.in
> > + # To generate new certificate:
> > + # * no passphrase
> > + # gpgsm --homedir /tmp/gpghome/ \
> > + # -o /tmp/gpgsm.crt.user \
> > + # --generate-key \
> > + # --batch t/lib-gpg/gpgsm-gen-key.in
> > + # To import certificate:
> > + # gpgsm --homedir /tmp/gpghome/ \
> > + # --import /tmp/gpgsm.crt.user
> > + # To export into a .p12 we can later import:
> > + # gpgsm --homedir /tmp/gpghome/ \
> > + # -o t/lib-gpg/gpgsm_cert.p12 \
> > + # --export-secret-key-p12
> > "committer@example.com"
> > + echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
> > + --passphrase-fd 0 --pinentry-mode loopback
> > \
> > + --import
> > "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
> > + gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K \
> > + | grep fingerprint: | cut -d" " -f4 | tr
> > -d '\n' > \
> > + ${GNUPGHOME}/trustlist.txt &&
> > + echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
> > + (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
> > + echo hello | gpgsm --homedir "${GNUPGHOME}"
> > >/dev/null \
> > + -u committer@example.com -o /dev/null
> > --sign - 2>&1 &&
> > + test_set_prereq GPGSM
>
> And when any of the above fails, we refrain from setting GPGSM
> prereq. Otherwise we are prepared to perform tests with gpgsm
> and get the prereq.
>
> > diff --git a/t/t4202-log.sh b/t/t4202-log.sh
> > index 25b1f8cc7..f57781e39 100755
> > --- a/t/t4202-log.sh
> > +++ b/t/t4202-log.sh
> > @@ -1556,12 +1556,28 @@ test_expect_success GPG 'setup signed
> > branch' ' git commit -S -m signed_commit
> > '
> >
> > +test_expect_success GPGSM 'setup signed branch x509' '
> > + test_when_finished "git reset --hard && git checkout
> > master" &&
> > + git checkout -b signed-x509 master &&
> > + echo foo >foo &&
> > + git add foo &&
> > + test_config gpg.format x509 &&
> > + test_config user.signingkey $GIT_COMMITTER_EMAIL &&
> > + git commit -S -m signed_commit
> > +'
>
> OK.
>
> > +test_expect_success GPGSM 'log --graph --show-signature x509' '
> > + git log --graph --show-signature -n1 signed-x509 >actual &&
> > + grep "^| gpgsm: Signature made" actual &&
> > + grep "^| gpgsm: Good signature" actual
> > +'
>
> OK.
>
> > @@ -1581,6 +1597,29 @@ test_expect_success GPG 'log --graph
> > --show-signature for merged tag' ' grep "^| | gpg: Good signature"
> > actual '
> >
> > +test_expect_success GPGSM 'log --graph --show-signature for merged
> > tag x509' '
> > + test_when_finished "git reset --hard && git checkout
> > master" &&
> > + test_config gpg.format x509 &&
> > + test_config user.signingkey $GIT_COMMITTER_EMAIL &&
> > + git checkout -b plain-x509 master &&
> > + echo aaa >bar &&
> > + git add bar &&
> > + git commit -m bar_commit &&
> > + git checkout -b tagged-x509 master &&
> > + echo bbb >baz &&
> > + git add baz &&
> > + git commit -m baz_commit &&
> > + git tag -s -m signed_tag_msg signed_tag_x509 &&
> > + git checkout plain-x509 &&
> > + git merge --no-ff -m msg signed_tag_x509 &&
> > + git log --graph --show-signature -n1 plain-x509 >actual &&
> > + grep "^|\\\ merged tag" actual &&
> > + grep "^| | gpgsm: Signature made" actual &&
> > + grep "^| | gpgsm: Good signature" actual &&
> > + git config --unset gpg.format &&
> > + git config --unset user.signingkey
>
> You are using test_config early enough in this test; doesn't that
> take care of the last two steps for you, even when an earlier step
> failed? If that is the case, then remove the last two line (and &&
> at the end of the line before).
Right, dropped those two lines and &&
> > diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
> > index 1cea758f7..a3a12bd05 100755
> > --- a/t/t5534-push-signed.sh
> > +++ b/t/t5534-push-signed.sh
> > @@ -218,4 +218,56 @@ test_expect_success GPG 'fail without key and
> > heed user.signingkey' ' test_cmp expect dst/push-cert-status
> > '
> >
> > +test_expect_success GPGSM 'fail without key and heed
> > user.signingkey x509' '
> > + test_config gpg.format x509 &&
> > + env | grep GIT > envfile &&
>
> The "envfile" is unused, no? Remove this line.
Thanks, debugging leftovers.
> > + prepare_dst &&
> > + mkdir -p dst/.git/hooks &&
> > + git -C dst config receive.certnonceseed sekrit &&
> > + write_script dst/.git/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_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
> > + NONCE=${GIT_PUSH_CERT_NONCE-nononce}
> > + E_O_F
> > +
> > + EOF
>
> OK, so up to this are what is done by post-receive, including the
> overwriting of ../push-cert (which is one level above the receiving
> repository's .git/, i.e. dst/push-cert) and ../push-cert-status.
>
> > + unset GIT_COMMITTER_EMAIL &&
> > + git config user.email hasnokey@nowhere.com &&
> > + git config user.signingkey "" &&
> > + test_must_fail git push --signed dst noop ff +noff &&
>
> This is OK for a test that is known to be always at the end, but
> also forbids others to further update this script to add more tests
> at the end, as the standard setting of environment is blown away
> (the config is probably OK, but test_config to arrange them to be
> cleaned up would have been nicer), which is not very nice. I think
> it should be easy to fix it when it becomes necessary, but at the
> same time if it is easy to fix, then probably we shouldn't introduce
> a breakage in the first place, so I am on the fence.
Switched to test_config, this is all coming from copying the previous
tests, which i left as is.
> > + git config user.signingkey committer@example.com &&
> > + git push --signed dst noop ff +noff &&
>
> So,... this is run without resetting user.email and demonstrates
> that signingkey is the only thing that matters, which makes sense.
>
> > + (
> > + cat <<-\EOF &&
> > + SIGNER=/CN=C O Mitter/O=Example/SN=C O/GN=Mitter
> > + KEY=
> > + STATUS=G
> > + NONCE_STATUS=OK
> > + EOF
> > + sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q"
> > dst/push-cert
> > + ) >expect.in &&
> > + key=$(cat "${GNUPGHOME}/trustlist.txt" | cut -d" " -f1 |
> > tr -d ":") &&
> > + sed -e "s/^KEY=/KEY=${key}/" expect.in > expect &&
>
> s/> expect/>expect/;
Done.
> > + noop=$(git rev-parse noop) &&
> > + ff=$(git rev-parse ff) &&
> > + noff=$(git rev-parse noff) &&
> > + grep "$noop $ff refs/heads/ff" dst/push-cert &&
> > + grep "$noop $noff refs/heads/noff" dst/push-cert &&
> > + test_cmp expect dst/push-cert-status
> > +'
> > +
> > +
> > test_done
> > diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
> > index d7b319e91..2147938aa 100755
> > --- a/t/t7004-tag.sh
> > +++ b/t/t7004-tag.sh
> > @@ -1354,6 +1354,19 @@ test_expect_success GPG \
> > 'test_config gpg.program echo &&
> > test_must_fail git tag -s -m tail tag-gpg-failure'
> >
> > +# try to sign with bad user.signingkey
> > +test_expect_success GPGSM \
> > + 'git tag -s fails if gpgsm is misconfigured (bad key)' \
> > + 'test_config user.signingkey BobTheMouse &&
> > + test_config gpg.format x509 &&
> > + test_must_fail git tag -s -m tail tag-gpg-failure'
> > +
> > +# try to produce invalid signature
> > +test_expect_success GPGSM \
> > + 'git tag -s fails if gpgsm is misconfigured (bad signature
> > format)' \
> > + 'test_config gpg.x509.program echo &&
> > + test_config gpg.format x509 &&
> > + test_must_fail git tag -s -m tail tag-gpg-failure'
>
> I can see that it is a gpgsm parallel of the earlier test we can see
> in the precontext of this hunk done for gpg, but how does the last
> one (and the original this one was modeled after) fail?
>
> We say "echo" is the program that signs for the chosen format, "tag
> -s" tries to run "echo" instead of "gpgsm" with "--status-fd=2
> -bsau" or whatever args we usually give, and...?
>
> I would guess you would either get "I don't know what you wanted me
> to do with --status-fd=2 option, I am erroring out" from "echo", or
> the "echo" command exiting without consuming any input, causing the
> feeder in "tag -s" to get SIGPIPE (or write(2) error), but the latter
> happens only when the payload to be signed is large enough. On a
> platform whose "echo" pays no attention to unknown option, "echo"
> itself may not even error out. And then we try to read from "echo"
> and we do not get anything (which is expected).
>
> And then who in "git tag -s" notice the breakage?
>
> ... goes and looks at gpg-interface.c::sign_buffer() ...
>
> Ah, we check the status-fd output for "[GnuPG:] SIG_CREATED", which
> would never happen if we are talking to "echo". OK, that is how
> this thing is expected to fail.
>
> What I have been getting at is if this is really trying to trigger
> the "(bad signature format)" breakage. The test uses a wrong
> program to simulate the case where a configured gpg/gpgsm failed to
> report "SIG_CREATED". "bad signature format" does not sound exactly
> like that, but you inherited the badness from the original, so let's
> leave it as is.
All valid points and yes this is coming from copying the other test.
Leaving as is.
> Thanks. Modulo a few nits I pointed out above, buried in all the
> other good bits, this looks reasonable to me.
Cool, Thanks.
Henning
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH v4 7/7] gpg-interface t: extend the existing GPG tests with GPGSM
2018-07-18 10:36 ` Henning Schild
@ 2018-07-18 17:06 ` Junio C Hamano
2018-07-19 12:14 ` [PATCH] t/t5534: do not unset GIT_COMMITTER_EMAIL for other tests Henning Schild
0 siblings, 1 reply; 24+ messages in thread
From: Junio C Hamano @ 2018-07-18 17:06 UTC (permalink / raw)
To: Henning Schild
Cc: git, Eric Sunshine, Martin Ågren, Ben Toews, Jeff King,
Taylor Blau, brian m . carlson
Henning Schild <henning.schild@siemens.com> writes:
>> > + unset GIT_COMMITTER_EMAIL &&
>> > + git config user.email hasnokey@nowhere.com &&
>> > + git config user.signingkey "" &&
>> > + test_must_fail git push --signed dst noop ff +noff &&
>>
>> This is OK for a test that is known to be always at the end, but
>> also forbids others to further update this script to add more tests
>> at the end, as the standard setting of environment is blown away
>> (the config is probably OK, but test_config to arrange them to be
>> cleaned up would have been nicer), which is not very nice. I think
>> it should be easy to fix it when it becomes necessary, but at the
>> same time if it is easy to fix, then probably we shouldn't introduce
>> a breakage in the first place, so I am on the fence.
>
> Switched to test_config, this is all coming from copying the previous
> tests, which i left as is.
I was specifically talking about the unsetting of GIT_COMMITTER_EMAIL,
not the configuration variables.
An easy way to try one step without the environment without
affecting later tests would be to run the above in a subshell,
perhaps like
test_config user.email ... &&
test_config user.signingkey "" &&
(
safe_unset GIT_COMMITTER_EMAIL &&
test_must_fail git push --signed ...
) &&
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH] t/t5534: do not unset GIT_COMMITTER_EMAIL for other tests
2018-07-18 17:06 ` Junio C Hamano
@ 2018-07-19 12:14 ` Henning Schild
2018-07-19 12:15 ` Henning Schild
2018-07-19 15:10 ` Taylor Blau
0 siblings, 2 replies; 24+ messages in thread
From: Henning Schild @ 2018-07-19 12:14 UTC (permalink / raw)
To: git
Cc: Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson, Henning Schild
Unsetting the varibale for good can have unwanted effects for new
tests added in the future It also meant we needed to hardcode the
value for "user.signingkey".
Move the unset into a subshell, get rid of the hardcoded
"committer@example.com", and switch the GPG variant to using test_config
just like GPGSM.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
t/t5534-push-signed.sh | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 0cb88aa6f..f6d674156 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -194,10 +194,12 @@ test_expect_success GPG 'fail without key and heed user.signingkey' '
EOF
- unset GIT_COMMITTER_EMAIL &&
- git config user.email hasnokey@nowhere.com &&
- test_must_fail git push --signed dst noop ff +noff &&
- git config user.signingkey committer@example.com &&
+ test_config user.email hasnokey@nowhere.com &&
+ (
+ unset GIT_COMMITTER_EMAIL &&
+ test_must_fail git push --signed dst noop ff +noff
+ ) &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
git push --signed dst noop ff +noff &&
(
@@ -241,11 +243,14 @@ test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
E_O_F
EOF
- unset GIT_COMMITTER_EMAIL &&
+
test_config user.email hasnokey@nowhere.com &&
test_config user.signingkey "" &&
- test_must_fail git push --signed dst noop ff +noff &&
- test_config user.signingkey committer@example.com &&
+ (
+ unset GIT_COMMITTER_EMAIL &&
+ test_must_fail git push --signed dst noop ff +noff
+ ) &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
git push --signed dst noop ff +noff &&
(
--
2.16.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH] t/t5534: do not unset GIT_COMMITTER_EMAIL for other tests
2018-07-19 12:14 ` [PATCH] t/t5534: do not unset GIT_COMMITTER_EMAIL for other tests Henning Schild
@ 2018-07-19 12:15 ` Henning Schild
2018-07-19 22:27 ` Junio C Hamano
2018-07-19 15:10 ` Taylor Blau
1 sibling, 1 reply; 24+ messages in thread
From: Henning Schild @ 2018-07-19 12:15 UTC (permalink / raw)
To: Junio C Hamano, Martin Ågren
Cc: git, Eric Sunshine, Ben Toews, Jeff King, Taylor Blau,
brian m . carlson
Looking at "what is cooking" i assume i should not add/fold this to/in
the serien anymore. So it comes as a separate patch on top.
Henning
Am Thu, 19 Jul 2018 14:14:09 +0200
schrieb Henning Schild <henning.schild@siemens.com>:
> Unsetting the varibale for good can have unwanted effects for new
> tests added in the future It also meant we needed to hardcode the
> value for "user.signingkey".
> Move the unset into a subshell, get rid of the hardcoded
> "committer@example.com", and switch the GPG variant to using
> test_config just like GPGSM.
>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
> t/t5534-push-signed.sh | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
> index 0cb88aa6f..f6d674156 100755
> --- a/t/t5534-push-signed.sh
> +++ b/t/t5534-push-signed.sh
> @@ -194,10 +194,12 @@ test_expect_success GPG 'fail without key and
> heed user.signingkey' '
> EOF
>
> - unset GIT_COMMITTER_EMAIL &&
> - git config user.email hasnokey@nowhere.com &&
> - test_must_fail git push --signed dst noop ff +noff &&
> - git config user.signingkey committer@example.com &&
> + test_config user.email hasnokey@nowhere.com &&
> + (
> + unset GIT_COMMITTER_EMAIL &&
> + test_must_fail git push --signed dst noop ff +noff
> + ) &&
> + test_config user.signingkey $GIT_COMMITTER_EMAIL &&
> git push --signed dst noop ff +noff &&
>
> (
> @@ -241,11 +243,14 @@ test_expect_success GPGSM 'fail without key and
> heed user.signingkey x509' ' E_O_F
>
> EOF
> - unset GIT_COMMITTER_EMAIL &&
> +
> test_config user.email hasnokey@nowhere.com &&
> test_config user.signingkey "" &&
> - test_must_fail git push --signed dst noop ff +noff &&
> - test_config user.signingkey committer@example.com &&
> + (
> + unset GIT_COMMITTER_EMAIL &&
> + test_must_fail git push --signed dst noop ff +noff
> + ) &&
> + test_config user.signingkey $GIT_COMMITTER_EMAIL &&
> git push --signed dst noop ff +noff &&
>
> (
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH] t/t5534: do not unset GIT_COMMITTER_EMAIL for other tests
2018-07-19 12:15 ` Henning Schild
@ 2018-07-19 22:27 ` Junio C Hamano
2018-07-20 8:28 ` Henning Schild
0 siblings, 1 reply; 24+ messages in thread
From: Junio C Hamano @ 2018-07-19 22:27 UTC (permalink / raw)
To: Henning Schild
Cc: Martin Ågren, git, Eric Sunshine, Ben Toews, Jeff King,
Taylor Blau, brian m . carlson
Henning Schild <henning.schild@siemens.com> writes:
> Looking at "what is cooking" i assume i should not add/fold this to/in
> the serien anymore. So it comes as a separate patch on top.
Thanks. I only said:
I think this round is mostly ready, except for a minor nit in the
last step. I do not mind merging this to 'next' and leave fixing
of the test to a later clean-up.
meaing that I _do not mind_ merging the slightly broken one to
'next' and fixing it with a follow-up (i.e. this patch), but fixing
with a replacement patch so that we pretend we never made a mistake
that needs fixing from the beginning is of course preferrable ;-)
Let's squash this patch into the last one in the series.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH] t/t5534: do not unset GIT_COMMITTER_EMAIL for other tests
2018-07-19 22:27 ` Junio C Hamano
@ 2018-07-20 8:28 ` Henning Schild
0 siblings, 0 replies; 24+ messages in thread
From: Henning Schild @ 2018-07-20 8:28 UTC (permalink / raw)
To: Junio C Hamano
Cc: Martin Ågren, git, Eric Sunshine, Ben Toews, Jeff King,
Taylor Blau, brian m . carlson
Am Thu, 19 Jul 2018 15:27:56 -0700
schrieb Junio C Hamano <gitster@pobox.com>:
> Henning Schild <henning.schild@siemens.com> writes:
>
> > Looking at "what is cooking" i assume i should not add/fold this
> > to/in the serien anymore. So it comes as a separate patch on top.
>
> Thanks. I only said:
>
> I think this round is mostly ready, except for a minor nit in the
> last step. I do not mind merging this to 'next' and leave fixing
> of the test to a later clean-up.
>
> meaing that I _do not mind_ merging the slightly broken one to
> 'next' and fixing it with a follow-up (i.e. this patch), but fixing
> with a replacement patch so that we pretend we never made a mistake
> that needs fixing from the beginning is of course preferrable ;-)
>
> Let's squash this patch into the last one in the series.
Ok, just sent a v6 of 7/7.
Henning
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH] t/t5534: do not unset GIT_COMMITTER_EMAIL for other tests
2018-07-19 12:14 ` [PATCH] t/t5534: do not unset GIT_COMMITTER_EMAIL for other tests Henning Schild
2018-07-19 12:15 ` Henning Schild
@ 2018-07-19 15:10 ` Taylor Blau
1 sibling, 0 replies; 24+ messages in thread
From: Taylor Blau @ 2018-07-19 15:10 UTC (permalink / raw)
To: Henning Schild
Cc: git, Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson
On Thu, Jul 19, 2018 at 02:14:09PM +0200, Henning Schild wrote:
> Unsetting the varibale for good can have unwanted effects for new
s/varibale/variable
> tests added in the future It also meant we needed to hardcode the
s/future/&.
> value for "user.signingkey".
> Move the unset into a subshell, get rid of the hardcoded
> "committer@example.com", and switch the GPG variant to using test_config
> just like GPGSM.
OK, sounds good.
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
> t/t5534-push-signed.sh | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
> index 0cb88aa6f..f6d674156 100755
> --- a/t/t5534-push-signed.sh
> +++ b/t/t5534-push-signed.sh
> @@ -194,10 +194,12 @@ test_expect_success GPG 'fail without key and heed user.signingkey' '
>
> EOF
>
> - unset GIT_COMMITTER_EMAIL &&
> - git config user.email hasnokey@nowhere.com &&
> - test_must_fail git push --signed dst noop ff +noff &&
> - git config user.signingkey committer@example.com &&
> + test_config user.email hasnokey@nowhere.com &&
> + (
> + unset GIT_COMMITTER_EMAIL &&
> + test_must_fail git push --signed dst noop ff +noff
> + ) &&
> + test_config user.signingkey $GIT_COMMITTER_EMAIL &&
> git push --signed dst noop ff +noff &&
I think replacing the 'git config' invocations with their 'test_config'
equivalents in its own patch would be easier to grok, but I don't think
that splitting the change out is worth a re-roll on its own.
> (
> @@ -241,11 +243,14 @@ test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
> E_O_F
>
> EOF
> - unset GIT_COMMITTER_EMAIL &&
> +
Nit; remove this newline.
> test_config user.email hasnokey@nowhere.com &&
> test_config user.signingkey "" &&
> - test_must_fail git push --signed dst noop ff +noff &&
> - test_config user.signingkey committer@example.com &&
> + (
> + unset GIT_COMMITTER_EMAIL &&
> + test_must_fail git push --signed dst noop ff +noff
> + ) &&
> + test_config user.signingkey $GIT_COMMITTER_EMAIL &&
> git push --signed dst noop ff +noff &&
Looks good.
> (
> --
> 2.16.4
Thanks,
Taylor
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v5 7/7] gpg-interface t: extend the existing GPG tests with GPGSM
2018-07-17 12:50 ` [PATCH v4 7/7] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
2018-07-17 21:31 ` Junio C Hamano
@ 2018-07-18 9:31 ` Henning Schild
2018-07-20 8:28 ` [PATCH v6 " Henning Schild
1 sibling, 1 reply; 24+ messages in thread
From: Henning Schild @ 2018-07-18 9:31 UTC (permalink / raw)
To: git
Cc: Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson, Henning Schild
Add test cases to cover the new X509/gpgsm support. Most of them
resemble existing ones. They just switch the format to x509 and set the
signingkey when creating signatures. Validation of signatures does not
need any configuration of git, it does need gpgsm to be configured to
trust the key(-chain).
Several of the testcases build on top of existing gpg testcases.
The commit ships a self-signed key for committer@example.com and
configures gpgsm to trust it.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
t/lib-gpg.sh | 28 ++++++++++++++++++++++++-
t/lib-gpg/gpgsm-gen-key.in | 8 +++++++
t/lib-gpg/gpgsm_cert.p12 | Bin 0 -> 2652 bytes
t/t4202-log.sh | 37 ++++++++++++++++++++++++++++++++
t/t5534-push-signed.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++
t/t7004-tag.sh | 13 ++++++++++++
t/t7030-verify-tag.sh | 33 +++++++++++++++++++++++++++++
7 files changed, 169 insertions(+), 1 deletion(-)
create mode 100644 t/lib-gpg/gpgsm-gen-key.in
create mode 100644 t/lib-gpg/gpgsm_cert.p12
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index a5d3b2cba..3fe02876c 100755
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -38,7 +38,33 @@ then
"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null 2>&1 \
--sign -u committer@example.com &&
- test_set_prereq GPG
+ test_set_prereq GPG &&
+ # Available key info:
+ # * see t/lib-gpg/gpgsm-gen-key.in
+ # To generate new certificate:
+ # * no passphrase
+ # gpgsm --homedir /tmp/gpghome/ \
+ # -o /tmp/gpgsm.crt.user \
+ # --generate-key \
+ # --batch t/lib-gpg/gpgsm-gen-key.in
+ # To import certificate:
+ # gpgsm --homedir /tmp/gpghome/ \
+ # --import /tmp/gpgsm.crt.user
+ # To export into a .p12 we can later import:
+ # gpgsm --homedir /tmp/gpghome/ \
+ # -o t/lib-gpg/gpgsm_cert.p12 \
+ # --export-secret-key-p12 "committer@example.com"
+ echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
+ --passphrase-fd 0 --pinentry-mode loopback \
+ --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
+ gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K \
+ | grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
+ ${GNUPGHOME}/trustlist.txt &&
+ echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
+ (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
+ echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
+ -u committer@example.com -o /dev/null --sign - 2>&1 &&
+ test_set_prereq GPGSM
;;
esac
fi
diff --git a/t/lib-gpg/gpgsm-gen-key.in b/t/lib-gpg/gpgsm-gen-key.in
new file mode 100644
index 000000000..a7fd87c06
--- /dev/null
+++ b/t/lib-gpg/gpgsm-gen-key.in
@@ -0,0 +1,8 @@
+Key-Type: RSA
+Key-Length: 2048
+Key-Usage: sign
+Serial: random
+Name-DN: CN=C O Mitter, O=Example, SN=C O, GN=Mitter
+Name-Email: committer@example.com
+Not-Before: 1970-01-01 00:00:00
+Not-After: 3000-01-01 00:00:00
diff --git a/t/lib-gpg/gpgsm_cert.p12 b/t/lib-gpg/gpgsm_cert.p12
new file mode 100644
index 0000000000000000000000000000000000000000..94ffad0d31a3b6c4e849b29d960762e485ba7ea8
GIT binary patch
literal 2652
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
literal 0
HcmV?d00001
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 25b1f8cc7..05d3707e3 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -1556,12 +1556,28 @@ test_expect_success GPG 'setup signed branch' '
git commit -S -m signed_commit
'
+test_expect_success GPGSM 'setup signed branch x509' '
+ test_when_finished "git reset --hard && git checkout master" &&
+ git checkout -b signed-x509 master &&
+ echo foo >foo &&
+ git add foo &&
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git commit -S -m signed_commit
+'
+
test_expect_success GPG 'log --graph --show-signature' '
git log --graph --show-signature -n1 signed >actual &&
grep "^| gpg: Signature made" actual &&
grep "^| gpg: Good signature" actual
'
+test_expect_success GPGSM 'log --graph --show-signature x509' '
+ git log --graph --show-signature -n1 signed-x509 >actual &&
+ grep "^| gpgsm: Signature made" actual &&
+ grep "^| gpgsm: Good signature" actual
+'
+
test_expect_success GPG 'log --graph --show-signature for merged tag' '
test_when_finished "git reset --hard && git checkout master" &&
git checkout -b plain master &&
@@ -1581,6 +1597,27 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
grep "^| | gpg: Good signature" actual
'
+test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
+ test_when_finished "git reset --hard && git checkout master" &&
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git checkout -b plain-x509 master &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-x509 master &&
+ echo bbb >baz &&
+ git add baz &&
+ git commit -m baz_commit &&
+ git tag -s -m signed_tag_msg signed_tag_x509 &&
+ git checkout plain-x509 &&
+ git merge --no-ff -m msg signed_tag_x509 &&
+ git log --graph --show-signature -n1 plain-x509 >actual &&
+ grep "^|\\\ merged tag" actual &&
+ grep "^| | gpgsm: Signature made" actual &&
+ grep "^| | gpgsm: Good signature" actual
+'
+
test_expect_success GPG '--no-show-signature overrides --show-signature' '
git log -1 --show-signature --no-show-signature signed >actual &&
! grep "^gpg:" actual
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 1cea758f7..0cb88aa6f 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -218,4 +218,55 @@ test_expect_success GPG 'fail without key and heed user.signingkey' '
test_cmp expect dst/push-cert-status
'
+test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
+ test_config gpg.format x509 &&
+ prepare_dst &&
+ mkdir -p dst/.git/hooks &&
+ git -C dst config receive.certnonceseed sekrit &&
+ write_script dst/.git/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_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+ NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+ E_O_F
+
+ EOF
+ unset GIT_COMMITTER_EMAIL &&
+ test_config user.email hasnokey@nowhere.com &&
+ test_config user.signingkey "" &&
+ test_must_fail git push --signed dst noop ff +noff &&
+ test_config user.signingkey committer@example.com &&
+ git push --signed dst noop ff +noff &&
+
+ (
+ cat <<-\EOF &&
+ SIGNER=/CN=C O Mitter/O=Example/SN=C O/GN=Mitter
+ KEY=
+ STATUS=G
+ NONCE_STATUS=OK
+ EOF
+ sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+ ) >expect.in &&
+ key=$(cat "${GNUPGHOME}/trustlist.txt" | cut -d" " -f1 | tr -d ":") &&
+ sed -e "s/^KEY=/KEY=${key}/" expect.in >expect &&
+
+ noop=$(git rev-parse noop) &&
+ ff=$(git rev-parse ff) &&
+ noff=$(git rev-parse noff) &&
+ grep "$noop $ff refs/heads/ff" dst/push-cert &&
+ grep "$noop $noff refs/heads/noff" dst/push-cert &&
+ test_cmp expect dst/push-cert-status
+'
+
+
test_done
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index d7b319e91..2147938aa 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1354,6 +1354,19 @@ test_expect_success GPG \
'test_config gpg.program echo &&
test_must_fail git tag -s -m tail tag-gpg-failure'
+# try to sign with bad user.signingkey
+test_expect_success GPGSM \
+ 'git tag -s fails if gpgsm is misconfigured (bad key)' \
+ 'test_config user.signingkey BobTheMouse &&
+ test_config gpg.format x509 &&
+ test_must_fail git tag -s -m tail tag-gpg-failure'
+
+# try to produce invalid signature
+test_expect_success GPGSM \
+ 'git tag -s fails if gpgsm is misconfigured (bad signature format)' \
+ 'test_config gpg.x509.program echo &&
+ test_config gpg.format x509 &&
+ test_must_fail git tag -s -m tail tag-gpg-failure'
# try to verify without gpg:
diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index 291a1e2b0..db6295d65 100755
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -41,6 +41,13 @@ test_expect_success GPG 'create signed tags' '
git tag -uB7227189 -m eighth eighth-signed-alt
'
+test_expect_success GPGSM 'create signed tags x509 ' '
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ echo 9 >file && test_tick && git commit -a -m "nineth gpgsm-signed" &&
+ git tag -s -m nineth nineth-signed-x509
+'
+
test_expect_success GPG 'verify and show signatures' '
(
for tag in initial second merge fourth-signed sixth-signed seventh-signed
@@ -72,6 +79,13 @@ test_expect_success GPG 'verify and show signatures' '
)
'
+test_expect_success GPGSM 'verify and show signatures x509' '
+ git verify-tag nineth-signed-x509 2>actual &&
+ grep "Good signature from" actual &&
+ ! grep "BAD signature from" actual &&
+ echo nineth-signed-x509 OK
+'
+
test_expect_success GPG 'detect fudged signature' '
git cat-file tag seventh-signed >raw &&
sed -e "/^tag / s/seventh/7th forged/" raw >forged1 &&
@@ -112,6 +126,12 @@ test_expect_success GPG 'verify signatures with --raw' '
)
'
+test_expect_success GPGSM 'verify signatures with --raw x509' '
+ git verify-tag --raw nineth-signed-x509 2>actual &&
+ grep "GOODSIG" actual &&
+ ! grep "BADSIG" actual &&
+ echo nineth-signed-x509 OK
+'
test_expect_success GPG 'verify multiple tags' '
tags="fourth-signed sixth-signed seventh-signed" &&
for i in $tags
@@ -125,6 +145,19 @@ test_expect_success GPG 'verify multiple tags' '
test_cmp expect.stderr actual.stderr
'
+test_expect_success GPGSM 'verify multiple tags x509' '
+ tags="seventh-signed nineth-signed-x509" &&
+ for i in $tags
+ do
+ git verify-tag -v --raw $i || return 1
+ done >expect.stdout 2>expect.stderr.1 &&
+ grep "^.GNUPG:." <expect.stderr.1 >expect.stderr &&
+ git verify-tag -v --raw $tags >actual.stdout 2>actual.stderr.1 &&
+ grep "^.GNUPG:." <actual.stderr.1 >actual.stderr &&
+ test_cmp expect.stdout actual.stdout &&
+ test_cmp expect.stderr actual.stderr
+'
+
test_expect_success GPG 'verifying tag with --format' '
cat >expect <<-\EOF &&
tagname : fourth-signed
--
2.16.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH v6 7/7] gpg-interface t: extend the existing GPG tests with GPGSM
2018-07-18 9:31 ` [PATCH v5 7/7] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
@ 2018-07-20 8:28 ` Henning Schild
2018-07-20 15:42 ` Junio C Hamano
0 siblings, 1 reply; 24+ messages in thread
From: Henning Schild @ 2018-07-20 8:28 UTC (permalink / raw)
To: git
Cc: Eric Sunshine, Junio C Hamano, Martin Ågren, Ben Toews,
Jeff King, Taylor Blau, brian m . carlson, Henning Schild
Add test cases to cover the new X509/gpgsm support. Most of them
resemble existing ones. They just switch the format to x509 and set the
signingkey when creating signatures. Validation of signatures does not
need any configuration of git, it does need gpgsm to be configured to
trust the key(-chain).
Several of the testcases build on top of existing gpg testcases.
The commit ships a self-signed key for committer@example.com and
configures gpgsm to trust it.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
t/lib-gpg.sh | 28 +++++++++++++++++++-
t/lib-gpg/gpgsm-gen-key.in | 8 ++++++
t/lib-gpg/gpgsm_cert.p12 | Bin 0 -> 2652 bytes
t/t4202-log.sh | 37 ++++++++++++++++++++++++++
t/t5534-push-signed.sh | 63 ++++++++++++++++++++++++++++++++++++++++++---
t/t7004-tag.sh | 13 ++++++++++
t/t7030-verify-tag.sh | 34 ++++++++++++++++++++++++
7 files changed, 178 insertions(+), 5 deletions(-)
create mode 100644 t/lib-gpg/gpgsm-gen-key.in
create mode 100644 t/lib-gpg/gpgsm_cert.p12
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index a5d3b2cba..3fe02876c 100755
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -38,7 +38,33 @@ then
"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null 2>&1 \
--sign -u committer@example.com &&
- test_set_prereq GPG
+ test_set_prereq GPG &&
+ # Available key info:
+ # * see t/lib-gpg/gpgsm-gen-key.in
+ # To generate new certificate:
+ # * no passphrase
+ # gpgsm --homedir /tmp/gpghome/ \
+ # -o /tmp/gpgsm.crt.user \
+ # --generate-key \
+ # --batch t/lib-gpg/gpgsm-gen-key.in
+ # To import certificate:
+ # gpgsm --homedir /tmp/gpghome/ \
+ # --import /tmp/gpgsm.crt.user
+ # To export into a .p12 we can later import:
+ # gpgsm --homedir /tmp/gpghome/ \
+ # -o t/lib-gpg/gpgsm_cert.p12 \
+ # --export-secret-key-p12 "committer@example.com"
+ echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
+ --passphrase-fd 0 --pinentry-mode loopback \
+ --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
+ gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K \
+ | grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
+ ${GNUPGHOME}/trustlist.txt &&
+ echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
+ (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
+ echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
+ -u committer@example.com -o /dev/null --sign - 2>&1 &&
+ test_set_prereq GPGSM
;;
esac
fi
diff --git a/t/lib-gpg/gpgsm-gen-key.in b/t/lib-gpg/gpgsm-gen-key.in
new file mode 100644
index 000000000..a7fd87c06
--- /dev/null
+++ b/t/lib-gpg/gpgsm-gen-key.in
@@ -0,0 +1,8 @@
+Key-Type: RSA
+Key-Length: 2048
+Key-Usage: sign
+Serial: random
+Name-DN: CN=C O Mitter, O=Example, SN=C O, GN=Mitter
+Name-Email: committer@example.com
+Not-Before: 1970-01-01 00:00:00
+Not-After: 3000-01-01 00:00:00
diff --git a/t/lib-gpg/gpgsm_cert.p12 b/t/lib-gpg/gpgsm_cert.p12
new file mode 100644
index 0000000000000000000000000000000000000000..94ffad0d31a3b6c4e849b29d960762e485ba7ea8
GIT binary patch
literal 2652
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
literal 0
HcmV?d00001
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 25b1f8cc7..05d3707e3 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -1556,12 +1556,28 @@ test_expect_success GPG 'setup signed branch' '
git commit -S -m signed_commit
'
+test_expect_success GPGSM 'setup signed branch x509' '
+ test_when_finished "git reset --hard && git checkout master" &&
+ git checkout -b signed-x509 master &&
+ echo foo >foo &&
+ git add foo &&
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git commit -S -m signed_commit
+'
+
test_expect_success GPG 'log --graph --show-signature' '
git log --graph --show-signature -n1 signed >actual &&
grep "^| gpg: Signature made" actual &&
grep "^| gpg: Good signature" actual
'
+test_expect_success GPGSM 'log --graph --show-signature x509' '
+ git log --graph --show-signature -n1 signed-x509 >actual &&
+ grep "^| gpgsm: Signature made" actual &&
+ grep "^| gpgsm: Good signature" actual
+'
+
test_expect_success GPG 'log --graph --show-signature for merged tag' '
test_when_finished "git reset --hard && git checkout master" &&
git checkout -b plain master &&
@@ -1581,6 +1597,27 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
grep "^| | gpg: Good signature" actual
'
+test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
+ test_when_finished "git reset --hard && git checkout master" &&
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git checkout -b plain-x509 master &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-x509 master &&
+ echo bbb >baz &&
+ git add baz &&
+ git commit -m baz_commit &&
+ git tag -s -m signed_tag_msg signed_tag_x509 &&
+ git checkout plain-x509 &&
+ git merge --no-ff -m msg signed_tag_x509 &&
+ git log --graph --show-signature -n1 plain-x509 >actual &&
+ grep "^|\\\ merged tag" actual &&
+ grep "^| | gpgsm: Signature made" actual &&
+ grep "^| | gpgsm: Good signature" actual
+'
+
test_expect_success GPG '--no-show-signature overrides --show-signature' '
git log -1 --show-signature --no-show-signature signed >actual &&
! grep "^gpg:" actual
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 1cea758f7..8cc6789e9 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -194,10 +194,12 @@ test_expect_success GPG 'fail without key and heed user.signingkey' '
EOF
- unset GIT_COMMITTER_EMAIL &&
- git config user.email hasnokey@nowhere.com &&
- test_must_fail git push --signed dst noop ff +noff &&
- git config user.signingkey committer@example.com &&
+ test_config user.email hasnokey@nowhere.com &&
+ (
+ unset GIT_COMMITTER_EMAIL &&
+ test_must_fail git push --signed dst noop ff +noff
+ ) &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
git push --signed dst noop ff +noff &&
(
@@ -218,4 +220,57 @@ test_expect_success GPG 'fail without key and heed user.signingkey' '
test_cmp expect dst/push-cert-status
'
+test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
+ test_config gpg.format x509 &&
+ prepare_dst &&
+ mkdir -p dst/.git/hooks &&
+ git -C dst config receive.certnonceseed sekrit &&
+ write_script dst/.git/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_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+ NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+ E_O_F
+
+ EOF
+
+ test_config user.email hasnokey@nowhere.com &&
+ test_config user.signingkey "" &&
+ (
+ unset GIT_COMMITTER_EMAIL &&
+ test_must_fail git push --signed dst noop ff +noff
+ ) &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git push --signed dst noop ff +noff &&
+
+ (
+ cat <<-\EOF &&
+ SIGNER=/CN=C O Mitter/O=Example/SN=C O/GN=Mitter
+ KEY=
+ STATUS=G
+ NONCE_STATUS=OK
+ EOF
+ sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+ ) >expect.in &&
+ key=$(cat "${GNUPGHOME}/trustlist.txt" | cut -d" " -f1 | tr -d ":") &&
+ sed -e "s/^KEY=/KEY=${key}/" expect.in >expect &&
+
+ noop=$(git rev-parse noop) &&
+ ff=$(git rev-parse ff) &&
+ noff=$(git rev-parse noff) &&
+ grep "$noop $ff refs/heads/ff" dst/push-cert &&
+ grep "$noop $noff refs/heads/noff" dst/push-cert &&
+ test_cmp expect dst/push-cert-status
+'
+
test_done
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index d7b319e91..2147938aa 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1354,6 +1354,19 @@ test_expect_success GPG \
'test_config gpg.program echo &&
test_must_fail git tag -s -m tail tag-gpg-failure'
+# try to sign with bad user.signingkey
+test_expect_success GPGSM \
+ 'git tag -s fails if gpgsm is misconfigured (bad key)' \
+ 'test_config user.signingkey BobTheMouse &&
+ test_config gpg.format x509 &&
+ test_must_fail git tag -s -m tail tag-gpg-failure'
+
+# try to produce invalid signature
+test_expect_success GPGSM \
+ 'git tag -s fails if gpgsm is misconfigured (bad signature format)' \
+ 'test_config gpg.x509.program echo &&
+ test_config gpg.format x509 &&
+ test_must_fail git tag -s -m tail tag-gpg-failure'
# try to verify without gpg:
diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index 291a1e2b0..99f35a5bb 100755
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -41,6 +41,13 @@ test_expect_success GPG 'create signed tags' '
git tag -uB7227189 -m eighth eighth-signed-alt
'
+test_expect_success GPGSM 'create signed tags x509 ' '
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ echo 9 >file && test_tick && git commit -a -m "nineth gpgsm-signed" &&
+ git tag -s -m nineth nineth-signed-x509
+'
+
test_expect_success GPG 'verify and show signatures' '
(
for tag in initial second merge fourth-signed sixth-signed seventh-signed
@@ -72,6 +79,13 @@ test_expect_success GPG 'verify and show signatures' '
)
'
+test_expect_success GPGSM 'verify and show signatures x509' '
+ git verify-tag nineth-signed-x509 2>actual &&
+ grep "Good signature from" actual &&
+ ! grep "BAD signature from" actual &&
+ echo nineth-signed-x509 OK
+'
+
test_expect_success GPG 'detect fudged signature' '
git cat-file tag seventh-signed >raw &&
sed -e "/^tag / s/seventh/7th forged/" raw >forged1 &&
@@ -112,6 +126,13 @@ test_expect_success GPG 'verify signatures with --raw' '
)
'
+test_expect_success GPGSM 'verify signatures with --raw x509' '
+ git verify-tag --raw nineth-signed-x509 2>actual &&
+ grep "GOODSIG" actual &&
+ ! grep "BADSIG" actual &&
+ echo nineth-signed-x509 OK
+'
+
test_expect_success GPG 'verify multiple tags' '
tags="fourth-signed sixth-signed seventh-signed" &&
for i in $tags
@@ -125,6 +146,19 @@ test_expect_success GPG 'verify multiple tags' '
test_cmp expect.stderr actual.stderr
'
+test_expect_success GPGSM 'verify multiple tags x509' '
+ tags="seventh-signed nineth-signed-x509" &&
+ for i in $tags
+ do
+ git verify-tag -v --raw $i || return 1
+ done >expect.stdout 2>expect.stderr.1 &&
+ grep "^.GNUPG:." <expect.stderr.1 >expect.stderr &&
+ git verify-tag -v --raw $tags >actual.stdout 2>actual.stderr.1 &&
+ grep "^.GNUPG:." <actual.stderr.1 >actual.stderr &&
+ test_cmp expect.stdout actual.stdout &&
+ test_cmp expect.stderr actual.stderr
+'
+
test_expect_success GPG 'verifying tag with --format' '
cat >expect <<-\EOF &&
tagname : fourth-signed
--
2.16.4
^ permalink raw reply related [flat|nested] 24+ messages in thread