← 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: 2012-03-13 17:25:29 UTC
  • mfrom: (6499 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6501.
  • Revision ID: v.ladeuil+lp@free.fr-20120313172529-i0suyjnepsor25i7
Merge trunk

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
 
        
179
 
        return [self._config.gpg_signing_command(), '--clearsign', '-u',
180
 
                                                self._config.gpg_signing_key()]
181
 
 
182
 
    def __init__(self, config):
183
 
        self._config = config
184
 
        try:
185
 
            import gpgme
186
 
            self.context = gpgme.Context()
187
 
        except ImportError, error:
188
 
            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, '--no-tty']
189
217
 
190
218
    def sign(self, content):
191
219
        if isinstance(content, unicode):
225
253
 
226
254
    def verify(self, content, testament):
227
255
        """Check content has a valid signature.
228
 
        
 
256
 
229
257
        :param content: the commit signature
230
258
        :param testament: the valid testament string for the commit
231
 
        
 
259
 
232
260
        :return: SIGNATURE_VALID or a failed SIGNATURE_ value, key uid if valid
233
261
        """
234
262
        try:
238
266
 
239
267
        signature = StringIO(content)
240
268
        plain_output = StringIO()
241
 
        
242
269
        try:
243
270
            result = self.context.verify(signature, None, plain_output)
244
271
        except gpgme.GpgmeError,error:
245
272
            raise errors.SignatureVerificationFailed(error[2])
246
273
 
 
274
        # No result if input is invalid.
 
275
        # test_verify_invalid()
247
276
        if len(result) == 0:
248
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()
249
280
        fingerprint = result[0].fpr
250
281
        if self.acceptable_keys is not None:
251
282
            if not fingerprint in self.acceptable_keys:
252
283
                return SIGNATURE_KEY_MISSING, fingerprint[-8:]
 
284
        # Check the signature actually matches the testament.
 
285
        # test_verify_bad_testament()
253
286
        if testament != plain_output.getvalue():
254
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.
255
291
        if result[0].summary & gpgme.SIGSUM_VALID:
256
292
            key = self.context.get_key(fingerprint)
257
293
            name = key.uids[0].name
258
294
            email = key.uids[0].email
259
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.
260
298
        if result[0].summary & gpgme.SIGSUM_RED:
261
299
            return SIGNATURE_NOT_VALID, None
 
300
        # GPG does not know this key.
 
301
        # test_verify_unknown_key()
262
302
        if result[0].summary & gpgme.SIGSUM_KEY_MISSING:
263
303
            return SIGNATURE_KEY_MISSING, fingerprint[-8:]
264
 
        #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.
265
306
        if result[0].summary == 0 and self.acceptable_keys is not None:
266
307
            if fingerprint in self.acceptable_keys:
 
308
                # test_verify_untrusted_but_accepted()
267
309
                return SIGNATURE_VALID, None
268
 
        else:
269
 
            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.
270
329
        raise errors.SignatureVerificationFailed("Unknown GnuPG key "\
271
330
                                                 "verification result")
272
331
 
273
332
    def set_acceptable_keys(self, command_line_input):
274
 
        """sets the acceptable keys for verifying with this GPGStrategy
275
 
        
 
333
        """Set the acceptable keys for verifying with this GPGStrategy.
 
334
 
276
335
        :param command_line_input: comma separated list of patterns from
277
336
                                command line
278
337
        :return: nothing
279
338
        """
280
339
        key_patterns = None
281
 
        acceptable_keys_config = self._config.acceptable_keys()
 
340
        acceptable_keys_config = self._config_stack.get('acceptable_keys')
282
341
        try:
283
342
            if isinstance(acceptable_keys_config, unicode):
284
343
                acceptable_keys_config = str(acceptable_keys_config)
285
344
        except UnicodeEncodeError:
286
 
            #gpg Context.keylist(pattern) does not like unicode
287
 
            raise errors.BzrCommandError('Only ASCII permitted in option names')
 
345
            # gpg Context.keylist(pattern) does not like unicode
 
346
            raise errors.BzrCommandError(
 
347
                gettext('Only ASCII permitted in option names'))
288
348
 
289
349
        if acceptable_keys_config is not None:
290
350
            key_patterns = acceptable_keys_config
291
 
        if command_line_input is not None: #command line overrides config
 
351
        if command_line_input is not None: # command line overrides config
292
352
            key_patterns = command_line_input
293
353
        if key_patterns is not None:
294
354
            patterns = key_patterns.split(",")
302
362
                    self.acceptable_keys.append(key.subkeys[0].fpr)
303
363
                    trace.mutter("Added acceptable key: " + key.subkeys[0].fpr)
304
364
                if not found_key:
305
 
                    trace.note(i18n.gettext(
306
 
                            "No GnuPG key results for pattern: {}"
 
365
                    trace.note(gettext(
 
366
                            "No GnuPG key results for pattern: {0}"
307
367
                                ).format(pattern))
308
368
 
 
369
    @deprecated_method(deprecated_in((2, 6, 0)))
309
370
    def do_verifications(self, revisions, repository,
310
371
                            process_events_callback=None):
311
372
        """do verifications on a set of revisions
312
 
        
 
373
 
313
374
        :param revisions: list of revision ids to verify
314
375
        :param repository: repository object
315
376
        :param process_events_callback: method to call for GUI frontends that
316
 
                                                want to keep their UI refreshed
317
 
        
 
377
            want to keep their UI refreshed
 
378
 
318
379
        :return: count dictionary of results of each type,
319
380
                 result list for each revision,
320
381
                 boolean True if all results are verified successfully
321
382
        """
322
 
        count = {SIGNATURE_VALID: 0,
323
 
                 SIGNATURE_KEY_MISSING: 0,
324
 
                 SIGNATURE_NOT_VALID: 0,
325
 
                 SIGNATURE_NOT_SIGNED: 0}
326
 
        result = []
327
 
        all_verifiable = True
328
 
        for rev_id in revisions:
329
 
            verification_result, uid =\
330
 
                                repository.verify_revision(rev_id,self)
331
 
            result.append([rev_id, verification_result, uid])
332
 
            count[verification_result] += 1
333
 
            if verification_result != SIGNATURE_VALID:
334
 
                all_verifiable = False
335
 
            if process_events_callback is not None:
336
 
                process_events_callback()
337
 
        return (count, result, all_verifiable)
 
383
        return bulk_verify_signatures(repository, revisions, self,
 
384
            process_events_callback)
338
385
 
 
386
    @deprecated_method(deprecated_in((2, 6, 0)))
339
387
    def verbose_valid_message(self, result):
340
388
        """takes a verify result and returns list of signed commits strings"""
341
 
        signers = {}
342
 
        for rev_id, validity, uid in result:
343
 
            if validity == SIGNATURE_VALID:
344
 
                signers.setdefault(uid, 0)
345
 
                signers[uid] += 1
346
 
        result = []
347
 
        for uid, number in signers.items():
348
 
             result.append( i18n.ngettext(u"{0} signed {1} commit", 
349
 
                             u"{0} signed {1} commits",
350
 
                             number).format(uid, number) )
351
 
        return result
352
 
 
353
 
 
 
389
        return verbose_valid_message(result)
 
390
 
 
391
    @deprecated_method(deprecated_in((2, 6, 0)))
354
392
    def verbose_not_valid_message(self, result, repo):
355
393
        """takes a verify result and returns list of not valid commit info"""
356
 
        signers = {}
357
 
        for rev_id, validity, empty in result:
358
 
            if validity == SIGNATURE_NOT_VALID:
359
 
                revision = repo.get_revision(rev_id)
360
 
                authors = ', '.join(revision.get_apparent_authors())
361
 
                signers.setdefault(authors, 0)
362
 
                signers[authors] += 1
363
 
        result = []
364
 
        for authors, number in signers.items():
365
 
            result.append( i18n.ngettext(u"{0} commit by author {1}", 
366
 
                                 u"{0} commits by author {1}",
367
 
                                 number).format(number, authors) )
368
 
        return result
 
394
        return verbose_not_valid_message(result, repo)
369
395
 
 
396
    @deprecated_method(deprecated_in((2, 6, 0)))
370
397
    def verbose_not_signed_message(self, result, repo):
371
398
        """takes a verify result and returns list of not signed commit info"""
372
 
        signers = {}
373
 
        for rev_id, validity, empty in result:
374
 
            if validity == SIGNATURE_NOT_SIGNED:
375
 
                revision = repo.get_revision(rev_id)
376
 
                authors = ', '.join(revision.get_apparent_authors())
377
 
                signers.setdefault(authors, 0)
378
 
                signers[authors] += 1
379
 
        result = []
380
 
        for authors, number in signers.items():
381
 
            result.append( i18n.ngettext(u"{0} commit by author {1}", 
382
 
                                 u"{0} commits by author {1}",
383
 
                                 number).format(number, authors) )
384
 
        return result
 
399
        return verbose_not_valid_message(result, repo)
385
400
 
 
401
    @deprecated_method(deprecated_in((2, 6, 0)))
386
402
    def verbose_missing_key_message(self, result):
387
403
        """takes a verify result and returns list of missing key info"""
388
 
        signers = {}
389
 
        for rev_id, validity, fingerprint in result:
390
 
            if validity == SIGNATURE_KEY_MISSING:
391
 
                signers.setdefault(fingerprint, 0)
392
 
                signers[fingerprint] += 1
393
 
        result = []
394
 
        for fingerprint, number in signers.items():
395
 
            result.append( i18n.ngettext(u"Unknown key {0} signed {1} commit", 
396
 
                                 u"Unknown key {0} signed {1} commits",
397
 
                                 number).format(fingerprint, number) )
398
 
        return result
399
 
 
 
404
        return verbose_missing_key_message(result)
 
405
 
 
406
    @deprecated_method(deprecated_in((2, 6, 0)))
 
407
    def verbose_expired_key_message(self, result, repo):
 
408
        """takes a verify result and returns list of expired key info"""
 
409
        return verbose_expired_key_message(result, repo)
 
410
 
 
411
    @deprecated_method(deprecated_in((2, 6, 0)))
400
412
    def valid_commits_message(self, count):
401
413
        """returns message for number of commits"""
402
 
        return i18n.gettext(u"{0} commits with valid signatures").format(
403
 
                                        count[SIGNATURE_VALID])
 
414
        return valid_commits_message(count)
404
415
 
 
416
    @deprecated_method(deprecated_in((2, 6, 0)))
405
417
    def unknown_key_message(self, count):
406
418
        """returns message for number of commits"""
407
 
        return i18n.ngettext(u"{0} commit with unknown key",
408
 
                             u"{0} commits with unknown keys",
409
 
                             count[SIGNATURE_KEY_MISSING]).format(
410
 
                                        count[SIGNATURE_KEY_MISSING])
 
419
        return unknown_key_message(count)
411
420
 
 
421
    @deprecated_method(deprecated_in((2, 6, 0)))
412
422
    def commit_not_valid_message(self, count):
413
423
        """returns message for number of commits"""
414
 
        return i18n.ngettext(u"{0} commit not valid",
415
 
                             u"{0} commits not valid",
416
 
                             count[SIGNATURE_NOT_VALID]).format(
417
 
                                            count[SIGNATURE_NOT_VALID])
 
424
        return commit_not_valid_message(count)
418
425
 
 
426
    @deprecated_method(deprecated_in((2, 6, 0)))
419
427
    def commit_not_signed_message(self, count):
420
428
        """returns message for number of commits"""
421
 
        return i18n.ngettext(u"{0} commit not signed",
422
 
                             u"{0} commits not signed",
423
 
                             count[SIGNATURE_NOT_SIGNED]).format(
424
 
                                        count[SIGNATURE_NOT_SIGNED])
 
429
        return commit_not_signed_message(count)
 
430
 
 
431
    @deprecated_method(deprecated_in((2, 6, 0)))
 
432
    def expired_commit_message(self, count):
 
433
        """returns message for number of commits"""
 
434
        return expired_commit_message(count)
 
435
 
 
436
 
 
437
def valid_commits_message(count):
 
438
    """returns message for number of commits"""
 
439
    return gettext(u"{0} commits with valid signatures").format(
 
440
                                    count[SIGNATURE_VALID])
 
441
 
 
442
 
 
443
def unknown_key_message(count):
 
444
    """returns message for number of commits"""
 
445
    return ngettext(u"{0} commit with unknown key",
 
446
                    u"{0} commits with unknown keys",
 
447
                    count[SIGNATURE_KEY_MISSING]).format(
 
448
                                    count[SIGNATURE_KEY_MISSING])
 
449
 
 
450
 
 
451
def commit_not_valid_message(count):
 
452
    """returns message for number of commits"""
 
453
    return ngettext(u"{0} commit not valid",
 
454
                    u"{0} commits not valid",
 
455
                    count[SIGNATURE_NOT_VALID]).format(
 
456
                                        count[SIGNATURE_NOT_VALID])
 
457
 
 
458
 
 
459
def commit_not_signed_message(count):
 
460
    """returns message for number of commits"""
 
461
    return ngettext(u"{0} commit not signed",
 
462
                    u"{0} commits not signed",
 
463
                    count[SIGNATURE_NOT_SIGNED]).format(
 
464
                                    count[SIGNATURE_NOT_SIGNED])
 
465
 
 
466
 
 
467
def expired_commit_message(count):
 
468
    """returns message for number of commits"""
 
469
    return ngettext(u"{0} commit with key now expired",
 
470
                    u"{0} commits with key now expired",
 
471
                    count[SIGNATURE_EXPIRED]).format(
 
472
                                count[SIGNATURE_EXPIRED])
 
473
 
 
474
 
 
475
def verbose_expired_key_message(result, repo):
 
476
    """takes a verify result and returns list of expired key info"""
 
477
    signers = {}
 
478
    fingerprint_to_authors = {}
 
479
    for rev_id, validity, fingerprint in result:
 
480
        if validity == SIGNATURE_EXPIRED:
 
481
            revision = repo.get_revision(rev_id)
 
482
            authors = ', '.join(revision.get_apparent_authors())
 
483
            signers.setdefault(fingerprint, 0)
 
484
            signers[fingerprint] += 1
 
485
            fingerprint_to_authors[fingerprint] = authors
 
486
    result = []
 
487
    for fingerprint, number in signers.items():
 
488
        result.append(
 
489
            ngettext(u"{0} commit by author {1} with key {2} now expired",
 
490
                     u"{0} commits by author {1} with key {2} now expired",
 
491
                     number).format(
 
492
                number, fingerprint_to_authors[fingerprint], fingerprint))
 
493
    return result
 
494
 
 
495
 
 
496
def verbose_valid_message(result):
 
497
    """takes a verify result and returns list of signed commits strings"""
 
498
    signers = {}
 
499
    for rev_id, validity, uid in result:
 
500
        if validity == SIGNATURE_VALID:
 
501
            signers.setdefault(uid, 0)
 
502
            signers[uid] += 1
 
503
    result = []
 
504
    for uid, number in signers.items():
 
505
         result.append(ngettext(u"{0} signed {1} commit",
 
506
                                u"{0} signed {1} commits",
 
507
                                number).format(uid, number))
 
508
    return result
 
509
 
 
510
 
 
511
def verbose_not_valid_message(result, repo):
 
512
    """takes a verify result and returns list of not valid commit info"""
 
513
    signers = {}
 
514
    for rev_id, validity, empty in result:
 
515
        if validity == SIGNATURE_NOT_VALID:
 
516
            revision = repo.get_revision(rev_id)
 
517
            authors = ', '.join(revision.get_apparent_authors())
 
518
            signers.setdefault(authors, 0)
 
519
            signers[authors] += 1
 
520
    result = []
 
521
    for authors, number in signers.items():
 
522
        result.append(ngettext(u"{0} commit by author {1}",
 
523
                               u"{0} commits by author {1}",
 
524
                               number).format(number, authors))
 
525
    return result
 
526
 
 
527
 
 
528
def verbose_not_signed_message(result, repo):
 
529
    """takes a verify result and returns list of not signed commit info"""
 
530
    signers = {}
 
531
    for rev_id, validity, empty in result:
 
532
        if validity == SIGNATURE_NOT_SIGNED:
 
533
            revision = repo.get_revision(rev_id)
 
534
            authors = ', '.join(revision.get_apparent_authors())
 
535
            signers.setdefault(authors, 0)
 
536
            signers[authors] += 1
 
537
    result = []
 
538
    for authors, number in signers.items():
 
539
        result.append(ngettext(u"{0} commit by author {1}",
 
540
                               u"{0} commits by author {1}",
 
541
                               number).format(number, authors))
 
542
    return result
 
543
 
 
544
 
 
545
def verbose_missing_key_message(result):
 
546
    """takes a verify result and returns list of missing key info"""
 
547
    signers = {}
 
548
    for rev_id, validity, fingerprint in result:
 
549
        if validity == SIGNATURE_KEY_MISSING:
 
550
            signers.setdefault(fingerprint, 0)
 
551
            signers[fingerprint] += 1
 
552
    result = []
 
553
    for fingerprint, number in signers.items():
 
554
        result.append(ngettext(u"Unknown key {0} signed {1} commit",
 
555
                               u"Unknown key {0} signed {1} commits",
 
556
                               number).format(fingerprint, number))
 
557
    return result