Merge branch 'master' into dist/eole/2.7.2/master
This commit is contained in:
commit
3f41daca79
|
@ -1,19 +1,25 @@
|
|||
%set %%boolean = {'oui': 1, 'non': 0}
|
||||
%set %%ssoFilters = %%getSSOFilters
|
||||
%set %%ldapAttributes = {"uid": "uid", "mail": "mail", "cn":"cn"}
|
||||
%set %%exported_vars = ['"UA": "HTTP_USER_AGENT"']
|
||||
%set %%cas_attributes = []
|
||||
%set %%ldap_attributes = ['"uid": "uid"', '"mail": "mail"','"cn":"cn"']
|
||||
%set %%ldap_attributes = {}
|
||||
%for %%attr in %%casAttribute
|
||||
%silent %%exported_vars.append('"' + %%attr + '": "' + %%attr.casLDAPAttribute + '"')
|
||||
%silent %%cas_attributes.append('"' + %%attr + '": "' + %%attr.casLDAPAttribute + '"')
|
||||
%silent %%ldap_attributes.append('"' + %%attr.casLDAPAttribute + '": "' + %%attr.casLDAPAttribute + '"')
|
||||
%set %%ldap_attributes[%%attr.casLDAPAttribute] = %%attr.casLDAPAttribute
|
||||
%end for
|
||||
%for %%key, %%value in %%ssoFilters
|
||||
%silent %%exported_vars.append('"' + %%key + '": "' + %%value + '"')
|
||||
%silent %%cas_attributes.append('"' + %%key + '": "' + %%value + '"')
|
||||
%set %%ldap_attributes[%%value] = %%value
|
||||
%end for
|
||||
%silent %%exported_vars.sort()
|
||||
%silent %%cas_attributes.sort()
|
||||
%set %%ldapAttr = []
|
||||
%for %%k, %%v in %%ldap_attributes.items()
|
||||
%silent %%ldapAttr.append('"' + %%k + '": "' + %%v + '"')
|
||||
%end for
|
||||
{
|
||||
%if %%lemon_user_db == "AD"
|
||||
"ADPwdExpireWarning": %%llADPasswordExpireWarn,
|
||||
|
@ -175,7 +181,7 @@
|
|||
"ldapSearchDeref": "find",
|
||||
"ldapBase": "%%ldapUserBaseDN",
|
||||
"ldapExportedVars": {
|
||||
%%custom_join(%%ldap_attributes, ',\n ')
|
||||
%%custom_join(%%ldapAttr, ',\n ')
|
||||
},
|
||||
"ldapGroupAttributeName": "memberUid",
|
||||
"ldapGroupAttributeNameGroup": "dn",
|
||||
|
|
Loading…
Reference in New Issue