Merge pull request #63 from cranti/master

Fix user update when attribute list is empty

Author: knaperek

djangosaml2/backends.py

@@ -230,27 +230,23 @@ def update_user(self, user, attributes, attribute_mapping,
         user_modified = False
         profile_modified = False
         for saml_attr, django_attrs in attribute_mapping.items():
-            try:
-                for attr in django_attrs:
-                    if hasattr(user, attr):
-                        user_attr = getattr(user, attr)
-                        if callable(user_attr):
-                            modified = user_attr(
-                                    attributes[saml_attr])
-                        else:
-                            modified = self._set_attribute(
-                                    user, attr, attributes[saml_attr][0])
-
-                        user_modified = user_modified or modified
-
-                    elif profile is not None and hasattr(profile, attr):
-                        modified = self._set_attribute(
-                            profile, attr, attributes[saml_attr][0])
-                        profile_modified = profile_modified or modified
-
-            except KeyError:
-                # the saml attribute is missing
-                pass
+            attr_value_list = attributes.get(saml_attr)
+            if not attr_value_list:
+                continue
+
+            for attr in django_attrs:
+                if hasattr(user, attr):
+                    user_attr = getattr(user, attr)
+                    if callable(user_attr):
+                        modified = user_attr(attr_value_list)
+                    else:
+                        modified = self._set_attribute(user, attr, attr_value_list[0])
+
+                    user_modified = user_modified or modified
+
+                elif profile is not None and hasattr(profile, attr):
+                    modified = self._set_attribute(profile, attr, attr_value_list[0])
+                    profile_modified = profile_modified or modified
 
         logger.debug('Sending the pre_save signal')
         signal_modified = any(

tests/testprofiles/tests.py

@@ -89,3 +89,25 @@ def test_update_user_callable_attributes(self):
         self.assertEquals(user.email, 'john@example.com')
         self.assertEquals(user.first_name, 'John')
         self.assertEquals(user.last_name, 'Doe')
+
+    def test_update_user_empty_attribute(self):
+        user = User.objects.create(username='john', last_name='Smith')
+
+        backend = Saml2Backend()
+        attribute_mapping = {
+            'uid': ('username', ),
+            'mail': ('email', ),
+            'cn': ('first_name', ),
+            'sn': ('last_name', ),
+            }
+        attributes = {
+            'uid': ('john', ),
+            'mail': ('john@example.com', ),
+            'cn': ('John', ),
+            'sn': (),
+            }
+        backend.update_user(user, attributes, attribute_mapping)
+        self.assertEquals(user.email, 'john@example.com')
+        self.assertEquals(user.first_name, 'John')
+        # empty attribute list: no update
+        self.assertEquals(user.last_name, 'Smith')