dani
/
lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove LDAPFilter option (#2183)

This commit is contained in:
Maxime Besson 2020-12-28 16:27:32 +01:00
parent b1232739a0
commit aa55f3d04a
25 changed files with 13 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm
View File

@ -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)],

3
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
View File

@ -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'

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
View File

@ -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'

4
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm
View File

@ -279,8 +279,8 @@ sub tree {
help => 'authldap.html#filters',
form => 'simpleInputContainer',
nodes => [
'LDAPFilter', 'AuthLDAPFilter',
'mailLDAPFilter', 'ldapSearchDeref',
'AuthLDAPFilter', 'mailLDAPFilter',
'ldapSearchDeref',
]
},
{

3
lemonldap-ng-manager/site/htdocs/static/languages/ar.json
View File

@ -437,7 +437,6 @@
"ldapConnection":"الاتصال",
"ldapExportedVars":"المتغيرات المصدرة",
"ldapFilters":"فلتر",
"LDAPFilter":"فلتر الاعْتيادي",
"ldapGroupAttributeName":"السمات المستهدف",
"ldapGroupAttributeNameGroup":"سمات مصدر المجموعة",
"ldapGroupAttributeNameSearch":"السمات التي تم البحث عنها",
@ -1185,4 +1184,4 @@
"samlRelayStateTimeout":"تناوب حالة مهلة الجلسة ",
"samlUseQueryStringSpecific":"استخدام أسلوب query_string المعين",
"samlOverrideIDPEntityID":"Override Entity ID when acting as IDP"
}
}

3
lemonldap-ng-manager/site/htdocs/static/languages/de.json
View File

@ -436,7 +436,6 @@
"ldapConnection":"Connection",
"ldapExportedVars":"Exported variables",
"ldapFilters":"Filters",
"LDAPFilter":"Default filter",
"ldapGroupAttributeName":"Target attribute",
"ldapGroupAttributeNameGroup":"Group source attribute",
"ldapGroupAttributeNameSearch":"Searched attributes",
@ -1184,4 +1183,4 @@
"samlRelayStateTimeout":"RelayState session timeout",
"samlUseQueryStringSpecific":"Use specific query_string method",
"samlOverrideIDPEntityID":"Override Entity ID when acting as IDP"
}
}

1
lemonldap-ng-manager/site/htdocs/static/languages/en.json
View File

@ -436,7 +436,6 @@
"ldapConnection":"Connection",
"ldapExportedVars":"Exported variables",
"ldapFilters":"Filters",
"LDAPFilter":"Default filter",
"ldapGroupAttributeName":"Target attribute",
"ldapGroupAttributeNameGroup":"Group source attribute",
"ldapGroupAttributeNameSearch":"Searched attributes",

1
lemonldap-ng-manager/site/htdocs/static/languages/fr.json
View File

@ -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",

3
lemonldap-ng-manager/site/htdocs/static/languages/it.json
View File

@ -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",
@ -1184,4 +1183,4 @@
"samlRelayStateTimeout":"Timeout di sessione di RelayState",
"samlUseQueryStringSpecific":"Utilizza il metodo specifico query_string",
"samlOverrideIDPEntityID":"Sostituisci l'ID entità quando agisce come IDP"
}
}

3
lemonldap-ng-manager/site/htdocs/static/languages/pl.json
View File

@ -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",
@ -1184,4 +1183,4 @@
"samlRelayStateTimeout":"Limit czasu sesji RelayState",
"samlUseQueryStringSpecific":"Użyj określonej metody query_string",
"samlOverrideIDPEntityID":"Zastąp identyfikator jednostki podczas działania jako IDP"
}
}

3
lemonldap-ng-manager/site/htdocs/static/languages/tr.json
View File

@ -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",
@ -1184,4 +1183,4 @@
"samlRelayStateTimeout":"RelayState oturum zaman aşımı",
"samlUseQueryStringSpecific":"Spesifik query_string metodu kullan",
"samlOverrideIDPEntityID":"IDP olarak davrandığında Varlık ID'yi geçersiz kıl"
}
}

3
lemonldap-ng-manager/site/htdocs/static/languages/vi.json
View File

@ -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",
@ -1184,4 +1183,4 @@
"samlRelayStateTimeout":"Thời gian hết hạn phiên RelayState ",
"samlUseQueryStringSpecific":"Sử dụng phương pháp query_string cụ thể",
"samlOverrideIDPEntityID":"Override Entity ID when acting as IDP"
}
}

3
lemonldap-ng-manager/site/htdocs/static/languages/zh.json
View File

@ -436,7 +436,6 @@
"ldapConnection":"连接",
"ldapExportedVars":"Exported variables",
"ldapFilters":"Filters",
"LDAPFilter":"Default filter",
"ldapGroupAttributeName":"Target attribute",
"ldapGroupAttributeNameGroup":"Group source attribute",
"ldapGroupAttributeNameSearch":"Searched attributes",
@ -1184,4 +1183,4 @@
"samlRelayStateTimeout":"RelayState session timeout",
"samlUseQueryStringSpecific":"Use specific query_string method",
"samlOverrideIDPEntityID":"Override Entity ID when acting as IDP"
}
}

2
lemonldap-ng-manager/site/htdocs/static/reverseTree.json
View File

File diff suppressed because one or more lines are too long

2
lemonldap-ng-manager/site/htdocs/static/struct.json
View File

File diff suppressed because one or more lines are too long

3
lemonldap-ng-manager/t/jsonfiles/01-base-tree.json
View File

@ -579,9 +579,6 @@
"type": "simpleInputContainer"
}, {
"_nodes": [{
"id": "LDAPFilter",
"title": "LDAPFilter"
}, {
"id": "AuthLDAPFilter",
"title": "AuthLDAPFilter"
}, {

3
lemonldap-ng-manager/t/jsonfiles/03-base-tree-appCat-modifed.json
View File

@ -683,9 +683,6 @@
"type": "simpleInputContainer"
}, {
"_nodes": [{
"id": "LDAPFilter",
"title": "LDAPFilter"
}, {
"id": "AuthLDAPFilter",
"title": "AuthLDAPFilter"
}, {

3
lemonldap-ng-manager/t/jsonfiles/11-modified-with-confirmation.json
View File

@ -718,9 +718,6 @@
"type": "simpleInputContainer"
}, {
"_nodes": [{
"id": "LDAPFilter",
"title": "LDAPFilter"
}, {
"id": "AuthLDAPFilter",
"title": "AuthLDAPFilter"
}, {

3
lemonldap-ng-manager/t/jsonfiles/12-modified.json
View File

@ -718,9 +718,6 @@
"type": "simpleInputContainer"
}, {
"_nodes": [{
"id": "LDAPFilter",
"title": "LDAPFilter"
}, {
"id": "AuthLDAPFilter",
"title": "AuthLDAPFilter"
}, {

3
lemonldap-ng-manager/t/jsonfiles/14-bad.json
View File

@ -708,9 +708,6 @@
"type": "simpleInputContainer"
}, {
"_nodes": [{
"id": "LDAPFilter",
"title": "LDAPFilter"
}, {
"id": "AuthLDAPFilter",
"title": "AuthLDAPFilter"
}, {

4
lemonldap-ng-manager/t/jsonfiles/15-combination.json
View File

@ -879,10 +879,6 @@
},
{
"_nodes": [{
"id": "LDAPFilter",
"title": "LDAPFilter"
},
{
"id": "AuthLDAPFilter",
"title": "AuthLDAPFilter"
},

4
lemonldap-ng-manager/t/jsonfiles/17-extra2f.json
View File

@ -1102,10 +1102,6 @@
},
{
"_nodes" : [
{
"id" : "LDAPFilter",
"title" : "LDAPFilter"
},
{
"id" : "AuthLDAPFilter",
"title" : "AuthLDAPFilter"

3
lemonldap-ng-manager/t/jsonfiles/70-diff.json
View File

@ -581,9 +581,6 @@
"type": "simpleInputContainer"
}, {
"_nodes": [{
"id": "LDAPFilter",
"title": "LDAPFilter"
}, {
"id": "AuthLDAPFilter",
"title": "AuthLDAPFilter"
}, {

1
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/LDAP.pm
View File

@ -71,7 +71,6 @@ has mailFilter => (
sub buildFilter {
return $_[0]->_buildFilter( $_[0]->conf->{AuthLDAPFilter}
|| $_[0]->conf->{LDAPFilter}
|| '(&(uid=$user)(objectClass=inetOrgPerson))' );
}

2
lemonldap-ng-portal/t/22-Auth-and-password-AD.t
View File

@ -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} || '',