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

rename get_parameter() to get_setting()

This commit is contained in:
Benjamin Dauvergne 2014-08-05 17:55:29 +02:00
parent 587084f3cd
commit e5e9dcf86a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mellon/adapters.py
View File

@ -12,7 +12,7 @@ class DefaultAdapter(object):
def authorize(self, idp, saml_attributes):
if not idp:
return False
required_classref = utils.get_parameter(idp, 'AUTHN_CLASSREF')
required_classref = utils.get_setting(idp, 'AUTHN_CLASSREF')
if required_classref:
given_classref = saml_attributes['authn_context_class_ref']
if given_classref is None or \
@ -21,8 +21,8 @@ class DefaultAdapter(object):
return True
def format_username(self, idp, saml_attributes):
realm = utils.get_parameter(idp, 'REALM')
username_template = utils.get_parameter(idp, 'USERNAME_TEMPLATE')
realm = utils.get_setting(idp, 'REALM')
username_template = utils.get_setting(idp, 'USERNAME_TEMPLATE')
try:
username = username_template.format(
realm=realm, attributes=saml_attributes, idp=idp)
@ -41,7 +41,7 @@ class DefaultAdapter(object):
username = self.format_username(idp, saml_attributes)
if not username:
return None
provision = utils.get_parameter(idp, 'PROVISION')
provision = utils.get_setting(idp, 'PROVISION')
if provision:
user, created = User.objects.get_or_create(username=username)
else:
@ -57,8 +57,8 @@ class DefaultAdapter(object):
self.provision_groups(user, idp, saml_attributes)
def provision_attribute(self, user, idp, saml_attributes):
realm = utils.get_parameter(idp, 'REALM')
attribute_mapping = utils.get_parameter(idp, 'ATTRIBUTE_MAPPING')
realm = utils.get_setting(idp, 'REALM')
attribute_mapping = utils.get_setting(idp, 'ATTRIBUTE_MAPPING')
for field, tpl in attribute_mapping.iteritems():
try:
value = tpl.format(realm=realm, attributes=saml_attributes, idp=idp)
@ -70,7 +70,7 @@ class DefaultAdapter(object):
setattr(user, field, value)
def provision_superuser(self, user, idp, saml_attributes):
superuser_mapping = utils.get_parameter(idp, 'SUPERUSER_MAPPING')
superuser_mapping = utils.get_setting(idp, 'SUPERUSER_MAPPING')
if not superuser_mapping:
return
for key, values in superuser_mapping.iteritems():
@ -93,8 +93,8 @@ class DefaultAdapter(object):
user.save()
def provision_groups(self, user, idp, saml_attributes):
group_attribute = utils.get_parameter(idp, 'GROUP_ATTRIBUTE')
create_group = utils.get_parameter(idp, 'CREATE_GROUP')
group_attribute = utils.get_setting(idp, 'GROUP_ATTRIBUTE')
create_group = utils.get_setting(idp, 'CREATE_GROUP')
if group_attribute in saml_attributes:
values = saml_attributes[group_attribute]
if not isinstance(values, (list, tuple)):

2
mellon/utils.py
View File

@ -107,7 +107,7 @@ def get_values(saml_attributes, name):
return (values,)
return values
def get_parameter(idp, name, default=None):
def get_setting(idp, name, default=None):
'''Get a parameter from an IdP specific configuration or from the main
settings.
'''

4
mellon/views.py
View File

@ -61,8 +61,8 @@ class LoginView(View):
def login_failure(self, request, login, idp_message, status_codes):
'''show error message to user after a login failure'''
idp = self.get_idp(request)
error_url = utils.get_parameter(idp, 'ERROR_URL')
error_redirect_after_timeout = utils.get_parameter(idp, 'ERROR_REDIRECT_AFTER_TIMEOUT')
error_url = utils.get_setting(idp, 'ERROR_URL')
error_redirect_after_timeout = utils.get_setting(idp, 'ERROR_REDIRECT_AFTER_TIMEOUT')
if error_url:
error_url = resolve_url(error_url)
next_url = error_url or login.msgRelayState or resolve_url(settings.LOGIN_REDIRECT_URL)