0003-auth_saml-set-attributes-using-model-67025.patch

Valentin Deniaud, 16 août 2022 14:12

Voir les différences: en ligne côte à côte

Subject: [PATCH 3/7] auth_saml: set attributes using model (#67025)

 src/authentic2_auth_saml/adapters.py | 45 +++++++++++++++++-----------
 tests/test_auth_saml.py              | 35 +++++++++++-----------
 2 files changed, 45 insertions(+), 35 deletions(-)

     import logging
     from contextlib import contextmanager
     from django.contrib import messages
     from django.core.exceptions import MultipleObjectsReturned
-...
             return self.msg % self.kwargs
     @contextmanager
     def wrap_mapping_errors(action):
         try:
             yield
         except MappingError as e:
             if action.mandatory:
                 # it's mandatory, provisionning should fail completely
                 raise e
             logger.warning('auth_saml: mapping action failed: %s', e)
     class SamlConditionContextProxy:
         def __init__(self, saml_attributes):
             self.saml_attributes = saml_attributes
-...
             if not isinstance(attribute_mapping, list):
                 raise MappingError(_('invalid A2_ATTRIBUTE_MAPPING'))
             if self.apply_attribute_mapping(user, idp, saml_attributes, attribute_mapping):
                 user.save()
             self.apply_attribute_mapping(user, idp, saml_attributes, attribute_mapping)
         def apply_attribute_mapping(self, user, idp, saml_attributes, attribute_mapping):
             self.rename_attributes(idp, saml_attributes)
             self.set_attributes(user, idp, saml_attributes)
             user_modified = False
             for mapping in attribute_mapping:
                 if not isinstance(mapping, dict):
                     raise MappingError(_('invalid mapping action "%(mapping)s"'), mapping=mapping)
-...
                     if not method:
                         raise MappingError(_('invalid action'))
                     logger.debug('auth_saml: applying provisionning mapping %s', mapping)
                     if method(user, idp, saml_attributes, mapping):
                         user_modified = True
                     method(user, idp, saml_attributes, mapping)
                 except MappingError as e:
                     if mandatory:
                         # it's mandatory, provisionning should fail completely
                         raise e
                     logger.warning('auth_saml: mapping action failed: %s', e)
             return user_modified
         def rename_attributes(self, idp, saml_attributes):
             for action in idp['authenticator'].rename_attribute_actions.all():
                 if action.from_name in saml_attributes:
                     saml_attributes[action.to_name] = saml_attributes[action.from_name]
         def action_set_attribute(self, user, idp, saml_attributes, mapping):
             attribute = mapping.get('attribute')
             if not attribute or not isinstance(attribute, str):
                 raise MappingError(_('missing attribute key'))
         def set_attributes(self, user, idp, saml_attributes):
             user_modified = False
             for action in idp['authenticator'].set_attribute_actions.all():
                 with wrap_mapping_errors(action):
                     user_modified |= self.set_user_attribute(user, action, saml_attributes)
             saml_attribute = mapping.get('saml_attribute')
             if not saml_attribute or not isinstance(saml_attribute, str):
                 raise MappingError(_('missing saml_attribute key'))
             if user_modified:
                 user.save()
             if saml_attribute not in saml_attributes:
                 raise MappingError(_('unknown saml_attribute (%s)') % saml_attribute)
             value = saml_attributes[saml_attribute]
             return self.set_user_attribute(user, attribute, value)
         def set_user_attribute(self, user, action, saml_attributes):
             if action.saml_attribute not in saml_attributes:
                 raise MappingError(_('unknown saml_attribute (%s)') % action.saml_attribute)
         def set_user_attribute(self, user, attribute, value):
             attribute = action.attribute
             value = saml_attributes[action.saml_attribute]
             if isinstance(value, list):
                 if len(value) == 0:
                     raise MappingError(_('no value for attribute "%(attribute)s"'), attribute=attribute)

     from authentic2.custom_user.models import DeletedUser
     from authentic2.models import Attribute
     from authentic2_auth_saml.adapters import AuthenticAdapter, MappingError
     from authentic2_auth_saml.models import RenameAttributeAction, SAMLAuthenticator
     from authentic2_auth_saml.models import RenameAttributeAction, SAMLAuthenticator, SetAttributeAction
     from .utils import login
-...
             enabled=True,
             metadata='meta1.xml',
             slug='idp1',
             a2_attribute_mapping=[
+                {
                     'attribute': 'email',
                     'saml_attribute': 'mail',
                     'mandatory': True,
                 },
+                {
                     'attribute': 'title',
                     'saml_attribute': 'title',
                 },
+                {
                     'attribute': 'first_name',
                     'saml_attribute': 'first_name',
                 },
             ],
+        )
         SetAttributeAction.objects.create(
             authenticator=authenticator,
             attribute='email',
             saml_attribute='mail',
             mandatory=True,
+        )
         SetAttributeAction.objects.create(
             authenticator=authenticator,
             attribute='title',
             saml_attribute='title',
+        )
         SetAttributeAction.objects.create(
             authenticator=authenticator,
             attribute='first_name',
             saml_attribute='first_name',
+        )
         RenameAttributeAction.objects.create(
             authenticator=authenticator,
-...
         adapter, idp, saml_attributes, title_attribute, user, rf
     ):
         saml_attributes['http://nice/attribute/givenName'] = []
         idp['A2_ATTRIBUTE_MAPPING'][-1]['mandatory'] = True
         SetAttributeAction.objects.filter(attribute='first_name').update(mandatory=True)
         with pytest.raises(MappingError, match='no value'):
             adapter.apply_attribute_mapping(user, idp, saml_attributes, idp['A2_ATTRIBUTE_MAPPING'])
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0003-auth_saml-set-attributes-using-model-67025.patch