From 994ccfae303328f880bd4da451f212e119e63a1c Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Sat, 2 Jan 2021 20:22:33 +0100 Subject: [PATCH] Append REST findUser URL parameter (#1986) --- .../lib/Lemonldap/NG/Manager/Build/Attributes.pm | 13 +++++++------ .../lib/Lemonldap/NG/Manager/Build/Tree.pm | 6 +++--- .../site/htdocs/static/languages/ar.json | 1 + .../site/htdocs/static/languages/de.json | 1 + .../site/htdocs/static/languages/en.json | 1 + .../site/htdocs/static/languages/es.json | 1 + .../site/htdocs/static/languages/fr.json | 1 + .../site/htdocs/static/languages/it.json | 1 + .../site/htdocs/static/languages/pl.json | 1 + .../site/htdocs/static/languages/tr.json | 1 + .../site/htdocs/static/languages/vi.json | 1 + .../site/htdocs/static/languages/zh.json | 1 + .../site/htdocs/static/languages/zh_TW.json | 1 + .../lib/Lemonldap/NG/Portal/UserDB/REST.pm | 2 +- 14 files changed, 22 insertions(+), 10 deletions(-) diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm index ac7825bf4..75bc1788b 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm @@ -535,13 +535,13 @@ sub attributes { flags => 'p', }, findUserSearchingAttributes => { - type => 'keyTextContainer', - keyTest => qr/^\S+$/, + type => 'keyTextContainer', + keyTest => qr/^\S+$/, documentation => 'Attributes used for searching accounts', }, findUserExcludingAttributes => { - type => 'keyTextContainer', - keyTest => qr/^\S+$/, + type => 'keyTextContainer', + keyTest => qr/^\S+$/, documentation => 'Attributes used for excluding accounts', }, globalLogoutRule => { @@ -3521,8 +3521,9 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?: radiusServer => { type => 'text', }, # REST - restAuthUrl => { type => 'url' }, - restUserDBUrl => { type => 'url' }, + restAuthUrl => { type => 'url' }, + restUserDBUrl => { type => 'url' }, + restFindUserDBUrl => { type => 'url' }, restPwdConfirmUrl => { type => 'url' }, restPwdModifyUrl => { type => 'url' }, diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm index b3f6a3373..044f029f0 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm @@ -392,9 +392,9 @@ sub tree { help => 'authrest.html', form => 'simpleInputContainer', nodes => [ - 'restAuthnLevel', 'restAuthUrl', - 'restUserDBUrl', 'restPwdConfirmUrl', - 'restPwdModifyUrl' + 'restAuthnLevel', 'restAuthUrl', + 'restUserDBUrl', 'restPwdConfirmUrl', + 'restPwdModifyUrl', 'restFindUserDBUrl' ] }, { diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json index 531c1c466..0b1d4ed79 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json @@ -848,6 +848,7 @@ "restSessionServer":"خادم جلسة ريست", "restAuthServer":"REST authentication server", "restClockTolerance":"REST server clock tolerance", +"restFindUserDBUrl":"User accounts URL", "restPasswordServer":"REST password reset server", "restUserDBUrl":"عنوان يو آر إل لبيانات المستخدم", "returnUrl":"إرجاع اليو آر إل", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/de.json b/lemonldap-ng-manager/site/htdocs/static/languages/de.json index 554904fff..746eb03bc 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/de.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/de.json @@ -848,6 +848,7 @@ "restSessionServer":"REST session server", "restAuthServer":"REST authentication server", "restClockTolerance":"REST server clock tolerance", +"restFindUserDBUrl":"User accounts URL", "restPasswordServer":"REST password reset server", "restUserDBUrl":"User data URL", "returnUrl":"Return URL", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/en.json b/lemonldap-ng-manager/site/htdocs/static/languages/en.json index 18c7befb1..40128cd34 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json @@ -848,6 +848,7 @@ "restSessionServer":"REST session server", "restAuthServer":"REST authentication server", "restClockTolerance":"REST server clock tolerance", +"restFindUserDBUrl":"User accounts URL", "restPasswordServer":"REST password reset server", "restUserDBUrl":"User data URL", "returnUrl":"Return URL", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/es.json b/lemonldap-ng-manager/site/htdocs/static/languages/es.json index 584bcce35..c874ccadb 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/es.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/es.json @@ -848,6 +848,7 @@ "restSessionServer":"Servidor de sesión REST", "restAuthServer":"REST authentication server", "restClockTolerance":"Tolerancia del reloj del servidor REST", +"restFindUserDBUrl":"User accounts URL", "restPasswordServer":"REST password reset server", "restUserDBUrl":"URL de datos de usuario", "returnUrl":"URL de retorno", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json index 2e1fc5719..6565750a6 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json @@ -848,6 +848,7 @@ "restPwdModifyUrl":"URL de modification de mot-de-passe", "restSessionServer":"Serveur de sessions REST", "restAuthServer":"Serveur d'authentification REST", +"restFindUserDBUrl":"URL des comptes utilisateurs", "restClockTolerance":"Tolérance aux écarts d'horloge", "restPasswordServer":"Serveur de réinitialisation de mdp REST", "restUserDBUrl":"URL de données utilisateurs", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/it.json b/lemonldap-ng-manager/site/htdocs/static/languages/it.json index d50f1bfc7..8e12421ff 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json @@ -848,6 +848,7 @@ "restSessionServer":"Server di sessione REST", "restAuthServer":"REST authentication server", "restClockTolerance":"REST server clock tolerance", +"restFindUserDBUrl":"User accounts URL", "restPasswordServer":"REST password reset server", "restUserDBUrl":"URL dei dati utente", "returnUrl":"URL di ritorno", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json index a2f0dc7c4..39f333d7b 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json @@ -848,6 +848,7 @@ "restSessionServer":"Serwer sesji REST", "restAuthServer":"Serwer uwierzytelniania REST", "restClockTolerance":"Tolerancja zegara serwera REST", +"restFindUserDBUrl":"User accounts URL", "restPasswordServer":"Serwer resetowania hasła REST", "restUserDBUrl":"Adres URL danych użytkownika", "returnUrl":"Zwróć adres URL", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json index 687125663..c26846b33 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json @@ -848,6 +848,7 @@ "restSessionServer":"REST oturum sunucusu", "restAuthServer":"REST doğrulama sunucusu", "restClockTolerance":"REST sunucu saat toleransı", +"restFindUserDBUrl":"User accounts URL", "restPasswordServer":"REST parola sıfırlama sunucusu", "restUserDBUrl":"Kullanıcı verisi URL'si", "returnUrl":"Dönüş URL'si", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json index ab86614f2..fe195067d 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json @@ -848,6 +848,7 @@ "restSessionServer":"Máy chủ phiên REST", "restAuthServer":"REST authentication server", "restClockTolerance":"REST server clock tolerance", +"restFindUserDBUrl":"User accounts URL", "restPasswordServer":"REST password reset server", "restUserDBUrl":"URL dữ liệu người dùng", "returnUrl":"Trả lại URL", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json index 916dadeee..674be0b36 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json @@ -848,6 +848,7 @@ "restSessionServer":"REST session server", "restAuthServer":"REST authentication server", "restClockTolerance":"REST server clock tolerance", +"restFindUserDBUrl":"User accounts URL", "restPasswordServer":"REST password reset server", "restUserDBUrl":"User data URL", "returnUrl":"Return URL", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json index 487a77654..9d74e80a7 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json @@ -848,6 +848,7 @@ "restSessionServer":"REST 工作階段伺服器", "restAuthServer":"REST 驗證伺服器", "restClockTolerance":"REST 伺服器時鐘公差", +"restFindUserDBUrl":"User accounts URL", "restPasswordServer":"REST 密碼重設伺服器", "restUserDBUrl":"使用者資料 URL", "returnUrl":"回傳 URL", diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/REST.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/REST.pm index 6c1c1d5a1..43e5c76f1 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/REST.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/REST.pm @@ -76,7 +76,7 @@ sub findUser { ]; $res = eval { $self->restCall( - $self->conf->{restUserDBUrl}, + $self->conf->{restFindUserDBUrl}, { searchingAttributes => to_json($searching), (