Skip to content

Commit

Permalink
Add Fixed logout inside manager
Browse files Browse the repository at this point in the history
  • Loading branch information
guimard committed May 1, 2024
1 parent de73ca2 commit 83a7079
Show file tree
Hide file tree
Showing 4 changed files with 392 additions and 0 deletions.
1 change: 1 addition & 0 deletions full/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ RUN echo auth-to-authn-by-jwt-manager.patch && patch -p1 < auth-to-authn-by-jwt-
echo patch oidc-auth-pkce.patch && patch -p1 < oidc-auth-pkce.patch && \
echo patch jitsi.patch && patch -p1 < jitsi.patch && \
echo patch ignorepollers.patch && patch -p1 < ignorepollers.patch && \
echo patch fixedLogout.patch && patch -p1 < fixedLogout.patch && \
rm -f *.patch && \
LLNG_DEFAULTCONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini \
perl -MLemonldap::NG::Manager::Build -e 'Lemonldap::NG::Manager::Build->run( \
Expand Down
195 changes: 195 additions & 0 deletions full/fixedLogout.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
diff --git a/usr/share/perl5/Lemonldap/NG/Manager/Build/Attributes.pm b/usr/share/perl5/Lemonldap/NG/Manager/Build/Attributes.pm
index 02ca10aaf..6eb596b23 100644
--- a/usr/share/perl5/Lemonldap/NG/Manager/Build/Attributes.pm
+++ b/usr/share/perl5/Lemonldap/NG/Manager/Build/Attributes.pm
@@ -779,6 +779,10 @@ sub attributes {
default => '^[*\w]+$',
documentation => 'Regular expression to validate parameters',
},
+ fixedLogoutRedirection => {
+ type => 'text',
+ documentation => 'Fixed logout redirection',
+ },
newLocationWarning => {
default => 0,
type => 'bool',
diff --git a/usr/share/perl5/Lemonldap/NG/Manager/Build/Tree.pm b/usr/share/perl5/Lemonldap/NG/Manager/Build/Tree.pm
index fd05c6a43..c9f9cec75 100644
--- a/usr/share/perl5/Lemonldap/NG/Manager/Build/Tree.pm
+++ b/usr/share/perl5/Lemonldap/NG/Manager/Build/Tree.pm
@@ -1310,6 +1310,7 @@ sub tree {
nodes => [
'infoFormMethod', 'confirmFormMethod',
'redirectFormMethod', 'activeTimer',
+ 'fixedLogoutRedirection',
]
},
]
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/ar.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/ar.json
index 6fef852a2..1c3e3f789 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/ar.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/ar.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Searching attributes",
"findUserWildcard":"Character used as wildcard",
"findUsers":"Search for user account",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"لست مخولا بعرض هذه الصفحة",
"forceSave":"فرض الحفظ",
"formReplay":"استمارة وظيفة replay",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/en.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/en.json
index 5e88c7faa..1dbc7e3c3 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/en.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/en.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Searching attributes",
"findUserWildcard":"Character used as wildcard",
"findUsers":"Search for user account",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"You're not authorized to show this page",
"forceSave":"Force save",
"formReplay":"Form replay",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/es.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/es.json
index 073703162..44e8f2057 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/es.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/es.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Searching attributes",
"findUserWildcard":"Character used as wildcard",
"findUsers":"Search for user account",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"No está autorizado a mostrar esta página",
"forceSave":"Forzar salvaguarda",
"formReplay":"Repetir formulario",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/fr.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/fr.json
index 63e68f539..ce6b7eac2 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/fr.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/fr.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Attributs de recherche",
"findUserWildcard":"Caractère utilisé comme joker",
"findUsers":"Recherche de compte",
+"fixedLogoutRedirection":"Redirection fixe après déconnexion",
"forbidden":"Vous n'êtes pas autorisé à visualiser cette page",
"forceSave":"Forcer la sauvegarde",
"formReplay":"Rejeu de formulaires",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/he.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/he.json
index 336b745bd..a80e554a8 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/he.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/he.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Searching attributes",
"findUserWildcard":"Character used as wildcard",
"findUsers":"חיפוש חשבון משתמש",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"אין לך הרשה לצפות בעמוד הזה",
"forceSave":"אילוץ שמירה",
"formReplay":"Form replay",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/it.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/it.json
index 82f7186ea..a01b3706c 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/it.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/it.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Searching attributes",
"findUserWildcard":"Character used as wildcard",
"findUsers":"Search for user account",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"Non sei autorizzato a mostrare questa pagina",
"forceSave":"Forza salvataggio",
"formReplay":"Ripetizione del modulo",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/pl.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/pl.json
index d59dca4f7..daec5fd42 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/pl.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/pl.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Wyszukiwanie atrybutów",
"findUserWildcard":"Znak używany jako symbol wieloznaczny",
"findUsers":"Wyszukaj konto użytkownika",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"Nie masz uprawnień do wyświetlania tej strony",
"forceSave":"Wymuś zapis",
"formReplay":"Powtórzenie formularza",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/pt.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/pt.json
index cb3753740..04c422ec1 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/pt.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/pt.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Atributos de pesquisa",
"findUserWildcard":"Caractere usado como coringa",
"findUsers":"Pesquisar por conta de usuário",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"Você não está autorizado a ver esta página",
"forceSave":"Forçar salvar",
"formReplay":"Replay de formulário",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/pt_BR.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/pt_BR.json
index bdd460bd1..bbda96dfb 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/pt_BR.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/pt_BR.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Atributos de pesquisa",
"findUserWildcard":"Caractere usado como coringa",
"findUsers":"Pesquisar por conta de usuário",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"Você não está autorizado a ver esta página",
"forceSave":"Forçar salvar",
"formReplay":"Replay de formulário",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/ru.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/ru.json
index 8c07941ff..dd8992e99 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/ru.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/ru.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Поиск атрибутов",
"findUserWildcard":"Символ, используемый в качестве подстановочного знака",
"findUsers":"Поиск учетной записи пользователя",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"У вас нет прав для просмотра этой страницы",
"forceSave":"Принудительное сохранение",
"formReplay":"Воспроизведение формы",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/tr.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/tr.json
index fa4af0dc1..23d8bee27 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/tr.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/tr.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Nitelikleri ara",
"findUserWildcard":"Karakter özel sembol olarak kullanıldı",
"findUsers":"Kullanıcı hesabına göre ara",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"Bu sayfayı görüntülemek için yetkili değilsiniz",
"forceSave":"Kaydetmeye zorla",
"formReplay":"Form tekrarı",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/vi.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/vi.json
index 382601d47..31d895511 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/vi.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/vi.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Tìm kiếm thuộc tính",
"findUserWildcard":"Ký tự được sử dụng làm ký tự đại diện",
"findUsers":"Tìm kiếm tài khoản người dùng",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"Bạn không được ủy quyền để hiển thị trang này",
"forceSave":"Bắt buộc lưu",
"formReplay":"Phát lại mẫu",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/zh.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/zh.json
index b9c404457..4616a7d2d 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/zh.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/zh.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Searching attributes",
"findUserWildcard":"Character used as wildcard",
"findUsers":"Search for user account",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"您無權顯示此頁面",
"forceSave":"強制儲存",
"formReplay":"表單重新進行",
diff --git a/usr/share/lemonldap-ng/manager/htdocs/static/languages/zh_TW.json b/usr/share/lemonldap-ng/manager/htdocs/static/languages/zh_TW.json
index ad7ff93ae..061b97025 100644
--- a/usr/share/lemonldap-ng/manager/htdocs/static/languages/zh_TW.json
+++ b/usr/share/lemonldap-ng/manager/htdocs/static/languages/zh_TW.json
@@ -387,6 +387,7 @@
"findUserSearchingAttributes":"Searching attributes",
"findUserWildcard":"Character used as wildcard",
"findUsers":"Search for user account",
+"fixedLogoutRedirection":"Fixed logout redirection",
"forbidden":"您無權顯示此頁面",
"forceSave":"強制儲存",
"formReplay":"表單重新進行",
1 change: 1 addition & 0 deletions manager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ RUN echo auth-to-authn-by-jwt-manager.patch && patch -p1 < auth-to-authn-by-jwt-
echo patch oidc-auth-pkce.patch && patch -p1 < oidc-auth-pkce.patch && \
echo patch jitsi.patch && patch -p1 < jitsi.patch && \
echo patch ignorepollers.patch && patch -p1 < ignorepollers.patch && \
echo patch fixedLogout.patch && patch -p1 < fixedLogout.patch && \
rm -f *.patch && \
LLNG_DEFAULTCONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini \
perl -MLemonldap::NG::Manager::Build -e 'Lemonldap::NG::Manager::Build->run( \
Expand Down
Loading

0 comments on commit 83a7079

Please sign in to comment.