diff options
| author |   aeroniero33 <justthisthing@gmail.com> | 2016-04-13 00:49:05 +0100 |
|---|---|---|
| committer |   Brian Dolbec <dolsen@gentoo.org> | 2016-06-01 08:13:48 -0700 |
| commit | bacec7da1e7ff446f232d48dcf34b71966df7068 (patch) | |
| tree | afd5cb8c5af65da49c669cc99e54d933c9af0e29 /gkeys | |
| parent | gkeys-gen: Fix typo causing a traceback for bug 572890 (diff) | |
| download | gentoo-keys-bacec7da1e7ff446f232d48dcf34b71966df7068.tar.gz gentoo-keys-bacec7da1e7ff446f232d48dcf34b71966df7068.tar.bz2 gentoo-keys-bacec7da1e7ff446f232d48dcf34b71966df7068.zip | |
Count Incorrect Qualified IDs and present them in the speccheck summary.
Changed the names of Qualified_IDs
Changed Qualified_Id position
Diffstat (limited to 'gkeys')
| -rw-r--r-- | gkeys/gkeys/actions.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py index d61b415..ef8a30e 100644 --- a/gkeys/gkeys/actions.py +++ b/gkeys/gkeys/actions.py @@ -407,6 +407,8 @@ class Actions(ActionBase): 'encrypts': [], 'authens': [], 'final': False, + 'qualified_id_checks': [], + 'qualified_id_passed': False } if key.key is "SUB": if key.sign_capable and key.passed_spec: @@ -419,6 +421,9 @@ class Actions(ActionBase): pub_pass['authens'].append(key.passed_spec) if key.passed_spec: pub_pass['auth'] = True + if key.id: + pub_pass['qualified_id_checks'].append(key.id) + pub_pass['qualified_id_passed'] = True validity = key.validity.split(',')[0] if not key.expire and not 'r' in validity: failed['expired'].append(_unicode("%s <%s>: %s") @@ -446,6 +451,9 @@ class Actions(ActionBase): if not pub_pass['sign']: failed['sign'].append(_unicode("%s <%s>: %s") % (gkey.name, gkey.nick, pub_pass['key'].fingerprint)) + if not pub_pass['qualified_id_passed']: + failed['qualified_id'].append(_unicode("%s <%s>: %s") + % (gkey.name, gkey.nick, pub_pass['key'].fingerprint)) if not pub_pass['encrypt']: failed['encrypt'].append(_unicode("%s <%s>: %s") % (gkey.name, gkey.nick, pub_pass['key'].fingerprint)) @@ -483,6 +491,8 @@ class Actions(ActionBase): self.output([sorted(set(failed['expired']))], '\n Expiry keys:') if failed['warn']: self.output([sorted(set(failed['warn']))], '\n Expiry Warnings:') + if failed['qualified_id']: + self.output([sorted(set(failed['qualified_id']))], '\n Qualified IDs:') if failed['spec']: self.output([sorted(set(failed['spec']))], '\n Failed to pass SPEC requirements:') if failed['spec-approved']: @@ -496,6 +506,7 @@ class Actions(ActionBase): 'No Encryption subkey...: %d' % len(set(failed['encrypt'])), 'Algorithm..............: %d' % len(set(failed['algo'])), 'Bit length.............: %d' % len(set(failed['bits'])), + 'Qualified IDs..........: %d' % len(set(failed['qualified_id'])), 'Expiry.................: %d' % len(set(failed['expired'])), 'Expiry Warnings........: %d' % len(set(failed['warn'])), 'SPEC requirements......: %d' % len(set(failed['spec'])), @@ -889,4 +900,3 @@ class Actions(ActionBase): msgs.append(keys[cat]) del keys return (True, msgs) - |