From 3e03081c193fe093979d94fb10170550ad0c0e9c Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sun, 5 May 2019 10:40:56 +0200
Subject: [PATCH] Update custom patches

---
 sources/patches/app-00-ldap-auth.patch        |  86 ++++++------
 .../app-01-logout-success-handler.patch       | 124 +++++++++---------
 2 files changed, 109 insertions(+), 101 deletions(-)

diff --git a/sources/patches/app-00-ldap-auth.patch b/sources/patches/app-00-ldap-auth.patch
index 5742009..3a36f5e 100644
--- a/sources/patches/app-00-ldap-auth.patch
+++ b/sources/patches/app-00-ldap-auth.patch
@@ -1,40 +1,46 @@
---- a/app/config/services.yml	2016-05-25 18:09:56.374914445 +0200
-+++ b/app/config/services.yml	2016-05-25 18:07:38.775042951 +0200
-@@ -43,6 +43,10 @@
-         tags:
-             - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
-
-+    yunohost.ldap:
-+        class: Symfony\Component\Ldap\LdapClient
-+        arguments: ["localhost"]
-+
-     craue_config_cache_provider:
-         class: Symfony\Component\Cache\Adapter\FilesystemAdapter
-         public: false
---- a/app/config/security.yml	2016-05-25 18:09:46.814645164 +0200
-+++ b/app/config/security.yml	2016-05-25 18:07:38.775042951 +0200
-@@ -13,6 +13,14 @@
-                 property: username
-         fos_userbundle:
-             id: fos_user.user_provider.username
-+        yunohost_users:
-+            ldap:
-+                service: yunohost.ldap
-+                base_dn: ou=users,dc=yunohost,dc=org
-+                search_dn:
-+                search_password:
-+                filter: (&(uid={username})(objectClass=posixAccount))
-+                default_roles: ROLE_USER
-
-     # the main part of the security, where you can set up firewalls
-     # for specific sections of your app
-@@ -38,6 +46,9 @@
-
-         secured_area:
-             pattern: ^/
-+            http_basic_ldap:
-+                service: yunohost.ldap
-+                dn_string: "uid={username},ou=users,dc=yunohost,dc=org"
-             form_login:
-                 provider: fos_userbundle
-                 csrf_token_generator: security.csrf.token_manager
+diff --git a/app/config/security.yml b/app/config/security.yml
+index 02afc9ea..5a3f7a34 100644
+--- a/app/config/security.yml
++++ b/app/config/security.yml
+@@ -13,6 +13,14 @@ security:
+                 property: username
+         fos_userbundle:
+             id: fos_user.user_provider.username_email
++        yunohost_users:
++            ldap:
++                service: yunohost.ldap
++                base_dn: ou=users,dc=yunohost,dc=org
++                search_dn:
++                search_password:
++                filter: (&(uid={username})(objectClass=posixAccount))
++                default_roles: ROLE_USER
+
+     # the main part of the security, where you can set up firewalls
+     # for specific sections of your app
+@@ -38,6 +46,9 @@ security:
+
+         secured_area:
+             pattern: ^/
++            http_basic_ldap:
++                service: yunohost.ldap
++                dn_string: "uid={username},ou=users,dc=yunohost,dc=org"
+             form_login:
+                 provider: fos_userbundle
+                 csrf_token_generator: security.csrf.token_manager
+diff --git a/app/config/services.yml b/app/config/services.yml
+index 7b85d846..f23961c5 100644
+--- a/app/config/services.yml
++++ b/app/config/services.yml
+@@ -43,6 +43,10 @@ services:
+         tags:
+             - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
+
++    yunohost.ldap:
++        class: Symfony\Component\Ldap\LdapClient
++        arguments: ["localhost"]
++
+     craue_config_cache_provider:
+         class: Symfony\Component\Cache\Adapter\FilesystemAdapter
+         public: false
+--
+2.17.1
diff --git a/sources/patches/app-01-logout-success-handler.patch b/sources/patches/app-01-logout-success-handler.patch
index 166643d..d321d54 100644
--- a/sources/patches/app-01-logout-success-handler.patch
+++ b/sources/patches/app-01-logout-success-handler.patch
@@ -1,61 +1,63 @@
-diff --git a/app/config/security.yml b/app/config/security.yml
-index b07b509..62f2550 100644
---- a/app/config/security.yml
-+++ b/app/config/security.yml
-@@ -60,7 +60,7 @@ security:
- 
-             logout:
-                 path:   /logout
--                target: /
-+                success_handler: yunohost.logout_success_handler
- 
-     access_control:
-         - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
-diff --git a/app/config/services.yml b/app/config/services.yml
-index 8a09fde..ee63e06 100644
---- a/app/config/services.yml
-+++ b/app/config/services.yml
-@@ -43,6 +43,10 @@
-         tags:
-             - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
-
-+    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 0000000..b326824
---- /dev/null
-+++ b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php
-@@ -0,0 +1,27 @@
-+<?php
-+
-+namespace Wallabag\YunoHostBundle\Security;
-+
-+use Symfony\Component\HttpFoundation\Request;
-+use Symfony\Component\HttpFoundation\RedirectResponse;
-+use Symfony\Component\Security\Http\Logout\LogoutSuccessHandlerInterface;
-+
-+/**
-+ * Redirects to the SSO logout URL in case of a successful logout.
-+ *
-+ * @see http://api.symfony.com/3.1/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.html
-+ */
-+class LogoutSuccessHandler implements LogoutSuccessHandlerInterface
-+{
-+    /**
-+     * {@inheritdoc}
-+     */
-+    public function onLogoutSuccess(Request $request)
-+    {
-+        // Retrieve the current SSO logout URL
-+        $main_domain = exec('cat /etc/yunohost/current_host');
-+        $url = 'https://' . $main_domain . '/yunohost/sso/?action=logout';
-+
-+        return new RedirectResponse($url);
-+    }
-+}
+diff --git a/app/config/security.yml b/app/config/security.yml
+index 5a3f7a34..1720e741 100644
+--- a/app/config/security.yml
++++ b/app/config/security.yml
+@@ -62,7 +62,7 @@ security:
+
+             logout:
+                 path:   /logout
+-                target: /
++                success_handler: yunohost.logout_success_handler
+
+     access_control:
+         - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+diff --git a/app/config/services.yml b/app/config/services.yml
+index f23961c5..f266e6d1 100644
+--- a/app/config/services.yml
++++ b/app/config/services.yml
+@@ -43,6 +43,10 @@ services:
+         tags:
+             - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
+
++    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
+--- /dev/null
++++ b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php
+@@ -0,0 +1,27 @@
++<?php
++
++namespace Wallabag\YunoHostBundle\Security;
++
++use Symfony\Component\HttpFoundation\Request;
++use Symfony\Component\HttpFoundation\RedirectResponse;
++use Symfony\Component\Security\Http\Logout\LogoutSuccessHandlerInterface;
++
++/**
++ * Redirects to the SSO logout URL in case of a successful logout.
++ *
++ * @see http://api.symfony.com/3.1/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.html
++ */
++class LogoutSuccessHandler implements LogoutSuccessHandlerInterface
++{
++    /**
++     * {@inheritdoc}
++     */
++    public function onLogoutSuccess(Request $request)
++    {
++        // Retrieve the current SSO logout URL
++        $main_domain = exec('cat /etc/yunohost/current_host');
++        $url = 'https://' . $main_domain . '/yunohost/sso/?action=logout';
++
++        return new RedirectResponse($url);
++    }
++}
+--
+2.17.1