From 2ca55ccc0d68d324b3c14ee921c5730d3b46cadb Mon Sep 17 00:00:00 2001 From: tpazderka Date: Mon, 5 Sep 2016 14:47:41 +0200 Subject: [PATCH 1/2] Fix eduID attributes Per http://software.internet2.edu/eduperson/internet2-mace-dir-eduperson-201602.html --- src/saml2/attributemaps/saml_uri.py | 48 +++++++++++------------ src/saml2/attributemaps/shibboleth_uri.py | 48 +++++++++++------------ tests/test_20_assertion.py | 2 +- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/saml2/attributemaps/saml_uri.py b/src/saml2/attributemaps/saml_uri.py index afdfee25d..6b0ac4cb3 100644 --- a/src/saml2/attributemaps/saml_uri.py +++ b/src/saml2/attributemaps/saml_uri.py @@ -19,19 +19,19 @@ EDUCOURSE_OID+'1': 'eduCourseOffering', EDUCOURSE_OID+'2': 'eduCourseMember', EDUPERSON_OID+'1': 'eduPersonAffiliation', - EDUPERSON_OID+'2': 'eduPersonEntitlement', - EDUPERSON_OID+'3': 'eduPersonNickname', - EDUPERSON_OID+'4': 'eduPersonOrgDN', - EDUPERSON_OID+'5': 'eduPersonOrgUnitDN', - EDUPERSON_OID+'6': 'eduPersonPrimaryAffiliation', - EDUPERSON_OID+'7': 'eduPersonPrimaryOrgUnitDN', - EDUPERSON_OID+'8': 'eduPersonPrincipalName', - EDUPERSON_OID+'9': 'eduPersonPrincipalName', - EDUPERSON_OID+'10': 'eduPersonScopedAffiliation', - EDUPERSON_OID+'11': 'eduPersonTargetedID', - EDUPERSON_OID+'12': 'eduPersonAssurance', + EDUPERSON_OID+'2': 'eduPersonNickname', + EDUPERSON_OID+'3': 'eduPersonOrgDN', + EDUPERSON_OID+'4': 'eduPersonOrgUnitDN', + EDUPERSON_OID+'5': 'eduPersonPrimaryAffiliation', + EDUPERSON_OID+'6': 'eduPersonPrincipalName', + EDUPERSON_OID+'7': 'eduPersonEntitlement', + EDUPERSON_OID+'8': 'eduPersonPrimaryOrgUnitDN', + EDUPERSON_OID+'9': 'eduPersonScopedAffiliation', + EDUPERSON_OID+'10': 'eduPersonTargetedID', + EDUPERSON_OID+'11': 'eduPersonAssurance', + EDUPERSON_OID+'12': 'eduPersonPrincipalNamePrior', EDUPERSON_OID+'13': 'eduPersonUniqueID', - EDUPERSON_OID+'14': 'eduPersonOrcid', + EDUPERSON_OID+'16': 'eduPersonOrcid', LDAPGVAT_OID+'1': 'PVP-GID', LDAPGVAT_OID+'149': 'PVP-BPK', LDAPGVAT_OID+'153': 'PVP-OU-OKZ', @@ -179,19 +179,19 @@ 'eduCourseMember': EDUCOURSE_OID+'2', 'eduCourseOffering': EDUCOURSE_OID+'1', 'eduPersonAffiliation': EDUPERSON_OID+'1', - 'eduPersonEntitlement': EDUPERSON_OID+'2', - 'eduPersonNickname': EDUPERSON_OID+'3', - 'eduPersonOrgDN': EDUPERSON_OID+'4', - 'eduPersonOrgUnitDN': EDUPERSON_OID+'5', - 'eduPersonPrimaryAffiliation': EDUPERSON_OID+'6', - 'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'7', - 'eduPersonPrincipalName': EDUPERSON_OID+'8', - 'eduPersonPrincipalNamePrior': EDUPERSON_OID+'9', - 'eduPersonScopedAffiliation': EDUPERSON_OID+'10', - 'eduPersonTargetedID': EDUPERSON_OID+'11', - 'eduPersonAssurance': EDUPERSON_OID+'12', + 'eduPersonEntitlement': EDUPERSON_OID+'7', + 'eduPersonNickname': EDUPERSON_OID+'2', + 'eduPersonOrgDN': EDUPERSON_OID+'3', + 'eduPersonOrgUnitDN': EDUPERSON_OID+'4', + 'eduPersonPrimaryAffiliation': EDUPERSON_OID+'5', + 'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'8', + 'eduPersonPrincipalName': EDUPERSON_OID+'6', + 'eduPersonPrincipalNamePrior': EDUPERSON_OID+'12', + 'eduPersonScopedAffiliation': EDUPERSON_OID+'9', + 'eduPersonTargetedID': EDUPERSON_OID+'10', + 'eduPersonAssurance': EDUPERSON_OID+'11', 'eduPersonUniqueID': EDUPERSON_OID+'13', - 'eduPersonOrcid': EDUPERSON_OID+'14', + 'eduPersonOrcid': EDUPERSON_OID+'16', 'email': PKCS_9+'1', 'employeeNumber': NETSCAPE_LDAP+'3', 'employeeType': NETSCAPE_LDAP+'4', diff --git a/src/saml2/attributemaps/shibboleth_uri.py b/src/saml2/attributemaps/shibboleth_uri.py index 81823a90f..45461971f 100644 --- a/src/saml2/attributemaps/shibboleth_uri.py +++ b/src/saml2/attributemaps/shibboleth_uri.py @@ -11,19 +11,19 @@ "identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri", 'fro': { EDUPERSON_OID+'1': 'eduPersonAffiliation', - EDUPERSON_OID+'2': 'eduPersonEntitlement', - EDUPERSON_OID+'3': 'eduPersonNickname', - EDUPERSON_OID+'4': 'eduPersonOrgDN', - EDUPERSON_OID+'5': 'eduPersonOrgUnitDN', - EDUPERSON_OID+'6': 'eduPersonPrimaryAffiliation', - EDUPERSON_OID+'7': 'eduPersonPrimaryOrgUnitDN', - EDUPERSON_OID+'8': 'eduPersonPrincipalName', - EDUPERSON_OID+'9': 'eduPersonPrincipalNamePrior', - EDUPERSON_OID+'10': 'eduPersonScopedAffiliation', - EDUPERSON_OID+'11': 'eduPersonTargetedID', - EDUPERSON_OID+'12': 'eduPersonAssurance', + EDUPERSON_OID+'2': 'eduPersonNickname', + EDUPERSON_OID+'3': 'eduPersonOrgDN', + EDUPERSON_OID+'4': 'eduPersonOrgUnitDN', + EDUPERSON_OID+'5': 'eduPersonPrimaryAffiliation', + EDUPERSON_OID+'6': 'eduPersonPrincipalName', + EDUPERSON_OID+'7': 'eduPersonEntitlement', + EDUPERSON_OID+'8': 'eduPersonPrimaryOrgUnitDN', + EDUPERSON_OID+'9': 'eduPersonScopedAffiliation', + EDUPERSON_OID+'10': 'eduPersonTargetedID', + EDUPERSON_OID+'11': 'eduPersonAssurance', + EDUPERSON_OID+'12': 'eduPersonPrincipalNamePrior', EDUPERSON_OID+'13': 'eduPersonUniqueID', - EDUPERSON_OID+'14': 'eduPersonOrcid', + EDUPERSON_OID+'16': 'eduPersonOrcid', NETSCAPE_LDAP+'1': 'carLicense', NETSCAPE_LDAP+'2': 'departmentNumber', NETSCAPE_LDAP+'3': 'employeeNumber', @@ -114,19 +114,19 @@ 'dnQualifier': X500ATTR+'46', 'domainComponent': UCL_DIR_PILOT+'25', 'eduPersonAffiliation': EDUPERSON_OID+'1', - 'eduPersonEntitlement': EDUPERSON_OID+'2', - 'eduPersonNickname': EDUPERSON_OID+'3', - 'eduPersonOrgDN': EDUPERSON_OID+'4', - 'eduPersonOrgUnitDN': EDUPERSON_OID+'5', - 'eduPersonPrimaryAffiliation': EDUPERSON_OID+'6', - 'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'7', - 'eduPersonPrincipalName': EDUPERSON_OID+'8', - 'eduPersonPrincipalNamePrior': EDUPERSON_OID+'9', - 'eduPersonScopedAffiliation': EDUPERSON_OID+'10', - 'eduPersonTargetedID': EDUPERSON_OID+'11', - 'eduPersonAssurance': EDUPERSON_OID+'12', + 'eduPersonEntitlement': EDUPERSON_OID+'7', + 'eduPersonNickname': EDUPERSON_OID+'2', + 'eduPersonOrgDN': EDUPERSON_OID+'3', + 'eduPersonOrgUnitDN': EDUPERSON_OID+'4', + 'eduPersonPrimaryAffiliation': EDUPERSON_OID+'5', + 'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'8', + 'eduPersonPrincipalName': EDUPERSON_OID+'6', + 'eduPersonPrincipalNamePrior': EDUPERSON_OID+'12', + 'eduPersonScopedAffiliation': EDUPERSON_OID+'9', + 'eduPersonTargetedID': EDUPERSON_OID+'10', + 'eduPersonAssurance': EDUPERSON_OID+'11', 'eduPersonUniqueID': EDUPERSON_OID+'13', - 'eduPersonOrcid': EDUPERSON_OID+'14', + 'eduPersonOrcid': EDUPERSON_OID+'16', 'email': PKCS_9+'1', 'emailAddress': PKCS_9+'1', 'employeeNumber': NETSCAPE_LDAP+'3', diff --git a/tests/test_20_assertion.py b/tests/test_20_assertion.py index f04883dd5..ae661d531 100644 --- a/tests/test_20_assertion.py +++ b/tests/test_20_assertion.py @@ -86,7 +86,7 @@ def test_filter_on_attributes_without_friendly_name(): "eduPersonAffiliation": "test", "extra": "foo"} eptid = to_dict( - Attribute(name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11", + Attribute(name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10", 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", From e1fc49ccc016db1d08e718fc6a9628d5e9d3c89f Mon Sep 17 00:00:00 2001 From: tpazderka Date: Fri, 16 Sep 2016 14:47:03 +0200 Subject: [PATCH 2/2] fixup! Fix eduID attributes --- src/saml2/attributemaps/basic.py | 4 ++-- src/saml2/attributemaps/saml_uri.py | 4 ++-- src/saml2/attributemaps/shibboleth_uri.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/saml2/attributemaps/basic.py b/src/saml2/attributemaps/basic.py index 27ab83de0..c05b6e98b 100644 --- a/src/saml2/attributemaps/basic.py +++ b/src/saml2/attributemaps/basic.py @@ -61,7 +61,7 @@ DEF+'eduPersonScopedAffiliation': 'eduPersonScopedAffiliation', DEF+'eduPersonTargetedID': 'eduPersonTargetedID', DEF+'eduPersonAssurance': 'eduPersonAssurance', - DEF+'eduPersonUniqueID': 'eduPersonUniqueID', + DEF+'eduPersonUniqueId': 'eduPersonUniqueId', DEF+'eduPersonOrcid': 'eduPersonOrcid', DEF+'email': 'email', DEF+'emailAddress': 'emailAddress', @@ -228,7 +228,7 @@ 'eduPersonScopedAffiliation': DEF+'eduPersonScopedAffiliation', 'eduPersonTargetedID': DEF+'eduPersonTargetedID', 'eduPersonAssurance': DEF+'eduPersonAssurance', - 'eduPersonUniqueID': DEF+'eduPersonUniqueID', + 'eduPersonUniqueId': DEF+'eduPersonUniqueId', 'eduPersonOrcid': DEF+'eduPersonOrcid', 'email': DEF+'email', 'emailAddress': DEF+'emailAddress', diff --git a/src/saml2/attributemaps/saml_uri.py b/src/saml2/attributemaps/saml_uri.py index 6b0ac4cb3..7eb892826 100644 --- a/src/saml2/attributemaps/saml_uri.py +++ b/src/saml2/attributemaps/saml_uri.py @@ -30,7 +30,7 @@ EDUPERSON_OID+'10': 'eduPersonTargetedID', EDUPERSON_OID+'11': 'eduPersonAssurance', EDUPERSON_OID+'12': 'eduPersonPrincipalNamePrior', - EDUPERSON_OID+'13': 'eduPersonUniqueID', + EDUPERSON_OID+'13': 'eduPersonUniqueId', EDUPERSON_OID+'16': 'eduPersonOrcid', LDAPGVAT_OID+'1': 'PVP-GID', LDAPGVAT_OID+'149': 'PVP-BPK', @@ -190,7 +190,7 @@ 'eduPersonScopedAffiliation': EDUPERSON_OID+'9', 'eduPersonTargetedID': EDUPERSON_OID+'10', 'eduPersonAssurance': EDUPERSON_OID+'11', - 'eduPersonUniqueID': EDUPERSON_OID+'13', + 'eduPersonUniqueId': EDUPERSON_OID+'13', 'eduPersonOrcid': EDUPERSON_OID+'16', 'email': PKCS_9+'1', 'employeeNumber': NETSCAPE_LDAP+'3', diff --git a/src/saml2/attributemaps/shibboleth_uri.py b/src/saml2/attributemaps/shibboleth_uri.py index 45461971f..54de47353 100644 --- a/src/saml2/attributemaps/shibboleth_uri.py +++ b/src/saml2/attributemaps/shibboleth_uri.py @@ -22,7 +22,7 @@ EDUPERSON_OID+'10': 'eduPersonTargetedID', EDUPERSON_OID+'11': 'eduPersonAssurance', EDUPERSON_OID+'12': 'eduPersonPrincipalNamePrior', - EDUPERSON_OID+'13': 'eduPersonUniqueID', + EDUPERSON_OID+'13': 'eduPersonUniqueId', EDUPERSON_OID+'16': 'eduPersonOrcid', NETSCAPE_LDAP+'1': 'carLicense', NETSCAPE_LDAP+'2': 'departmentNumber', @@ -125,7 +125,7 @@ 'eduPersonScopedAffiliation': EDUPERSON_OID+'9', 'eduPersonTargetedID': EDUPERSON_OID+'10', 'eduPersonAssurance': EDUPERSON_OID+'11', - 'eduPersonUniqueID': EDUPERSON_OID+'13', + 'eduPersonUniqueId': EDUPERSON_OID+'13', 'eduPersonOrcid': EDUPERSON_OID+'16', 'email': PKCS_9+'1', 'emailAddress': PKCS_9+'1',