diff --git a/sources/patches/main-00-ldap-auth.patch b/sources/patches/main-00-ldap-auth.patch index f1f61be..8e9a0d8 100644 --- a/sources/patches/main-00-ldap-auth.patch +++ b/sources/patches/main-00-ldap-auth.patch @@ -1,15 +1,15 @@ -From e8027b881cffa0ed75de2c809fd88cf3cee42a0a Mon Sep 17 00:00:00 2001 +From 488b781e030637ab6feafc0da640217e1d654ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 11 Jun 2024 11:50:36 +0200 -Subject: [PATCH 1/4] Add ldap auth +Subject: [PATCH 1/3] Add ldap auth --- - app/config/security.yml | 11 +++++++++++ - app/config/services.yml | 4 ++++ - 2 files changed, 15 insertions(+) + app/config/security.yml | 12 ++++++++++++ + app/config/services.yml | 7 +++++++ + 2 files changed, 19 insertions(+) diff --git a/app/config/security.yml b/app/config/security.yml -index 9ab51621..675d8905 100644 +index 9ab51621..f4ea3d47 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -13,6 +13,14 @@ security: @@ -39,22 +39,20 @@ index 9ab51621..675d8905 100644 provider: fos_userbundle csrf_token_generator: security.csrf.token_manager diff --git a/app/config/services.yml b/app/config/services.yml -index 270e79d9..efdd34d5 100644 +index 270e79d9..c67341e8 100644 --- a/app/config/services.yml +++ b/app/config/services.yml -@@ -176,6 +176,10 @@ services: +@@ -394,3 +394,10 @@ services: + public: false tags: - - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } - + - { name: pagerfanta.view, alias: default_wallabag } ++ + Symfony\Component\Ldap\Ldap: + arguments: ['@Symfony\Component\Ldap\Adapter\ExtLdap\Adapter'] + tags: [ldap] + Symfony\Component\Ldap\Adapter\ExtLdap\Adapter: + arguments: + - host: localhost -+ - craue_config_cache_provider: - class: Symfony\Component\Cache\Adapter\FilesystemAdapter - public: false -- 2.45.1 + diff --git a/sources/patches/main-01-logout-success-handler.patch b/sources/patches/main-01-logout-success-handler.patch index 5fac906..505c9f9 100644 --- a/sources/patches/main-01-logout-success-handler.patch +++ b/sources/patches/main-01-logout-success-handler.patch @@ -1,21 +1,21 @@ -From 1a9312652c4ecb7b84aed0328c294b105763f816 Mon Sep 17 00:00:00 2001 +From 711f4a49fa7d4c471cd905870fecaa6f83156d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 11 Jun 2024 11:52:33 +0200 -Subject: [PATCH 2/4] Configure a custom logout success handler for yunohost +Subject: [PATCH 2/3] Configure a custom logout success handler for yunohost ldap --- app/config/security.yml | 2 +- - app/config/services.yml | 4 +++ + app/config/services.yml | 3 +++ .../Security/LogoutSuccessHandler.php | 27 +++++++++++++++++++ - 3 files changed, 32 insertions(+), 1 deletion(-) + 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php diff --git a/app/config/security.yml b/app/config/security.yml -index 675d8905..876f4471 100644 +index f4ea3d47..de6b705b 100644 --- a/app/config/security.yml +++ b/app/config/security.yml -@@ -63,7 +63,7 @@ security: +@@ -64,7 +64,7 @@ security: logout: path: /logout @@ -25,20 +25,16 @@ index 675d8905..876f4471 100644 two_factor: provider: fos_userbundle diff --git a/app/config/services.yml b/app/config/services.yml -index efdd34d5..584b63c6 100644 +index c67341e8..7057ca42 100644 --- a/app/config/services.yml +++ b/app/config/services.yml -@@ -176,6 +176,10 @@ services: - tags: - - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } - +@@ -401,3 +401,6 @@ services: + Symfony\Component\Ldap\Adapter\ExtLdap\Adapter: + arguments: + - host: localhost ++ + yunohost.logout_success_handler: + class: Wallabag\YunoHostBundle\Security\LogoutSuccessHandler -+ -+ - yunohost.ldap: - class: Symfony\Component\Ldap\LdapClient - arguments: ["localhost"] diff --git a/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php new file mode 100644 index 00000000..b3268243 diff --git a/sources/patches/main-02-oauth-workaround.patch b/sources/patches/main-02-oauth-workaround.patch index 20c5476..747030f 100644 --- a/sources/patches/main-02-oauth-workaround.patch +++ b/sources/patches/main-02-oauth-workaround.patch @@ -1,7 +1,7 @@ -From 7dc04c8bc50149998aa03a31f31674535a98ada9 Mon Sep 17 00:00:00 2001 +From 85c26ff4df2191bf3494491f27e2922aa6b569c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 11 Jun 2024 11:54:25 +0200 -Subject: [PATCH 4/4] OAuthStorage workaround +Subject: [PATCH 3/3] OAuthStorage workaround --- .../oauth-server-bundle/Storage/OAuthStorage.php | 2 +-