Added new eduPerson attributes and fixed some map errors

3 files changed, 64 insertions, 40 deletions

diff --git a/src/saml2/attributemaps/basic.py b/src/saml2/attributemaps/basic.py
index dbed6cee..27ab83de 100644
--- a/src/saml2/attributemaps/basic.py
+++ b/src/saml2/attributemaps/basic.py
@@ -47,6 +47,8 @@ MAP = {
         DEF+'eduOrgLegalName': 'eduOrgLegalName',
         DEF+'eduOrgSuperiorURI': 'eduOrgSuperiorURI',
         DEF+'eduOrgWhitePagesURI': 'eduOrgWhitePagesURI',
+        DEF+'eduCourseOffering': 'eduCourseOffering',
+        DEF+'eduCourseMember': 'eduCourseMember',
         DEF+'eduPersonAffiliation': 'eduPersonAffiliation',
         DEF+'eduPersonEntitlement': 'eduPersonEntitlement',
         DEF+'eduPersonNickname': 'eduPersonNickname',
@@ -55,8 +57,12 @@ MAP = {
         DEF+'eduPersonPrimaryAffiliation': 'eduPersonPrimaryAffiliation',
         DEF+'eduPersonPrimaryOrgUnitDN': 'eduPersonPrimaryOrgUnitDN',
         DEF+'eduPersonPrincipalName': 'eduPersonPrincipalName',
+        DEF+'eduPersonPrincipalNamePrior': 'eduPersonPrincipalNamePrior',
         DEF+'eduPersonScopedAffiliation': 'eduPersonScopedAffiliation',
         DEF+'eduPersonTargetedID': 'eduPersonTargetedID',
+        DEF+'eduPersonAssurance': 'eduPersonAssurance',
+        DEF+'eduPersonUniqueID': 'eduPersonUniqueID',
+        DEF+'eduPersonOrcid': 'eduPersonOrcid',
         DEF+'email': 'email',
         DEF+'emailAddress': 'emailAddress',
         DEF+'employeeNumber': 'employeeNumber',
@@ -208,6 +214,8 @@ MAP = {
         'eduOrgLegalName': DEF+'eduOrgLegalName',
         'eduOrgSuperiorURI': DEF+'eduOrgSuperiorURI',
         'eduOrgWhitePagesURI': DEF+'eduOrgWhitePagesURI',
+        'eduCourseMember': DEF+'eduCourseMember',
+        'eduCourseOffering': DEF+'eduCourseOffering',
         'eduPersonAffiliation': DEF+'eduPersonAffiliation',
         'eduPersonEntitlement': DEF+'eduPersonEntitlement',
         'eduPersonNickname': DEF+'eduPersonNickname',
@@ -216,8 +224,12 @@ MAP = {
         'eduPersonPrimaryAffiliation': DEF+'eduPersonPrimaryAffiliation',
         'eduPersonPrimaryOrgUnitDN': DEF+'eduPersonPrimaryOrgUnitDN',
         'eduPersonPrincipalName': DEF+'eduPersonPrincipalName',
+        'eduPersonPrincipalNamePrior': DEF+'eduPersonPrincipalNamePrior',
         'eduPersonScopedAffiliation': DEF+'eduPersonScopedAffiliation',
         'eduPersonTargetedID': DEF+'eduPersonTargetedID',
+        'eduPersonAssurance': DEF+'eduPersonAssurance',
+        'eduPersonUniqueID': DEF+'eduPersonUniqueID',
+        'eduPersonOrcid': DEF+'eduPersonOrcid',
         'email': DEF+'email',
         'emailAddress': DEF+'emailAddress',
         'employeeNumber': DEF+'employeeNumber',
diff --git a/src/saml2/attributemaps/saml_uri.py b/src/saml2/attributemaps/saml_uri.py
index aba79612..e905be4b 100644
--- a/src/saml2/attributemaps/saml_uri.py
+++ b/src/saml2/attributemaps/saml_uri.py
@@ -19,16 +19,19 @@ MAP = {
         EDUCOURSE_OID+'1': 'eduCourseOffering',
         EDUCOURSE_OID+'2': 'eduCourseMember',
         EDUPERSON_OID+'1': 'eduPersonAffiliation',
-        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+'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+'13': 'eduPersonUniqueID',
+        EDUPERSON_OID+'14': 'eduPersonOrcid',
         LDAPGVAT_OID+'1': 'PVP-GID',
         LDAPGVAT_OID+'149': 'PVP-BPK',
         LDAPGVAT_OID+'153': 'PVP-OU-OKZ',
@@ -176,16 +179,19 @@ MAP = {
         'eduCourseMember': EDUCOURSE_OID+'2',
         'eduCourseOffering': EDUCOURSE_OID+'1',
         'eduPersonAffiliation': EDUPERSON_OID+'1',
-        'eduPersonAssurance': EDUPERSON_OID+'11',
-        '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',
-        'eduPersonScopedAffiliation': EDUPERSON_OID+'9',
-        'eduPersonTargetedID': EDUPERSON_OID+'10',
+        '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',
+        'eduPersonUniqueID': EDUPERSON_OID+'13',
+        'eduPersonOrcid': EDUPERSON_OID+'14',
         '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 782c3b3f..81823a90 100644
--- a/src/saml2/attributemaps/shibboleth_uri.py
+++ b/src/saml2/attributemaps/shibboleth_uri.py
@@ -11,16 +11,19 @@ MAP = {
     "identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri",
     'fro': {
         EDUPERSON_OID+'1': 'eduPersonAffiliation',
-        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+'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+'13': 'eduPersonUniqueID',
+        EDUPERSON_OID+'14': 'eduPersonOrcid',
         NETSCAPE_LDAP+'1': 'carLicense',
         NETSCAPE_LDAP+'2': 'departmentNumber',
         NETSCAPE_LDAP+'3': 'employeeNumber',
@@ -111,16 +114,19 @@ MAP = {
         'dnQualifier': X500ATTR+'46',
         'domainComponent': UCL_DIR_PILOT+'25',
         'eduPersonAffiliation': EDUPERSON_OID+'1',
-        'eduPersonAssurance': EDUPERSON_OID+'11',
-        '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',
-        'eduPersonScopedAffiliation': EDUPERSON_OID+'9',
-        'eduPersonTargetedID': EDUPERSON_OID+'10',
+        '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',
+        'eduPersonUniqueID': EDUPERSON_OID+'13',
+        'eduPersonOrcid': EDUPERSON_OID+'14',
         'email': PKCS_9+'1',
         'emailAddress': PKCS_9+'1',
         'employeeNumber': NETSCAPE_LDAP+'3',