holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Setup/SAML: fix not stored custome OID and added eduPersonUniqueId

Browse Source
This commit is contained in:
Ralf Becker 2021-04-07 10:07:56 +02:00
parent 102a790c44
commit 673760f59d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/Auth/Saml.php
View File

@ -100,6 +100,7 @@ class Saml implements BackendSSO
* Some urn:oid constants for common attributes * Some urn:oid constants for common attributes
*/ */
const eduPersonPricipalName = 'urn:oid:1.3.6.1.4.1.5923.1.1.1.6'; const eduPersonPricipalName = 'urn:oid:1.3.6.1.4.1.5923.1.1.1.6';
const eduPersonUniqueId = 'urn:oid:1.3.6.1.4.1.5923.1.1.1.13';
const emailAddress = 'urn:oid:0.9.2342.19200300.100.1.3'; const emailAddress = 'urn:oid:0.9.2342.19200300.100.1.3';
const firstName = 'urn:oid:2.5.4.42'; const firstName = 'urn:oid:2.5.4.42';
const lastName = 'urn:oid:2.5.4.4'; const lastName = 'urn:oid:2.5.4.4';
@ -526,6 +527,8 @@ class Saml implements BackendSSO
{ {
case 'eduPersonPrincipalName': case 'eduPersonPrincipalName':
return self::eduPersonPricipalName; return self::eduPersonPricipalName;
case 'eduPersonUniqueId':
return self::eduPersonUniqueId;
case 'emailAddress': case 'emailAddress':
return self::emailAddress; return self::emailAddress;
case 'customOid': case 'customOid':

3
setup/templates/default/config.tpl
View File

@ -522,8 +522,9 @@
<td> <td>
<select name="newsettings[saml_username]"> <select name="newsettings[saml_username]">
<option value="eduPersonPrincipalName"{selected_saml_username_eduPersonPrincipalName}>eduPersonPrincipalName</option> <option value="eduPersonPrincipalName"{selected_saml_username_eduPersonPrincipalName}>eduPersonPrincipalName</option>
<option value="eduPersonUniqueId"{selected_saml_username_eduPersonUniqueId}>eduPersonUniqueId</option>
<option value="emailAddress"{selected_saml_username_emailAddress}>emailAddress</option> <option value="emailAddress"{selected_saml_username_emailAddress}>emailAddress</option>
<option value="custom"{selected_saml_username_customOid}>{lang_custom_OID}</option> <option value="customOid"{selected_saml_username_customOid}>{lang_custom_OID}</option>
</select> </select>
<input name="newsettings[saml_username_oid]" value="{value_saml_username_oid}" placeholder="urn:oid:x.x.x.x" size="40" /> <input name="newsettings[saml_username_oid]" value="{value_saml_username_oid}" placeholder="urn:oid:x.x.x.x" size="40" />
</td> </td>