From b40ae547f43ef252f3277af9fe2fd58be0d19d03 Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Thu, 12 Nov 2020 19:52:48 +0100 Subject: [PATCH] Update langs & test conf (#2381) --- doc/sources/admin/configvhost.rst | 26 +++++++++++++++++++ e2e-tests/lmConf-1.json | 10 +++++++ .../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/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 + 11 files changed, 45 insertions(+) diff --git a/doc/sources/admin/configvhost.rst b/doc/sources/admin/configvhost.rst index 6db92de1c..4ffdb283e 100644 --- a/doc/sources/admin/configvhost.rst +++ b/doc/sources/admin/configvhost.rst @@ -503,6 +503,9 @@ Some options are available: - Maintenance mode: reject all requests with a maintenance message - Aliases: list of aliases for this virtual host *(avoid to rewrite rules,...)* +- Access to trace: can be used for overwriting REMOTE_CUSTOM with a custom function. + Provide a comma separated list with custom function path and args. + By example: My::accessToTrace, 'Dr Who', 'dwho@badwolf.org' - Type: handler type (normal, :doc:`ServiceToken Handler`, :doc:`DevOps Handler`,...) @@ -515,6 +518,29 @@ Some options are available: seconds. This TTL can be customized for each virtual host. +.. attention:: + + A hash reference containing $req, $session, $vhost, $custom and an array reference + with provided parameters is passed to accessToTrace custom function. + + :: + + package My; + + sub accessToTrace { + my $hash = shift; + my $custom = $hash->{custom}; + my $req = $hash->{req}; + my $vhost = $hash->{vhost}; + my $custom = hash->{custom}; + + return + "$custom alias $hash->{params}->[0]#$hash->{params}->[1]:$hash->{session}->{groups}"; + } + + 1; + + .. danger:: A same virtual host can serve many locations. Each diff --git a/e2e-tests/lmConf-1.json b/e2e-tests/lmConf-1.json index 51f89b8f3..cc40fcc93 100644 --- a/e2e-tests/lmConf-1.json +++ b/e2e-tests/lmConf-1.json @@ -164,6 +164,16 @@ "default": "accept" } }, + "vhostOptions":{ + "manager.example.com": { + "vhostMaintenance": 0, + "vhostPort": -1, + "vhostHttps": -1, + "vhostAliases": "", + "vhostServiceTokenTTL": -1, + "vhostAccessToTrace": "My::accessToTrace, Doctor, Who","vhostType":"Main" + } + }, "loginHistoryEnabled": 1, "macros": { "UA" : "$ENV{HTTP_USER_AGENT}", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json index 7dd45394e..480168079 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json @@ -1001,6 +1001,7 @@ "verifyU2FKey":"Verify U2F key", "verifyTOTPKey":"Verify TOTP key", "version":"الإصدار", +"vhostAccessToTrace":"Access to trace", "vhostAliases":"اسماء مستعارة", "vhostAuthnLevel":"مستوى إثبات الهوية واجب", "vhostHttps":"إتش تي تي بي س", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/de.json b/lemonldap-ng-manager/site/htdocs/static/languages/de.json index 159db8aed..6fa11feb6 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/de.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/de.json @@ -1001,6 +1001,7 @@ "verifyU2FKey":"Verify U2F key", "verifyTOTPKey":"Verify TOTP key", "version":"Version", +"vhostAccessToTrace":"Access to trace", "vhostAliases":"Aliases", "vhostAuthnLevel":"Required authentication level", "vhostHttps":"HTTPS", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/en.json b/lemonldap-ng-manager/site/htdocs/static/languages/en.json index 65c0a5160..2fd12af6d 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json @@ -1001,6 +1001,7 @@ "verifyU2FKey":"Verify U2F key", "verifyTOTPKey":"Verify TOTP key", "version":"Version", +"vhostAccessToTrace":"Access to trace", "vhostAliases":"Aliases", "vhostAuthnLevel":"Required authentication level", "vhostHttps":"HTTPS", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json index 4caf6dbe6..1948e596b 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json @@ -1001,6 +1001,7 @@ "verifyU2FKey":"Vérifier la clef U2F", "verifyTOTPKey":"Vérifier la clef TOTP", "version":"Version", +"vhostAccessToTrace":"Accès à tracer", "vhostAliases":"Alias", "vhostAuthnLevel":"Niveau d'authentification requis", "vhostHttps":"HTTPS", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/it.json b/lemonldap-ng-manager/site/htdocs/static/languages/it.json index 86b7c1c7a..963fe9610 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json @@ -1001,6 +1001,7 @@ "verifyU2FKey":"Verifica la chiave U2F", "verifyTOTPKey":"Verifica la chiave TOTP", "version":"Versioni", +"vhostAccessToTrace":"Access to trace", "vhostAliases":"Alias", "vhostAuthnLevel":"Livello di autenticazione richiesto", "vhostHttps":"HTTPS", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json index 2a23f2a02..3aede669b 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json @@ -1001,6 +1001,7 @@ "verifyU2FKey":"Sprawdź klucz U2F", "verifyTOTPKey":"Sprawdź klucz TOTP", "version":"Wersja", +"vhostAccessToTrace":"Access to trace", "vhostAliases":"Aliasy", "vhostAuthnLevel":"Wymagany poziom uwierzytelnienia", "vhostHttps":"HTTPS", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json index ecb131aea..c2a9992f0 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json @@ -1001,6 +1001,7 @@ "verifyU2FKey":"U2F anahtarını doğrula", "verifyTOTPKey":"TOTP anahtarını doğrula", "version":"Sürüm", +"vhostAccessToTrace":"Access to trace", "vhostAliases":"Takma adlar", "vhostAuthnLevel":"Gereken doğrulama seviyesi", "vhostHttps":"HTTPS", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json index 16389f323..f49f42797 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json @@ -1001,6 +1001,7 @@ "verifyU2FKey":"Verify U2F key", "verifyTOTPKey":"Verify TOTP key", "version":"Phiên bản", +"vhostAccessToTrace":"Access to trace", "vhostAliases":"Bí danh", "vhostAuthnLevel":"Mức xác thực bắt buộc", "vhostHttps":"HTTPS", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json index 434b2ccb1..435f4f4ac 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json @@ -1001,6 +1001,7 @@ "verifyU2FKey":"Verify U2F key", "verifyTOTPKey":"Verify TOTP key", "version":"Version", +"vhostAccessToTrace":"Access to trace", "vhostAliases":"Aliases", "vhostAuthnLevel":"Required authentication level", "vhostHttps":"HTTPS",