Remove LDAPFilter option (#2183)
This commit is contained in:
Maxime Besson
parent
b1232739a0
commit
aa55f3d04a
|
|
@ -45,7 +45,7 @@ our $authParameters = {
|
|||
githubParams => [qw(githubAuthnLevel githubClientID githubClientSecret githubUserField githubScope)],
|
||||
gpgParams => [qw(gpgAuthnLevel gpgDb)],
|
||||
kerberosParams => [qw(krbAuthnLevel krbKeytab krbByJs krbRemoveDomain krbAllowedDomains)],
|
||||
ldapParams => [qw(ldapAuthnLevel ldapExportedVars ldapServer ldapPort ldapVerify ldapBase managerDn managerPassword ldapTimeout ldapIOTimeout ldapVersion ldapRaw ldapCAFile ldapCAPath LDAPFilter AuthLDAPFilter mailLDAPFilter ldapSearchDeref ldapGroupBase ldapGroupObjectClass ldapGroupAttributeName ldapGroupAttributeNameUser ldapGroupAttributeNameSearch ldapGroupDecodeSearchedValue ldapGroupRecursive ldapGroupAttributeNameGroup ldapPpolicyControl ldapSetPassword ldapChangePasswordAsUser ldapPwdEnc ldapUsePasswordResetAttribute ldapPasswordResetAttribute ldapPasswordResetAttributeValue ldapAllowResetExpiredPassword ldapITDS)],
|
||||
ldapParams => [qw(ldapAuthnLevel ldapExportedVars ldapServer ldapPort ldapVerify ldapBase managerDn managerPassword ldapTimeout ldapIOTimeout ldapVersion ldapRaw ldapCAFile ldapCAPath AuthLDAPFilter mailLDAPFilter ldapSearchDeref ldapGroupBase ldapGroupObjectClass ldapGroupAttributeName ldapGroupAttributeNameUser ldapGroupAttributeNameSearch ldapGroupDecodeSearchedValue ldapGroupRecursive ldapGroupAttributeNameGroup ldapPpolicyControl ldapSetPassword ldapChangePasswordAsUser ldapPwdEnc ldapUsePasswordResetAttribute ldapPasswordResetAttribute ldapPasswordResetAttributeValue ldapAllowResetExpiredPassword ldapITDS)],
|
||||
linkedinParams => [qw(linkedInAuthnLevel linkedInClientID linkedInClientSecret linkedInFields linkedInUserField linkedInScope)],
|
||||
nullParams => [qw(nullAuthnLevel)],
|
||||
oidcParams => [qw(oidcAuthnLevel oidcRPCallbackGetParam oidcRPStateTimeout)],
|
||||
|
|
|
|||
|
|
@ -1662,9 +1662,6 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
|
|||
'test' => qr/^[a-zA-Z][a-zA-Z0-9_:\-]*$/,
|
||||
'type' => 'keyTextContainer'
|
||||
},
|
||||
'LDAPFilter' => {
|
||||
'type' => 'text'
|
||||
},
|
||||
'ldapGroupAttributeName' => {
|
||||
'default' => 'member',
|
||||
'type' => 'text'
|
||||
|
|
|
|||
|
|
@ -3321,8 +3321,6 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
|
|||
type => 'text',
|
||||
documentation => 'LDAP filter for mail search'
|
||||
},
|
||||
LDAPFilter =>
|
||||
{ type => 'text', documentation => 'Default LDAP filter' },
|
||||
AuthLDAPFilter => {
|
||||
type => 'text',
|
||||
documentation => 'LDAP filter for auth search'
|
||||
|
|
|
|||
|
|
@ -279,8 +279,8 @@ sub tree {
|
|||
help => 'authldap.html#filters',
|
||||
form => 'simpleInputContainer',
|
||||
nodes => [
|
||||
'LDAPFilter', 'AuthLDAPFilter',
|
||||
'mailLDAPFilter', 'ldapSearchDeref',
|
||||
'AuthLDAPFilter', 'mailLDAPFilter',
|
||||
'ldapSearchDeref',
|
||||
]
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -437,7 +437,6 @@
|
|||
"ldapConnection":"الاتصال",
|
||||
"ldapExportedVars":"المتغيرات المصدرة",
|
||||
"ldapFilters":"فلتر",
|
||||
"LDAPFilter":"فلتر الاعْتيادي",
|
||||
"ldapGroupAttributeName":"السمات المستهدف",
|
||||
"ldapGroupAttributeNameGroup":"سمات مصدر المجموعة",
|
||||
"ldapGroupAttributeNameSearch":"السمات التي تم البحث عنها",
|
||||
|
|
|
|||
|
|
@ -436,7 +436,6 @@
|
|||
"ldapConnection":"Connection",
|
||||
"ldapExportedVars":"Exported variables",
|
||||
"ldapFilters":"Filters",
|
||||
"LDAPFilter":"Default filter",
|
||||
"ldapGroupAttributeName":"Target attribute",
|
||||
"ldapGroupAttributeNameGroup":"Group source attribute",
|
||||
"ldapGroupAttributeNameSearch":"Searched attributes",
|
||||
|
|
|
|||
|
|
@ -436,7 +436,6 @@
|
|||
"ldapConnection":"Connection",
|
||||
"ldapExportedVars":"Exported variables",
|
||||
"ldapFilters":"Filters",
|
||||
"LDAPFilter":"Default filter",
|
||||
"ldapGroupAttributeName":"Target attribute",
|
||||
"ldapGroupAttributeNameGroup":"Group source attribute",
|
||||
"ldapGroupAttributeNameSearch":"Searched attributes",
|
||||
|
|
|
|||
|
|
@ -436,7 +436,6 @@
|
|||
"ldapConnection":"Connexion",
|
||||
"ldapExportedVars":"Variables exportées",
|
||||
"ldapFilters":"Filtres",
|
||||
"LDAPFilter":"Filtre par défaut",
|
||||
"ldapGroupAttributeName":"Attribut cible",
|
||||
"ldapGroupAttributeNameGroup":"Attribut source groupe",
|
||||
"ldapGroupAttributeNameSearch":"Attributs recherchés",
|
||||
|
|
|
|||
|
|
@ -436,7 +436,6 @@
|
|||
"ldapConnection":"Connessione",
|
||||
"ldapExportedVars":"Variabili esportate",
|
||||
"ldapFilters":"Filtri",
|
||||
"LDAPFilter":"Filtro predefinito",
|
||||
"ldapGroupAttributeName":"Attributo target",
|
||||
"ldapGroupAttributeNameGroup":"Attributo del gruppo sorgente",
|
||||
"ldapGroupAttributeNameSearch":"Attributi ricercati",
|
||||
|
|
|
|||
|
|
@ -436,7 +436,6 @@
|
|||
"ldapConnection":"Połączenie",
|
||||
"ldapExportedVars":"Wyeksportowane zmienne",
|
||||
"ldapFilters":"Filtry",
|
||||
"LDAPFilter":"Domyślny filtr",
|
||||
"ldapGroupAttributeName":"Atrybut docelowy",
|
||||
"ldapGroupAttributeNameGroup":"Atrybut źródła grupy",
|
||||
"ldapGroupAttributeNameSearch":"Szukane atrybuty",
|
||||
|
|
|
|||
|
|
@ -436,7 +436,6 @@
|
|||
"ldapConnection":"Bağlantı",
|
||||
"ldapExportedVars":"Dışa aktarılan değişkenler",
|
||||
"ldapFilters":"Filtreler",
|
||||
"LDAPFilter":"Varsayılan filtre",
|
||||
"ldapGroupAttributeName":"Hedef nitelik",
|
||||
"ldapGroupAttributeNameGroup":"Grup kaynağı niteliği",
|
||||
"ldapGroupAttributeNameSearch":"Aranan nitelikler",
|
||||
|
|
|
|||
|
|
@ -436,7 +436,6 @@
|
|||
"ldapConnection":"Kết nối",
|
||||
"ldapExportedVars":"Biến đã được xuất",
|
||||
"ldapFilters":"Bộ lọc",
|
||||
"LDAPFilter":"Bộ lọc mặc định",
|
||||
"ldapGroupAttributeName":"Thuộc tính đích",
|
||||
"ldapGroupAttributeNameGroup":"Thuộc tính nguồn nhóm",
|
||||
"ldapGroupAttributeNameSearch":"Thuộc tính đã tìm kiếm",
|
||||
|
|
|
|||
|
|
@ -436,7 +436,6 @@
|
|||
"ldapConnection":"连接",
|
||||
"ldapExportedVars":"Exported variables",
|
||||
"ldapFilters":"Filters",
|
||||
"LDAPFilter":"Default filter",
|
||||
"ldapGroupAttributeName":"Target attribute",
|
||||
"ldapGroupAttributeNameGroup":"Group source attribute",
|
||||
"ldapGroupAttributeNameSearch":"Searched attributes",
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -579,9 +579,6 @@
|
|||
"type": "simpleInputContainer"
|
||||
}, {
|
||||
"_nodes": [{
|
||||
"id": "LDAPFilter",
|
||||
"title": "LDAPFilter"
|
||||
}, {
|
||||
"id": "AuthLDAPFilter",
|
||||
"title": "AuthLDAPFilter"
|
||||
}, {
|
||||
|
|
|
|||
|
|
@ -683,9 +683,6 @@
|
|||
"type": "simpleInputContainer"
|
||||
}, {
|
||||
"_nodes": [{
|
||||
"id": "LDAPFilter",
|
||||
"title": "LDAPFilter"
|
||||
}, {
|
||||
"id": "AuthLDAPFilter",
|
||||
"title": "AuthLDAPFilter"
|
||||
}, {
|
||||
|
|
|
|||
|
|
@ -718,9 +718,6 @@
|
|||
"type": "simpleInputContainer"
|
||||
}, {
|
||||
"_nodes": [{
|
||||
"id": "LDAPFilter",
|
||||
"title": "LDAPFilter"
|
||||
}, {
|
||||
"id": "AuthLDAPFilter",
|
||||
"title": "AuthLDAPFilter"
|
||||
}, {
|
||||
|
|
|
|||
|
|
@ -718,9 +718,6 @@
|
|||
"type": "simpleInputContainer"
|
||||
}, {
|
||||
"_nodes": [{
|
||||
"id": "LDAPFilter",
|
||||
"title": "LDAPFilter"
|
||||
}, {
|
||||
"id": "AuthLDAPFilter",
|
||||
"title": "AuthLDAPFilter"
|
||||
}, {
|
||||
|
|
|
|||
|
|
@ -708,9 +708,6 @@
|
|||
"type": "simpleInputContainer"
|
||||
}, {
|
||||
"_nodes": [{
|
||||
"id": "LDAPFilter",
|
||||
"title": "LDAPFilter"
|
||||
}, {
|
||||
"id": "AuthLDAPFilter",
|
||||
"title": "AuthLDAPFilter"
|
||||
}, {
|
||||
|
|
|
|||
|
|
@ -879,10 +879,6 @@
|
|||
},
|
||||
{
|
||||
"_nodes": [{
|
||||
"id": "LDAPFilter",
|
||||
"title": "LDAPFilter"
|
||||
},
|
||||
{
|
||||
"id": "AuthLDAPFilter",
|
||||
"title": "AuthLDAPFilter"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1102,10 +1102,6 @@
|
|||
},
|
||||
{
|
||||
"_nodes" : [
|
||||
{
|
||||
"id" : "LDAPFilter",
|
||||
"title" : "LDAPFilter"
|
||||
},
|
||||
{
|
||||
"id" : "AuthLDAPFilter",
|
||||
"title" : "AuthLDAPFilter"
|
||||
|
|
|
|||
|
|
@ -581,9 +581,6 @@
|
|||
"type": "simpleInputContainer"
|
||||
}, {
|
||||
"_nodes": [{
|
||||
"id": "LDAPFilter",
|
||||
"title": "LDAPFilter"
|
||||
}, {
|
||||
"id": "AuthLDAPFilter",
|
||||
"title": "AuthLDAPFilter"
|
||||
}, {
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ has mailFilter => (
|
|||
|
||||
sub buildFilter {
|
||||
return $_[0]->_buildFilter( $_[0]->conf->{AuthLDAPFilter}
|
||||
|| $_[0]->conf->{LDAPFilter}
|
||||
|| '(&(uid=$user)(objectClass=inetOrgPerson))' );
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ SKIP: {
|
|||
authentication => 'AD',
|
||||
userDB => 'Same',
|
||||
passwordDB => 'AD',
|
||||
LDAPFilter => $ENV{ADFILTER} || '(cn=$user)',
|
||||
AuthLDAPFilter => $ENV{ADFILTER} || '(cn=$user)',
|
||||
ldapServer => $ENV{ADSERVER},
|
||||
ldapBase => $ENV{ADBASE},
|
||||
managerDn => $ENV{MANAGERDN} || '',
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user