mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-29 02:22:45 +02:00
![Ingo Klöcker](/assets/img/avatar_default.png)
* g10/keyedit.c (find_userid_by_namehash, find_userid): New.
(keyedit_quick_revuid): Use find_userid() instead of iterating over the
nodes of the keyblock.
* tests/openpgp/quick-key-manipulation.scm: Add test for revoking a
user ID specified by its hash.
--
This makes it possible to specify the user ID to revoke as UID hash when
calling --quick-revoke-uid.
GnuPG-bug-id: 5936
(cherry picked from commit 35b1755070
)
229 lines
7.9 KiB
Scheme
Executable File
229 lines
7.9 KiB
Scheme
Executable File
#!/usr/bin/env gpgscm
|
|
|
|
;; Copyright (C) 2016-2017 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 (in-srcdir "tests" "openpgp" "defs.scm"))
|
|
(load (with-path "time.scm"))
|
|
(setup-environment)
|
|
|
|
(define (exact id)
|
|
(string-append "=" id))
|
|
|
|
(define (count-uids-of-secret-key id)
|
|
(length (filter (lambda (x) (and (string=? "uid" (car x))
|
|
(not (string=? "r" (cadr x)))))
|
|
(gpg-with-colons
|
|
`(--with-fingerprint
|
|
--list-secret-keys ,(exact id))))))
|
|
|
|
(define alpha "Alpha <alpha@invalid.example.net>")
|
|
(define bravo "Bravo <bravo@invalid.example.net>")
|
|
(define charlie "Charlie <charlie@invalid.example.net>")
|
|
(define delta "Delta <delta@invalid.example.net>")
|
|
(define deltahash "359DC5EFF98B14A58AAA615C638E8BD0CEDA537B")
|
|
|
|
(define (key-data key)
|
|
(filter (lambda (x) (or (string=? (car x) "pub")
|
|
(string=? (car x) "sub")))
|
|
(gpg-with-colons `(-k ,key))))
|
|
|
|
(setenv "PINENTRY_USER_DATA" "test" #t)
|
|
|
|
(info "Checking quick key generation...")
|
|
(call-check `(,@GPG --quick-generate-key ,alpha))
|
|
|
|
(define keyinfo (gpg-with-colons `(-k ,(exact alpha))))
|
|
(define fpr (:fpr (assoc "fpr" keyinfo)))
|
|
|
|
(assert (= 1 (count-uids-of-secret-key alpha)))
|
|
(assert (not (equal? "" (:expire (assoc "pub" keyinfo)))))
|
|
|
|
(info "Checking that we can add a user ID...")
|
|
|
|
;; Make sure the key capabilities don't change when we add a user id.
|
|
;; (See bug #2697.)
|
|
(let ((pre (key-data (exact alpha)))
|
|
(result (call-check `(,@GPG --quick-add-uid ,(exact alpha) ,bravo)))
|
|
(post (key-data (exact alpha))))
|
|
(if (not (equal? pre post))
|
|
(begin
|
|
(display "Key capabilities changed when adding a user id:")
|
|
(newline)
|
|
(display " Pre: ")
|
|
(display pre)
|
|
(newline)
|
|
(display " Post: ")
|
|
(display post)
|
|
(newline)
|
|
(exit 1))))
|
|
|
|
(assert (= 2 (count-uids-of-secret-key alpha)))
|
|
(assert (= 2 (count-uids-of-secret-key bravo)))
|
|
|
|
(info "Checking that we can mark an user ID as primary.")
|
|
(call-check `(,@gpg --quick-set-primary-uid ,(exact alpha) ,alpha))
|
|
(call-check `(,@gpg --quick-set-primary-uid ,(exact alpha) ,bravo))
|
|
;; XXX I don't know how to verify this. The keylisting does not seem
|
|
;; to indicate the primary UID.
|
|
|
|
(info "Checking that we get an error making non-existent user ID the primary one.")
|
|
(catch '()
|
|
(call-check `(,@GPG --quick-set-primary-uid ,(exact alpha) ,charlie))
|
|
(error "Expected an error, but get none."))
|
|
|
|
(info "Checking that we can revoke a user ID...")
|
|
(call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,alpha))
|
|
|
|
(info "Checking that we can revoke a user ID by its hash...")
|
|
(call-check `(,@GPG --quick-add-uid ,(exact bravo) ,delta))
|
|
(call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,deltahash))
|
|
|
|
(info "Checking that we get an error revoking a non-existent user ID.")
|
|
(catch '()
|
|
(call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,charlie))
|
|
(error "Expected an error, but get none."))
|
|
|
|
(info "Checking that we get an error revoking the last valid user ID.")
|
|
(catch '()
|
|
(call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,bravo))
|
|
(error "Expected an error, but get none."))
|
|
|
|
(assert (= 1 (count-uids-of-secret-key bravo)))
|
|
|
|
(info "Checking that we can change the expiration time.")
|
|
|
|
(define (expiration-time id)
|
|
(:expire (assoc "pub" (gpg-with-colons `(-k ,id)))))
|
|
|
|
;; Remove the expiration date.
|
|
(call-check `(,@gpg --quick-set-expire ,fpr "0"))
|
|
(assert (equal? "" (expiration-time fpr)))
|
|
|
|
;; Make the key expire in one year.
|
|
(call-check `(,@gpg --quick-set-expire ,fpr "1y"))
|
|
(assert (time-matches? (+ (get-time) (years->seconds 1))
|
|
(string->number (expiration-time fpr))
|
|
(minutes->seconds 5)))
|
|
|
|
|
|
;;
|
|
;; Check --quick-addkey
|
|
;;
|
|
|
|
;; Get the subkeys.
|
|
(define (get-subkeys)
|
|
(filter (lambda (x) (equal? "sub" (car x)))
|
|
(gpg-with-colons `(-k ,fpr))))
|
|
|
|
;; This keeps track of the number of subkeys.
|
|
(define count (length (get-subkeys)))
|
|
|
|
(for-each-p
|
|
"Checking that we can add subkeys..."
|
|
(lambda (args check)
|
|
(set! count (+ 1 count))
|
|
(call-check `(,@gpg --quick-add-key ,fpr ,@args))
|
|
(let ((subkeys (get-subkeys)))
|
|
(assert (= count (length subkeys)))
|
|
(if check (check (last subkeys)))))
|
|
;; A bunch of arguments...
|
|
'(()
|
|
(- - -)
|
|
(default default never)
|
|
(rsa "sign auth encr" "seconds=600") ;; GPGME uses this
|
|
(rsa "auth,encr" "2") ;; "without a letter, days is assumed"
|
|
;; Sadly, the timestamp is truncated by the use of time_t on
|
|
;; systems where time_t is a signed 32 bit value.
|
|
(rsa "sign" "2038-01-01") ;; unix millennium
|
|
(rsa "sign" "20380101T115500") ;; unix millennium
|
|
;; Once fixed, we can use later timestamps:
|
|
;; (rsa "sign" "2105-01-01") ;; "last year GnuPG can represent is 2105"
|
|
;; (rsa "sign" "21050101T115500") ;; "last year GnuPG can represent is 2105"
|
|
(rsa sign "2d")
|
|
(rsa1024 sign "2w")
|
|
(rsa2048 encr "2m")
|
|
(rsa4096 sign,auth "2y")
|
|
(future-default))
|
|
;; ... with functions to check that the created key matches the
|
|
;; expectations (or #f for no tests).
|
|
(list
|
|
#f
|
|
#f
|
|
(lambda (subkey)
|
|
(assert (equal? "" (:expire subkey))))
|
|
(lambda (subkey)
|
|
(assert (= 1 (:alg subkey)))
|
|
(assert (string-contains? (:cap subkey) "s"))
|
|
(assert (string-contains? (:cap subkey) "a"))
|
|
(assert (string-contains? (:cap subkey) "e"))
|
|
(assert (time-matches? (+ (get-time) 600)
|
|
(string->number (:expire subkey))
|
|
(minutes->seconds 5))))
|
|
(lambda (subkey)
|
|
(assert (= 1 (:alg subkey)))
|
|
(assert (string-contains? (:cap subkey) "a"))
|
|
(assert (string-contains? (:cap subkey) "e"))
|
|
(assert (time-matches? (+ (get-time) (days->seconds 2))
|
|
(string->number (:expire subkey))
|
|
(minutes->seconds 5))))
|
|
(lambda (subkey)
|
|
(assert (= 1 (:alg subkey)))
|
|
(assert (string-contains? (:cap subkey) "s"))
|
|
(assert (time-matches? 2145960000 ;; UTC 2038-01-01 12:00:00
|
|
;; 4260254400 ;; UTC 2105-01-01 12:00:00
|
|
(string->number (:expire subkey))
|
|
;; GnuPG choses the middle of the day (local time)
|
|
;; when no hh:mm:ss is specified
|
|
(days->seconds 1))))
|
|
(lambda (subkey)
|
|
(assert (= 1 (:alg subkey)))
|
|
(assert (string-contains? (:cap subkey) "s"))
|
|
(assert (time-matches? 2145959700 ;; UTC 2038-01-01 11:55:00
|
|
;; 4260254100 ;; UTC 2105-01-01 11:55:00
|
|
(string->number (:expire subkey))
|
|
(minutes->seconds 5))))
|
|
(lambda (subkey)
|
|
(assert (= 1 (:alg subkey)))
|
|
(assert (string-contains? (:cap subkey) "s"))
|
|
(assert (time-matches? (+ (get-time) (days->seconds 2))
|
|
(string->number (:expire subkey))
|
|
(minutes->seconds 5))))
|
|
(lambda (subkey)
|
|
(assert (= 1 (:alg subkey)))
|
|
(assert (= 1024 (:length subkey)))
|
|
(assert (string-contains? (:cap subkey) "s"))
|
|
(assert (time-matches? (+ (get-time) (weeks->seconds 2))
|
|
(string->number (:expire subkey))
|
|
(minutes->seconds 5))))
|
|
(lambda (subkey)
|
|
(assert (= 1 (:alg subkey)))
|
|
(assert (= 2048 (:length subkey)))
|
|
(assert (string-contains? (:cap subkey) "e"))
|
|
(assert (time-matches? (+ (get-time) (months->seconds 2))
|
|
(string->number (:expire subkey))
|
|
(minutes->seconds 5))))
|
|
(lambda (subkey)
|
|
(assert (= 1 (:alg subkey)))
|
|
(assert (= 4096 (:length subkey)))
|
|
(assert (string-contains? (:cap subkey) "s"))
|
|
(assert (string-contains? (:cap subkey) "a"))
|
|
(assert (time-matches? (+ (get-time) (years->seconds 2))
|
|
(string->number (:expire subkey))
|
|
(minutes->seconds 5))))
|
|
#f))
|