gpg-interface: prefer check_signature() for GPG verification
cover gpg-interface: prefer check_signature() for GPG verification
This patch refactors the use of verify_signed_buffer() for GPG verification to use check_signature() instead.
Previously, both check_signature() and verify_signed_buffer() were used to verify signatures in various parts of Git. However, verify_signed_buffer() does not parse the GPG status message. Instead, it relies entirely on the exit code from GPG coupled with the existence of a GOODSIG string in the output buffer. Unfortunately, the mere prescience of GOODSIG does not necessarily imply a valid signature, as shown by Michał Górny [1].
verify_signed_buffer() should be reserved for internal use by check_signature() since check_signature() parses and verifies the status message. This is accomplished in this patch.
Note that the patch is prepared for the next branch. I'm not sure if that's appropriate -- but it seemed sensible since I've already touched code in gpg-interface.c that's been merged in next.
[1] https://dev.gentoo.org/~mgorny/articles/attack-on-git-signature-verification.html
Hans Jerry Illikainen (1):
gpg-interface: prefer check_signature() for GPG verification
builtin/fmt-merge-msg.c | 11 +++-- gpg-interface.c | 97 +++++++++++++++++++++-------------------- gpg-interface.h | 9 ---- log-tree.c | 30 +++++++------ 4 files changed, 72 insertions(+), 75 deletions(-)
--
2.24.GIT
PATCH 1/1 gpg-interface: prefer check_signature() for GPG verification
This commit refactors the use of verify_signed_buffer() outside of gpg-interface.c to use check_signature() instead. It also turns verify_signed_buffer() into a file-local function since it's now only invoked internally by check_signature().
There were previously two globally scoped functions used in different parts of Git to perform GPG signature verification:verify_signed_buffer() and check_signature(). Now only check_signature() is used.
The verify_signed_buffer() function doesn't guard against duplicate signatures as described by Michał Górny [1]. Instead it only ensures a non-erroneous exit code from GPG and the presence of at least one GOODSIG status field. This stands in contrast with check_signature() that returns an error if more than one signature is encountered.
The lower degree of verification makes the use of verify_signed_buffer() problematic if callers don't parse and validate the various parts of the GPG status message themselves. And processing these messages seems like a task that should be reserved to gpg-interface.c with the function check_signature().
Furthermore, the use of verify_signed_buffer() makes it difficult to introduce new functionality that relies on the content of the GPG status lines.
Now all operations that does signature verification share a single entry point to gpg-interface.c. This makes it easier to propagate changed or additional functionality in GPG signature verification to all parts of Git, without having odd edge-cases that don't perform the same degree of verification.
[1] https://dev.gentoo.org/~mgorny/articles/attack-on-git-signature-verification.html
--- builtin/fmt-merge-msg.c | 11 +++-- gpg-interface.c | 97 +++++++++++++++++++++-------------------- gpg-interface.h | 9 ---- log-tree.c | 30 +++++++------ 4 files changed, 72 insertions(+), 75 deletions(-)
builtin/fmt-merge-msg.c +7 -4
@@ -495,6 +495,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)enum object_type type;unsigned long size, len;char *buf =read_object_file (oid, &type, &size); +struct signature_check sigc = {0 };struct strbuf sig =STRBUF_INIT ;if (!buf || type !=OBJ_TAG )
@@ -503,10 +504,12 @@ static void fmt_merge_msg_sigs(struct strbuf *out)if (size == len) ;/* merely annotated */ -else if (verify_signed_buffer (buf, len, buf + len, size - len, &sig,NULL )) { -if (!sig.len) -strbuf_addstr (&sig,"gpg verification failed.\n" ); - } +else if (!check_signature (buf, len, buf + len, size - len, + &sigc)) { +strbuf_addstr (&sig, sigc.gpg_output); +signature_check_clear (&sigc); + }else +strbuf_addstr (&sig,"gpg verification failed.\n" );if (!tag_number++) {fmt_tag_signature (&tagbuf, &sig, buf, len);
gpg-interface.c +49 -48
106 lines not on this page · raw message
gpg-interface.h +0 -9
@@ -46,15 +46,6 @@ size_t parse_signature(const char *buf, size_t size);int sign_buffer (struct strbuf *buffer,struct strbuf *signature,const char *signing_key); -/* -* Run "gpg" to see if the payload matches the detached signature. -* gpg_output, when set, receives the diagnostic output from GPG. -* gpg_status, when set, receives the status output from GPG. -*/ -int verify_signed_buffer (const char *payload,size_t payload_size, -const char *signature,size_t signature_size, -struct strbuf *gpg_output,struct strbuf *gpg_status); -int git_gpg_config (const char *,const char *,void *);void set_signing_key (const char *);const char *get_signing_key (void );
log-tree.c +16 -14
@@ -449,22 +449,22 @@ static void show_signature(struct rev_info *opt, struct commit *commit) {struct strbuf payload =STRBUF_INIT ;struct strbuf signature =STRBUF_INIT ; -struct strbuf gpg_output =STRBUF_INIT ; +struct signature_check sigc = {0 };int status;if (parse_signed_commit (commit, &payload, &signature) <=0 ) goto out; - status =verify_signed_buffer (payload.buf, payload.len, - signature.buf, signature.len, - &gpg_output,NULL ); -if (status && !gpg_output.len) -strbuf_addstr (&gpg_output,"No signature\n" ); - -show_sig_lines (opt, status, gpg_output.buf); + status =check_signature (payload.buf, payload.len, signature.buf, + signature.len, &sigc); +if (status && sigc.result =='N' ) +show_sig_lines (opt, status,"No signature\n" ); +else { +show_sig_lines (opt, status, sigc.gpg_output); +signature_check_clear (&sigc); + } out: -strbuf_release (&gpg_output);strbuf_release (&payload);strbuf_release (&signature); }
@@ -497,6 +497,7 @@ static int show_one_mergetag(struct commit *commit,struct object_id oid;struct tag *tag;struct strbuf verify_message; +struct signature_check sigc = {0 };int status, nth;size_t payload_size, gpg_message_offset;
@@ -525,12 +526,13 @@ static int show_one_mergetag(struct commit *commit, status =-1 ;if (extra->len > payload_size) {/* could have a good signature */ -if (!verify_signed_buffer (extra->value, payload_size, - extra->value + payload_size, - extra->len - payload_size, - &verify_message,NULL )) +if (!check_signature (extra->value, payload_size, + extra->value + payload_size, + extra->len - payload_size, &sigc)) { +strbuf_addstr (&verify_message, sigc.gpg_output); +signature_check_clear (&sigc); status =0 ;/* good */ -else if (verify_message.len <= gpg_message_offset) + }else if (verify_message.len <= gpg_message_offset)strbuf_addstr (&verify_message,"No signature\n" );/* otherwise we couldn't verify, which is shown as bad */ }
Signature · 1 line
2.24.GIT
Quoted 9 lines · Hans Jerry Illikainen
This commit refactors the use of
verify_signed_buffer()outside ofgpg-interface.cto usecheck_signature()instead. It also turnsverify_signed_buffer()into a file-local function since it's now only invoked internally bycheck_signature().There were previously two globally scoped functions used in different parts of Git to perform GPG signature verification:
verify_signed_buffer()andcheck_signature(). Now onlycheck_signature()is used.
OK. I wondered why the former does not get removed, but if the latter uses it as its implementation detail, then it is expected that it has to remain. So check_signature() allows it to make a minimum sanity check, but it does its own verification based on the status output, and both have to pass for a signature to be valid? Which makes sense to me.
Quoted 5 lines
Now all operations that does signature verification share a single entry point to
gpg-interface.c. This makes it easier to propagate changed or additional functionality in GPG signature verification to all parts of Git, without having odd edge-cases that don't perform the same degree of verification.
Makes sense.
cover gpg-interface: prefer check_signature() for GPG verification
In reply to Hans Jerry IllikainenThis patch refactors the use of verify_signed_buffer() for GPG verification to use check_signature() instead.
Previously, both check_signature() and verify_signed_buffer() were used to verify signatures in various parts of Git. However, verify_signed_buffer() does not parse the GPG status message. Instead, it relies entirely on the exit code from GPG coupled with the existence of a GOODSIG string in the output buffer. Unfortunately, the mere prescience of GOODSIG does not necessarily imply a valid signature, as shown by Michał Górny [1].
verify_signed_buffer() should be reserved for internal use by check_signature() since check_signature() parses and verifies the status message. This is accomplished in this patch.
Changes since v0:
* Added regression tests for log-tree and fmt-merge-msg.
* Fixed a bug in log-tree.c that caused "No signature" to be shown erroneously.
* Fixed a similar bug in fmt-merge-msg.c.
* Always invoke signature_check_clear() after check_signature(). The check function may touch the signature_check structure on failure.
[1] https://dev.gentoo.org/~mgorny/articles/attack-on-git-signature-verification.html
Hans Jerry Illikainen (2):
t: increase test coverage of signature verification output
gpg-interface: prefer check_signature() for GPG verification
builtin/fmt-merge-msg.c | 11 ++-- gpg-interface.c | 97 +++++++++++++++++------------------ gpg-interface.h | 9 ---- log-tree.c | 34 ++++++------- t/t4202-log.sh | 106 +++++++++++++++++++++++++++++++++++++++ t/t6200-fmt-merge-msg.sh | 23 +++++++++ 6 files changed, 202 insertions(+), 78 deletions(-)
Signature · 1 line
2.25.1.709.g558d21736a
PATCH 1/2 t: increase test coverage of signature verification output
There weren't any tests for unsuccessful signature verification of signed merge tags shown in 'git log'. There also weren't any tests for the GPG output from 'git fmt-merge-msg'. This was noticed while investigating a buggy refactor that slipped through the test suite; see commit 72b006f4bfd30b7c5037c163efaf279ab65bea9c.
This commit adds signature verification tests to the 'log' and 'fmt-merge-msg' builtins.
Thanks to Linus Torvalds for reporting and finding the (now reverted) commit that introduced the regression.
Note that the "log --show-signature for merged tag with GPG failure" test case is really hacky. It relies on an implementation detail of verify_signed_buffer() -- namely, it assumes that the signature is written to a temporary file whose path is under TMPDIR.
The rationale for that test case is to check whether the code path that yields the "No signature" message is reachable on failure. The functionality in log-tree.c that may show this message does some pre-parsing of a possible signature that prevents the GPG interface from being invoked if a signature is actually missing. And I haven't been able to construct a signature that both 1. satisfies that pre-processing, and 2. causes GPG to fail without any sort of output on stderr along the lines of "this is a bogus/corrupt/... signature" (the "No signature" message should only be shown if GPG produce no output).
--- t/t4202-log.sh | 106 +++++++++++++++++++++++++++++++++++++++ t/t6200-fmt-merge-msg.sh | 23 +++++++++ 2 files changed, 129 insertions(+)
t/t4202-log.sh +106 -0
@@ -1607,6 +1607,67 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' ' grep "^| | gpg: Good signature" actual ' +test_expect_success GPG 'log --graph --show-signature for merged tag with missing key' ' + test_when_finished "git reset --hard && git checkout master" && + git checkout -b plain-nokey master && + echo aaa >bar && + git add bar && + git commit -m bar_commit && + git checkout -b tagged-nokey master && + echo bbb >baz && + git add baz && + git commit -m baz_commit && + git tag -s -m signed_tag_msg signed_tag_nokey && + git checkout plain-nokey && + git merge --no-ff -m msg signed_tag_nokey && + GNUPGHOME=. git log --graph --show-signature -n1 plain-nokey >actual && + grep "^|\\\ merged tag" actual && + grep "^| | gpg: Signature made" actual && + grep "^| | gpg: Can'"'"'t check signature: \(public key not found\|No public key\)" actual +' + +test_expect_success GPG 'log --graph --show-signature for merged tag with bad signature' ' + test_when_finished "git reset --hard && git checkout master" && + git checkout -b plain-bad master && + echo aaa >bar && + git add bar && + git commit -m bar_commit && + git checkout -b tagged-bad master && + echo bbb >baz && + git add baz && + git commit -m baz_commit && + git tag -s -m signed_tag_msg signed_tag_bad && + git cat-file tag signed_tag_bad >raw && + sed -e "s/signed_tag_msg/forged/" raw >forged && + git hash-object -w -t tag forged >forged.tag && + git checkout plain-bad && + git merge --no-ff -m msg "$(cat forged.tag)" && + git log --graph --show-signature -n1 plain-bad >actual && + grep "^|\\\ merged tag" actual && + grep "^| | gpg: Signature made" actual && + grep "^| | gpg: BAD signature from" actual +' + +test_expect_success GPG 'log --show-signature for merged tag with GPG failure' ' + test_when_finished "git reset --hard && git checkout master" && + git checkout -b plain-fail master && + echo aaa >bar && + git add bar && + git commit -m bar_commit && + git checkout -b tagged-fail master && + echo bbb >baz && + git add baz && + git commit -m baz_commit && + git tag -s -m signed_tag_msg signed_tag_fail && + git checkout plain-fail && + git merge --no-ff -m msg signed_tag_fail && + TMPDIR="$(pwd)/bogus" git log --show-signature -n1 plain-fail >actual && + grep "^merged tag" actual && + grep "^No signature" actual && + ! grep "^gpg: Signature made" actual +' + + test_expect_success GPG 'log --graph --show-signature for merged tag in shallow clone' ' test_when_finished "git reset --hard && git checkout master" && git checkout -b plain-shallow master &&
@@ -1648,6 +1709,51 @@ test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' ' grep "^| | gpgsm: Good signature" actual ' +test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 missing key' ' + 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-nokey master && + echo aaa >bar && + git add bar && + git commit -m bar_commit && + git checkout -b tagged-x509-nokey master && + echo bbb >baz && + git add baz && + git commit -m baz_commit && + git tag -s -m signed_tag_msg signed_tag_x509_nokey && + git checkout plain-x509-nokey && + git merge --no-ff -m msg signed_tag_x509_nokey && + GNUPGHOME=. git log --graph --show-signature -n1 plain-x509-nokey >actual && + grep "^|\\\ merged tag" actual && + grep "^| | gpgsm: certificate not found" actual +' + +test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 bad signature' ' + 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-bad master && + echo aaa >bar && + git add bar && + git commit -m bar_commit && + git checkout -b tagged-x509-bad master && + echo bbb >baz && + git add baz && + git commit -m baz_commit && + git tag -s -m signed_tag_msg signed_tag_x509_bad && + git cat-file tag signed_tag_x509_bad >raw && + sed -e "s/signed_tag_msg/forged/" raw >forged && + git hash-object -w -t tag forged >forged.tag && + git checkout plain-x509-bad && + git merge --no-ff -m msg "$(cat forged.tag)" && + git log --graph --show-signature -n1 plain-x509-bad >actual && + grep "^|\\\ merged tag" actual && + grep "^| | gpgsm: Signature made" actual && + grep "^| | gpgsm: invalid 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
t/t6200-fmt-merge-msg.sh +23 -0
@@ -6,6 +6,7 @@ test_description='fmt-merge-msg test' . ./test-lib.sh +. "$TEST_DIRECTORY/lib-gpg.sh" test_expect_success setup ' echo one >one &&
@@ -73,6 +74,10 @@ test_expect_success setup ' apos="'\''" ' +test_expect_success GPG ' + git tag -s -m signed-tag-msg signed-good-tag left +' + test_expect_success 'message for merging local branch' ' echo "Merge branch ${apos}left${apos}" >expected &&
@@ -83,6 +88,24 @@ test_expect_success 'message for merging local branch' ' test_cmp expected actual ' +test_expect_success GPG 'message for merging local tag signed by good key' ' + git checkout master && + git fetch . signed-good-tag && + git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 && + grep "^Merge tag ${apos}signed-good-tag${apos}" actual && + grep "^# gpg: Signature made" actual && + grep "^# gpg: Good signature from" actual +' + +test_expect_success GPG 'message for merging local tag signed by unknown key' ' + git checkout master && + git fetch . signed-good-tag && + GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 && + grep "^Merge tag ${apos}signed-good-tag${apos}" actual && + grep "^# gpg: Signature made" actual && + grep "^# gpg: Can${apos}t check signature: \(public key not found\|No public key\)" actual +' + test_expect_success 'message for merging external branch' ' echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
Signature · 1 line
2.25.1.709.g558d21736a
Re: [PATCH v1 1/2] t: increase test coverage of signature verification output
Hi Hans,
I was wondering why your patches made the CI/PR builds fail on macOS and Windows. This was a pretty hard thing to figure out, see below:
Quoted 13 lines · Hans Jerry Illikainen
t/t6200-fmt-merge-msg.sh +1
-0@@ -6,6 +6,7 @@ test_description='fmt-merge-msg test' . ./test-lib.sh +. "$TEST_DIRECTORY/lib-gpg.sh" test_expect_success setup ' echo one >one &&
t/t6200-fmt-merge-msg.sh test_expect_success setup ' · line 77
Quoted 4 lines
t/t6200-fmt-merge-msg.sh +1
-0@@ -73,6 +74,10 @@ test_expect_success setup ' apos="'\''" ' +test_expect_success GPG '
For developers who are very familiar with Git's test suite, it is really hard to spot what is wrong with this line, and I was fooled for quite a few days, too.
The thing is that this GPG looks like an innocent prereq and it is
correct: this test case really depends on GPG being present and working.
But it is not a prereq.
This is used as the _title_ of the test case. And on the macOS/Windows agents, the GPG prereq is not met.
The reason is that this test_expect_success call only receives two arguments, so it does not interpret the first one as a prereq. But I think that this GPG was actually intended as a prereq, so the test case's title is missing.
Could you kindly change this patch so that it adds a title, e.g. set up signed tag?
That should let the CI build pass again.
Thank you,
Dscho
Quoted 36 lines
t/t6200-fmt-merge-msg.sh +21
-1+ git tag -s -m signed-tag-msg signed-good-tag left +' + test_expect_success 'message for merging local branch' ' echo "Merge branch ${apos}left${apos}" >expected &&@@ -83,6 +88,24 @@ test_expect_success 'message for merging local branch' ' test_cmp expected actual ' +test_expect_success GPG 'message for merging local tag signed by good key' ' + git checkout master && + git fetch . signed-good-tag && + git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 && + grep "^Merge tag ${apos}signed-good-tag${apos}" actual && + grep "^# gpg: Signature made" actual && + grep "^# gpg: Good signature from" actual +' + +test_expect_success GPG 'message for merging local tag signed by unknown key' ' + git checkout master && + git fetch . signed-good-tag && + GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 && + grep "^Merge tag ${apos}signed-good-tag${apos}" actual && + grep "^# gpg: Signature made" actual && + grep "^# gpg: Can${apos}t check signature: \(public key not found\|No public key\)" actual +' + test_expect_success 'message for merging external branch' ' echo "Merge branch ${apos}left${apos} of $(pwd)" >expected && --2.25.1.709.g558d21736a
Re: [PATCH v1 1/2] t: increase test coverage of signature verification output
Quoted 17 lines · Johannes Schindelin
Hi Hans,
I was wondering why your patches made the CI/PR builds fail on macOS and Windows. This was a pretty hard thing to figure out, see below:
Quoted 10 lines · Hans Jerry Illikainen
t/t6200-fmt-merge-msg.sh +1
-0@@ -6,6 +6,7 @@ test_description='fmt-merge-msg test' . ./test-lib.sh +. "$TEST_DIRECTORY/lib-gpg.sh"
Quoted 7 lines
t/t6200-fmt-merge-msg.sh test_expect_success setup ' · line 77
Quoted 7 lines
t/t6200-fmt-merge-msg.sh +1
-0test_expect_success setup ' echo one >one &&@@ -73,6 +74,10 @@ test_expect_success setup ' apos="'\''" ' +test_expect_success GPG '
Ahh, thanks for a pair of sharp eyes.
PATCH 2/2 gpg-interface: prefer check_signature() for GPG verification
In reply to Hans Jerry IllikainenThis commit refactors the use of verify_signed_buffer() outside of gpg-interface.c to use check_signature() instead. It also turns verify_signed_buffer() into a file-local function since it's now only invoked internally by check_signature().
There were previously two globally scoped functions used in different parts of Git to perform GPG signature verification:verify_signed_buffer() and check_signature(). Now only check_signature() is used.
The verify_signed_buffer() function doesn't guard against duplicate signatures as described by Michał Górny [1]. Instead it only ensures a non-erroneous exit code from GPG and the presence of at least one GOODSIG status field. This stands in contrast with check_signature() that returns an error if more than one signature is encountered.
The lower degree of verification makes the use of verify_signed_buffer() problematic if callers don't parse and validate the various parts of the GPG status message themselves. And processing these messages seems like a task that should be reserved to gpg-interface.c with the function check_signature().
Furthermore, the use of verify_signed_buffer() makes it difficult to introduce new functionality that relies on the content of the GPG status lines.
Now all operations that does signature verification share a single entry point to gpg-interface.c. This makes it easier to propagate changed or additional functionality in GPG signature verification to all parts of Git, without having odd edge-cases that don't perform the same degree of verification.
[1] https://dev.gentoo.org/~mgorny/articles/attack-on-git-signature-verification.html
--- builtin/fmt-merge-msg.c | 11 +++-- gpg-interface.c | 97 +++++++++++++++++++++-------------------- gpg-interface.h | 9 ---- log-tree.c | 34 +++++++-------- 4 files changed, 73 insertions(+), 78 deletions(-)
builtin/fmt-merge-msg.c +7 -4
@@ -494,6 +494,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)enum object_type type;unsigned long size, len;char *buf =read_object_file (oid, &type, &size); +struct signature_check sigc = {0 };struct strbuf sig =STRBUF_INIT ;if (!buf || type !=OBJ_TAG )
@@ -502,10 +503,12 @@ static void fmt_merge_msg_sigs(struct strbuf *out)if (size == len) ;/* merely annotated */ -else if (verify_signed_buffer (buf, len, buf + len, size - len, &sig,NULL )) { -if (!sig.len) -strbuf_addstr (&sig,"gpg verification failed.\n" ); - } +else if (check_signature (buf, len, buf + len, size - len, &sigc) && + !sigc.gpg_output) +strbuf_addstr (&sig,"gpg verification failed.\n" ); +else +strbuf_addstr (&sig, sigc.gpg_output); +signature_check_clear (&sigc);if (!tag_number++) {fmt_tag_signature (&tagbuf, &sig, buf, len);
gpg-interface.c +49 -48
106 lines not on this page · raw message
gpg-interface.h +0 -9
@@ -54,15 +54,6 @@ size_t parse_signature(const char *buf, size_t size);int sign_buffer (struct strbuf *buffer,struct strbuf *signature,const char *signing_key); -/* -* Run "gpg" to see if the payload matches the detached signature. -* gpg_output, when set, receives the diagnostic output from GPG. -* gpg_status, when set, receives the status output from GPG. -*/ -int verify_signed_buffer (const char *payload,size_t payload_size, -const char *signature,size_t signature_size, -struct strbuf *gpg_output,struct strbuf *gpg_status); -int git_gpg_config (const char *,const char *,void *);void set_signing_key (const char *);const char *get_signing_key (void );
log-tree.c +17 -17
@@ -449,22 +449,21 @@ static void show_signature(struct rev_info *opt, struct commit *commit) {struct strbuf payload =STRBUF_INIT ;struct strbuf signature =STRBUF_INIT ; -struct strbuf gpg_output =STRBUF_INIT ; +struct signature_check sigc = {0 };int status;if (parse_signed_commit (commit, &payload, &signature) <=0 ) goto out; - status =verify_signed_buffer (payload.buf, payload.len, - signature.buf, signature.len, - &gpg_output,NULL ); -if (status && !gpg_output.len) -strbuf_addstr (&gpg_output,"No signature\n" ); - -show_sig_lines (opt, status, gpg_output.buf); + status =check_signature (payload.buf, payload.len, signature.buf, + signature.len, &sigc); +if (status && !sigc.gpg_output) +show_sig_lines (opt, status,"No signature\n" ); +else +show_sig_lines (opt, status, sigc.gpg_output); +signature_check_clear (&sigc); out: -strbuf_release (&gpg_output);strbuf_release (&payload);strbuf_release (&signature); }
@@ -497,8 +496,9 @@ static int show_one_mergetag(struct commit *commit,struct object_id oid;struct tag *tag;struct strbuf verify_message; +struct signature_check sigc = {0 };int status, nth; -size_t payload_size, gpg_message_offset; +size_t payload_size;hash_object_file (the_hash_algo, extra->value, extra->len,type_name (OBJ_TAG ), &oid);
@@ -520,19 +520,19 @@ static int show_one_mergetag(struct commit *commit,else strbuf_addf (&verify_message,"parent #%d, tagged '%s'\n" , nth +1 , tag->tag); - gpg_message_offset = verify_message.len; payload_size =parse_signature (extra->value, extra->len); status =-1 ;if (extra->len > payload_size) {/* could have a good signature */ -if (!verify_signed_buffer (extra->value, payload_size, - extra->value + payload_size, - extra->len - payload_size, - &verify_message,NULL )) - status =0 ;/* good */ -else if (verify_message.len <= gpg_message_offset) + status =check_signature (extra->value, payload_size, + extra->value + payload_size, + extra->len - payload_size, &sigc); +if (sigc.gpg_output) +strbuf_addstr (&verify_message, sigc.gpg_output); +else strbuf_addstr (&verify_message,"No signature\n" ); +signature_check_clear (&sigc);/* otherwise we couldn't verify, which is shown as bad */ }
Signature · 1 line
2.25.1.709.g558d21736a
Quoted 15 lines · Hans Jerry Illikainen
This patch refactors the use of
verify_signed_buffer()for GPG verification to usecheck_signature()instead.Previously, both
check_signature()andverify_signed_buffer()were used to verify signatures in various parts of Git. However,verify_signed_buffer()does not parse the GPG status message. Instead, it relies entirely on the exit code from GPG coupled with the existence of a GOODSIG string in the output buffer. Unfortunately, the mere prescience of GOODSIG does not necessarily imply a valid signature, as shown by Michał Górny [1].
verify_signed_buffer()should be reserved for internal use bycheck_signature()sincecheck_signature()parses and verifies the status message. This is accomplished in this patch.
Quoted 7 lines
Changes since v0:
* Added regression tests for log-tree and fmt-merge-msg.
* Fixed a bug inlog-tree.cthat caused "No signature" to be shown erroneously.
* Fixed a similar bug infmt-merge-msg.c.
* Always invokesignature_check_clear()aftercheck_signature(). The check function may touch thesignature_checkstructure on failure.
Thanks. Will queue. Let's cook it slower and aim for the next cycle.
Quoted 13 lines
[1] https://dev.gentoo.org/~mgorny/articles/attack-on-git-signature-verification.html
Hans Jerry Illikainen (2):
t: increase test coverage of signature verification output
gpg-interface: prefercheck_signature()for GPG verificationbuiltin/fmt-merge-msg.c | 11 ++-- gpg-interface.c | 97 +++++++++++++++++------------------ gpg-interface.h | 9 ---- log-tree.c | 34 ++++++------- t/t4202-log.sh | 106 +++++++++++++++++++++++++++++++++++++++ t/t6200-fmt-merge-msg.sh | 23 +++++++++ 6 files changed, 202 insertions(+), 78 deletions(-)
Hi Junio,
Quoted 25 lines · Junio C Hamano
Quoted 15 lines · Hans Jerry Illikainen
This patch refactors the use of
verify_signed_buffer()for GPG verification to usecheck_signature()instead.Previously, both
check_signature()andverify_signed_buffer()were used to verify signatures in various parts of Git. However,verify_signed_buffer()does not parse the GPG status message. Instead, it relies entirely on the exit code from GPG coupled with the existence of a GOODSIG string in the output buffer. Unfortunately, the mere prescience of GOODSIG does not necessarily imply a valid signature, as shown by Michał Górny [1].
verify_signed_buffer()should be reserved for internal use bycheck_signature()sincecheck_signature()parses and verifies the status message. This is accomplished in this patch.Quoted 7 lines
Changes since v0:
* Added regression tests for log-tree and fmt-merge-msg.
* Fixed a bug inlog-tree.cthat caused "No signature" to be shown erroneously.
* Fixed a similar bug infmt-merge-msg.c.
* Always invokesignature_check_clear()aftercheck_signature(). The check function may touch thesignature_checkstructure on failure.
Quoted 2 lines
Thanks. Will queue. Let's cook it slower and aim for the next cycle.
Good call about cooking this slower: it fails both on Windows and on macOS (see
https://dev.azure.com/gitgitgadget/git/_build/results?buildId=32672&view=ms.vss-test-web.build-test-results-tab&runId=101636&resultId=101463&paneView=debug
for details):
expecting success of 6200.2 'GPG':
git tag -s -m signed-tag-msg signed-good-tag left
++ git tag -s -m signed-tag-msg signed-good-tag left
error: gpg failed to sign the data
error: unable to sign the tag
error: last command exited with $?=128
Not very helpful log, I must say.
Ciao,
Dscho
Quoted 16 lines
Quoted 14 lines
[1] https://dev.gentoo.org/~mgorny/articles/attack-on-git-signature-verification.html
Hans Jerry Illikainen (2):
t: increase test coverage of signature verification output
gpg-interface: prefercheck_signature()for GPG verificationbuiltin/fmt-merge-msg.c | 11 ++-- gpg-interface.c | 97 +++++++++++++++++------------------ gpg-interface.h | 9 ---- log-tree.c | 34 ++++++------- t/t4202-log.sh | 106 +++++++++++++++++++++++++++++++++++++++ t/t6200-fmt-merge-msg.sh | 23 +++++++++ 6 files changed, 202 insertions(+), 78 deletions(-)