entrouvert
/
django-mellon
16
0
Fork 0
Code Issues Pull Requests Releases Activity

python3: handle differences in lasso/py2/py3 encodings

This commit is contained in:
Frédéric Péters 2018-03-25 10:20:03 +02:00
parent 401b65f8b3
commit 24e85adc5a
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mellon/utils.py
View File

@ -228,16 +228,18 @@ def get_status_codes_and_message(profile):
assert profile.response, 'missing response in profile' assert profile.response, 'missing response in profile'
assert profile.response.status, 'missing status in response' assert profile.response.status, 'missing status in response'
from .views import lasso_decode
status_codes = [] status_codes = []
status = profile.response.status status = profile.response.status
a = status a = status
while a.statusCode: while a.statusCode:
status_codes.append(a.statusCode.value.decode('utf-8')) status_codes.append(lasso_decode(a.statusCode.value))
a = a.statusCode a = a.statusCode
message = None message = None
if status.statusMessage: if status.statusMessage:
message = status.statusMessage.decode('utf-8') message = lasso_decode(status.statusMessage)
return status_codes, message return status_codes, message
def login(request, user): def login(request, user):

18
mellon/views.py
View File

@ -13,6 +13,7 @@ from django.conf import settings
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
from django.shortcuts import render, resolve_url from django.shortcuts import render, resolve_url
from django.utils.http import urlencode from django.utils.http import urlencode
from django.utils import six
from django.contrib.auth import REDIRECT_FIELD_NAME from django.contrib.auth import REDIRECT_FIELD_NAME
from django.db import transaction from django.db import transaction
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
@ -22,6 +23,11 @@ from . import app_settings, utils
lasso.setFlag('thin-sessions') lasso.setFlag('thin-sessions')
if six.PY3:
lasso_decode = lambda x: x
else:
lasso_decode = lambda x: x.decode('utf-8')
class LogMixin(object): class LogMixin(object):
"""Initialize a module logger in new objects""" """Initialize a module logger in new objects"""
@ -157,20 +163,20 @@ class LoginView(ProfileMixin, LogMixin, View):
for value in at.attributeValue: for value in at.attributeValue:
content = [any.exportToXml() for any in value.any] content = [any.exportToXml() for any in value.any]
content = ''.join(content) content = ''.join(content)
values.append(content.decode('utf8')) values.append(lasso_decode(content))
attributes['issuer'] = login.remoteProviderId attributes['issuer'] = login.remoteProviderId
if login.nameIdentifier: if login.nameIdentifier:
name_id = login.nameIdentifier name_id = login.nameIdentifier
name_id_format = unicode(name_id.format name_id_format = six.u(name_id.format
or lasso.SAML2_NAME_IDENTIFIER_FORMAT_UNSPECIFIED) or lasso.SAML2_NAME_IDENTIFIER_FORMAT_UNSPECIFIED)
attributes.update({ attributes.update({
'name_id_content': name_id.content.decode('utf8'), 'name_id_content': lasso_decode(name_id.content),
'name_id_format': name_id_format 'name_id_format': name_id_format
}) })
if name_id.nameQualifier: if name_id.nameQualifier:
attributes['name_id_name_qualifier'] = unicode(name_id.nameQualifier) attributes['name_id_name_qualifier'] = six.u(name_id.nameQualifier)
if name_id.spNameQualifier: if name_id.spNameQualifier:
attributes['name_id_sp_name_qualifier'] = unicode(name_id.spNameQualifier) attributes['name_id_sp_name_qualifier'] = six.u(name_id.spNameQualifier)
authn_statement = login.assertion.authnStatement[0] authn_statement = login.assertion.authnStatement[0]
if authn_statement.authnInstant: if authn_statement.authnInstant:
attributes['authn_instant'] = utils.iso8601_to_datetime(authn_statement.authnInstant) attributes['authn_instant'] = utils.iso8601_to_datetime(authn_statement.authnInstant)
@ -302,7 +308,7 @@ class LoginView(ProfileMixin, LogMixin, View):
a = a.statusCode a = a.statusCode
args = ['SAML authentication failed: status is not success codes: %r', status_codes] args = ['SAML authentication failed: status is not success codes: %r', status_codes]
if status.statusMessage: if status.statusMessage:
idp_message = status.statusMessage.decode('utf-8') idp_message = lasso_decode(status.statusMessage)
args[0] += ' message: %r' args[0] += ' message: %r'
args.append(status.statusMessage) args.append(status.statusMessage)
self.log.warning(*args) self.log.warning(*args)