Projet

Général

Profil

0001-prevent-conversion-from-SSLError-to-str-to-fail-fixe.patch

Benjamin Dauvergne, 07 mars 2018 17:01

Télécharger (2,03 ko)

Voir les différences: 

Subject: [PATCH] prevent conversion from SSLError to str to fail (fixes
 #20113)

Some versions of requests raise SSLError exceptions whose __str__ does
not return a string object.

 mellon/adapters.py | 6 +++---
 mellon/views.py    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
mellon/adapters.py
39 39 
                    response = requests.get(idp['METADATA_URL'], verify=verify_ssl_certificate)
40 40 
                    response.raise_for_status()
41 41 
                except requests.exceptions.RequestException as e:
42 
                    self.logger.error(
43 
                        u'retrieval of metadata URL %r failed with error %s for %d-th idp',
44 
                        idp['METADATA_URL'], e, i)
42 
                    self.logger.exception(
43 
                        u'retrieval of metadata URL %r failed for %d-th idp',
44 
                        idp['METADATA_URL'], i)
45 45 
                    continue
46 46 
                idp['METADATA'] = response.content
47 47 
            elif 'METADATA' in idp:
mellon/views.py
263 263 
                                   timeout=app_settings.ARTIFACT_RESOLVE_TIMEOUT,
264 264 
                                   verify=verify_ssl_certificate)
265 265 
        except RequestException as e:
266 
            self.log.warning('unable to reach %r: %s', login.msgUrl, e)
266 
            self.log.warning('unable to reach %r: %r', login.msgUrl, e)
267 267 
            return self.sso_failure(request, login, _('IdP is temporarily down, please try again '
268 268 
                                                      'later.'), status_codes)
269 269 
        if result.status_code != 200:
270 
-