jan/debianmemberportfolio
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Revert back some name/mail processing for cases where the uid is not strictly an email

Browse source
This commit is contained in:
Olivier Berger 2013-11-18 13:59:49 +01:00
parent de3dda922b
commit 755a2dc5ea
1 changed files with 40 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
ddportfolioservice/model/keyringanalyzer.py
View file

@ -53,14 +53,39 @@ def _get_keyrings():
keyrings.sort() keyrings.sort()
return keyrings return keyrings
def _parse_uid(uid): def _parse_uid(uid):
""" """
Parse a uid of the form 'Real Name <email@example.com>' into email Parse a uid of the form 'Real Name <email@example.com>' into email
and realname parts. and realname parts.
""" """
(uid, mail) = email.utils.parseaddr(uid)
return (uid, mail) # First try with the Python library, but it doesn't always catch everything
(name, mail) = email.utils.parseaddr(uid)
if (not name) and (not mail):
logging.warning("malformed uid %s", uid)
if (not name) or (not mail):
logging.debug("strange uid %s: '%s' - <%s>", uid, name, mail)
# Try and do better than the python library
if not '@' in mail:
uid = uid.strip()
# First, strip comment
s = uid.find('(')
e = uid.find(')')
if s >= 0 and e >= 0:
uid = uid[:s] + uid[e + 1:]
s = uid.find('<')
e = uid.find('>')
mail = None
if s >= 0 and e >= 0:
mail = uid[s + 1:e]
uid = uid[:s] + uid[e + 1:]
uid = uid.strip()
if not mail and uid.find('@') >= 0:
mail, uid = uid, mail
name = uid
logging.debug("corrected: '%s' - <%s>", name, mail)
return (name, mail)
resultdict = {} resultdict = {}
@ -107,19 +132,20 @@ def process_keyrings():
else: else:
continue continue
# Do stuff with 'uid' # Do stuff with 'uid'
uid, email = _parse_uid(uid) if uid:
if email: (uid, mail) = _parse_uid(uid)
if email.endswith('@debian.org'): if mail:
login = email[0:-len('@debian.org')] if mail.endswith('@debian.org'):
_add_to_result('login:email:%s' % email, login) login = mail[0:-len('@debian.org')]
_add_to_result('login:email:%s' % mail, login)
_add_to_result('login:fpr:%s' % fpr, login) _add_to_result('login:fpr:%s' % fpr, login)
_add_to_result('fpr:login:%s' % login, fpr) _add_to_result('fpr:login:%s' % login, fpr)
_add_to_result('fpr:email:%s' % email, fpr) _add_to_result('fpr:email:%s' % mail, fpr)
_add_to_result('email:fpr:%s' % fpr, email) _add_to_result('email:fpr:%s' % fpr, mail)
if uid: if uid:
_add_to_result('name:fpr:%s' % fpr, uid) _add_to_result('name:fpr:%s' % fpr, uid)
if email: if mail:
_add_to_result('name:email:%s' % email, uid) _add_to_result('name:email:%s' % mail, uid)
retcode = proc.wait() retcode = proc.wait()
if retcode != 0: if retcode != 0:
logging.error("subprocess ended with return code %d", retcode) logging.error("subprocess ended with return code %d", retcode)