kallithea Changeset - 9ee018948dcd

Changeset - 9ee018948dcd

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 11 years ago 2015-03-11 00:24:25
madski@unity3d.com

helpers: fix gravatar handling with (invalid) non-ascii email addresses

It would crash with UnicodeDecodeError when trying to expand unicode email into
utf8 template.

1 file changed with 1 insertions and 4 deletions:

kallithea/lib/helpers.py

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -884,38 +884,35 @@ def gravatar(email_address, cls='', size @@
     return literal(tmpl)
 def gravatar_url(email_address, size=30, ssl_enabled=True):
     # doh, we need to re-import those to mock it later
     from pylons import url
     from pylons import tmpl_context as c
     _def = 'anonymous@kallithea-scm.org'  # default gravatar
     _use_gravatar = c.visual.use_gravatar
     _gravatar_url = c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL
     email_address = email_address or _def
     if isinstance(email_address, unicode):
         #hashlib crashes on unicode items
         email_address = safe_str(email_address)
     if not _use_gravatar or not email_address or email_address == _def:
         return ""
     if _use_gravatar:
         _md5 = lambda s: hashlib.md5(s).hexdigest()
         tmpl = _gravatar_url
         parsed_url = urlparse.urlparse(url.current(qualified=True))
         tmpl = tmpl.replace('{email}', email_address)\
                    .replace('{md5email}', _md5(email_address.lower())) \
+                   .replace('{md5email}', _md5(safe_str(email_address).lower())) \
                    .replace('{netloc}', parsed_url.netloc)\
                    .replace('{scheme}', parsed_url.scheme)\
                    .replace('{size}', safe_str(size))
         return tmpl
 class Page(_Page):
     """
     Custom pager to match rendering style with YUI paginator
     """
     def _get_pos(self, cur_page, max_page, items):
         edge = (items / 2) + 1

0 comments (0 inline, 0 general)