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

Add ldap IO timeout option to manager (#2267)

Browse Source
This commit is contained in:
Maxime Besson 2020-10-27 11:36:08 +01:00
parent bcb81cd91b
commit 1623c542a0
16 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm
View File

@ -138,12 +138,13 @@ sub defaultValues {
'ldapGroupAttributeNameSearch' => 'cn', 'ldapGroupAttributeNameSearch' => 'cn',
'ldapGroupAttributeNameUser' => 'dn', 'ldapGroupAttributeNameUser' => 'dn',
'ldapGroupObjectClass' => 'groupOfNames', 'ldapGroupObjectClass' => 'groupOfNames',
'ldapIOTimeout' => 10,
'ldapPasswordResetAttribute' => 'pwdReset', 'ldapPasswordResetAttribute' => 'pwdReset',
'ldapPasswordResetAttributeValue' => 'TRUE', 'ldapPasswordResetAttributeValue' => 'TRUE',
'ldapPwdEnc' => 'utf-8', 'ldapPwdEnc' => 'utf-8',
'ldapSearchDeref' => 'find', 'ldapSearchDeref' => 'find',
'ldapServer' => 'ldap://localhost', 'ldapServer' => 'ldap://localhost',
'ldapTimeout' => 120, 'ldapTimeout' => 10,
'ldapUsePasswordResetAttribute' => 1, 'ldapUsePasswordResetAttribute' => 1,
'ldapVerify' => 'require', 'ldapVerify' => 'require',
'ldapVersion' => 3, 'ldapVersion' => 3,

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)], githubParams => [qw(githubAuthnLevel githubClientID githubClientSecret githubUserField githubScope)],
gpgParams => [qw(gpgAuthnLevel gpgDb)], gpgParams => [qw(gpgAuthnLevel gpgDb)],
kerberosParams => [qw(krbAuthnLevel krbKeytab krbByJs krbRemoveDomain)], kerberosParams => [qw(krbAuthnLevel krbKeytab krbByJs krbRemoveDomain)],
ldapParams => [qw(ldapAuthnLevel ldapExportedVars ldapServer ldapPort ldapVerify ldapBase managerDn managerPassword ldapTimeout 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 LDAPFilter 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)], linkedinParams => [qw(linkedInAuthnLevel linkedInClientID linkedInClientSecret linkedInFields linkedInUserField linkedInScope)],
nullParams => [qw(nullAuthnLevel)], nullParams => [qw(nullAuthnLevel)],
oidcParams => [qw(oidcAuthnLevel oidcRPCallbackGetParam oidcRPStateTimeout)], oidcParams => [qw(oidcAuthnLevel oidcRPCallbackGetParam oidcRPStateTimeout)],

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

@ -1660,6 +1660,10 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
'default' => 0, 'default' => 0,
'type' => 'bool' 'type' => 'bool'
}, },
'ldapIOTimeout' => {
'default' => 10,
'type' => 'int'
},
'ldapITDS' => { 'ldapITDS' => {
'default' => 0, 'default' => 0,
'type' => 'bool' 'type' => 'bool'
@ -1728,7 +1732,7 @@ m[^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
'type' => 'bool' 'type' => 'bool'
}, },
'ldapTimeout' => { 'ldapTimeout' => {
'default' => 120, 'default' => 10,
'type' => 'int' 'type' => 'int'
}, },
'ldapUsePasswordResetAttribute' => { 'ldapUsePasswordResetAttribute' => {

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

@ -3304,9 +3304,14 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
}, },
ldapTimeout => { ldapTimeout => {
type => 'int', type => 'int',
default => 120, default => 10,
documentation => 'LDAP connection timeout', documentation => 'LDAP connection timeout',
}, },
ldapIOTimeout => {
type => 'int',
default => 10,
documentation => 'LDAP operation timeout',
},
ldapVersion => { ldapVersion => {
type => 'int', type => 'int',
default => 3, default => 3,

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

@ -259,9 +259,9 @@ sub tree {
'ldapServer', 'ldapPort', 'ldapServer', 'ldapPort',
'ldapVerify', 'ldapBase', 'ldapVerify', 'ldapBase',
'managerDn', 'managerPassword', 'managerDn', 'managerPassword',
'ldapTimeout', 'ldapVersion', 'ldapTimeout', 'ldapIOTimeout',
'ldapRaw', 'ldapCAFile', 'ldapVersion', 'ldapRaw',
'ldapCAPath', 'ldapCAFile', 'ldapCAPath',
] ]
}, },
{ {

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

@ -443,7 +443,8 @@
"ldapSearchDeref":"الاسم المستعار", "ldapSearchDeref":"الاسم المستعار",
"ldapServer":"مضيف الخادم", "ldapServer":"مضيف الخادم",
"ldapSetPassword":"تعديل كلمة المرور مع عملية موسعة", "ldapSetPassword":"تعديل كلمة المرور مع عملية موسعة",
"ldapTimeout":"مهلة", "ldapTimeout":"Connection timeout",
"ldapIOTimeout": "Operation timeout",
"ldapUsePasswordResetAttribute":"استخدام سمة إعادة الضبط", "ldapUsePasswordResetAttribute":"استخدام سمة إعادة الضبط",
"ldapVerify":"Verify LDAP server certificate", "ldapVerify":"Verify LDAP server certificate",
"ldapVersion":"الإصدار", "ldapVersion":"الإصدار",
@ -1160,4 +1161,4 @@
"samlRelayStateTimeout":"تناوب حالة مهلة الجلسة ", "samlRelayStateTimeout":"تناوب حالة مهلة الجلسة ",
"samlUseQueryStringSpecific":"استخدام أسلوب query_string المعين", "samlUseQueryStringSpecific":"استخدام أسلوب query_string المعين",
"samlOverrideIDPEntityID":"Override Entity ID when acting as IDP" "samlOverrideIDPEntityID":"Override Entity ID when acting as IDP"
} }

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

@ -443,7 +443,8 @@
"ldapSearchDeref":"Alias dereference", "ldapSearchDeref":"Alias dereference",
"ldapServer":"Server host", "ldapServer":"Server host",
"ldapSetPassword":"Password modify extended operation", "ldapSetPassword":"Password modify extended operation",
"ldapTimeout":"Timeout", "ldapTimeout":"Connection timeout",
"ldapIOTimeout": "Operation timeout",
"ldapUsePasswordResetAttribute":"Use reset attribute", "ldapUsePasswordResetAttribute":"Use reset attribute",
"ldapVerify":"Verify LDAP server certificate", "ldapVerify":"Verify LDAP server certificate",
"ldapVersion":"Version", "ldapVersion":"Version",
@ -1160,4 +1161,4 @@
"samlRelayStateTimeout":"RelayState session timeout", "samlRelayStateTimeout":"RelayState session timeout",
"samlUseQueryStringSpecific":"Use specific query_string method", "samlUseQueryStringSpecific":"Use specific query_string method",
"samlOverrideIDPEntityID":"Override Entity ID when acting as IDP" "samlOverrideIDPEntityID":"Override Entity ID when acting as IDP"
} }

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

@ -443,7 +443,8 @@
"ldapSearchDeref":"Alias dereference", "ldapSearchDeref":"Alias dereference",
"ldapServer":"Server host", "ldapServer":"Server host",
"ldapSetPassword":"Password modify extended operation", "ldapSetPassword":"Password modify extended operation",
"ldapTimeout":"Timeout", "ldapTimeout":"Connection timeout",
"ldapIOTimeout": "Operation timeout",
"ldapUsePasswordResetAttribute":"Use reset attribute", "ldapUsePasswordResetAttribute":"Use reset attribute",
"ldapVerify":"Verify LDAP server certificate", "ldapVerify":"Verify LDAP server certificate",
"ldapVersion":"Version", "ldapVersion":"Version",

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

@ -443,7 +443,8 @@
"ldapSearchDeref":"Déréférence des alias", "ldapSearchDeref":"Déréférence des alias",
"ldapServer":"Hôte", "ldapServer":"Hôte",
"ldapSetPassword":"Opération étendue password modify", "ldapSetPassword":"Opération étendue password modify",
"ldapTimeout":"Temps maximum d'inactivité", "ldapTimeout":"Délai maximum de connexion",
"ldapIOTimeout": "Délai maximum d'opération",
"ldapUsePasswordResetAttribute":"Utiliser l'attribut de réinitialisation", "ldapUsePasswordResetAttribute":"Utiliser l'attribut de réinitialisation",
"ldapVerify":"Vérifier le certificat du serveur LDAP", "ldapVerify":"Vérifier le certificat du serveur LDAP",
"ldapVersion":"Version", "ldapVersion":"Version",

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

@ -443,7 +443,8 @@
"ldapSearchDeref":"Alias dereference", "ldapSearchDeref":"Alias dereference",
"ldapServer":"Host del server", "ldapServer":"Host del server",
"ldapSetPassword":"Operazione prolungata di modifica password", "ldapSetPassword":"Operazione prolungata di modifica password",
"ldapTimeout":"Timeout", "ldapTimeout":"Connection timeout",
"ldapIOTimeout": "Operation timeout",
"ldapUsePasswordResetAttribute":"Utilizza l'attributo di ripristino", "ldapUsePasswordResetAttribute":"Utilizza l'attributo di ripristino",
"ldapVerify":"Verify LDAP server certificate", "ldapVerify":"Verify LDAP server certificate",
"ldapVersion":"Versione", "ldapVersion":"Versione",
@ -1160,4 +1161,4 @@
"samlRelayStateTimeout":"Timeout di sessione di RelayState", "samlRelayStateTimeout":"Timeout di sessione di RelayState",
"samlUseQueryStringSpecific":"Utilizza il metodo specifico query_string", "samlUseQueryStringSpecific":"Utilizza il metodo specifico query_string",
"samlOverrideIDPEntityID":"Sostituisci l'ID entità quando agisce come IDP" "samlOverrideIDPEntityID":"Sostituisci l'ID entità quando agisce come IDP"
} }

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

@ -443,7 +443,8 @@
"ldapSearchDeref":"Dereferencja aliasu", "ldapSearchDeref":"Dereferencja aliasu",
"ldapServer":"Host serwera", "ldapServer":"Host serwera",
"ldapSetPassword":"Rozszerzona operacja modyfikacji hasła", "ldapSetPassword":"Rozszerzona operacja modyfikacji hasła",
"ldapTimeout":"Limit czasu", "ldapTimeout":"Connection timeout",
"ldapIOTimeout": "Operation timeout",
"ldapUsePasswordResetAttribute":"Użyj atrybutu reset", "ldapUsePasswordResetAttribute":"Użyj atrybutu reset",
"ldapVerify":"Verify LDAP server certificate", "ldapVerify":"Verify LDAP server certificate",
"ldapVersion":"Wersja", "ldapVersion":"Wersja",
@ -1160,4 +1161,4 @@
"samlRelayStateTimeout":"Limit czasu sesji RelayState", "samlRelayStateTimeout":"Limit czasu sesji RelayState",
"samlUseQueryStringSpecific":"Użyj określonej metody query_string", "samlUseQueryStringSpecific":"Użyj określonej metody query_string",
"samlOverrideIDPEntityID":"Zastąp identyfikator jednostki podczas działania jako IDP" "samlOverrideIDPEntityID":"Zastąp identyfikator jednostki podczas działania jako IDP"
} }

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

@ -443,7 +443,8 @@
"ldapSearchDeref":"Takma ad yönlendirmeleri", "ldapSearchDeref":"Takma ad yönlendirmeleri",
"ldapServer":"Konak sunucu", "ldapServer":"Konak sunucu",
"ldapSetPassword":"Parola değiştirme işlemi genişletilmiş", "ldapSetPassword":"Parola değiştirme işlemi genişletilmiş",
"ldapTimeout":"Zaman aşımı", "ldapTimeout":"Connection timeout",
"ldapIOTimeout": "Operation timeout",
"ldapUsePasswordResetAttribute":"Sıfırlama niteliklerini kullan", "ldapUsePasswordResetAttribute":"Sıfırlama niteliklerini kullan",
"ldapVerify":"LDAP sunucu sertifikasını doğrulayın", "ldapVerify":"LDAP sunucu sertifikasını doğrulayın",
"ldapVersion":"Sürüm", "ldapVersion":"Sürüm",
@ -1160,4 +1161,4 @@
"samlRelayStateTimeout":"RelayState oturum zaman aşımı", "samlRelayStateTimeout":"RelayState oturum zaman aşımı",
"samlUseQueryStringSpecific":"Spesifik query_string metodu kullan", "samlUseQueryStringSpecific":"Spesifik query_string metodu kullan",
"samlOverrideIDPEntityID":"IDP olarak davrandığında Varlık ID'yi geçersiz kıl" "samlOverrideIDPEntityID":"IDP olarak davrandığında Varlık ID'yi geçersiz kıl"
} }

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

@ -443,7 +443,8 @@
"ldapSearchDeref":"Bí danh ngoại tham chiếu ", "ldapSearchDeref":"Bí danh ngoại tham chiếu ",
"ldapServer":"Máy chủ lưu trữ", "ldapServer":"Máy chủ lưu trữ",
"ldapSetPassword":"Mật khẩu sửa đổi hoạt động mở rộng", "ldapSetPassword":"Mật khẩu sửa đổi hoạt động mở rộng",
"ldapTimeout":"Thời gian chờ", "ldapTimeout":"Connection timeout",
"ldapIOTimeout": "Operation timeout",
"ldapUsePasswordResetAttribute":"Sử dụng thuộc tính đặt lại", "ldapUsePasswordResetAttribute":"Sử dụng thuộc tính đặt lại",
"ldapVerify":"Verify LDAP server certificate", "ldapVerify":"Verify LDAP server certificate",
"ldapVersion":"Phiên bản", "ldapVersion":"Phiên bản",
@ -1160,4 +1161,4 @@
"samlRelayStateTimeout":"Thời gian hết hạn phiên RelayState ", "samlRelayStateTimeout":"Thời gian hết hạn phiên RelayState ",
"samlUseQueryStringSpecific":"Sử dụng phương pháp query_string cụ thể", "samlUseQueryStringSpecific":"Sử dụng phương pháp query_string cụ thể",
"samlOverrideIDPEntityID":"Override Entity ID when acting as IDP" "samlOverrideIDPEntityID":"Override Entity ID when acting as IDP"
} }

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

@ -443,7 +443,8 @@
"ldapSearchDeref":"Alias dereference", "ldapSearchDeref":"Alias dereference",
"ldapServer":"Server host", "ldapServer":"Server host",
"ldapSetPassword":"Password modify extended operation", "ldapSetPassword":"Password modify extended operation",
"ldapTimeout":"Timeout", "ldapTimeout":"Connection timeout",
"ldapIOTimeout": "Operation timeout",
"ldapUsePasswordResetAttribute":"Use reset attribute", "ldapUsePasswordResetAttribute":"Use reset attribute",
"ldapVerify":"Verify LDAP server certificate", "ldapVerify":"Verify LDAP server certificate",
"ldapVersion":"版本", "ldapVersion":"版本",
@ -1160,4 +1161,4 @@
"samlRelayStateTimeout":"RelayState session timeout", "samlRelayStateTimeout":"RelayState session timeout",
"samlUseQueryStringSpecific":"Use specific query_string method", "samlUseQueryStringSpecific":"Use specific query_string method",
"samlOverrideIDPEntityID":"Override Entity ID when acting as IDP" "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