1.1 --- a/parsers/pgp_keys.py Mon Nov 11 23:20:54 2013 +0100
1.2 +++ b/parsers/pgp_keys.py Tue Nov 12 23:07:50 2013 +0100
1.3 @@ -81,14 +81,20 @@
1.4 write(fmt.table_row(on=1))
1.5 write(fmt.rawHTML("<th>")); write(fmt.text(_("Known"))); write(fmt.rawHTML("</th>"))
1.6 write(fmt.rawHTML("<th>")); write(fmt.text(_("Identity"))); write(fmt.rawHTML("</th>"))
1.7 - write(fmt.rawHTML("<th>")); write(fmt.text(_("Fingerprint"))); write(fmt.rawHTML("</th>"))
1.8 + write(fmt.rawHTML("<th>")); write(fmt.text(_("Confirmed by"))); write(fmt.rawHTML("</th>"))
1.9 write(fmt.table_row(on=0))
1.10 write(fmt.rawHTML("</thead>"))
1.11
1.12 write(fmt.rawHTML("<tbody>"))
1.13
1.14 + # For each key in the message, show whether it is already known to GPG,
1.15 + # the user of the key, and whether other known people have signed it.
1.16 +
1.17 for key in gpg.getKeysFromString(self.raw):
1.18 write(fmt.table_row(on=1))
1.19 +
1.20 + # Known...
1.21 +
1.22 write(fmt.table_cell(on=1))
1.23 try:
1.24 gpg.listKeys(key["keyid"])
1.25 @@ -97,11 +103,37 @@
1.26 except MoinMessageError:
1.27 pass
1.28 write(fmt.table_cell(on=0))
1.29 +
1.30 + # Identity...
1.31 +
1.32 write(fmt.table_cell(on=1))
1.33 - write(fmt.text(key["userid"]))
1.34 + write(fmt.text(key["userid"])); write(fmt.linebreak(0))
1.35 + write(fmt.small(on=1)); write(fmt.text(key["fingerprint"])); write(fmt.small(on=0))
1.36 write(fmt.table_cell(on=0))
1.37 +
1.38 + # Confirmed by...
1.39 +
1.40 write(fmt.table_cell(on=1))
1.41 - write(fmt.text(key["fingerprint"]))
1.42 +
1.43 + first = True
1.44 +
1.45 + for signature in key["signatures"]:
1.46 +
1.47 + # Skip unknown signers and self-signatures.
1.48 +
1.49 + signer = signature["userid"]
1.50 + if not signer:
1.51 + continue
1.52 + try:
1.53 + gpg.listKeys(signature["keyid"])
1.54 + except MoinMessageError:
1.55 + continue
1.56 +
1.57 + if not first:
1.58 + write(fmt.linebreak(0))
1.59 + write(fmt.text(signer))
1.60 + first = False
1.61 +
1.62 write(fmt.table_cell(on=0))
1.63 write(fmt.table_row(on=0))
1.64