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