Skip to content

Commit d134a02

Browse files
author
Roland Hedberg
committed
Added new eduPerson attributes and fixed some map errors
1 parent ad7881b commit d134a02

File tree

3 files changed

+64
-40
lines changed

3 files changed

+64
-40
lines changed

‎src/saml2/attributemaps/basic.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
DEF+'eduOrgLegalName': 'eduOrgLegalName',
4848
DEF+'eduOrgSuperiorURI': 'eduOrgSuperiorURI',
4949
DEF+'eduOrgWhitePagesURI': 'eduOrgWhitePagesURI',
50+
DEF+'eduCourseOffering': 'eduCourseOffering',
51+
DEF+'eduCourseMember': 'eduCourseMember',
5052
DEF+'eduPersonAffiliation': 'eduPersonAffiliation',
5153
DEF+'eduPersonEntitlement': 'eduPersonEntitlement',
5254
DEF+'eduPersonNickname': 'eduPersonNickname',
@@ -55,8 +57,12 @@
5557
DEF+'eduPersonPrimaryAffiliation': 'eduPersonPrimaryAffiliation',
5658
DEF+'eduPersonPrimaryOrgUnitDN': 'eduPersonPrimaryOrgUnitDN',
5759
DEF+'eduPersonPrincipalName': 'eduPersonPrincipalName',
60+
DEF+'eduPersonPrincipalNamePrior': 'eduPersonPrincipalNamePrior',
5861
DEF+'eduPersonScopedAffiliation': 'eduPersonScopedAffiliation',
5962
DEF+'eduPersonTargetedID': 'eduPersonTargetedID',
63+
DEF+'eduPersonAssurance': 'eduPersonAssurance',
64+
DEF+'eduPersonUniqueID': 'eduPersonUniqueID',
65+
DEF+'eduPersonOrcid': 'eduPersonOrcid',
6066
DEF+'email': 'email',
6167
DEF+'emailAddress': 'emailAddress',
6268
DEF+'employeeNumber': 'employeeNumber',
@@ -208,6 +214,8 @@
208214
'eduOrgLegalName': DEF+'eduOrgLegalName',
209215
'eduOrgSuperiorURI': DEF+'eduOrgSuperiorURI',
210216
'eduOrgWhitePagesURI': DEF+'eduOrgWhitePagesURI',
217+
'eduCourseMember': DEF+'eduCourseMember',
218+
'eduCourseOffering': DEF+'eduCourseOffering',
211219
'eduPersonAffiliation': DEF+'eduPersonAffiliation',
212220
'eduPersonEntitlement': DEF+'eduPersonEntitlement',
213221
'eduPersonNickname': DEF+'eduPersonNickname',
@@ -216,8 +224,12 @@
216224
'eduPersonPrimaryAffiliation': DEF+'eduPersonPrimaryAffiliation',
217225
'eduPersonPrimaryOrgUnitDN': DEF+'eduPersonPrimaryOrgUnitDN',
218226
'eduPersonPrincipalName': DEF+'eduPersonPrincipalName',
227+
'eduPersonPrincipalNamePrior': DEF+'eduPersonPrincipalNamePrior',
219228
'eduPersonScopedAffiliation': DEF+'eduPersonScopedAffiliation',
220229
'eduPersonTargetedID': DEF+'eduPersonTargetedID',
230+
'eduPersonAssurance': DEF+'eduPersonAssurance',
231+
'eduPersonUniqueID': DEF+'eduPersonUniqueID',
232+
'eduPersonOrcid': DEF+'eduPersonOrcid',
221233
'email': DEF+'email',
222234
'emailAddress': DEF+'emailAddress',
223235
'employeeNumber': DEF+'employeeNumber',

‎src/saml2/attributemaps/saml_uri.py

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,19 @@
1919
EDUCOURSE_OID+'1': 'eduCourseOffering',
2020
EDUCOURSE_OID+'2': 'eduCourseMember',
2121
EDUPERSON_OID+'1': 'eduPersonAffiliation',
22-
EDUPERSON_OID+'2': 'eduPersonNickname',
23-
EDUPERSON_OID+'3': 'eduPersonOrgDN',
24-
EDUPERSON_OID+'4': 'eduPersonOrgUnitDN',
25-
EDUPERSON_OID+'5': 'eduPersonPrimaryAffiliation',
26-
EDUPERSON_OID+'6': 'eduPersonPrincipalName',
27-
EDUPERSON_OID+'7': 'eduPersonEntitlement',
28-
EDUPERSON_OID+'8': 'eduPersonPrimaryOrgUnitDN',
29-
EDUPERSON_OID+'9': 'eduPersonScopedAffiliation',
30-
EDUPERSON_OID+'10': 'eduPersonTargetedID',
31-
EDUPERSON_OID+'11': 'eduPersonAssurance',
22+
EDUPERSON_OID+'2': 'eduPersonEntitlement',
23+
EDUPERSON_OID+'3': 'eduPersonNickname',
24+
EDUPERSON_OID+'4': 'eduPersonOrgDN',
25+
EDUPERSON_OID+'5': 'eduPersonOrgUnitDN',
26+
EDUPERSON_OID+'6': 'eduPersonPrimaryAffiliation',
27+
EDUPERSON_OID+'7': 'eduPersonPrimaryOrgUnitDN',
28+
EDUPERSON_OID+'8': 'eduPersonPrincipalName',
29+
EDUPERSON_OID+'9': 'eduPersonPrincipalNamePrior',
30+
EDUPERSON_OID+'10': 'eduPersonScopedAffiliation',
31+
EDUPERSON_OID+'11': 'eduPersonTargetedID',
32+
EDUPERSON_OID+'12': 'eduPersonAssurance',
33+
EDUPERSON_OID+'13': 'eduPersonUniqueID',
34+
EDUPERSON_OID+'14': 'eduPersonOrcid',
3235
LDAPGVAT_OID+'1': 'PVP-GID',
3336
LDAPGVAT_OID+'149': 'PVP-BPK',
3437
LDAPGVAT_OID+'153': 'PVP-OU-OKZ',
@@ -176,16 +179,19 @@
176179
'eduCourseMember': EDUCOURSE_OID+'2',
177180
'eduCourseOffering': EDUCOURSE_OID+'1',
178181
'eduPersonAffiliation': EDUPERSON_OID+'1',
179-
'eduPersonAssurance': EDUPERSON_OID+'11',
180-
'eduPersonEntitlement': EDUPERSON_OID+'7',
181-
'eduPersonNickname': EDUPERSON_OID+'2',
182-
'eduPersonOrgDN': EDUPERSON_OID+'3',
183-
'eduPersonOrgUnitDN': EDUPERSON_OID+'4',
184-
'eduPersonPrimaryAffiliation': EDUPERSON_OID+'5',
185-
'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'8',
186-
'eduPersonPrincipalName': EDUPERSON_OID+'6',
187-
'eduPersonScopedAffiliation': EDUPERSON_OID+'9',
188-
'eduPersonTargetedID': EDUPERSON_OID+'10',
182+
'eduPersonEntitlement': EDUPERSON_OID+'2',
183+
'eduPersonNickname': EDUPERSON_OID+'3',
184+
'eduPersonOrgDN': EDUPERSON_OID+'4',
185+
'eduPersonOrgUnitDN': EDUPERSON_OID+'5',
186+
'eduPersonPrimaryAffiliation': EDUPERSON_OID+'6',
187+
'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'7',
188+
'eduPersonPrincipalName': EDUPERSON_OID+'8',
189+
'eduPersonPrincipalNamePrior': EDUPERSON_OID+'9',
190+
'eduPersonScopedAffiliation': EDUPERSON_OID+'10',
191+
'eduPersonTargetedID': EDUPERSON_OID+'11',
192+
'eduPersonAssurance': EDUPERSON_OID+'12',
193+
'eduPersonUniqueID': EDUPERSON_OID+'13',
194+
'eduPersonOrcid': EDUPERSON_OID+'14',
189195
'email': PKCS_9+'1',
190196
'employeeNumber': NETSCAPE_LDAP+'3',
191197
'employeeType': NETSCAPE_LDAP+'4',

‎src/saml2/attributemaps/shibboleth_uri.py

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,19 @@
1111
"identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri",
1212
'fro': {
1313
EDUPERSON_OID+'1': 'eduPersonAffiliation',
14-
EDUPERSON_OID+'2': 'eduPersonNickname',
15-
EDUPERSON_OID+'3': 'eduPersonOrgDN',
16-
EDUPERSON_OID+'4': 'eduPersonOrgUnitDN',
17-
EDUPERSON_OID+'5': 'eduPersonPrimaryAffiliation',
18-
EDUPERSON_OID+'6': 'eduPersonPrincipalName',
19-
EDUPERSON_OID+'7': 'eduPersonEntitlement',
20-
EDUPERSON_OID+'8': 'eduPersonPrimaryOrgUnitDN',
21-
EDUPERSON_OID+'9': 'eduPersonScopedAffiliation',
22-
EDUPERSON_OID+'10': 'eduPersonTargetedID',
23-
EDUPERSON_OID+'11': 'eduPersonAssurance',
14+
EDUPERSON_OID+'2': 'eduPersonEntitlement',
15+
EDUPERSON_OID+'3': 'eduPersonNickname',
16+
EDUPERSON_OID+'4': 'eduPersonOrgDN',
17+
EDUPERSON_OID+'5': 'eduPersonOrgUnitDN',
18+
EDUPERSON_OID+'6': 'eduPersonPrimaryAffiliation',
19+
EDUPERSON_OID+'7': 'eduPersonPrimaryOrgUnitDN',
20+
EDUPERSON_OID+'8': 'eduPersonPrincipalName',
21+
EDUPERSON_OID+'9': 'eduPersonPrincipalNamePrior',
22+
EDUPERSON_OID+'10': 'eduPersonScopedAffiliation',
23+
EDUPERSON_OID+'11': 'eduPersonTargetedID',
24+
EDUPERSON_OID+'12': 'eduPersonAssurance',
25+
EDUPERSON_OID+'13': 'eduPersonUniqueID',
26+
EDUPERSON_OID+'14': 'eduPersonOrcid',
2427
NETSCAPE_LDAP+'1': 'carLicense',
2528
NETSCAPE_LDAP+'2': 'departmentNumber',
2629
NETSCAPE_LDAP+'3': 'employeeNumber',
@@ -111,16 +114,19 @@
111114
'dnQualifier': X500ATTR+'46',
112115
'domainComponent': UCL_DIR_PILOT+'25',
113116
'eduPersonAffiliation': EDUPERSON_OID+'1',
114-
'eduPersonAssurance': EDUPERSON_OID+'11',
115-
'eduPersonEntitlement': EDUPERSON_OID+'7',
116-
'eduPersonNickname': EDUPERSON_OID+'2',
117-
'eduPersonOrgDN': EDUPERSON_OID+'3',
118-
'eduPersonOrgUnitDN': EDUPERSON_OID+'4',
119-
'eduPersonPrimaryAffiliation': EDUPERSON_OID+'5',
120-
'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'8',
121-
'eduPersonPrincipalName': EDUPERSON_OID+'6',
122-
'eduPersonScopedAffiliation': EDUPERSON_OID+'9',
123-
'eduPersonTargetedID': EDUPERSON_OID+'10',
117+
'eduPersonEntitlement': EDUPERSON_OID+'2',
118+
'eduPersonNickname': EDUPERSON_OID+'3',
119+
'eduPersonOrgDN': EDUPERSON_OID+'4',
120+
'eduPersonOrgUnitDN': EDUPERSON_OID+'5',
121+
'eduPersonPrimaryAffiliation': EDUPERSON_OID+'6',
122+
'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'7',
123+
'eduPersonPrincipalName': EDUPERSON_OID+'8',
124+
'eduPersonPrincipalNamePrior': EDUPERSON_OID+'9',
125+
'eduPersonScopedAffiliation': EDUPERSON_OID+'10',
126+
'eduPersonTargetedID': EDUPERSON_OID+'11',
127+
'eduPersonAssurance': EDUPERSON_OID+'12',
128+
'eduPersonUniqueID': EDUPERSON_OID+'13',
129+
'eduPersonOrcid': EDUPERSON_OID+'14',
124130
'email': PKCS_9+'1',
125131
'emailAddress': PKCS_9+'1',
126132
'employeeNumber': NETSCAPE_LDAP+'3',

0 commit comments

Comments
 (0)