Added new eduPerson attributes and fixed some map errors

1 files changed, 113 insertions, 107 deletions

diff --git a/tests/test_20_assertion.py b/tests/test_20_assertion.py
index 8043c911..779a6efc 100644
--- a/tests/test_20_assertion.py
+++ b/tests/test_20_assertion.py
@@ -81,14 +81,18 @@ def test_filter_on_attributes_1():
 
 
 def test_filter_on_attributes_without_friendly_name():
-    ava = {"eduPersonTargetedID": "test@example.com", "eduPersonAffiliation": "test",
+    ava = {"eduPersonTargetedID": "test@example.com",
+           "eduPersonAffiliation": "test",
            "extra": "foo"}
     eptid = to_dict(
-            Attribute(name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10", name_format=NAME_FORMAT_URI), ONTS)
+        Attribute(name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11",
+                  name_format=NAME_FORMAT_URI), ONTS)
     ep_affiliation = to_dict(
-            Attribute(name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1", name_format=NAME_FORMAT_URI), ONTS)
+        Attribute(name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1",
+                  name_format=NAME_FORMAT_URI), ONTS)
 
-    restricted_ava = filter_on_attributes(ava, required=[eptid], optional=[ep_affiliation],
+    restricted_ava = filter_on_attributes(ava, required=[eptid],
+                                          optional=[ep_affiliation],
                                           acs=ac_factory())
     assert restricted_ava == {"eduPersonTargetedID": "test@example.com",
                               "eduPersonAffiliation": "test"}
@@ -97,8 +101,9 @@ def test_filter_on_attributes_without_friendly_name():
 def test_filter_on_attributes_with_missing_required_attribute():
     ava = {"extra": "foo"}
     eptid = to_dict(Attribute(
-            friendly_name="eduPersonTargetedID", name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10",
-            name_format=NAME_FORMAT_URI), ONTS)
+        friendly_name="eduPersonTargetedID",
+        name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10",
+        name_format=NAME_FORMAT_URI), ONTS)
     with pytest.raises(MissingValue):
         filter_on_attributes(ava, required=[eptid])
 
@@ -106,8 +111,9 @@ def test_filter_on_attributes_with_missing_required_attribute():
 def test_filter_on_attributes_with_missing_optional_attribute():
     ava = {"extra": "foo"}
     eptid = to_dict(Attribute(
-            friendly_name="eduPersonTargetedID", name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10",
-            name_format=NAME_FORMAT_URI), ONTS)
+        friendly_name="eduPersonTargetedID",
+        name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10",
+        name_format=NAME_FORMAT_URI), ONTS)
     assert filter_on_attributes(ava, optional=[eptid]) == {}
 
 
@@ -418,9 +424,9 @@ def test_filter_values_req_2():
 
 def test_filter_values_req_3():
     a = to_dict(
-            Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
-                      friendly_name="serialNumber",
-                      attribute_value=[AttributeValue(text="12345")]), ONTS)
+        Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
+                  friendly_name="serialNumber",
+                  attribute_value=[AttributeValue(text="12345")]), ONTS)
 
     required = [a]
     ava = {"serialNumber": ["12345"]}
@@ -432,9 +438,9 @@ def test_filter_values_req_3():
 
 def test_filter_values_req_4():
     a = to_dict(
-            Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
-                      friendly_name="serialNumber",
-                      attribute_value=[AttributeValue(text="54321")]), ONTS)
+        Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
+                  friendly_name="serialNumber",
+                  attribute_value=[AttributeValue(text="54321")]), ONTS)
 
     required = [a]
     ava = {"serialNumber": ["12345"]}
@@ -444,9 +450,9 @@ def test_filter_values_req_4():
 
 def test_filter_values_req_5():
     a = to_dict(
-            Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
-                      friendly_name="serialNumber",
-                      attribute_value=[AttributeValue(text="12345")]), ONTS)
+        Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
+                  friendly_name="serialNumber",
+                  attribute_value=[AttributeValue(text="12345")]), ONTS)
 
     required = [a]
     ava = {"serialNumber": ["12345", "54321"]}
@@ -458,9 +464,9 @@ def test_filter_values_req_5():
 
 def test_filter_values_req_6():
     a = to_dict(
-            Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
-                      friendly_name="serialNumber",
-                      attribute_value=[AttributeValue(text="54321")]), ONTS)
+        Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
+                  friendly_name="serialNumber",
+                  attribute_value=[AttributeValue(text="54321")]), ONTS)
 
     required = [a]
     ava = {"serialNumber": ["12345", "54321"]}
@@ -472,13 +478,13 @@ def test_filter_values_req_6():
 
 def test_filter_values_req_opt_0():
     r = to_dict(
-            Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
-                      friendly_name="serialNumber",
-                      attribute_value=[AttributeValue(text="54321")]), ONTS)
+        Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
+                  friendly_name="serialNumber",
+                  attribute_value=[AttributeValue(text="54321")]), ONTS)
     o = to_dict(
-            Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
-                      friendly_name="serialNumber",
-                      attribute_value=[AttributeValue(text="12345")]), ONTS)
+        Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
+                  friendly_name="serialNumber",
+                  attribute_value=[AttributeValue(text="12345")]), ONTS)
 
     ava = {"serialNumber": ["12345", "54321"]}
 
@@ -489,14 +495,14 @@ def test_filter_values_req_opt_0():
 
 def test_filter_values_req_opt_1():
     r = to_dict(
-            Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
-                      friendly_name="serialNumber",
-                      attribute_value=[AttributeValue(text="54321")]), ONTS)
+        Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
+                  friendly_name="serialNumber",
+                  attribute_value=[AttributeValue(text="54321")]), ONTS)
     o = to_dict(
-            Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
-                      friendly_name="serialNumber",
-                      attribute_value=[AttributeValue(text="12345"),
-                                       AttributeValue(text="abcd0")]), ONTS)
+        Attribute(name="urn:oid:2.5.4.5", name_format=NAME_FORMAT_URI,
+                  friendly_name="serialNumber",
+                  attribute_value=[AttributeValue(text="12345"),
+                                   AttributeValue(text="abcd0")]), ONTS)
 
     ava = {"serialNumber": ["12345", "54321"]}
 
@@ -508,30 +514,30 @@ def test_filter_values_req_opt_1():
 def test_filter_values_req_opt_2():
     r = [
         to_dict(
-                Attribute(
-                        friendly_name="surName",
-                        name="urn:oid:2.5.4.4",
-                        name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
-                ONTS),
+            Attribute(
+                friendly_name="surName",
+                name="urn:oid:2.5.4.4",
+                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
+            ONTS),
         to_dict(
-                Attribute(
-                        friendly_name="givenName",
-                        name="urn:oid:2.5.4.42",
-                        name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
-                ONTS),
+            Attribute(
+                friendly_name="givenName",
+                name="urn:oid:2.5.4.42",
+                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
+            ONTS),
         to_dict(
-                Attribute(
-                        friendly_name="mail",
-                        name="urn:oid:0.9.2342.19200300.100.1.3",
-                        name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
-                ONTS)]
+            Attribute(
+                friendly_name="mail",
+                name="urn:oid:0.9.2342.19200300.100.1.3",
+                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
+            ONTS)]
     o = [
         to_dict(
-                Attribute(
-                        friendly_name="title",
-                        name="urn:oid:2.5.4.12",
-                        name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
-                ONTS)]
+            Attribute(
+                friendly_name="title",
+                name="urn:oid:2.5.4.12",
+                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"),
+            ONTS)]
 
     ava = {"surname": ["Hedberg"], "givenName": ["Roland"],
            "eduPersonAffiliation": ["staff"], "uid": ["rohe0002"]}
@@ -545,18 +551,18 @@ def test_filter_values_req_opt_2():
 def test_filter_values_req_opt_4():
     r = [
         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"),
         Attribute(
-                friendly_name="givenName",
-                name="urn:oid:2.5.4.42",
-                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
+            friendly_name="givenName",
+            name="urn:oid:2.5.4.42",
+            name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
     o = [
         Attribute(
-                friendly_name="title",
-                name="urn:oid:2.5.4.12",
-                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
+            friendly_name="title",
+            name="urn:oid:2.5.4.12",
+            name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
 
     acs = attribute_converter.ac_factory(full_path("attributemaps"))
 
@@ -577,15 +583,15 @@ def test_filter_values_req_opt_4():
 
 def test_filter_ava_0():
     policy = Policy(
-            {
-                "default": {
-                    "lifetime": {"minutes": 15},
-                    "attribute_restrictions": None  # means all I have
-                },
-                "urn:mace:example.com:saml:roland:sp": {
-                    "lifetime": {"minutes": 5},
-                }
+        {
+            "default": {
+                "lifetime": {"minutes": 15},
+                "attribute_restrictions": None  # means all I have
+            },
+            "urn:mace:example.com:saml:roland:sp": {
+                "lifetime": {"minutes": 5},
             }
+        }
     )
 
     ava = {"givenName": ["Derek"], "surName": ["Jeter"],
@@ -701,30 +707,30 @@ def test_filter_ava_4():
 def test_req_opt():
     req = [
         to_dict(
-                md.RequestedAttribute(
-                        friendly_name="surname", name="urn:oid:2.5.4.4",
-                        name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
-                        is_required="true"), ONTS),
+            md.RequestedAttribute(
+                friendly_name="surname", name="urn:oid:2.5.4.4",
+                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
+                is_required="true"), ONTS),
         to_dict(
-                md.RequestedAttribute(
-                        friendly_name="givenname",
-                        name="urn:oid:2.5.4.42",
-                        name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
-                        is_required="true"), ONTS),
+            md.RequestedAttribute(
+                friendly_name="givenname",
+                name="urn:oid:2.5.4.42",
+                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
+                is_required="true"), ONTS),
         to_dict(
-                md.RequestedAttribute(
-                        friendly_name="edupersonaffiliation",
-                        name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1",
-                        name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
-                        is_required="true"), ONTS)]
+            md.RequestedAttribute(
+                friendly_name="edupersonaffiliation",
+                name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1",
+                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
+                is_required="true"), ONTS)]
 
     opt = [
         to_dict(
-                md.RequestedAttribute(
-                        friendly_name="title",
-                        name="urn:oid:2.5.4.12",
-                        name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
-                        is_required="false"), ONTS)]
+            md.RequestedAttribute(
+                friendly_name="title",
+                name="urn:oid:2.5.4.12",
+                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri",
+                is_required="false"), ONTS)]
 
     policy = Policy()
     ava = {'givenname': 'Roland', 'surname': 'Hedberg',
@@ -738,18 +744,18 @@ def test_req_opt():
 def test_filter_on_wire_representation_1():
     r = [
         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"),
         Attribute(
-                friendly_name="givenName",
-                name="urn:oid:2.5.4.42",
-                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
+            friendly_name="givenName",
+            name="urn:oid:2.5.4.42",
+            name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
     o = [
         Attribute(
-                friendly_name="title",
-                name="urn:oid:2.5.4.12",
-                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
+            friendly_name="title",
+            name="urn:oid:2.5.4.12",
+            name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
 
     acs = attribute_converter.ac_factory(full_path("attributemaps"))
 
@@ -763,18 +769,18 @@ def test_filter_on_wire_representation_1():
 def test_filter_on_wire_representation_2():
     r = [
         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"),
         Attribute(
-                friendly_name="givenName",
-                name="urn:oid:2.5.4.42",
-                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
+            friendly_name="givenName",
+            name="urn:oid:2.5.4.42",
+            name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
     o = [
         Attribute(
-                friendly_name="title",
-                name="urn:oid:2.5.4.12",
-                name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
+            friendly_name="title",
+            name="urn:oid:2.5.4.12",
+            name_format="urn:oasis:names:tc:SAML:2.0:attrname-format:uri")]
 
     acs = attribute_converter.ac_factory(full_path("attributemaps"))