Merge pull request #548 from mrvanes/fix-friendlyname-mapping

Do not map attribute FriendlyName to attribute Name

Author: c00kiemon5ter

src/saml2/attribute_converter.py

@@ -118,42 +118,7 @@ def to_local(acs, statement, allow_unknown_attributes=False):
     :param allow_unknown_attributes: If unknown attributes are allowed
     :return: A key,values dictionary
     """
-    if not acs:
-        acs = [AttributeConverter()]
-        acsd = {"": acs}
-    else:
-        acsd = dict([(a.name_format, a) for a in acs])
-
-    ava = {}
-    for attr in statement.attribute:
-        try:
-            _func = acsd[attr.name_format].ava_from
-        except KeyError:
-            if attr.name_format == NAME_FORMAT_UNSPECIFIED or \
-                    allow_unknown_attributes:
-                _func = acs[0].lcd_ava_from
-            else:
-                logger.info("Unsupported attribute name format: %s",
-                    attr.name_format)
-                continue
-
-        try:
-            key, val = _func(attr)
-        except KeyError:
-            if allow_unknown_attributes:
-                key, val = acs[0].lcd_ava_from(attr)
-            else:
-                logger.info("Unknown attribute name: %s", attr)
-                continue
-        except AttributeError:
-            continue
-
-        try:
-            ava[key].extend(val)
-        except KeyError:
-            ava[key] = val
-
-    return ava
+    return list_to_local(acs, statement.attribute, allow_unknown_attributes)
 
 
 def list_to_local(acs, attrlist, allow_unknown_attributes=False):
@@ -313,23 +278,15 @@ def from_dict(self, mapdict):
 
     def lcd_ava_from(self, attribute):
         """
-        In nothing else works, this should
+        If nothing else works, this should
 
-        :param attribute: An Attribute Instance
+        :param attribute: an Attribute instance
         :return:
         """
-        try:
-            name = attribute.friendly_name.strip()
-        except AttributeError:
-            name = attribute.name.strip()
-
-        values = []
-        for value in attribute.attribute_value:
-            if not value.text:
-                values.append('')
-            else:
-                values.append(value.text.strip())
-
+        name = attribute.name.strip()
+        values = [
+            (value.text or '').strip()
+            for value in attribute.attribute_value]
         return name, values
 
     def fail_safe_fro(self, statement):

tests/test_19_attribute_converter.py

@@ -192,7 +192,7 @@ def test_mixed_attributes_1(self):
         ava = to_local(self.acs, ats, True)
         assert ava == {'eduPersonAffiliation': ['staff'],
                        'givenName': ['Roland'], 'sn': ['Hedberg'],
-                       'swissEduPersonHomeOrganizationType': ['others'],
+                       'urn:oid:2.16.756.1.2.5.1.1.5': ['others'],
                        'uid': ['demouser'], 'urn:example:com:foo': ['Thing'],
                        'user_id': ['bob']}