diff options
| author | tpazderka <tomas.pazderka@nic.cz> | 2016-09-05 14:47:41 +0200 |
|---|---|---|
| committer | tpazderka <tomas.pazderka@nic.cz> | 2016-09-08 09:12:11 +0200 |
| commit | 2ca55ccc0d68d324b3c14ee921c5730d3b46cadb (patch) | |
| tree | 4984b795edf3d80bbc65c25534eaa314898183ea /src/saml2/attributemaps | |
| parent | fd7a4f694b137a92f2a8b7f502d51fc21e3528c7 (diff) | |
| download | pysaml2-2ca55ccc0d68d324b3c14ee921c5730d3b46cadb.tar.gz | |
Fix eduID attributes
Per http://software.internet2.edu/eduperson/internet2-mace-dir-eduperson-201602.html
Diffstat (limited to 'src/saml2/attributemaps')
| -rw-r--r-- | src/saml2/attributemaps/saml_uri.py | 48 | ||||
| -rw-r--r-- | src/saml2/attributemaps/shibboleth_uri.py | 48 |
2 files changed, 48 insertions, 48 deletions
diff --git a/src/saml2/attributemaps/saml_uri.py b/src/saml2/attributemaps/saml_uri.py index afdfee25..6b0ac4cb 100644 --- a/src/saml2/attributemaps/saml_uri.py +++ b/src/saml2/attributemaps/saml_uri.py @@ -19,19 +19,19 @@ MAP = { 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 @@ MAP = { '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 81823a90..45461971 100644 --- a/src/saml2/attributemaps/shibboleth_uri.py +++ b/src/saml2/attributemaps/shibboleth_uri.py @@ -11,19 +11,19 @@ MAP = { "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 @@ MAP = { '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', |