2016-06-21 13:20:29 +02:00
|
|
|
#!/usr/bin/env gpgscm
|
|
|
|
|
|
|
|
;; Copyright (C) 2016 g10 Code GmbH
|
|
|
|
;;
|
|
|
|
;; This file is part of GnuPG.
|
|
|
|
;;
|
|
|
|
;; GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation; either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
;;
|
|
|
|
;; GnuPG is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
;;
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
;; along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
(load (with-path "defs.scm"))
|
2017-02-15 14:50:44 +01:00
|
|
|
(load (with-path "time.scm"))
|
2016-11-07 16:21:21 +01:00
|
|
|
(setup-environment)
|
2016-06-21 13:20:29 +02:00
|
|
|
|
2016-12-19 15:59:56 +01:00
|
|
|
(define GPGTIME 1480943782)
|
|
|
|
|
|
|
|
;; Generate a --faked-system-time parameter for a particular offset.
|
|
|
|
(define (faketime delta)
|
|
|
|
(string-append "--faked-system-time=" (number->string (+ GPGTIME delta))))
|
|
|
|
|
g10: Cache the effective policy. Recompute it when required.
* g10/tofu.c (initdb): Add column effective_policy to the bindings
table.
(record_binding): New parameters effective_policy and set_conflict.
Save the effective policy. If SET_CONFLICT is set, then set conflict
according to CONFLICT. Otherwise, preserve the current value of
conflict. Update callers.
(get_trust): Don't compute the effective policy here...
(get_policy): ... do it here, if it was not cached. Take new
parameters, PK, the public key, and NOW, the time that the operation
started. Update callers.
(show_statistics): New parameter PK. Pass it to get_policy. Update
callers.
(tofu_notice_key_changed): New function.
* g10/gpgv.c (tofu_notice_key_changed): New stub.
* g10/import.c (import_revoke_cert): Take additional argument CTRL.
Pass it to keydb_update_keyblock.
* g10/keydb.c (keydb_update_keyblock): Take additional argument CTRL.
Update callers.
[USE_TOFU]: Call tofu_notice_key_changed.
* g10/test-stubs.c (tofu_notice_key_changed): New stub.
* tests/openpgp/tofu.scm: Assume that manually setting a binding's
policy to auto does not cause the tofu engine to forget about any
conflict.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
We now store the computed policy in the tofu DB (in the
effective_policy column of the bindings table) to avoid computing it
every time, which is expensive. Further, policy is never overridden
in case of a conflict. Instead, we detect a conflict if CONFLICT is
not empty.
This change is backwards compatible to existing DBs. The only minor
incompatibility is that unresolved conflicts won't be automatically
resolved in case we import a direct signature, or cross signatures.
2016-11-21 22:47:30 +01:00
|
|
|
;; Redefine GPG without --always-trust and a fixed time.
|
2017-01-02 16:37:02 +01:00
|
|
|
(define GPG `(,(tool 'gpg) --no-permission-warning ,(faketime 0)))
|
2016-06-21 13:20:29 +02:00
|
|
|
|
|
|
|
(catch (skip "Tofu not supported")
|
|
|
|
(call-check `(,@GPG --trust-model=tofu --list-config)))
|
|
|
|
|
2017-02-28 13:20:57 +01:00
|
|
|
(let ((trust-model (gpg-config 'gpg "trust-model")))
|
|
|
|
(trust-model::update "tofu"))
|
|
|
|
|
2016-12-06 11:17:13 +01:00
|
|
|
(define KEYS '("1C005AF3" "BE04EB2B" "B662E42F"))
|
2016-06-21 13:20:29 +02:00
|
|
|
|
|
|
|
;; Import the test keys.
|
|
|
|
(for-each (lambda (keyid)
|
2016-12-06 11:17:13 +01:00
|
|
|
(call-check `(,@GPG --import
|
|
|
|
,(in-srcdir "tofu/conflicting/"
|
|
|
|
(string-append keyid ".gpg"))))
|
2016-12-06 15:21:30 +01:00
|
|
|
(catch (fail "Missing key" keyid)
|
2016-06-21 13:20:29 +02:00
|
|
|
(call-check `(,@GPG --list-keys ,keyid))))
|
|
|
|
KEYS)
|
|
|
|
|
|
|
|
;; Get tofu policy for KEYID. Any remaining arguments are simply
|
|
|
|
;; passed to GPG.
|
|
|
|
;;
|
|
|
|
;; This function only supports keys with a single user id.
|
2016-09-07 11:02:51 +02:00
|
|
|
(define (getpolicy keyid . args)
|
2016-06-21 13:20:29 +02:00
|
|
|
(let ((policy
|
2016-08-25 09:26:36 +02:00
|
|
|
(list-ref (assoc "tfs" (gpg-with-colons
|
2017-02-28 13:20:57 +01:00
|
|
|
`(--with-tofu-info
|
2016-06-21 13:20:29 +02:00
|
|
|
,@args
|
2016-08-25 09:26:36 +02:00
|
|
|
--list-keys ,keyid))) 5)))
|
2016-06-21 13:20:29 +02:00
|
|
|
(unless (member policy '("auto" "good" "unknown" "bad" "ask"))
|
2016-12-06 15:21:30 +01:00
|
|
|
(fail "Bad policy:" policy))
|
2016-06-21 13:20:29 +02:00
|
|
|
policy))
|
|
|
|
|
|
|
|
;; Check that KEYID's tofu policy matches EXPECTED-POLICY. Any
|
|
|
|
;; remaining arguments are simply passed to GPG.
|
|
|
|
;;
|
|
|
|
;; This function only supports keys with a single user id.
|
2016-09-07 11:02:51 +02:00
|
|
|
(define (checkpolicy keyid expected-policy . args)
|
|
|
|
(let ((policy (apply getpolicy `(,keyid ,@args))))
|
2016-06-21 13:20:29 +02:00
|
|
|
(unless (string=? policy expected-policy)
|
2016-12-06 15:21:30 +01:00
|
|
|
(fail keyid ": Expected policy to be" expected-policy
|
2016-06-21 13:20:29 +02:00
|
|
|
"but got" policy))))
|
|
|
|
|
|
|
|
;; Get the trust level for KEYID. Any remaining arguments are simply
|
|
|
|
;; passed to GPG.
|
|
|
|
;;
|
|
|
|
;; This function only supports keys with a single user id.
|
2016-09-07 11:02:51 +02:00
|
|
|
(define (gettrust keyid . args)
|
2016-06-21 13:20:29 +02:00
|
|
|
(let ((trust
|
|
|
|
(list-ref (assoc "pub" (gpg-with-colons
|
2017-02-28 13:20:57 +01:00
|
|
|
`(,@args
|
2016-06-21 13:20:29 +02:00
|
|
|
--list-keys ,keyid))) 1)))
|
|
|
|
(unless (and (= 1 (string-length trust))
|
|
|
|
(member (string-ref trust 0) (string->list "oidreqnmfuws-")))
|
2016-12-06 15:21:30 +01:00
|
|
|
(fail "Bad trust value:" trust))
|
2016-06-21 13:20:29 +02:00
|
|
|
trust))
|
|
|
|
|
|
|
|
;; Check that KEYID's trust level matches EXPECTED-TRUST. Any
|
|
|
|
;; remaining arguments are simply passed to GPG.
|
|
|
|
;;
|
|
|
|
;; This function only supports keys with a single user id.
|
2016-09-07 11:02:51 +02:00
|
|
|
(define (checktrust keyid expected-trust . args)
|
|
|
|
(let ((trust (apply gettrust `(,keyid ,@args))))
|
2016-06-21 13:20:29 +02:00
|
|
|
(unless (string=? trust expected-trust)
|
2016-12-06 15:21:30 +01:00
|
|
|
(fail keyid ": Expected trust to be" expected-trust
|
2016-06-21 13:20:29 +02:00
|
|
|
"but got" trust))))
|
|
|
|
|
|
|
|
;; Set key KEYID's policy to POLICY. Any remaining arguments are
|
|
|
|
;; passed as options to gpg.
|
2016-09-07 11:02:51 +02:00
|
|
|
(define (setpolicy keyid policy . args)
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG ,@args
|
2016-06-21 13:20:29 +02:00
|
|
|
--tofu-policy ,policy ,keyid)))
|
|
|
|
|
2016-09-12 11:07:48 +02:00
|
|
|
(info "Checking tofu policies and trust...")
|
|
|
|
|
|
|
|
;; Carefully remove the TOFU db.
|
2017-01-16 13:59:56 +01:00
|
|
|
(catch '() (unlink (path-join GNUPGHOME "tofu.db")))
|
2016-09-12 11:07:48 +02:00
|
|
|
|
|
|
|
;; Verify a message. There should be no conflict and the trust
|
|
|
|
;; policy should be set to auto.
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG --verify ,(in-srcdir "tofu/conflicting/1C005AF3-1.txt")))
|
2016-09-12 11:07:48 +02:00
|
|
|
|
2016-12-06 11:17:13 +01:00
|
|
|
(checkpolicy "1C005AF3" "auto")
|
2016-09-12 11:07:48 +02:00
|
|
|
;; Check default trust.
|
2016-12-06 11:17:13 +01:00
|
|
|
(checktrust "1C005AF3" "m")
|
2016-09-12 11:07:48 +02:00
|
|
|
|
|
|
|
;; Trust should be derived lazily. Thus, if the policy is set to
|
|
|
|
;; auto and we change --tofu-default-policy, then the trust should
|
|
|
|
;; change as well. Try it.
|
2016-12-06 11:17:13 +01:00
|
|
|
(checktrust "1C005AF3" "f" '--tofu-default-policy=good)
|
|
|
|
(checktrust "1C005AF3" "-" '--tofu-default-policy=unknown)
|
|
|
|
(checktrust "1C005AF3" "n" '--tofu-default-policy=bad)
|
2016-09-12 11:07:48 +02:00
|
|
|
|
|
|
|
;; Change the policy to something other than auto and make sure the
|
|
|
|
;; policy and the trust are correct.
|
2016-06-21 13:20:29 +02:00
|
|
|
(for-each-p
|
2016-09-12 11:07:48 +02:00
|
|
|
"Setting a fixed policy..."
|
|
|
|
(lambda (policy)
|
|
|
|
(let ((expected-trust
|
|
|
|
(cond
|
|
|
|
((string=? "good" policy) "f")
|
|
|
|
((string=? "unknown" policy) "-")
|
|
|
|
(else "n"))))
|
2016-12-06 11:17:13 +01:00
|
|
|
(setpolicy "1C005AF3" policy)
|
2016-09-12 11:07:48 +02:00
|
|
|
|
|
|
|
;; Since we have a fixed policy, the trust level shouldn't
|
|
|
|
;; change if we change the default policy.
|
|
|
|
(for-each-p
|
|
|
|
""
|
|
|
|
(lambda (default-policy)
|
2016-12-06 11:17:13 +01:00
|
|
|
(checkpolicy "1C005AF3" policy
|
2016-09-12 11:07:48 +02:00
|
|
|
'--tofu-default-policy default-policy)
|
2016-12-06 11:17:13 +01:00
|
|
|
(checktrust "1C005AF3" expected-trust
|
2016-09-12 11:07:48 +02:00
|
|
|
'--tofu-default-policy default-policy))
|
|
|
|
'("auto" "good" "unknown" "bad" "ask"))))
|
|
|
|
'("good" "unknown" "bad"))
|
|
|
|
|
2016-12-06 11:17:13 +01:00
|
|
|
;; At the end, 1C005AF3's policy should be bad.
|
|
|
|
(checkpolicy "1C005AF3" "bad")
|
g10: Cache the effective policy. Recompute it when required.
* g10/tofu.c (initdb): Add column effective_policy to the bindings
table.
(record_binding): New parameters effective_policy and set_conflict.
Save the effective policy. If SET_CONFLICT is set, then set conflict
according to CONFLICT. Otherwise, preserve the current value of
conflict. Update callers.
(get_trust): Don't compute the effective policy here...
(get_policy): ... do it here, if it was not cached. Take new
parameters, PK, the public key, and NOW, the time that the operation
started. Update callers.
(show_statistics): New parameter PK. Pass it to get_policy. Update
callers.
(tofu_notice_key_changed): New function.
* g10/gpgv.c (tofu_notice_key_changed): New stub.
* g10/import.c (import_revoke_cert): Take additional argument CTRL.
Pass it to keydb_update_keyblock.
* g10/keydb.c (keydb_update_keyblock): Take additional argument CTRL.
Update callers.
[USE_TOFU]: Call tofu_notice_key_changed.
* g10/test-stubs.c (tofu_notice_key_changed): New stub.
* tests/openpgp/tofu.scm: Assume that manually setting a binding's
policy to auto does not cause the tofu engine to forget about any
conflict.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
We now store the computed policy in the tofu DB (in the
effective_policy column of the bindings table) to avoid computing it
every time, which is expensive. Further, policy is never overridden
in case of a conflict. Instead, we detect a conflict if CONFLICT is
not empty.
This change is backwards compatible to existing DBs. The only minor
incompatibility is that unresolved conflicts won't be automatically
resolved in case we import a direct signature, or cross signatures.
2016-11-21 22:47:30 +01:00
|
|
|
|
2016-12-06 11:17:13 +01:00
|
|
|
;; 1C005AF3 and BE04EB2B conflict. A policy setting of "auto"
|
|
|
|
;; (BE04EB2B's state) will result in an effective policy of ask. But,
|
g10: Cache the effective policy. Recompute it when required.
* g10/tofu.c (initdb): Add column effective_policy to the bindings
table.
(record_binding): New parameters effective_policy and set_conflict.
Save the effective policy. If SET_CONFLICT is set, then set conflict
according to CONFLICT. Otherwise, preserve the current value of
conflict. Update callers.
(get_trust): Don't compute the effective policy here...
(get_policy): ... do it here, if it was not cached. Take new
parameters, PK, the public key, and NOW, the time that the operation
started. Update callers.
(show_statistics): New parameter PK. Pass it to get_policy. Update
callers.
(tofu_notice_key_changed): New function.
* g10/gpgv.c (tofu_notice_key_changed): New stub.
* g10/import.c (import_revoke_cert): Take additional argument CTRL.
Pass it to keydb_update_keyblock.
* g10/keydb.c (keydb_update_keyblock): Take additional argument CTRL.
Update callers.
[USE_TOFU]: Call tofu_notice_key_changed.
* g10/test-stubs.c (tofu_notice_key_changed): New stub.
* tests/openpgp/tofu.scm: Assume that manually setting a binding's
policy to auto does not cause the tofu engine to forget about any
conflict.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
We now store the computed policy in the tofu DB (in the
effective_policy column of the bindings table) to avoid computing it
every time, which is expensive. Further, policy is never overridden
in case of a conflict. Instead, we detect a conflict if CONFLICT is
not empty.
This change is backwards compatible to existing DBs. The only minor
incompatibility is that unresolved conflicts won't be automatically
resolved in case we import a direct signature, or cross signatures.
2016-11-21 22:47:30 +01:00
|
|
|
;; a policy setting of "bad" will result in an effective policy of
|
|
|
|
;; bad.
|
2016-12-06 11:17:13 +01:00
|
|
|
(setpolicy "BE04EB2B" "auto")
|
|
|
|
(checkpolicy "BE04EB2B" "ask")
|
|
|
|
(checkpolicy "1C005AF3" "bad")
|
|
|
|
|
|
|
|
;; 1C005AF3, B662E42F, and BE04EB2B conflict. We change BE04EB2B's
|
|
|
|
;; policy to auto and leave 1C005AF3's policy at bad. This conflict
|
|
|
|
;; should cause BE04EB2B's effective policy to be ask (since it is
|
|
|
|
;; auto), but not affect 1C005AF3's policy.
|
|
|
|
(setpolicy "BE04EB2B" "auto")
|
|
|
|
(checkpolicy "BE04EB2B" "ask")
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG --verify ,(in-srcdir "tofu/conflicting/B662E42F-1.txt")))
|
2016-12-06 11:17:13 +01:00
|
|
|
(checkpolicy "BE04EB2B" "ask")
|
|
|
|
(checkpolicy "1C005AF3" "bad")
|
|
|
|
(checkpolicy "B662E42F" "ask")
|
2016-10-13 12:44:59 +02:00
|
|
|
|
2016-12-06 12:05:45 +01:00
|
|
|
;; Check that the stats are emitted correctly.
|
|
|
|
|
|
|
|
(display "Checking TOFU stats...\n")
|
|
|
|
|
2016-12-19 15:59:56 +01:00
|
|
|
(define (check-counts keyid expected-sigs expected-sig-days
|
|
|
|
expected-encs expected-enc-days . args)
|
2016-12-06 12:05:45 +01:00
|
|
|
(let*
|
|
|
|
((tfs (assoc "tfs"
|
|
|
|
(gpg-with-colons
|
2017-02-28 13:20:57 +01:00
|
|
|
`(--with-tofu-info ,@args --list-keys ,keyid))))
|
2016-12-06 12:05:45 +01:00
|
|
|
(sigs (string->number (list-ref tfs 3)))
|
2016-12-19 15:59:56 +01:00
|
|
|
(sig-days (string->number (list-ref tfs 11)))
|
|
|
|
(encs (string->number (list-ref tfs 4)))
|
|
|
|
(enc-days (string->number (list-ref tfs 12)))
|
|
|
|
)
|
|
|
|
; (display keyid) (display ": ") (display tfs) (display "\n")
|
2016-12-06 12:05:45 +01:00
|
|
|
(unless (= sigs expected-sigs)
|
2016-12-06 15:21:30 +01:00
|
|
|
(fail keyid ": # signatures (" sigs ") does not match expected"
|
2016-12-06 12:05:45 +01:00
|
|
|
"# signatures (" expected-sigs ").\n"))
|
2016-12-19 15:59:56 +01:00
|
|
|
(unless (= sig-days expected-sig-days)
|
|
|
|
(fail keyid ": # signature days (" sig-days ")"
|
|
|
|
"does not match expected"
|
|
|
|
"# signature days (" expected-sig-days ").\n"))
|
2016-12-06 12:05:45 +01:00
|
|
|
(unless (= encs expected-encs)
|
2016-12-06 15:21:30 +01:00
|
|
|
(fail keyid ": # encryptions (" encs ") does not match expected"
|
2016-12-06 12:05:45 +01:00
|
|
|
"# encryptions (" expected-encs ").\n"))
|
2016-12-19 15:59:56 +01:00
|
|
|
(unless (= enc-days expected-enc-days)
|
|
|
|
(fail keyid ": # encryption days (" encs ")"
|
|
|
|
"does not match expected"
|
|
|
|
"# encryption days (" expected-enc-days ").\n"))
|
2016-12-06 12:05:45 +01:00
|
|
|
))
|
|
|
|
|
|
|
|
;; Carefully remove the TOFU db.
|
2017-01-16 13:59:56 +01:00
|
|
|
(catch '() (unlink (path-join GNUPGHOME "tofu.db")))
|
2016-12-06 12:05:45 +01:00
|
|
|
|
2016-12-19 15:59:56 +01:00
|
|
|
(check-counts "1C005AF3" 0 0 0 0)
|
|
|
|
(check-counts "BE04EB2B" 0 0 0 0)
|
|
|
|
(check-counts "B662E42F" 0 0 0 0)
|
2016-12-06 12:05:45 +01:00
|
|
|
|
|
|
|
;; Verify a message. The signature count should increase by 1.
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG --verify ,(in-srcdir "tofu/conflicting/1C005AF3-1.txt")))
|
2016-12-19 15:59:56 +01:00
|
|
|
|
|
|
|
(check-counts "1C005AF3" 1 1 0 0)
|
2016-12-06 12:05:45 +01:00
|
|
|
|
|
|
|
;; Verify the same message. The signature count should remain the
|
|
|
|
;; same.
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG --verify ,(in-srcdir "tofu/conflicting/1C005AF3-1.txt")))
|
2016-12-19 15:59:56 +01:00
|
|
|
(check-counts "1C005AF3" 1 1 0 0)
|
2016-12-06 12:05:45 +01:00
|
|
|
|
|
|
|
;; Verify another message.
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG --verify ,(in-srcdir "tofu/conflicting/1C005AF3-2.txt")))
|
2016-12-19 15:59:56 +01:00
|
|
|
(check-counts "1C005AF3" 2 1 0 0)
|
2016-12-06 12:05:45 +01:00
|
|
|
|
|
|
|
;; Verify another message.
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG --verify ,(in-srcdir "tofu/conflicting/1C005AF3-3.txt")))
|
2016-12-19 15:59:56 +01:00
|
|
|
(check-counts "1C005AF3" 3 1 0 0)
|
2016-12-06 12:05:45 +01:00
|
|
|
|
|
|
|
;; Verify a message from a different sender. The signature count
|
|
|
|
;; should increase by 1 for that key.
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG --verify ,(in-srcdir "tofu/conflicting/BE04EB2B-1.txt")))
|
2016-12-19 15:59:56 +01:00
|
|
|
(check-counts "1C005AF3" 3 1 0 0)
|
|
|
|
(check-counts "BE04EB2B" 1 1 0 0)
|
|
|
|
(check-counts "B662E42F" 0 0 0 0)
|
|
|
|
|
|
|
|
;; Verify another message on a new day. (Recall: we are interested in
|
|
|
|
;; when the message was first verified, not when the signer claimed
|
|
|
|
;; that it was signed.)
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG ,(faketime (days->seconds 2))
|
2016-12-19 15:59:56 +01:00
|
|
|
--verify ,(in-srcdir "tofu/conflicting/1C005AF3-4.txt")))
|
|
|
|
(check-counts "1C005AF3" 4 2 0 0)
|
|
|
|
(check-counts "BE04EB2B" 1 1 0 0)
|
|
|
|
(check-counts "B662E42F" 0 0 0 0)
|
|
|
|
|
|
|
|
;; And another.
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG ,(faketime (days->seconds 2))
|
2016-12-19 15:59:56 +01:00
|
|
|
--verify ,(in-srcdir "tofu/conflicting/1C005AF3-5.txt")))
|
|
|
|
(check-counts "1C005AF3" 5 2 0 0)
|
|
|
|
(check-counts "BE04EB2B" 1 1 0 0)
|
|
|
|
(check-counts "B662E42F" 0 0 0 0)
|
|
|
|
|
|
|
|
;; Another, but for a different key.
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG ,(faketime (days->seconds 2))
|
2016-12-19 15:59:56 +01:00
|
|
|
--verify ,(in-srcdir "tofu/conflicting/BE04EB2B-2.txt")))
|
|
|
|
(check-counts "1C005AF3" 5 2 0 0)
|
|
|
|
(check-counts "BE04EB2B" 2 2 0 0)
|
|
|
|
(check-counts "B662E42F" 0 0 0 0)
|
|
|
|
|
|
|
|
;; And add a third day.
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG ,(faketime (days->seconds 4))
|
2016-12-19 15:59:56 +01:00
|
|
|
--verify ,(in-srcdir "tofu/conflicting/BE04EB2B-3.txt")))
|
|
|
|
(check-counts "1C005AF3" 5 2 0 0)
|
|
|
|
(check-counts "BE04EB2B" 3 3 0 0)
|
|
|
|
(check-counts "B662E42F" 0 0 0 0)
|
|
|
|
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG ,(faketime (days->seconds 4))
|
2016-12-19 15:59:56 +01:00
|
|
|
--verify ,(in-srcdir "tofu/conflicting/BE04EB2B-4.txt")))
|
|
|
|
(check-counts "1C005AF3" 5 2 0 0)
|
|
|
|
(check-counts "BE04EB2B" 4 3 0 0)
|
|
|
|
(check-counts "B662E42F" 0 0 0 0)
|
2016-10-13 12:44:59 +02:00
|
|
|
|
|
|
|
;; Check that we detect the following attack:
|
|
|
|
;;
|
|
|
|
;; Alice and Bob each have a key and cross sign them. Bob then adds a
|
|
|
|
;; new user id, "Alice". TOFU should now detect a conflict, because
|
|
|
|
;; Alice only signed Bob's "Bob" user id.
|
|
|
|
|
|
|
|
(display "Checking cross sigs...\n")
|
|
|
|
(define GPG `(,(tool 'gpg) --no-permission-warning
|
|
|
|
--faked-system-time=1476304861))
|
|
|
|
|
|
|
|
;; Carefully remove the TOFU db.
|
2017-01-16 13:59:56 +01:00
|
|
|
(catch '() (unlink (path-join GNUPGHOME "tofu.db")))
|
2016-10-13 12:44:59 +02:00
|
|
|
|
|
|
|
(define DIR "tofu/cross-sigs")
|
|
|
|
;; The test keys.
|
|
|
|
(define KEYA "1938C3A0E4674B6C217AC0B987DB2814EC38277E")
|
|
|
|
(define KEYB "DC463A16E42F03240D76E8BA8B48C6BD871C2247")
|
2016-10-13 21:38:50 +02:00
|
|
|
(define KEYIDA (substring KEYA (- (string-length KEYA) 8)))
|
|
|
|
(define KEYIDB (substring KEYB (- (string-length KEYB) 8)))
|
2016-10-13 12:44:59 +02:00
|
|
|
|
|
|
|
(define (verify-messages)
|
|
|
|
(for-each
|
|
|
|
(lambda (key)
|
|
|
|
(for-each
|
|
|
|
(lambda (i)
|
|
|
|
(let ((fn (in-srcdir DIR (string-append key "-" i ".txt"))))
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG --verify ,fn))))
|
2016-10-13 12:44:59 +02:00
|
|
|
(list "1" "2")))
|
2016-10-13 21:38:50 +02:00
|
|
|
(list KEYIDA KEYIDB)))
|
2016-10-13 12:44:59 +02:00
|
|
|
|
|
|
|
;; Import the public keys.
|
|
|
|
(display " > Two keys. ")
|
2016-10-13 21:38:50 +02:00
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDA "-1.gpg"))))
|
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-1.gpg"))))
|
2016-10-13 12:44:59 +02:00
|
|
|
;; Make sure the tofu engine registers the keys.
|
|
|
|
(verify-messages)
|
|
|
|
(display "<\n")
|
|
|
|
|
2016-10-13 20:54:06 +02:00
|
|
|
;; Since there is no conflict, the policy should be auto.
|
2016-10-13 12:44:59 +02:00
|
|
|
(checkpolicy KEYA "auto")
|
|
|
|
(checkpolicy KEYB "auto")
|
|
|
|
|
|
|
|
;; Import the cross sigs.
|
|
|
|
(display " > Adding cross signatures. ")
|
2016-10-13 21:38:50 +02:00
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDA "-2.gpg"))))
|
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-2.gpg"))))
|
2016-10-13 12:44:59 +02:00
|
|
|
(verify-messages)
|
|
|
|
(display "<\n")
|
|
|
|
|
|
|
|
;; There is still no conflict, so the policy shouldn't have changed.
|
|
|
|
(checkpolicy KEYA "auto")
|
|
|
|
(checkpolicy KEYB "auto")
|
|
|
|
|
|
|
|
;; Import the conflicting user id.
|
|
|
|
(display " > Adding conflicting user id. ")
|
2016-10-13 21:38:50 +02:00
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-3.gpg"))))
|
2016-10-13 12:44:59 +02:00
|
|
|
(verify-messages)
|
|
|
|
(display "<\n")
|
|
|
|
|
|
|
|
(checkpolicy KEYA "ask")
|
|
|
|
(checkpolicy KEYB "ask")
|
|
|
|
|
g10: Cache the effective policy. Recompute it when required.
* g10/tofu.c (initdb): Add column effective_policy to the bindings
table.
(record_binding): New parameters effective_policy and set_conflict.
Save the effective policy. If SET_CONFLICT is set, then set conflict
according to CONFLICT. Otherwise, preserve the current value of
conflict. Update callers.
(get_trust): Don't compute the effective policy here...
(get_policy): ... do it here, if it was not cached. Take new
parameters, PK, the public key, and NOW, the time that the operation
started. Update callers.
(show_statistics): New parameter PK. Pass it to get_policy. Update
callers.
(tofu_notice_key_changed): New function.
* g10/gpgv.c (tofu_notice_key_changed): New stub.
* g10/import.c (import_revoke_cert): Take additional argument CTRL.
Pass it to keydb_update_keyblock.
* g10/keydb.c (keydb_update_keyblock): Take additional argument CTRL.
Update callers.
[USE_TOFU]: Call tofu_notice_key_changed.
* g10/test-stubs.c (tofu_notice_key_changed): New stub.
* tests/openpgp/tofu.scm: Assume that manually setting a binding's
policy to auto does not cause the tofu engine to forget about any
conflict.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
We now store the computed policy in the tofu DB (in the
effective_policy column of the bindings table) to avoid computing it
every time, which is expensive. Further, policy is never overridden
in case of a conflict. Instead, we detect a conflict if CONFLICT is
not empty.
This change is backwards compatible to existing DBs. The only minor
incompatibility is that unresolved conflicts won't be automatically
resolved in case we import a direct signature, or cross signatures.
2016-11-21 22:47:30 +01:00
|
|
|
;; Import Alice's signature on the conflicting user id. Since there
|
|
|
|
;; is now a cross signature, we should revert to the default policy.
|
2016-10-13 12:44:59 +02:00
|
|
|
(display " > Adding cross signature on user id. ")
|
2016-10-13 21:38:50 +02:00
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-4.gpg"))))
|
2016-10-13 12:44:59 +02:00
|
|
|
(verify-messages)
|
|
|
|
(display "<\n")
|
|
|
|
|
|
|
|
(checkpolicy KEYA "auto")
|
|
|
|
(checkpolicy KEYB "auto")
|
2016-10-13 20:54:06 +02:00
|
|
|
|
|
|
|
;; Remove the keys.
|
|
|
|
(call-check `(,@GPG --delete-key ,KEYA))
|
|
|
|
(call-check `(,@GPG --delete-key ,KEYB))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check that we detect the following attack:
|
|
|
|
;;
|
|
|
|
;; Alice has an ultimately trusted key and she signs Bob's key. Then
|
|
|
|
;; Bob adds a new user id, "Alice". TOFU should now detect a
|
|
|
|
;; conflict, because Alice only signed Bob's "Bob" user id.
|
2016-11-22 15:05:59 +01:00
|
|
|
;;
|
|
|
|
;;
|
|
|
|
;; The Alice key:
|
|
|
|
;; pub rsa2048 2016-10-11 [SC]
|
|
|
|
;; 1938C3A0E4674B6C217AC0B987DB2814EC38277E
|
|
|
|
;; uid [ultimate] Spy Cow <spy@cow.com>
|
|
|
|
;; sub rsa2048 2016-10-11 [E]
|
|
|
|
;;
|
|
|
|
;; The Bob key:
|
|
|
|
;;
|
|
|
|
;; pub rsa2048 2016-10-11 [SC]
|
|
|
|
;; DC463A16E42F03240D76E8BA8B48C6BD871C2247
|
|
|
|
;; uid [ full ] Spy R. Cow <spy@cow.com>
|
|
|
|
;; uid [ full ] Spy R. Cow <spy@cow.de>
|
|
|
|
;; sub rsa2048 2016-10-11 [E]
|
2016-10-13 20:54:06 +02:00
|
|
|
|
|
|
|
(display "Checking UTK sigs...\n")
|
|
|
|
(define GPG `(,(tool 'gpg) --no-permission-warning
|
|
|
|
--faked-system-time=1476304861))
|
|
|
|
|
|
|
|
;; Carefully remove the TOFU db.
|
2017-01-16 13:59:56 +01:00
|
|
|
(catch '() (unlink (path-join GNUPGHOME "tofu.db")))
|
2016-10-13 20:54:06 +02:00
|
|
|
|
|
|
|
(define DIR "tofu/cross-sigs")
|
|
|
|
;; The test keys.
|
|
|
|
(define KEYA "1938C3A0E4674B6C217AC0B987DB2814EC38277E")
|
|
|
|
(define KEYB "DC463A16E42F03240D76E8BA8B48C6BD871C2247")
|
2016-10-13 21:38:50 +02:00
|
|
|
(define KEYIDA (substring KEYA (- (string-length KEYA) 8)))
|
|
|
|
(define KEYIDB (substring KEYB (- (string-length KEYB) 8)))
|
2016-10-13 20:54:06 +02:00
|
|
|
|
|
|
|
(define (verify-messages)
|
|
|
|
(for-each
|
|
|
|
(lambda (key)
|
|
|
|
(for-each
|
|
|
|
(lambda (i)
|
|
|
|
(let ((fn (in-srcdir DIR (string-append key "-" i ".txt"))))
|
2017-02-28 13:20:57 +01:00
|
|
|
(call-check `(,@GPG --verify ,fn))))
|
2016-10-13 20:54:06 +02:00
|
|
|
(list "1" "2")))
|
2016-10-13 21:38:50 +02:00
|
|
|
(list KEYIDA KEYIDB)))
|
2016-10-13 20:54:06 +02:00
|
|
|
|
|
|
|
;; Import the public keys.
|
|
|
|
(display " > Two keys. ")
|
2016-10-13 21:38:50 +02:00
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDA "-1.gpg"))))
|
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-1.gpg"))))
|
2016-10-13 20:54:06 +02:00
|
|
|
(display "<\n")
|
|
|
|
|
2016-11-22 15:05:59 +01:00
|
|
|
(checkpolicy KEYA "auto")
|
|
|
|
(checkpolicy KEYB "auto")
|
|
|
|
|
2016-10-13 20:54:06 +02:00
|
|
|
;; Import the cross sigs.
|
|
|
|
(display " > Adding cross signatures. ")
|
2016-10-13 21:38:50 +02:00
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDA "-2.gpg"))))
|
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-2.gpg"))))
|
2016-10-13 20:54:06 +02:00
|
|
|
(display "<\n")
|
|
|
|
|
2016-11-22 15:05:59 +01:00
|
|
|
(checkpolicy KEYA "auto")
|
|
|
|
(checkpolicy KEYB "auto")
|
|
|
|
|
2016-10-13 20:54:06 +02:00
|
|
|
;; Make KEYA ultimately trusted.
|
|
|
|
(display (string-append " > Marking " KEYA " as ultimately trusted. "))
|
|
|
|
(pipe:do
|
|
|
|
(pipe:echo (string-append KEYA ":6:\n"))
|
|
|
|
(pipe:gpg `(--import-ownertrust)))
|
|
|
|
(display "<\n")
|
|
|
|
|
|
|
|
;; An ultimately trusted key's policy is good.
|
|
|
|
(checkpolicy KEYA "good")
|
|
|
|
;; A key signed by a UTK for which there is no policy gets the default
|
|
|
|
;; policy of good.
|
|
|
|
(checkpolicy KEYB "good")
|
|
|
|
|
|
|
|
;; Import the conflicting user id.
|
|
|
|
(display " > Adding conflicting user id. ")
|
2016-10-13 21:38:50 +02:00
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-3.gpg"))))
|
2016-10-13 20:54:06 +02:00
|
|
|
(verify-messages)
|
|
|
|
(display "<\n")
|
|
|
|
|
|
|
|
(checkpolicy KEYA "good")
|
|
|
|
(checkpolicy KEYB "ask")
|
|
|
|
|
|
|
|
;; Import Alice's signature on the conflicting user id.
|
|
|
|
(display " > Adding cross signature on user id. ")
|
2016-10-13 21:38:50 +02:00
|
|
|
(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-4.gpg"))))
|
2016-10-13 20:54:06 +02:00
|
|
|
(verify-messages)
|
|
|
|
(display "<\n")
|
|
|
|
|
|
|
|
(checkpolicy KEYA "good")
|
|
|
|
(checkpolicy KEYB "good")
|
|
|
|
|
|
|
|
;; Remove the keys.
|
|
|
|
(call-check `(,@GPG --delete-key ,KEYA))
|
|
|
|
(call-check `(,@GPG --delete-key ,KEYB))
|