Skip to content

Commit b7c9f91

Browse files
roherohe
authored
Merge pull request #354 from tpazderka/fix-eduid
Fix eduID attributes
2 parents 146ff74 + e1fc49c commit b7c9f91

File tree

4 files changed

+55
-55
lines changed

4 files changed

+55
-55
lines changed

‎src/saml2/attributemaps/basic.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
DEF+'eduPersonScopedAffiliation': 'eduPersonScopedAffiliation',
6262
DEF+'eduPersonTargetedID': 'eduPersonTargetedID',
6363
DEF+'eduPersonAssurance': 'eduPersonAssurance',
64-
DEF+'eduPersonUniqueID': 'eduPersonUniqueID',
64+
DEF+'eduPersonUniqueId': 'eduPersonUniqueId',
6565
DEF+'eduPersonOrcid': 'eduPersonOrcid',
6666
DEF+'email': 'email',
6767
DEF+'emailAddress': 'emailAddress',
@@ -228,7 +228,7 @@
228228
'eduPersonScopedAffiliation': DEF+'eduPersonScopedAffiliation',
229229
'eduPersonTargetedID': DEF+'eduPersonTargetedID',
230230
'eduPersonAssurance': DEF+'eduPersonAssurance',
231-
'eduPersonUniqueID': DEF+'eduPersonUniqueID',
231+
'eduPersonUniqueId': DEF+'eduPersonUniqueId',
232232
'eduPersonOrcid': DEF+'eduPersonOrcid',
233233
'email': DEF+'email',
234234
'emailAddress': DEF+'emailAddress',

‎src/saml2/attributemaps/saml_uri.py

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
EDUCOURSE_OID+'1': 'eduCourseOffering',
2020
EDUCOURSE_OID+'2': 'eduCourseMember',
2121
EDUPERSON_OID+'1': 'eduPersonAffiliation',
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': 'eduPersonPrincipalName',
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',
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',
32+
EDUPERSON_OID+'12': 'eduPersonPrincipalNamePrior',
33+
EDUPERSON_OID+'13': 'eduPersonUniqueId',
34+
EDUPERSON_OID+'16': 'eduPersonOrcid',
3535
LDAPGVAT_OID+'1': 'PVP-GID',
3636
LDAPGVAT_OID+'149': 'PVP-BPK',
3737
LDAPGVAT_OID+'153': 'PVP-OU-OKZ',
@@ -179,19 +179,19 @@
179179
'eduCourseMember': EDUCOURSE_OID+'2',
180180
'eduCourseOffering': EDUCOURSE_OID+'1',
181181
'eduPersonAffiliation': EDUPERSON_OID+'1',
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',
182+
'eduPersonEntitlement': EDUPERSON_OID+'7',
183+
'eduPersonNickname': EDUPERSON_OID+'2',
184+
'eduPersonOrgDN': EDUPERSON_OID+'3',
185+
'eduPersonOrgUnitDN': EDUPERSON_OID+'4',
186+
'eduPersonPrimaryAffiliation': EDUPERSON_OID+'5',
187+
'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'8',
188+
'eduPersonPrincipalName': EDUPERSON_OID+'6',
189+
'eduPersonPrincipalNamePrior': EDUPERSON_OID+'12',
190+
'eduPersonScopedAffiliation': EDUPERSON_OID+'9',
191+
'eduPersonTargetedID': EDUPERSON_OID+'10',
192+
'eduPersonAssurance': EDUPERSON_OID+'11',
193+
'eduPersonUniqueId': EDUPERSON_OID+'13',
194+
'eduPersonOrcid': EDUPERSON_OID+'16',
195195
'email': PKCS_9+'1',
196196
'employeeNumber': NETSCAPE_LDAP+'3',
197197
'employeeType': NETSCAPE_LDAP+'4',

‎src/saml2/attributemaps/shibboleth_uri.py

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
"identifier": "urn:mace:shibboleth:1.0:attributeNamespace:uri",
1212
'fro': {
1313
EDUPERSON_OID+'1': 'eduPersonAffiliation',
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',
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',
24+
EDUPERSON_OID+'12': 'eduPersonPrincipalNamePrior',
25+
EDUPERSON_OID+'13': 'eduPersonUniqueId',
26+
EDUPERSON_OID+'16': 'eduPersonOrcid',
2727
NETSCAPE_LDAP+'1': 'carLicense',
2828
NETSCAPE_LDAP+'2': 'departmentNumber',
2929
NETSCAPE_LDAP+'3': 'employeeNumber',
@@ -114,19 +114,19 @@
114114
'dnQualifier': X500ATTR+'46',
115115
'domainComponent': UCL_DIR_PILOT+'25',
116116
'eduPersonAffiliation': EDUPERSON_OID+'1',
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',
117+
'eduPersonEntitlement': EDUPERSON_OID+'7',
118+
'eduPersonNickname': EDUPERSON_OID+'2',
119+
'eduPersonOrgDN': EDUPERSON_OID+'3',
120+
'eduPersonOrgUnitDN': EDUPERSON_OID+'4',
121+
'eduPersonPrimaryAffiliation': EDUPERSON_OID+'5',
122+
'eduPersonPrimaryOrgUnitDN': EDUPERSON_OID+'8',
123+
'eduPersonPrincipalName': EDUPERSON_OID+'6',
124+
'eduPersonPrincipalNamePrior': EDUPERSON_OID+'12',
125+
'eduPersonScopedAffiliation': EDUPERSON_OID+'9',
126+
'eduPersonTargetedID': EDUPERSON_OID+'10',
127+
'eduPersonAssurance': EDUPERSON_OID+'11',
128+
'eduPersonUniqueId': EDUPERSON_OID+'13',
129+
'eduPersonOrcid': EDUPERSON_OID+'16',
130130
'email': PKCS_9+'1',
131131
'emailAddress': PKCS_9+'1',
132132
'employeeNumber': NETSCAPE_LDAP+'3',

‎tests/test_20_assertion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def test_filter_on_attributes_without_friendly_name():
8686
"eduPersonAffiliation": "test",
8787
"extra": "foo"}
8888
eptid = to_dict(
89-
Attribute(name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11",
89+
Attribute(name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10",
9090
name_format=NAME_FORMAT_URI), ONTS)
9191
ep_affiliation = to_dict(
9292
Attribute(name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1",

0 commit comments

Comments
 (0)