Testing

README.md

@@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps
 Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html).
 
 
-**Shipped version:** 2.5.4~ynh6
+**Shipped version:** 2.5.4~ynh9
 
 **Demo:** <https://demo.yunohost.org/wallabag/>
 

README_es.md

@@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps
 Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html).
 
 
-**Versión actual:** 2.5.4~ynh6
+**Versión actual:** 2.5.4~ynh9
 
 **Demo:** <https://demo.yunohost.org/wallabag/>
 

README_eu.md

@@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps
 Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html).
 
 
-**Paketatutako bertsioa:** 2.5.4~ynh6
+**Paketatutako bertsioa:** 2.5.4~ynh9
 
 **Demoa:** <https://demo.yunohost.org/wallabag/>
 

README_fr.md

@@ -22,7 +22,7 @@ Sont disponibles une interface web, des add-ons pour navigateurs (Firefox/Chrome
 La mise à niveau depuis le paquet YunoHost de [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) demande une opération manuelle, c'est pourquoi un nouveau paquet est fournit. Pour le processus de migration, merci de vous référer à [la documentation officiel de Wallabag](https://doc.wallabag.org/fr/user/import/wallabagv1.html).
 
 
-**Version incluse :** 2.5.4~ynh6
+**Version incluse :** 2.5.4~ynh9
 
 **Démo :** <https://demo.yunohost.org/wallabag/>
 

README_gl.md

@@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps
 Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html).
 
 
-**Versión proporcionada:** 2.5.4~ynh6
+**Versión proporcionada:** 2.5.4~ynh9
 
 **Demo:** <https://demo.yunohost.org/wallabag/>
 

README_id.md

@@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps
 Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html).
 
 
-**Versi terkirim:** 2.5.4~ynh6
+**Versi terkirim:** 2.5.4~ynh9
 
 **Demo:** <https://demo.yunohost.org/wallabag/>
 

README_nl.md

@@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps
 Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html).
 
 
-**Geleverde versie:** 2.5.4~ynh6
+**Geleverde versie:** 2.5.4~ynh9
 
 **Demo:** <https://demo.yunohost.org/wallabag/>
 

README_ru.md

@@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps
 Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html).
 
 
-**Поставляемая версия:** 2.5.4~ynh6
+**Поставляемая версия:** 2.5.4~ynh9
 
 **Демо-версия:** <https://demo.yunohost.org/wallabag/>
 

README_zh_Hans.md

@@ -22,7 +22,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps
 Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html).
 
 
-**分发版本：** 2.5.4~ynh6
+**分发版本：** 2.5.4~ynh9
 
 **演示：** <https://demo.yunohost.org/wallabag/>
 

manifest.toml

@@ -6,7 +6,7 @@ id = "wallabag2"
 name = "Wallabag"
 description.en = "Save and classify articles. Read them later"
 description.fr = "Enregistrez et classez les articles. Lisez-les plus tard"
-version = "2.5.4~ynh6"
+version = "2.5.4~ynh9"
 
 maintainers = ["lapineige"]
 

scripts/backup

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 

scripts/change_url

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 

scripts/install

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
@@ -27,6 +23,8 @@ ynh_setup_source --dest_dir="$install_dir"
 mkdir -p "$install_dir/var/logs/"
 touch "$install_dir/var/logs/prod.log"
 
+chown -R "$app:www-data" "$install_dir"
+
 # Set permissions to app files
 # Restrict rights to Wallabag user only
 if [ -e "$install_dir/var/cache/prod/appProdProjectContainer.php" ]; then
@@ -75,7 +73,6 @@ ynh_config_add_phpfpm
 
 ynh_config_add_logrotate "$install_dir/var/logs/prod.log"
 
-# Create a dedicated Fail2Ban config
 ynh_config_add_fail2ban --logpath="$install_dir/var/logs/prod.log" --failregex='app.ERROR: Authentication failure for user "([\w]+)?", from IP "<HOST>"'
 
 #=================================================

scripts/remove

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 

scripts/restore

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 

scripts/upgrade

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
@@ -18,6 +14,8 @@ ynh_setup_source --dest_dir="$install_dir" --full_replace --keep="app/config/par
 mkdir -p "$install_dir/var/logs/"
 touch "$install_dir/var/logs/prod.log"
 
+chown -R "$app:www-data" "$install_dir"
+
 # Set permissions to app files
 # Restrict rights to Wallabag user only
 if [ -e "$install_dir/var/cache/prod/appProdProjectContainer.php" ]; then

sources/patches/main/00-ldap-auth.patch

@@ -0,0 +1,46 @@
+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

sources/patches/main/01-logout-success-handler.patch

@@ -0,0 +1,63 @@
+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

sources/patches/main/02-oauth-workaround.patch

@@ -0,0 +1,11 @@
+--- a/vendor/friendsofsymfony/oauth-server-bundle/Storage/OAuthStorage.php      2016-02-22 13:57:55.000000000 +0000
++++ b/vendor/friendsofsymfony/oauth-server-bundle/Storage/OAuthStorage.php      2017-04-13 17:16:06.298501506 +0000
+@@ -170,7 +170,7 @@
+         if (null !== $user) {
+             $encoder = $this->encoderFactory->getEncoder($user);
+
+-            if ($encoder->isPasswordValid($user->getPassword(), $password, $user->getSalt())) {
++            if (true) {
+                 return array(
+                     'data' => $user,
+                 );