openstack/deb-python-pysaml2
Code Issues Proposed changes

Fix eduID attributes

Browse Source 
Per http://software.internet2.edu/eduperson/internet2-mace-dir-eduperson-201602.html
This commit is contained in:
tpazderka
2016-09-05 14:47:41 +02:00
parent fd7a4f694b
commit 2ca55ccc0d
3 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/saml2/attributemaps/saml_uri.py
View File

@@ -19,19 +19,19 @@ MAP = {
EDUCOURSE_OID+'1': 'eduCourseOffering', EDUCOURSE_OID+'1': 'eduCourseOffering',
EDUCOURSE_OID+'2': 'eduCourseMember', EDUCOURSE_OID+'2': 'eduCourseMember',
EDUPERSON_OID+'1': 'eduPersonAffiliation', EDUPERSON_OID+'1': 'eduPersonAffiliation',
EDUPERSON_OID+'2': 'eduPersonEntitlement', EDUPERSON_OID+'2': 'eduPersonNickname',
EDUPERSON_OID+'3': 'eduPersonNickname', EDUPERSON_OID+'3': 'eduPersonOrgDN',
EDUPERSON_OID+'4': 'eduPersonOrgDN', EDUPERSON_OID+'4': 'eduPersonOrgUnitDN',
EDUPERSON_OID+'5': 'eduPersonOrgUnitDN', EDUPERSON_OID+'5': 'eduPersonPrimaryAffiliation',
EDUPERSON_OID+'6': 'eduPersonPrimaryAffiliation', EDUPERSON_OID+'6': 'eduPersonPrincipalName',
EDUPERSON_OID+'7': 'eduPersonPrimaryOrgUnitDN', EDUPERSON_OID+'7': 'eduPersonEntitlement',
EDUPERSON_OID+'8': 'eduPersonPrincipalName', EDUPERSON_OID+'8': 'eduPersonPrimaryOrgUnitDN',
EDUPERSON_OID+'9': 'eduPersonPrincipalName', EDUPERSON_OID+'9': 'eduPersonScopedAffiliation',
EDUPERSON_OID+'10': 'eduPersonScopedAffiliation', EDUPERSON_OID+'10': 'eduPersonTargetedID',
EDUPERSON_OID+'11': 'eduPersonTargetedID', EDUPERSON_OID+'11': 'eduPersonAssurance',
EDUPERSON_OID+'12': 'eduPersonAssurance', EDUPERSON_OID+'12': 'eduPersonPrincipalNamePrior',
EDUPERSON_OID+'13': 'eduPersonUniqueID', EDUPERSON_OID+'13': 'eduPersonUniqueID',
EDUPERSON_OID+'14': 'eduPersonOrcid', EDUPERSON_OID+'16': 'eduPersonOrcid',
LDAPGVAT_OID+'1': 'PVP-GID', LDAPGVAT_OID+'1': 'PVP-GID',
LDAPGVAT_OID+'149': 'PVP-BPK', LDAPGVAT_OID+'149': 'PVP-BPK',
LDAPGVAT_OID+'153': 'PVP-OU-OKZ', LDAPGVAT_OID+'153': 'PVP-OU-OKZ',
@@ -179,19 +179,19 @@ MAP = {
'eduCourseMember': EDUCOURSE_OID+'2', 'eduCourseMember': EDUCOURSE_OID+'2',
'eduCourseOffering': EDUCOURSE_OID+'1', 'eduCourseOffering': EDUCOURSE_OID+'1',
'eduPersonAffiliation': EDUPERSON_OID+'1', 'eduPersonAffiliation': EDUPERSON_OID+'1',
'eduPersonEntitlement': EDUPERSON_OID+'2', 'eduPersonEntitlement': EDUPERSON_OID+'7',
'eduPersonNickname': EDUPERSON_OID+'3', 'eduPersonNickname': EDUPERSON_OID+'2',
'eduPersonOrgDN': EDUPERSON_OID+'4', 'eduPersonOrgDN': EDUPERSON_OID+'3',
'eduPersonOrgUnitDN': EDUPERSON_OID+'5', 'eduPersonOrgUnitDN': EDUPERSON_OID+'4',
'eduPersonPrimaryAffiliation': EDUPERSON_OID+'6', 'eduPersonPrimaryAffiliation': EDUPERSON_OID+'5',
'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'7', 'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'8',
'eduPersonPrincipalName': EDUPERSON_OID+'8', 'eduPersonPrincipalName': EDUPERSON_OID+'6',
'eduPersonPrincipalNamePrior': EDUPERSON_OID+'9', 'eduPersonPrincipalNamePrior': EDUPERSON_OID+'12',
'eduPersonScopedAffiliation': EDUPERSON_OID+'10', 'eduPersonScopedAffiliation': EDUPERSON_OID+'9',
'eduPersonTargetedID': EDUPERSON_OID+'11', 'eduPersonTargetedID': EDUPERSON_OID+'10',
'eduPersonAssurance': EDUPERSON_OID+'12', 'eduPersonAssurance': EDUPERSON_OID+'11',
'eduPersonUniqueID': EDUPERSON_OID+'13', 'eduPersonUniqueID': EDUPERSON_OID+'13',
'eduPersonOrcid': EDUPERSON_OID+'14', 'eduPersonOrcid': EDUPERSON_OID+'16',
'email': PKCS_9+'1', 'email': PKCS_9+'1',
'employeeNumber': NETSCAPE_LDAP+'3', 'employeeNumber': NETSCAPE_LDAP+'3',
'employeeType': NETSCAPE_LDAP+'4', 'employeeType': NETSCAPE_LDAP+'4',

48
src/saml2/attributemaps/shibboleth_uri.py
View File

@@ -11,19 +11,19 @@ MAP = {
"identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri", "identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri",
'fro': { 'fro': {
EDUPERSON_OID+'1': 'eduPersonAffiliation', EDUPERSON_OID+'1': 'eduPersonAffiliation',
EDUPERSON_OID+'2': 'eduPersonEntitlement', EDUPERSON_OID+'2': 'eduPersonNickname',
EDUPERSON_OID+'3': 'eduPersonNickname', EDUPERSON_OID+'3': 'eduPersonOrgDN',
EDUPERSON_OID+'4': 'eduPersonOrgDN', EDUPERSON_OID+'4': 'eduPersonOrgUnitDN',
EDUPERSON_OID+'5': 'eduPersonOrgUnitDN', EDUPERSON_OID+'5': 'eduPersonPrimaryAffiliation',
EDUPERSON_OID+'6': 'eduPersonPrimaryAffiliation', EDUPERSON_OID+'6': 'eduPersonPrincipalName',
EDUPERSON_OID+'7': 'eduPersonPrimaryOrgUnitDN', EDUPERSON_OID+'7': 'eduPersonEntitlement',
EDUPERSON_OID+'8': 'eduPersonPrincipalName', EDUPERSON_OID+'8': 'eduPersonPrimaryOrgUnitDN',
EDUPERSON_OID+'9': 'eduPersonPrincipalNamePrior', EDUPERSON_OID+'9': 'eduPersonScopedAffiliation',
EDUPERSON_OID+'10': 'eduPersonScopedAffiliation', EDUPERSON_OID+'10': 'eduPersonTargetedID',
EDUPERSON_OID+'11': 'eduPersonTargetedID', EDUPERSON_OID+'11': 'eduPersonAssurance',
EDUPERSON_OID+'12': 'eduPersonAssurance', EDUPERSON_OID+'12': 'eduPersonPrincipalNamePrior',
EDUPERSON_OID+'13': 'eduPersonUniqueID', EDUPERSON_OID+'13': 'eduPersonUniqueID',
EDUPERSON_OID+'14': 'eduPersonOrcid', EDUPERSON_OID+'16': 'eduPersonOrcid',
NETSCAPE_LDAP+'1': 'carLicense', NETSCAPE_LDAP+'1': 'carLicense',
NETSCAPE_LDAP+'2': 'departmentNumber', NETSCAPE_LDAP+'2': 'departmentNumber',
NETSCAPE_LDAP+'3': 'employeeNumber', NETSCAPE_LDAP+'3': 'employeeNumber',
@@ -114,19 +114,19 @@ MAP = {
'dnQualifier': X500ATTR+'46', 'dnQualifier': X500ATTR+'46',
'domainComponent': UCL_DIR_PILOT+'25', 'domainComponent': UCL_DIR_PILOT+'25',
'eduPersonAffiliation': EDUPERSON_OID+'1', 'eduPersonAffiliation': EDUPERSON_OID+'1',
'eduPersonEntitlement': EDUPERSON_OID+'2', 'eduPersonEntitlement': EDUPERSON_OID+'7',
'eduPersonNickname': EDUPERSON_OID+'3', 'eduPersonNickname': EDUPERSON_OID+'2',
'eduPersonOrgDN': EDUPERSON_OID+'4', 'eduPersonOrgDN': EDUPERSON_OID+'3',
'eduPersonOrgUnitDN': EDUPERSON_OID+'5', 'eduPersonOrgUnitDN': EDUPERSON_OID+'4',
'eduPersonPrimaryAffiliation': EDUPERSON_OID+'6', 'eduPersonPrimaryAffiliation': EDUPERSON_OID+'5',
'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'7', 'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'8',
'eduPersonPrincipalName': EDUPERSON_OID+'8', 'eduPersonPrincipalName': EDUPERSON_OID+'6',
'eduPersonPrincipalNamePrior': EDUPERSON_OID+'9', 'eduPersonPrincipalNamePrior': EDUPERSON_OID+'12',
'eduPersonScopedAffiliation': EDUPERSON_OID+'10', 'eduPersonScopedAffiliation': EDUPERSON_OID+'9',
'eduPersonTargetedID': EDUPERSON_OID+'11', 'eduPersonTargetedID': EDUPERSON_OID+'10',
'eduPersonAssurance': EDUPERSON_OID+'12', 'eduPersonAssurance': EDUPERSON_OID+'11',
'eduPersonUniqueID': EDUPERSON_OID+'13', 'eduPersonUniqueID': EDUPERSON_OID+'13',
'eduPersonOrcid': EDUPERSON_OID+'14', 'eduPersonOrcid': EDUPERSON_OID+'16',
'email': PKCS_9+'1', 'email': PKCS_9+'1',
'emailAddress': PKCS_9+'1', 'emailAddress': PKCS_9+'1',
'employeeNumber': NETSCAPE_LDAP+'3', 'employeeNumber': NETSCAPE_LDAP+'3',

2
tests/test_20_assertion.py
View File

@@ -86,7 +86,7 @@ def test_filter_on_attributes_without_friendly_name():
"eduPersonAffiliation": "test", "eduPersonAffiliation": "test",
"extra": "foo"} "extra": "foo"}
eptid = to_dict( 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) name_format=NAME_FORMAT_URI), ONTS)
ep_affiliation = to_dict( ep_affiliation = to_dict(
Attribute(name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1", Attribute(name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1",