Merge branch 'dev'

Author: peppelinux

djangosaml2/backends.py

@@ -159,6 +159,8 @@ def _update_user(self, user, attributes: dict, attribute_mapping: dict, force_sa
                 user = self.save_user(user)
             return user
 
+        # Lookup key
+        user_lookup_key = self._user_lookup_attribute
         has_updated_fields = False
         for saml_attr, django_attrs in attribute_mapping.items():
             attr_value_list = attributes.get(saml_attr)
@@ -168,7 +170,12 @@ def _update_user(self, user, attributes: dict, attribute_mapping: dict, force_sa
                 continue
 
             for attr in django_attrs:
-                if hasattr(user, attr):
+                if attr == user_lookup_key:
+                    # Don't update user_lookup_key (e.g. username) (issue #245)
+                    # It was just used to find/create this user and might have
+                    # been changed by `clean_user_main_attribute`
+                    continue
+                elif hasattr(user, attr):
                     user_attr = getattr(user, attr)
                     if callable(user_attr):
                         modified = user_attr(attr_value_list)

djangosaml2/views.py

@@ -250,14 +250,14 @@ def get(self, request, *args, **kwargs):
 
         # SSO options
         sign_requests = getattr(conf, '_sp_authn_requests_signed', False)
-
         if sign_requests:
-            csc = settings.SAML_CONFIG['service']['sp']
-            sso_kwargs["sigalg"] = csc.get('signing_algorithm',
-                                           saml2.xmldsig.SIG_RSA_SHA256)
-            sso_kwargs["digest_alg"] = csc.get('digest_algorithm',
-                                               saml2.xmldsig.DIGEST_SHA256)
-
+            sso_kwargs["sigalg"] = getattr(conf, '_sp_signing_algorithm',
+                                           saml2.xmldsig.SIG_RSA_SHA256
+            )
+            sso_kwargs["digest_alg"] = getattr(conf,
+                                               '_sp_digest_algorithm',
+                                               saml2.xmldsig.DIGEST_SHA256
+            )
         # pysaml needs a string otherwise: "cannot serialize True (type bool)"
         if getattr(conf, '_sp_force_authn', False):
             sso_kwargs['force_authn'] = "true"

tests/testprofiles/tests.py

@@ -338,17 +338,18 @@ def is_authorized(self, attributes, attribute_mapping, idp_entityid: str, assert
         return attributes.get('is_staff', (None, ))[0] == True and assertion_info.get('assertion_id', None) != None
 
     def clean_attributes(self, attributes: dict, idp_entityid: str, **kwargs) -> dict:
-        ''' Keep only age attribute '''
+        ''' Keep only certain attribute '''
         return {
             'age': attributes.get('age', (None, )),
+            'mail': attributes.get('mail', (None, )),
             'is_staff': attributes.get('is_staff', (None, )),
             'uid': attributes.get('uid', (None, )),
         }
 
     def clean_user_main_attribute(self, main_attribute):
-        ''' Replace all spaces an dashes by underscores '''
+        ''' Partition string on @ and return the first part '''
         if main_attribute:
-            return main_attribute.replace('-', '_').replace(' ', '_')
+            return main_attribute.partition('@')[0]
         return main_attribute
 
 
@@ -380,10 +381,13 @@ def test_is_authorized(self):
 
     def test_clean_attributes(self):
         attributes = {'random': 'dummy', 'value': 123, 'age': '28'}
-        self.assertEqual(self.backend.clean_attributes(attributes, ''), {'age': '28', 'is_staff': (None,), 'uid': (None,)})
-        
+        self.assertEqual(
+            self.backend.clean_attributes(attributes, ''),
+            {'age': '28', 'mail': (None,), 'is_staff': (None,), 'uid': (None,)}
+        )
+
     def test_clean_user_main_attribute(self):
-        self.assertEqual(self.backend.clean_user_main_attribute('va--l__ u -e'), 'va__l___u__e')
+        self.assertEqual(self.backend.clean_user_main_attribute('john@example.com'), 'john')
 
     def test_authenticate(self):
         attribute_mapping = {
@@ -454,3 +458,35 @@ def test_authenticate(self):
         self.user.refresh_from_db()
         self.assertEqual(self.user.age, '28')
         self.assertEqual(self.user.is_staff, True)
+
+    def test_user_cleaned_main_attribute(self):
+        """
+        In this test the username is taken from the `mail` attribute,
+        but cleaned to remove the @domain part. After fetching and
+        updating the user, the username remains the same.
+        """
+        attribute_mapping = {
+            'mail': ('username',),
+            'cn': ('first_name',),
+            'sn': ('last_name',),
+            'is_staff': ('is_staff', ),
+        }
+        attributes = {
+            'mail': ('john@example.com',),
+            'cn': ('John',),
+            'sn': ('Doe',),
+            'is_staff': (True, ),
+        }
+        assertion_info = {
+            'assertion_id': 'abcdefg12345',
+        }
+        user = self.backend.authenticate(
+            None,
+            session_info={'ava': attributes, 'issuer': 'dummy_entity_id'},
+            attribute_mapping=attribute_mapping,
+            assertion_info=assertion_info,
+        )
+        self.assertEqual(user, self.user)
+
+        self.user.refresh_from_db()
+        self.assertEqual(user.username, 'john')