t7501: add tests for --amend --signoff
[git.git] / t / t7510-signed-commit.sh
blob0d2dd29fe6a12c20ffbbe169afabd4c31bc6545c
1 #!/bin/sh
3 test_description='signed commit tests'
4 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
5 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7 . ./test-lib.sh
8 GNUPGHOME_NOT_USED=$GNUPGHOME
9 . "$TEST_DIRECTORY/lib-gpg.sh"
11 test_expect_success GPG 'create signed commits' '
12 test_oid_cache <<-\EOF &&
13 header sha1:gpgsig
14 header sha256:gpgsig-sha256
15 EOF
17 test_when_finished "test_unconfig commit.gpgsign" &&
19 echo 1 >file && git add file &&
20 test_tick && git commit -S -m initial &&
21 git tag initial &&
22 git branch side &&
24 echo 2 >file && test_tick && git commit -a -S -m second &&
25 git tag second &&
27 git checkout side &&
28 echo 3 >elif && git add elif &&
29 test_tick && git commit -m "third on side" &&
31 git checkout main &&
32 test_tick && git merge -S side &&
33 git tag merge &&
35 echo 4 >file && test_tick && git commit -a -m "fourth unsigned" &&
36 git tag fourth-unsigned &&
38 test_tick && git commit --amend -S -m "fourth signed" &&
39 git tag fourth-signed &&
41 git config commit.gpgsign true &&
42 echo 5 >file && test_tick && git commit -a -m "fifth signed" &&
43 git tag fifth-signed &&
45 git config commit.gpgsign false &&
46 echo 6 >file && test_tick && git commit -a -m "sixth" &&
47 git tag sixth-unsigned &&
49 git config commit.gpgsign true &&
50 echo 7 >file && test_tick && git commit -a -m "seventh" --no-gpg-sign &&
51 git tag seventh-unsigned &&
53 test_tick && git rebase -f HEAD^^ && git tag sixth-signed HEAD^ &&
54 git tag seventh-signed &&
56 echo 8 >file && test_tick && git commit -a -m eighth -SB7227189 &&
57 git tag eighth-signed-alt &&
59 # commit.gpgsign is still on but this must not be signed
60 echo 9 | git commit-tree HEAD^{tree} >oid &&
61 test_line_count = 1 oid &&
62 git tag ninth-unsigned $(cat oid) &&
63 # explicit -S of course must sign.
64 echo 10 | git commit-tree -S HEAD^{tree} >oid &&
65 test_line_count = 1 oid &&
66 git tag tenth-signed $(cat oid) &&
68 # --gpg-sign[=<key-id>] must sign.
69 echo 11 | git commit-tree --gpg-sign HEAD^{tree} >oid &&
70 test_line_count = 1 oid &&
71 git tag eleventh-signed $(cat oid) &&
72 echo 12 | git commit-tree --gpg-sign=B7227189 HEAD^{tree} >oid &&
73 test_line_count = 1 oid &&
74 git tag twelfth-signed-alt $(cat oid)
77 test_expect_success GPG 'verify and show signatures' '
79 for commit in initial second merge fourth-signed \
80 fifth-signed sixth-signed seventh-signed tenth-signed \
81 eleventh-signed
83 git verify-commit $commit &&
84 git show --pretty=short --show-signature $commit >actual &&
85 grep "Good signature from" actual &&
86 ! grep "BAD signature from" actual &&
87 echo $commit OK || exit 1
88 done
89 ) &&
91 for commit in merge^2 fourth-unsigned sixth-unsigned \
92 seventh-unsigned ninth-unsigned
94 test_must_fail git verify-commit $commit &&
95 git show --pretty=short --show-signature $commit >actual &&
96 ! grep "Good signature from" actual &&
97 ! grep "BAD signature from" actual &&
98 echo $commit OK || exit 1
99 done
100 ) &&
102 for commit in eighth-signed-alt twelfth-signed-alt
104 git show --pretty=short --show-signature $commit >actual &&
105 grep "Good signature from" actual &&
106 ! grep "BAD signature from" actual &&
107 grep "not certified" actual &&
108 echo $commit OK || exit 1
109 done
113 test_expect_success GPG 'verify-commit exits failure on unknown signature' '
114 test_must_fail env GNUPGHOME="$GNUPGHOME_NOT_USED" git verify-commit initial 2>actual &&
115 ! grep "Good signature from" actual &&
116 ! grep "BAD signature from" actual &&
117 grep -q -F -e "No public key" -e "public key not found" actual
120 test_expect_success GPG 'verify-commit exits success on untrusted signature' '
121 git verify-commit eighth-signed-alt 2>actual &&
122 grep "Good signature from" actual &&
123 ! grep "BAD signature from" actual &&
124 grep "not certified" actual
127 test_expect_success GPG 'verify-commit exits success with matching minTrustLevel' '
128 test_config gpg.minTrustLevel ultimate &&
129 git verify-commit sixth-signed
132 test_expect_success GPG 'verify-commit exits success with low minTrustLevel' '
133 test_config gpg.minTrustLevel fully &&
134 git verify-commit sixth-signed
137 test_expect_success GPG 'verify-commit exits failure with high minTrustLevel' '
138 test_config gpg.minTrustLevel ultimate &&
139 test_must_fail git verify-commit eighth-signed-alt
142 test_expect_success GPG 'verify signatures with --raw' '
144 for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
146 git verify-commit --raw $commit 2>actual &&
147 grep "GOODSIG" actual &&
148 ! grep "BADSIG" actual &&
149 echo $commit OK || exit 1
150 done
151 ) &&
153 for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned
155 test_must_fail git verify-commit --raw $commit 2>actual &&
156 ! grep "GOODSIG" actual &&
157 ! grep "BADSIG" actual &&
158 echo $commit OK || exit 1
159 done
160 ) &&
162 for commit in eighth-signed-alt
164 git verify-commit --raw $commit 2>actual &&
165 grep "GOODSIG" actual &&
166 ! grep "BADSIG" actual &&
167 grep "TRUST_UNDEFINED" actual &&
168 echo $commit OK || exit 1
169 done
173 test_expect_success GPG 'proper header is used for hash algorithm' '
174 git cat-file commit fourth-signed >output &&
175 grep "^$(test_oid header) -----BEGIN PGP SIGNATURE-----" output
178 test_expect_success GPG 'show signed commit with signature' '
179 git show -s initial >commit &&
180 git show -s --show-signature initial >show &&
181 git verify-commit -v initial >verify.1 2>verify.2 &&
182 git cat-file commit initial >cat &&
183 grep -v -e "gpg: " -e "Warning: " show >show.commit &&
184 grep -e "gpg: " -e "Warning: " show >show.gpg &&
185 grep -v "^ " cat | grep -v "^gpgsig.* " >cat.commit &&
186 test_cmp show.commit commit &&
187 test_cmp show.gpg verify.2 &&
188 test_cmp cat.commit verify.1
191 test_expect_success GPG 'detect fudged signature' '
192 git cat-file commit seventh-signed >raw &&
193 sed -e "s/^seventh/7th forged/" raw >forged1 &&
194 git hash-object -w -t commit forged1 >forged1.commit &&
195 test_must_fail git verify-commit $(cat forged1.commit) &&
196 git show --pretty=short --show-signature $(cat forged1.commit) >actual1 &&
197 grep "BAD signature from" actual1 &&
198 ! grep "Good signature from" actual1
201 test_expect_success GPG 'detect fudged signature with NUL' '
202 git cat-file commit seventh-signed >raw &&
203 cat raw >forged2 &&
204 echo Qwik | tr "Q" "\000" >>forged2 &&
205 git hash-object --literally -w -t commit forged2 >forged2.commit &&
206 test_must_fail git verify-commit $(cat forged2.commit) &&
207 git show --pretty=short --show-signature $(cat forged2.commit) >actual2 &&
208 grep "BAD signature from" actual2 &&
209 ! grep "Good signature from" actual2
212 test_expect_success GPG 'amending already signed commit' '
213 git checkout -f fourth-signed^0 &&
214 git commit --amend -S --no-edit &&
215 git verify-commit HEAD &&
216 git show -s --show-signature HEAD >actual &&
217 grep "Good signature from" actual &&
218 ! grep "BAD signature from" actual
221 test_expect_success GPG2 'bare signature' '
222 git verify-commit fifth-signed 2>expect &&
223 echo >>expect &&
224 git log -1 --format="%GG" fifth-signed >actual &&
225 test_cmp expect actual
228 test_expect_success GPG 'show good signature with custom format' '
229 cat >expect <<-\EOF &&
231 ultimate
232 13B6F51ECDDE430D
233 C O Mitter <committer@example.com>
234 73D758744BE721698EC54E8713B6F51ECDDE430D
235 73D758744BE721698EC54E8713B6F51ECDDE430D
237 git log -1 --format="%G?%n%GT%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
238 test_cmp expect actual
241 test_expect_success GPG 'show bad signature with custom format' '
242 cat >expect <<-\EOF &&
244 undefined
245 13B6F51ECDDE430D
246 C O Mitter <committer@example.com>
250 git log -1 --format="%G?%n%GT%n%GK%n%GS%n%GF%n%GP" $(cat forged1.commit) >actual &&
251 test_cmp expect actual
254 test_expect_success GPG 'show untrusted signature with custom format' '
255 cat >expect <<-\EOF &&
257 undefined
258 65A0EEA02E30CAD7
259 Eris Discordia <discord@example.net>
260 F8364A59E07FFE9F4D63005A65A0EEA02E30CAD7
261 D4BE22311AD3131E5EDA29A461092E85B7227189
263 git log -1 --format="%G?%n%GT%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
264 test_cmp expect actual
267 test_expect_success GPG 'show untrusted signature with undefined trust level' '
268 cat >expect <<-\EOF &&
270 undefined
271 65A0EEA02E30CAD7
272 Eris Discordia <discord@example.net>
273 F8364A59E07FFE9F4D63005A65A0EEA02E30CAD7
274 D4BE22311AD3131E5EDA29A461092E85B7227189
276 git log -1 --format="%G?%n%GT%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
277 test_cmp expect actual
280 test_expect_success GPG 'show untrusted signature with ultimate trust level' '
281 cat >expect <<-\EOF &&
283 ultimate
284 13B6F51ECDDE430D
285 C O Mitter <committer@example.com>
286 73D758744BE721698EC54E8713B6F51ECDDE430D
287 73D758744BE721698EC54E8713B6F51ECDDE430D
289 git log -1 --format="%G?%n%GT%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
290 test_cmp expect actual
293 test_expect_success GPG 'show unknown signature with custom format' '
294 cat >expect <<-\EOF &&
296 undefined
297 65A0EEA02E30CAD7
302 GNUPGHOME="$GNUPGHOME_NOT_USED" git log -1 --format="%G?%n%GT%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
303 test_cmp expect actual
306 test_expect_success GPG 'show lack of signature with custom format' '
307 cat >expect <<-\EOF &&
309 undefined
315 git log -1 --format="%G?%n%GT%n%GK%n%GS%n%GF%n%GP" seventh-unsigned >actual &&
316 test_cmp expect actual
319 test_expect_success GPG 'log.showsignature behaves like --show-signature' '
320 test_config log.showsignature true &&
321 git show initial >actual &&
322 grep "gpg: Signature made" actual &&
323 grep "gpg: Good signature" actual
326 test_expect_success GPG 'check config gpg.format values' '
327 test_config gpg.format openpgp &&
328 git commit -S --amend -m "success" &&
329 test_config gpg.format OpEnPgP &&
330 test_must_fail git commit -S --amend -m "fail"
333 test_expect_success GPG 'detect fudged commit with double signature' '
334 sed -e "/gpgsig/,/END PGP/d" forged1 >double-base &&
335 sed -n -e "/gpgsig/,/END PGP/p" forged1 | \
336 sed -e "s/^$(test_oid header)//;s/^ //" | gpg --dearmor >double-sig1.sig &&
337 gpg -o double-sig2.sig -u 29472784 --detach-sign double-base &&
338 cat double-sig1.sig double-sig2.sig | gpg --enarmor >double-combined.asc &&
339 sed -e "s/^\(-.*\)ARMORED FILE/\1SIGNATURE/;1s/^/$(test_oid header) /;2,\$s/^/ /" \
340 double-combined.asc > double-gpgsig &&
341 sed -e "/committer/r double-gpgsig" double-base >double-commit &&
342 git hash-object -w -t commit double-commit >double-commit.commit &&
343 test_must_fail git verify-commit $(cat double-commit.commit) &&
344 git show --pretty=short --show-signature $(cat double-commit.commit) >double-actual &&
345 grep "BAD signature from" double-actual &&
346 grep "Good signature from" double-actual
349 test_expect_success GPG 'show double signature with custom format' '
350 cat >expect <<-\EOF &&
357 git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat double-commit.commit) >actual &&
358 test_cmp expect actual
362 # NEEDSWORK: This test relies on the test_tick commit/author dates from the first
363 # 'create signed commits' test even though it creates its own
364 test_expect_success GPG 'verify-commit verifies multiply signed commits' '
365 git init multiply-signed &&
366 cd multiply-signed &&
367 test_commit first &&
368 echo 1 >second &&
369 git add second &&
370 tree=$(git write-tree) &&
371 parent=$(git rev-parse HEAD^{commit}) &&
372 git commit --gpg-sign -m second &&
373 git cat-file commit HEAD &&
374 # Avoid trailing whitespace.
375 sed -e "s/^Q//" -e "s/^Z/ /" >commit <<-EOF &&
376 Qtree $tree
377 Qparent $parent
378 Qauthor A U Thor <author@example.com> 1112912653 -0700
379 Qcommitter C O Mitter <committer@example.com> 1112912653 -0700
380 Qgpgsig -----BEGIN PGP SIGNATURE-----
382 Q iHQEABECADQWIQRz11h0S+chaY7FTocTtvUezd5DDQUCX/uBDRYcY29tbWl0dGVy
383 Q QGV4YW1wbGUuY29tAAoJEBO29R7N3kMNd+8AoK1I8mhLHviPH+q2I5fIVgPsEtYC
384 Q AKCTqBh+VabJceXcGIZuF0Ry+udbBQ==
385 Q =tQ0N
386 Q -----END PGP SIGNATURE-----
387 Qgpgsig-sha256 -----BEGIN PGP SIGNATURE-----
389 Q iHQEABECADQWIQRz11h0S+chaY7FTocTtvUezd5DDQUCX/uBIBYcY29tbWl0dGVy
390 Q QGV4YW1wbGUuY29tAAoJEBO29R7N3kMN/NEAn0XO9RYSBj2dFyozi0JKSbssYMtO
391 Q AJwKCQ1BQOtuwz//IjU8TiS+6S4iUw==
392 Q =pIwP
393 Q -----END PGP SIGNATURE-----
395 Qsecond
397 head=$(git hash-object -t commit -w commit) &&
398 git reset --hard $head &&
399 git verify-commit $head 2>actual &&
400 grep "Good signature from" actual &&
401 ! grep "BAD signature from" actual
404 test_expect_success 'custom `gpg.program`' '
405 write_script fake-gpg <<-\EOF &&
406 args="$*"
408 # skip uninteresting options
409 while case "$1" in
410 --status-fd=*|--keyid-format=*) ;; # skip
411 *) break;;
412 esac; do shift; done
414 case "$1" in
415 -bsau)
416 test -z "$LET_GPG_PROGRAM_FAIL" || {
417 echo "zOMG signing failed!" >&2
418 exit 1
420 cat >sign.file
421 echo "[GNUPG:] SIG_CREATED $args" >&2
422 echo "-----BEGIN PGP MESSAGE-----"
423 echo "$args"
424 echo "-----END PGP MESSAGE-----"
426 --verify)
427 cat "$2" >verify.file
428 exit 0
431 echo "Unhandled args: $*" >&2
432 exit 1
434 esac
437 test_config gpg.program "$(pwd)/fake-gpg" &&
438 git commit -S --allow-empty -m signed-commit &&
439 test_path_exists sign.file &&
440 git show --show-signature &&
441 test_path_exists verify.file &&
443 test_must_fail env LET_GPG_PROGRAM_FAIL=1 \
444 git commit -S --allow-empty -m must-fail 2>err &&
445 grep zOMG err
448 test_done