← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/gpg.py

  • Committer: Vincent Ladeuil
  • Date: 2015-09-08 07:59:37 UTC
  • mto: This revision was merged to the branch mainline in revision 6604.
  • Revision ID: v.ladeuil+lp@free.fr-20150908075937-u63hgo67v3c2lapt
Skip the missed test in test_transport.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/gpg.py
17
17
 
18
18
"""GPG signing and checking logic."""
19
19
 
 
20
from __future__ import absolute_import
 
21
 
20
22
import os
21
23
import sys
22
24
from StringIO import StringIO
27
29
import subprocess
28
30
 
29
31
from bzrlib import (
 
32
    config,
30
33
    errors,
31
34
    trace,
32
35
    ui,
33
36
    )
 
37
from bzrlib.i18n import (
 
38
    gettext, 
 
39
    ngettext,
 
40
    )
34
41
""")
35
42
 
36
 
class i18n:
37
 
    """this class is ready to use bzrlib.i18n but bzrlib.i18n is not ready to
38
 
    use so here is a stub until it is"""
39
 
    @staticmethod
40
 
    def gettext(string):
41
 
        return string
42
 
        
43
 
    @staticmethod
44
 
    def ngettext(single, plural, number):
45
 
        if number == 1:
46
 
            return single
47
 
        else:
48
 
            return plural
 
43
from bzrlib.symbol_versioning import (
 
44
    deprecated_in,
 
45
    deprecated_method,
 
46
    )
49
47
 
50
48
#verification results
51
49
SIGNATURE_VALID = 0
52
50
SIGNATURE_KEY_MISSING = 1
53
51
SIGNATURE_NOT_VALID = 2
54
52
SIGNATURE_NOT_SIGNED = 3
 
53
SIGNATURE_EXPIRED = 4
 
54
 
 
55
 
 
56
def bulk_verify_signatures(repository, revids, strategy,
 
57
        process_events_callback=None):
 
58
    """Do verifications on a set of revisions
 
59
 
 
60
    :param repository: repository object
 
61
    :param revids: list of revision ids to verify
 
62
    :param strategy: GPG strategy to use
 
63
    :param process_events_callback: method to call for GUI frontends that
 
64
        want to keep their UI refreshed
 
65
 
 
66
    :return: count dictionary of results of each type,
 
67
             result list for each revision,
 
68
             boolean True if all results are verified successfully
 
69
    """
 
70
    count = {SIGNATURE_VALID: 0,
 
71
             SIGNATURE_KEY_MISSING: 0,
 
72
             SIGNATURE_NOT_VALID: 0,
 
73
             SIGNATURE_NOT_SIGNED: 0,
 
74
             SIGNATURE_EXPIRED: 0}
 
75
    result = []
 
76
    all_verifiable = True
 
77
    total = len(revids)
 
78
    pb = ui.ui_factory.nested_progress_bar()
 
79
    try:
 
80
        for i, (rev_id, verification_result, uid) in enumerate(
 
81
                repository.verify_revision_signatures(
 
82
                    revids, strategy)):
 
83
            pb.update("verifying signatures", i, total)
 
84
            result.append([rev_id, verification_result, uid])
 
85
            count[verification_result] += 1
 
86
            if verification_result != SIGNATURE_VALID:
 
87
                all_verifiable = False
 
88
            if process_events_callback is not None:
 
89
                process_events_callback()
 
90
    finally:
 
91
        pb.finished()
 
92
    return (count, result, all_verifiable)
55
93
 
56
94
 
57
95
class DisabledGPGStrategy(object):
104
142
                else:
105
143
                    self.acceptable_keys.append(pattern)
106
144
 
 
145
    @deprecated_method(deprecated_in((2, 6, 0)))
107
146
    def do_verifications(self, revisions, repository):
108
 
        count = {SIGNATURE_VALID: 0,
109
 
                 SIGNATURE_KEY_MISSING: 0,
110
 
                 SIGNATURE_NOT_VALID: 0,
111
 
                 SIGNATURE_NOT_SIGNED: 0}
112
 
        result = []
113
 
        all_verifiable = True
114
 
        for rev_id in revisions:
115
 
            verification_result, uid =\
116
 
                                repository.verify_revision(rev_id,self)
117
 
            result.append([rev_id, verification_result, uid])
118
 
            count[verification_result] += 1
119
 
            if verification_result != SIGNATURE_VALID:
120
 
                all_verifiable = False
121
 
        return (count, result, all_verifiable)
 
147
        return bulk_verify_signatures(repository, revisions, self)
122
148
 
 
149
    @deprecated_method(deprecated_in((2, 6, 0)))
123
150
    def valid_commits_message(self, count):
124
 
        return i18n.gettext(u"{0} commits with valid signatures").format(
125
 
                                        count[SIGNATURE_VALID])            
 
151
        return valid_commits_message(count)
126
152
 
 
153
    @deprecated_method(deprecated_in((2, 6, 0)))
127
154
    def unknown_key_message(self, count):
128
 
        return i18n.ngettext(u"{0} commit with unknown key",
129
 
                             u"{0} commits with unknown keys",
130
 
                             count[SIGNATURE_KEY_MISSING]).format(
131
 
                                        count[SIGNATURE_KEY_MISSING])
 
155
        return unknown_key_message(count)
132
156
 
 
157
    @deprecated_method(deprecated_in((2, 6, 0)))
133
158
    def commit_not_valid_message(self, count):
134
 
        return i18n.ngettext(u"{0} commit not valid",
135
 
                             u"{0} commits not valid",
136
 
                             count[SIGNATURE_NOT_VALID]).format(
137
 
                                            count[SIGNATURE_NOT_VALID])
 
159
        return commit_not_valid_message(count)
138
160
 
 
161
    @deprecated_method(deprecated_in((2, 6, 0)))
139
162
    def commit_not_signed_message(self, count):
140
 
        return i18n.ngettext(u"{0} commit not signed",
141
 
                             u"{0} commits not signed",
142
 
                             count[SIGNATURE_NOT_SIGNED]).format(
143
 
                                        count[SIGNATURE_NOT_SIGNED])
 
163
        return commit_not_signed_message(count)
 
164
 
 
165
    @deprecated_method(deprecated_in((2, 6, 0)))
 
166
    def expired_commit_message(self, count):
 
167
        return expired_commit_message(count)
144
168
 
145
169
 
146
170
def _set_gpg_tty():
161
185
 
162
186
    acceptable_keys = None
163
187
 
 
188
    def __init__(self, config_stack):
 
189
        self._config_stack = config_stack
 
190
        try:
 
191
            import gpgme
 
192
            self.context = gpgme.Context()
 
193
        except ImportError, error:
 
194
            pass # can't use verify()
 
195
 
164
196
    @staticmethod
165
197
    def verify_signatures_available():
166
198
        """
175
207
            return False
176
208
 
177
209
    def _command_line(self):
178
 
        return [self._config.gpg_signing_command(), '--clearsign']
179
 
 
180
 
    def __init__(self, config):
181
 
        self._config = config
182
 
        try:
183
 
            import gpgme
184
 
            self.context = gpgme.Context()
185
 
        except ImportError, error:
186
 
            pass # can't use verify()
 
210
        key = self._config_stack.get('gpg_signing_key')
 
211
        if key is None or key == 'default':
 
212
            # 'default' or not setting gpg_signing_key at all means we should
 
213
            # use the user email address
 
214
            key = config.extract_email_address(self._config_stack.get('email'))
 
215
        return [self._config_stack.get('gpg_signing_command'), '--clearsign',
 
216
                '-u', key]
187
217
 
188
218
    def sign(self, content):
189
219
        if isinstance(content, unicode):
223
253
 
224
254
    def verify(self, content, testament):
225
255
        """Check content has a valid signature.
226
 
        
 
256
 
227
257
        :param content: the commit signature
228
258
        :param testament: the valid testament string for the commit
229
 
        
 
259
 
230
260
        :return: SIGNATURE_VALID or a failed SIGNATURE_ value, key uid if valid
231
261
        """
232
262
        try:
236
266
 
237
267
        signature = StringIO(content)
238
268
        plain_output = StringIO()
239
 
        
240
269
        try:
241
270
            result = self.context.verify(signature, None, plain_output)
242
271
        except gpgme.GpgmeError,error:
243
272
            raise errors.SignatureVerificationFailed(error[2])
244
273
 
 
274
        # No result if input is invalid.
 
275
        # test_verify_invalid()
245
276
        if len(result) == 0:
246
277
            return SIGNATURE_NOT_VALID, None
 
278
        # User has specified a list of acceptable keys, check our result is in
 
279
        # it.  test_verify_unacceptable_key()
247
280
        fingerprint = result[0].fpr
248
281
        if self.acceptable_keys is not None:
249
282
            if not fingerprint in self.acceptable_keys:
250
283
                return SIGNATURE_KEY_MISSING, fingerprint[-8:]
 
284
        # Check the signature actually matches the testament.
 
285
        # test_verify_bad_testament()
251
286
        if testament != plain_output.getvalue():
252
287
            return SIGNATURE_NOT_VALID, None
 
288
        # Yay gpgme set the valid bit.
 
289
        # Can't write a test for this one as you can't set a key to be
 
290
        # trusted using gpgme.
253
291
        if result[0].summary & gpgme.SIGSUM_VALID:
254
292
            key = self.context.get_key(fingerprint)
255
293
            name = key.uids[0].name
256
294
            email = key.uids[0].email
257
295
            return SIGNATURE_VALID, name + " <" + email + ">"
 
296
        # Sigsum_red indicates a problem, unfortunatly I have not been able
 
297
        # to write any tests which actually set this.
258
298
        if result[0].summary & gpgme.SIGSUM_RED:
259
299
            return SIGNATURE_NOT_VALID, None
 
300
        # GPG does not know this key.
 
301
        # test_verify_unknown_key()
260
302
        if result[0].summary & gpgme.SIGSUM_KEY_MISSING:
261
303
            return SIGNATURE_KEY_MISSING, fingerprint[-8:]
262
 
        #summary isn't set if sig is valid but key is untrusted
 
304
        # Summary isn't set if sig is valid but key is untrusted but if user
 
305
        # has explicity set the key as acceptable we can validate it.
263
306
        if result[0].summary == 0 and self.acceptable_keys is not None:
264
307
            if fingerprint in self.acceptable_keys:
 
308
                # test_verify_untrusted_but_accepted()
265
309
                return SIGNATURE_VALID, None
266
 
        else:
267
 
            return SIGNATURE_KEY_MISSING, None
 
310
        # test_verify_valid_but_untrusted()
 
311
        if result[0].summary == 0 and self.acceptable_keys is None:
 
312
            return SIGNATURE_NOT_VALID, None
 
313
        if result[0].summary & gpgme.SIGSUM_KEY_EXPIRED:
 
314
            expires = self.context.get_key(result[0].fpr).subkeys[0].expires
 
315
            if expires > result[0].timestamp:
 
316
                # The expired key was not expired at time of signing.
 
317
                # test_verify_expired_but_valid()
 
318
                return SIGNATURE_EXPIRED, fingerprint[-8:]
 
319
            else:
 
320
                # I can't work out how to create a test where the signature
 
321
                # was expired at the time of signing.
 
322
                return SIGNATURE_NOT_VALID, None
 
323
        # A signature from a revoked key gets this.
 
324
        # test_verify_revoked_signature()
 
325
        if result[0].summary & gpgme.SIGSUM_SYS_ERROR:
 
326
            return SIGNATURE_NOT_VALID, None
 
327
        # Other error types such as revoked keys should (I think) be caught by
 
328
        # SIGSUM_RED so anything else means something is buggy.
268
329
        raise errors.SignatureVerificationFailed("Unknown GnuPG key "\
269
330
                                                 "verification result")
270
331
 
271
332
    def set_acceptable_keys(self, command_line_input):
272
 
        """sets the acceptable keys for verifying with this GPGStrategy
273
 
        
 
333
        """Set the acceptable keys for verifying with this GPGStrategy.
 
334
 
274
335
        :param command_line_input: comma separated list of patterns from
275
336
                                command line
276
337
        :return: nothing
277
338
        """
278
 
        key_patterns = None
279
 
        acceptable_keys_config = self._config.acceptable_keys()
280
 
        try:
281
 
            if isinstance(acceptable_keys_config, unicode):
282
 
                acceptable_keys_config = str(acceptable_keys_config)
283
 
        except UnicodeEncodeError:
284
 
            #gpg Context.keylist(pattern) does not like unicode
285
 
            raise errors.BzrCommandError('Only ASCII permitted in option names')
286
 
 
 
339
        patterns = None
 
340
        acceptable_keys_config = self._config_stack.get('acceptable_keys')
287
341
        if acceptable_keys_config is not None:
288
 
            key_patterns = acceptable_keys_config
289
 
        if command_line_input is not None: #command line overrides config
290
 
            key_patterns = command_line_input
291
 
        if key_patterns is not None:
292
 
            patterns = key_patterns.split(",")
 
342
            patterns = acceptable_keys_config
 
343
        if command_line_input is not None: # command line overrides config
 
344
            patterns = command_line_input.split(',')
293
345
 
 
346
        if patterns:
294
347
            self.acceptable_keys = []
295
348
            for pattern in patterns:
296
349
                result = self.context.keylist(pattern)
300
353
                    self.acceptable_keys.append(key.subkeys[0].fpr)
301
354
                    trace.mutter("Added acceptable key: " + key.subkeys[0].fpr)
302
355
                if not found_key:
303
 
                    trace.note(i18n.gettext(
304
 
                            "No GnuPG key results for pattern: {}"
 
356
                    trace.note(gettext(
 
357
                            "No GnuPG key results for pattern: {0}"
305
358
                                ).format(pattern))
306
359
 
 
360
    @deprecated_method(deprecated_in((2, 6, 0)))
307
361
    def do_verifications(self, revisions, repository,
308
362
                            process_events_callback=None):
309
363
        """do verifications on a set of revisions
310
 
        
 
364
 
311
365
        :param revisions: list of revision ids to verify
312
366
        :param repository: repository object
313
367
        :param process_events_callback: method to call for GUI frontends that
314
 
                                                want to keep their UI refreshed
315
 
        
 
368
            want to keep their UI refreshed
 
369
 
316
370
        :return: count dictionary of results of each type,
317
371
                 result list for each revision,
318
372
                 boolean True if all results are verified successfully
319
373
        """
320
 
        count = {SIGNATURE_VALID: 0,
321
 
                 SIGNATURE_KEY_MISSING: 0,
322
 
                 SIGNATURE_NOT_VALID: 0,
323
 
                 SIGNATURE_NOT_SIGNED: 0}
324
 
        result = []
325
 
        all_verifiable = True
326
 
        for rev_id in revisions:
327
 
            verification_result, uid =\
328
 
                                repository.verify_revision(rev_id,self)
329
 
            result.append([rev_id, verification_result, uid])
330
 
            count[verification_result] += 1
331
 
            if verification_result != SIGNATURE_VALID:
332
 
                all_verifiable = False
333
 
            if process_events_callback is not None:
334
 
                process_events_callback()
335
 
        return (count, result, all_verifiable)
 
374
        return bulk_verify_signatures(repository, revisions, self,
 
375
            process_events_callback)
336
376
 
 
377
    @deprecated_method(deprecated_in((2, 6, 0)))
337
378
    def verbose_valid_message(self, result):
338
379
        """takes a verify result and returns list of signed commits strings"""
339
 
        signers = {}
340
 
        for rev_id, validity, uid in result:
341
 
            if validity == SIGNATURE_VALID:
342
 
                signers.setdefault(uid, 0)
343
 
                signers[uid] += 1
344
 
        result = []
345
 
        for uid, number in signers.items():
346
 
             result.append( i18n.ngettext(u"{0} signed {1} commit", 
347
 
                             u"{0} signed {1} commits",
348
 
                             number).format(uid, number) )
349
 
        return result
350
 
 
351
 
 
 
380
        return verbose_valid_message(result)
 
381
 
 
382
    @deprecated_method(deprecated_in((2, 6, 0)))
352
383
    def verbose_not_valid_message(self, result, repo):
353
384
        """takes a verify result and returns list of not valid commit info"""
354
 
        signers = {}
355
 
        for rev_id, validity, empty in result:
356
 
            if validity == SIGNATURE_NOT_VALID:
357
 
                revision = repo.get_revision(rev_id)
358
 
                authors = ', '.join(revision.get_apparent_authors())
359
 
                signers.setdefault(authors, 0)
360
 
                signers[authors] += 1
361
 
        result = []
362
 
        for authors, number in signers.items():
363
 
            result.append( i18n.ngettext(u"{0} commit by author {1}", 
364
 
                                 u"{0} commits by author {1}",
365
 
                                 number).format(number, authors) )
366
 
        return result
 
385
        return verbose_not_valid_message(result, repo)
367
386
 
 
387
    @deprecated_method(deprecated_in((2, 6, 0)))
368
388
    def verbose_not_signed_message(self, result, repo):
369
389
        """takes a verify result and returns list of not signed commit info"""
370
 
        signers = {}
371
 
        for rev_id, validity, empty in result:
372
 
            if validity == SIGNATURE_NOT_SIGNED:
373
 
                revision = repo.get_revision(rev_id)
374
 
                authors = ', '.join(revision.get_apparent_authors())
375
 
                signers.setdefault(authors, 0)
376
 
                signers[authors] += 1
377
 
        result = []
378
 
        for authors, number in signers.items():
379
 
            result.append( i18n.ngettext(u"{0} commit by author {1}", 
380
 
                                 u"{0} commits by author {1}",
381
 
                                 number).format(number, authors) )
382
 
        return result
 
390
        return verbose_not_valid_message(result, repo)
383
391
 
 
392
    @deprecated_method(deprecated_in((2, 6, 0)))
384
393
    def verbose_missing_key_message(self, result):
385
394
        """takes a verify result and returns list of missing key info"""
386
 
        signers = {}
387
 
        for rev_id, validity, fingerprint in result:
388
 
            if validity == SIGNATURE_KEY_MISSING:
389
 
                signers.setdefault(fingerprint, 0)
390
 
                signers[fingerprint] += 1
391
 
        result = []
392
 
        for fingerprint, number in signers.items():
393
 
            result.append( i18n.ngettext(u"Unknown key {0} signed {1} commit", 
394
 
                                 u"Unknown key {0} signed {1} commits",
395
 
                                 number).format(fingerprint, number) )
396
 
        return result
397
 
 
 
395
        return verbose_missing_key_message(result)
 
396
 
 
397
    @deprecated_method(deprecated_in((2, 6, 0)))
 
398
    def verbose_expired_key_message(self, result, repo):
 
399
        """takes a verify result and returns list of expired key info"""
 
400
        return verbose_expired_key_message(result, repo)
 
401
 
 
402
    @deprecated_method(deprecated_in((2, 6, 0)))
398
403
    def valid_commits_message(self, count):
399
404
        """returns message for number of commits"""
400
 
        return i18n.gettext(u"{0} commits with valid signatures").format(
401
 
                                        count[SIGNATURE_VALID])
 
405
        return valid_commits_message(count)
402
406
 
 
407
    @deprecated_method(deprecated_in((2, 6, 0)))
403
408
    def unknown_key_message(self, count):
404
409
        """returns message for number of commits"""
405
 
        return i18n.ngettext(u"{0} commit with unknown key",
406
 
                             u"{0} commits with unknown keys",
407
 
                             count[SIGNATURE_KEY_MISSING]).format(
408
 
                                        count[SIGNATURE_KEY_MISSING])
 
410
        return unknown_key_message(count)
409
411
 
 
412
    @deprecated_method(deprecated_in((2, 6, 0)))
410
413
    def commit_not_valid_message(self, count):
411
414
        """returns message for number of commits"""
412
 
        return i18n.ngettext(u"{0} commit not valid",
413
 
                             u"{0} commits not valid",
414
 
                             count[SIGNATURE_NOT_VALID]).format(
415
 
                                            count[SIGNATURE_NOT_VALID])
 
415
        return commit_not_valid_message(count)
416
416
 
 
417
    @deprecated_method(deprecated_in((2, 6, 0)))
417
418
    def commit_not_signed_message(self, count):
418
419
        """returns message for number of commits"""
419
 
        return i18n.ngettext(u"{0} commit not signed",
420
 
                             u"{0} commits not signed",
421
 
                             count[SIGNATURE_NOT_SIGNED]).format(
422
 
                                        count[SIGNATURE_NOT_SIGNED])
 
420
        return commit_not_signed_message(count)
 
421
 
 
422
    @deprecated_method(deprecated_in((2, 6, 0)))
 
423
    def expired_commit_message(self, count):
 
424
        """returns message for number of commits"""
 
425
        return expired_commit_message(count)
 
426
 
 
427
 
 
428
def valid_commits_message(count):
 
429
    """returns message for number of commits"""
 
430
    return gettext(u"{0} commits with valid signatures").format(
 
431
                                    count[SIGNATURE_VALID])
 
432
 
 
433
 
 
434
def unknown_key_message(count):
 
435
    """returns message for number of commits"""
 
436
    return ngettext(u"{0} commit with unknown key",
 
437
                    u"{0} commits with unknown keys",
 
438
                    count[SIGNATURE_KEY_MISSING]).format(
 
439
                                    count[SIGNATURE_KEY_MISSING])
 
440
 
 
441
 
 
442
def commit_not_valid_message(count):
 
443
    """returns message for number of commits"""
 
444
    return ngettext(u"{0} commit not valid",
 
445
                    u"{0} commits not valid",
 
446
                    count[SIGNATURE_NOT_VALID]).format(
 
447
                                        count[SIGNATURE_NOT_VALID])
 
448
 
 
449
 
 
450
def commit_not_signed_message(count):
 
451
    """returns message for number of commits"""
 
452
    return ngettext(u"{0} commit not signed",
 
453
                    u"{0} commits not signed",
 
454
                    count[SIGNATURE_NOT_SIGNED]).format(
 
455
                                    count[SIGNATURE_NOT_SIGNED])
 
456
 
 
457
 
 
458
def expired_commit_message(count):
 
459
    """returns message for number of commits"""
 
460
    return ngettext(u"{0} commit with key now expired",
 
461
                    u"{0} commits with key now expired",
 
462
                    count[SIGNATURE_EXPIRED]).format(
 
463
                                count[SIGNATURE_EXPIRED])
 
464
 
 
465
 
 
466
def verbose_expired_key_message(result, repo):
 
467
    """takes a verify result and returns list of expired key info"""
 
468
    signers = {}
 
469
    fingerprint_to_authors = {}
 
470
    for rev_id, validity, fingerprint in result:
 
471
        if validity == SIGNATURE_EXPIRED:
 
472
            revision = repo.get_revision(rev_id)
 
473
            authors = ', '.join(revision.get_apparent_authors())
 
474
            signers.setdefault(fingerprint, 0)
 
475
            signers[fingerprint] += 1
 
476
            fingerprint_to_authors[fingerprint] = authors
 
477
    result = []
 
478
    for fingerprint, number in signers.items():
 
479
        result.append(
 
480
            ngettext(u"{0} commit by author {1} with key {2} now expired",
 
481
                     u"{0} commits by author {1} with key {2} now expired",
 
482
                     number).format(
 
483
                number, fingerprint_to_authors[fingerprint], fingerprint))
 
484
    return result
 
485
 
 
486
 
 
487
def verbose_valid_message(result):
 
488
    """takes a verify result and returns list of signed commits strings"""
 
489
    signers = {}
 
490
    for rev_id, validity, uid in result:
 
491
        if validity == SIGNATURE_VALID:
 
492
            signers.setdefault(uid, 0)
 
493
            signers[uid] += 1
 
494
    result = []
 
495
    for uid, number in signers.items():
 
496
         result.append(ngettext(u"{0} signed {1} commit",
 
497
                                u"{0} signed {1} commits",
 
498
                                number).format(uid, number))
 
499
    return result
 
500
 
 
501
 
 
502
def verbose_not_valid_message(result, repo):
 
503
    """takes a verify result and returns list of not valid commit info"""
 
504
    signers = {}
 
505
    for rev_id, validity, empty in result:
 
506
        if validity == SIGNATURE_NOT_VALID:
 
507
            revision = repo.get_revision(rev_id)
 
508
            authors = ', '.join(revision.get_apparent_authors())
 
509
            signers.setdefault(authors, 0)
 
510
            signers[authors] += 1
 
511
    result = []
 
512
    for authors, number in signers.items():
 
513
        result.append(ngettext(u"{0} commit by author {1}",
 
514
                               u"{0} commits by author {1}",
 
515
                               number).format(number, authors))
 
516
    return result
 
517
 
 
518
 
 
519
def verbose_not_signed_message(result, repo):
 
520
    """takes a verify result and returns list of not signed commit info"""
 
521
    signers = {}
 
522
    for rev_id, validity, empty in result:
 
523
        if validity == SIGNATURE_NOT_SIGNED:
 
524
            revision = repo.get_revision(rev_id)
 
525
            authors = ', '.join(revision.get_apparent_authors())
 
526
            signers.setdefault(authors, 0)
 
527
            signers[authors] += 1
 
528
    result = []
 
529
    for authors, number in signers.items():
 
530
        result.append(ngettext(u"{0} commit by author {1}",
 
531
                               u"{0} commits by author {1}",
 
532
                               number).format(number, authors))
 
533
    return result
 
534
 
 
535
 
 
536
def verbose_missing_key_message(result):
 
537
    """takes a verify result and returns list of missing key info"""
 
538
    signers = {}
 
539
    for rev_id, validity, fingerprint in result:
 
540
        if validity == SIGNATURE_KEY_MISSING:
 
541
            signers.setdefault(fingerprint, 0)
 
542
            signers[fingerprint] += 1
 
543
    result = []
 
544
    for fingerprint, number in signers.items():
 
545
        result.append(ngettext(u"Unknown key {0} signed {1} commit",
 
546
                               u"Unknown key {0} signed {1} commits",
 
547
                               number).format(fingerprint, number))
 
548
    return result