Merge pull request #299 from rebeckag/attr_conv_fix

Make AttributeConverter.adjust more robust (by fixing attribute name …

Author: Roland Hedberg

src/saml2/attribute_converter.py

@@ -284,7 +284,7 @@ def adjust(self):
         if self._fro is None and self._to is not None:
             self._fro = dict(
                 [(value.lower(), key) for key, value in self._to.items()])
-        if self._to is None and self.fro is not None:
+        if self._to is None and self._fro is not None:
             self._to = dict(
                 [(value.lower(), key) for key, value in self._fro.items()])
 

tests/test_19_attribute_converter.py

@@ -5,14 +5,15 @@
 from attribute_statement_data import *
 
 from pathutils import full_path
-from saml2.attribute_converter import AttributeConverterNOOP
+from saml2.attribute_converter import AttributeConverterNOOP, AttributeConverter
 from saml2.attribute_converter import to_local
 from saml2.saml import attribute_from_string
 
 
-def _eq(l1,l2):
+def _eq(l1, l2):
     return set(l1) == set(l2)
 
+
 BASIC_NF = 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic'
 URI_NF = 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri'
 SAML1 = 'urn:mace:shibboleth:1.0:attributeNamespace:uri'
@@ -30,11 +31,11 @@ def setup_class(self):
     def test_setup(self):
         print(self.acs)
         assert len(self.acs) == 3
-        assert _eq([a.name_format for a in self.acs],[BASIC_NF, URI_NF, SAML1] )
+        assert _eq([a.name_format for a in self.acs], [BASIC_NF, URI_NF, SAML1])
 
     def test_ava_fro_1(self):
         ats = saml.attribute_statement_from_string(STATEMENT1)
-        #print(ats)
+        # print(ats)
         ava = None
 
         for ac in self.acs:
@@ -56,7 +57,7 @@ def test_ava_fro_1(self):
 
     def test_ava_fro_2(self):
         ats = saml.attribute_statement_from_string(STATEMENT2)
-        #print(ats)
+        # print(ats)
         ava = {}
         for ac in self.acs:
             ava.update(ac.fro(ats))
@@ -66,7 +67,7 @@ def test_ava_fro_2(self):
                                 'uid', 'mail', 'givenName', 'sn'])
 
     def test_to_attrstat_1(self):
-        ava = { "givenName": "Roland", "sn": "Hedberg" }
+        ava = {"givenName": "Roland", "sn": "Hedberg"}
 
         statement = attribute_converter.from_local(self.acs, ava, BASIC_NF)
 
@@ -90,7 +91,7 @@ def test_to_attrstat_1(self):
             assert False
 
     def test_to_attrstat_2(self):
-        ava = { "givenName": "Roland", "surname": "Hedberg" }
+        ava = {"givenName": "Roland", "surname": "Hedberg"}
 
         statement = attribute_converter.from_local(self.acs, ava, URI_NF)
 
@@ -117,17 +118,17 @@ def test_to_local_name(self):
 
         attr = [
             saml.Attribute(
-                friendly_name="surName",
-                name="urn:oid:2.5.4.4",
-                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
+                    friendly_name="surName",
+                    name="urn:oid:2.5.4.4",
+                    name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
             saml.Attribute(
-                friendly_name="efternamn",
-                name="urn:oid:2.5.4.42",
-                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
+                    friendly_name="efternamn",
+                    name="urn:oid:2.5.4.42",
+                    name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
             saml.Attribute(
-                friendly_name="titel",
-                name="urn:oid:2.5.4.12",
-                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
+                    friendly_name="titel",
+                    name="urn:oid:2.5.4.12",
+                    name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
 
         lan = [attribute_converter.to_local_name(self.acs, a) for a in attr]
 
@@ -153,16 +154,16 @@ def test_to_local_name(self):
     def test_to_local_name_from_basic(self):
         attr = [
             saml.Attribute(
-                name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN",
-                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:basic")
+                    name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN",
+                    name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:basic")
         ]
 
         lan = [attribute_converter.to_local_name(self.acs, a) for a in attr]
 
         assert _eq(lan, ['eduPersonPrimaryOrgUnitDN'])
 
     def test_to_and_for(self):
-        ava = { "givenName": "Roland", "surname": "Hedberg" }
+        ava = {"givenName": "Roland", "surname": "Hedberg"}
 
         basic_ac = [a for a in self.acs if a.name_format == BASIC_NF][0]
 
@@ -192,9 +193,26 @@ def test_mixed_attributes_1(self):
                        'uid': ['demouser'], 'urn:example:com:foo': ['Thing'],
                        'user_id': ['bob']}
 
+    def test_adjust_with_only_from_defined(self):
+        attr_conv = AttributeConverter()
+        attr_conv._fro = {"id1": "name1", "id2": "name2"}
+        attr_conv.adjust()
+        assert attr_conv._to is not None
+
+    def test_adjust_with_only_to_defined(self):
+        attr_conv = AttributeConverter()
+        attr_conv._to = {"id1": "name1", "id2": "name2"}
+        attr_conv.adjust()
+        assert attr_conv._fro is not None
+
+    def test_adjust_with_no_mapping_defined(self):
+        attr_conv = AttributeConverter()
+        attr_conv.adjust()
+        assert attr_conv._fro is None and attr_conv._to is None
+
 
 def test_noop_attribute_conversion():
-    ava = {"urn:oid:2.5.4.4": "Roland", "urn:oid:2.5.4.42": "Hedberg" }
+    ava = {"urn:oid:2.5.4.4": "Roland", "urn:oid:2.5.4.42": "Hedberg"}
     aconv = AttributeConverterNOOP(URI_NF)
     res = aconv.to_(ava)
 
@@ -229,4 +247,4 @@ def test_schac():
     t = TestAC()
     t.setup_class()
     t.test_to_attrstat_1()
-    #test_schac()
+    # test_schac()