Les adresses mail ça sert à rien, et les longIDs, c'est mieux.

This commit is contained in:
Vincent Le Gallic 2013-03-07 19:34:14 +01:00
parent ced75bcaed
commit 2cc93e5dfb
2 changed files with 21 additions and 30 deletions

View file

@ -184,17 +184,8 @@ def get_recipients_of_roles(roles):
def get_dest_of_roles(roles): def get_dest_of_roles(roles):
""" Summarize recipients of a role """ """ Summarize recipients of a role """
allkeys = all_keys() allkeys = all_keys()
def additionnal_info(rec): return ["%s (%s)" % (rec, allkeys[rec]) for rec in \
""" Gives additionnal information for a given recipient """ get_recipients_of_roles(roles) if allkeys[rec]]
if len(allkeys[rec]) == 0:
return ""
out = allkeys[rec][0]
if len(allkeys[rec]) > 1:
out += " -> " + allkeys[rec][1]
return "(%s)" % out
return ["%s %s" % (rec, additionnal_info(rec)) for rec in \
get_recipients_of_roles(roles) ]
def encrypt(roles, contents): def encrypt(roles, contents):
"""Chiffre le contenu pour les roles donnés""" """Chiffre le contenu pour les roles donnés"""

View file

@ -18,25 +18,25 @@ DEST_MAIL = "root@crans.org"
KEYS = { KEYS = {
"aza-vallina": ("Damien.Aza-Vallina@crans.org", None), 'aza-vallina': None,
"dandrimont": ("nicolas.dandrimont@crans.org", "66475AAF"), 'becue': '0D442664194974E2',
"blockelet": ("blockelet@crans.org", "AF087A52"), 'blockelet': '5314C173AF087A52',
"chambart": ("pierre.chambart@crans.org", "F2530FCE"), 'boilard': 'C1690AB9C39EB6F4',
"dimino": ("jdimino@dptinfo.ens-cachan.fr", "2127F85A"), 'cauderlier': None,
"durand-gasselin": ("adg@crans.org", "8E96ACDA"), 'chambart': '43680A46F2530FCE',
"glondu": ("Stephane.Glondu@crans.org", "49881AD3"), 'dandrimont': 'B8E5087766475AAF',
"huber": ("olivier.huber@crans.org", "E0DCF376"), 'dimino': '1E8A30532127F85A',
"lagorce": ("xavier.lagorce@crans.org", "0BF3708E"), 'dstan': 'BC9BF8456E1C820B',
"parret-freaud": ("parret-freaud@crans.org", "7D980513"), 'durand-gasselin': '30F01C448E96ACDA',
"tvincent": ("vincent.thomas@crans.org", "C5C4ACC0"), 'glondu': '7853DA4D49881AD3',
"iffrig": ("iffrig@crans.org","5BEC9A2F"), 'huber': '1EF81A95E0DCF376',
"becue": ("becue@crans.org", "194974E2"), 'iffrig': 'AB7F558C5BEC9A2F',
"dstan": ("daniel.stan@crans.org", "6E1C820B"), 'lagorce': '9D9D7CE70BF3708E',
"samir": ("samir@crans.org", "41C2B76B"), 'legallic': '3602E1C9A94025B0',
"boilard": ("boilard@crans.org", "C39EB6F4"), 'maioli': None,
"cauderlier": ("cauderlier@crans.org",None), #Méchant pas beau 'parret-freaud': '13AC8F777D980513',
"maioli": ("maioli@crans.org",None), #Bis (maybe 9E5026E8) 'samir': 'C86AD2AA41C2B76B',
"legallic": ("legallic@crans.org", "A94025B0"), 'tvincent': '1C6BE33AC5C4ACC0'
} }
# Les variables suivantes sont utilisées pour définir le dictionnaire des # Les variables suivantes sont utilisées pour définir le dictionnaire des