16 files changed, 76 insertions, 50 deletions

diff --git a/application/front/ShaarliMiddleware.php b/application/front/ShaarliMiddleware.php
index fa6c6467..f8992e0b 100644
--- a/application/front/ShaarliMiddleware.php
+++ b/application/front/ShaarliMiddleware.php
@@ -3,7 +3,8 @@
 namespace Shaarli\Front;
 
 use Shaarli\Container\ShaarliContainer;
-use Shaarli\Front\Exception\ShaarliException;
+use Shaarli\Front\Exception\ShaarliFrontException;
+use Shaarli\Front\Exception\UnauthorizedException;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
@@ -39,7 +40,7 @@ class ShaarliMiddleware
     {
         try {
             $response = $next($request, $response);
-        } catch (ShaarliException $e) {
+        } catch (ShaarliFrontException $e) {
             $this->container->pageBuilder->assign('message', $e->getMessage());
             if ($this->container->conf->get('dev.debug', false)) {
                 $this->container->pageBuilder->assign(
@@ -50,6 +51,8 @@ class ShaarliMiddleware
 
             $response = $response->withStatus($e->getCode());
             $response = $response->write($this->container->pageBuilder->render('error'));
+        } catch (UnauthorizedException $e) {
+            return $response->withRedirect($request->getUri()->getBasePath() . '/login');
         }
 
         return $response;
diff --git a/application/front/controllers/LogoutController.php b/application/front/controller/admin/LogoutController.php
index aba078c3..41e81984 100644
--- a/application/front/controllers/LogoutController.php
+++ b/application/front/controller/admin/LogoutController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Admin;
 
 use Shaarli\Security\LoginManager;
 use Slim\Http\Request;
@@ -13,10 +13,8 @@ use Slim\Http\Response;
  *
  * Slim controller used to logout the user.
  * It invalidates page cache and terminate the user session. Then it redirects to the homepage.
- *
- * @package Front\Controller
  */
-class LogoutController extends ShaarliController
+class LogoutController extends ShaarliAdminController
 {
     public function index(Request $request, Response $response): Response
     {
diff --git a/application/front/controllers/SessionFilterController.php b/application/front/controller/admin/SessionFilterController.php
index a021dc37..69a16ec3 100644
--- a/application/front/controllers/SessionFilterController.php
+++ b/application/front/controller/admin/SessionFilterController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Admin;
 
 use Shaarli\Bookmark\BookmarkFilter;
 use Shaarli\Security\SessionManager;
@@ -13,10 +13,8 @@ use Slim\Http\Response;
  * Class SessionFilterController
  *
  * Slim controller used to handle filters stored in the user session, such as visibility, links per page, etc.
- *
- * @package Shaarli\Front\Controller
  */
-class SessionFilterController extends ShaarliController
+class SessionFilterController extends ShaarliAdminController
 {
     /**
      * GET /links-per-page: set the number of bookmarks to display per page in homepage
@@ -33,7 +31,7 @@ class SessionFilterController extends ShaarliController
             abs(intval($linksPerPage))
         );
 
-        return $this->redirectFromReferer($response, ['linksperpage'], ['nb']);
+        return $this->redirectFromReferer($request, $response, ['linksperpage'], ['nb']);
     }
 
     /**
@@ -42,7 +40,7 @@ class SessionFilterController extends ShaarliController
     public function visibility(Request $request, Response $response, array $args): Response
     {
         if (false === $this->container->loginManager->isLoggedIn()) {
-            return $this->redirectFromReferer($response, ['visibility']);
+            return $this->redirectFromReferer($request, $response, ['visibility']);
         }
 
         $newVisibility = $args['visibility'] ?? null;
@@ -63,7 +61,7 @@ class SessionFilterController extends ShaarliController
             $this->container->sessionManager->deleteSessionParameter(SessionManager::KEY_VISIBILITY);
         }
 
-        return $this->redirectFromReferer($response, ['visibility']);
+        return $this->redirectFromReferer($request, $response, ['visibility']);
     }
 
     /**
@@ -76,6 +74,6 @@ class SessionFilterController extends ShaarliController
             empty($this->container->sessionManager->getSessionParameter(SessionManager::KEY_UNTAGGED_ONLY))
         );
 
-        return $this->redirectFromReferer($response, ['untaggedonly', 'untagged-only']);
+        return $this->redirectFromReferer($request, $response, ['untaggedonly', 'untagged-only']);
     }
 }
diff --git a/application/front/controller/admin/ShaarliAdminController.php b/application/front/controller/admin/ShaarliAdminController.php
new file mode 100644
index 00000000..ea703f62
--- /dev/null
+++ b/application/front/controller/admin/ShaarliAdminController.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shaarli\Front\Controller\Admin;
+
+use Shaarli\Container\ShaarliContainer;
+use Shaarli\Front\Controller\Visitor\ShaarliVisitorController;
+use Shaarli\Front\Exception\UnauthorizedException;
+
+abstract class ShaarliAdminController extends ShaarliVisitorController
+{
+    public function __construct(ShaarliContainer $container)
+    {
+        parent::__construct($container);
+
+        if (true !== $this->container->loginManager->isLoggedIn()) {
+            throw new UnauthorizedException();
+        }
+    }
+}
diff --git a/application/front/controllers/DailyController.php b/application/front/controller/visitor/DailyController.php
index 4a0735aa..47e2503a 100644
--- a/application/front/controllers/DailyController.php
+++ b/application/front/controller/visitor/DailyController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use DateTime;
 use DateTimeImmutable;
@@ -14,10 +14,8 @@ use Slim\Http\Response;
  * Class DailyController
  *
  * Slim controller used to render the daily page.
- *
- * @package Front\Controller
  */
-class DailyController extends ShaarliController
+class DailyController extends ShaarliVisitorController
 {
     public static $DAILY_RSS_NB_DAYS = 8;
 
diff --git a/application/front/controllers/FeedController.php b/application/front/controller/visitor/FeedController.php
index 78d826d9..70664635 100644
--- a/application/front/controllers/FeedController.php
+++ b/application/front/controller/visitor/FeedController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use Shaarli\Feed\FeedBuilder;
 use Slim\Http\Request;
@@ -12,10 +12,8 @@ use Slim\Http\Response;
  * Class FeedController
  *
  * Slim controller handling ATOM and RSS feed.
- *
- * @package Front\Controller
  */
-class FeedController extends ShaarliController
+class FeedController extends ShaarliVisitorController
 {
     public function atom(Request $request, Response $response): Response
     {
diff --git a/application/front/controllers/LoginController.php b/application/front/controller/visitor/LoginController.php
index ae3599e0..4de2f55d 100644
--- a/application/front/controllers/LoginController.php
+++ b/application/front/controller/visitor/LoginController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use Shaarli\Front\Exception\LoginBannedException;
 use Slim\Http\Request;
@@ -15,10 +15,8 @@ use Slim\Http\Response;
  *
  * The login page is not available if the user is banned
  * or if open shaarli setting is enabled.
- *
- * @package Front\Controller
  */
-class LoginController extends ShaarliController
+class LoginController extends ShaarliVisitorController
 {
     public function index(Request $request, Response $response): Response
     {
diff --git a/application/front/controllers/OpenSearchController.php b/application/front/controller/visitor/OpenSearchController.php
index fa32c5f1..0fd68db6 100644
--- a/application/front/controllers/OpenSearchController.php
+++ b/application/front/controller/visitor/OpenSearchController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use Slim\Http\Request;
 use Slim\Http\Response;
@@ -12,10 +12,8 @@ use Slim\Http\Response;
  *
  * Slim controller used to render open search template.
  * This allows to add Shaarli as a search engine within the browser.
- *
- * @package front\controllers
  */
-class OpenSearchController extends ShaarliController
+class OpenSearchController extends ShaarliVisitorController
 {
     public function index(Request $request, Response $response): Response
     {
diff --git a/application/front/controllers/PictureWallController.php b/application/front/controller/visitor/PictureWallController.php
index 08d31b29..4e1dce8c 100644
--- a/application/front/controllers/PictureWallController.php
+++ b/application/front/controller/visitor/PictureWallController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use Shaarli\Front\Exception\ThumbnailsDisabledException;
 use Shaarli\Thumbnailer;
@@ -14,10 +14,8 @@ use Slim\Http\Response;
  *
  * Slim controller used to render the pictures wall page.
  * If thumbnails mode is set to NONE, we just render the template without any image.
- *
- * @package Front\Controller
  */
-class PictureWallController extends ShaarliController
+class PictureWallController extends ShaarliVisitorController
 {
     public function index(Request $request, Response $response): Response
     {
diff --git a/application/front/controllers/ShaarliController.php b/application/front/controller/visitor/ShaarliVisitorController.php
index bfff5fcf..655b3baa 100644
--- a/application/front/controllers/ShaarliController.php
+++ b/application/front/controller/visitor/ShaarliVisitorController.php
@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use Shaarli\Bookmark\BookmarkFilter;
 use Shaarli\Container\ShaarliContainer;
+use Slim\Http\Request;
 use Slim\Http\Response;
 
-abstract class ShaarliController
+abstract class ShaarliVisitorController
 {
     /** @var ShaarliContainer */
     protected $container;
@@ -89,9 +90,13 @@ abstract class ShaarliController
      * @param array $loopTerms   Terms to remove from path and query string to prevent direction loop.
      * @param array $clearParams List of parameter to remove from the query string of the referrer.
      */
-    protected function redirectFromReferer(Response $response, array $loopTerms = [], array $clearParams = []): Response
-    {
-        $defaultPath = './';
+    protected function redirectFromReferer(
+        Request $request,
+        Response $response,
+        array $loopTerms = [],
+        array $clearParams = []
+    ): Response {
+        $defaultPath = $request->getUri()->getBasePath();
         $referer = $this->container->environment['HTTP_REFERER'] ?? null;
 
         if (null !== $referer) {
diff --git a/application/front/controllers/TagCloudController.php b/application/front/controller/visitor/TagCloudController.php
index 1ff7c2e6..15b6d7b7 100644
--- a/application/front/controllers/TagCloudController.php
+++ b/application/front/controller/visitor/TagCloudController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use Slim\Http\Request;
 use Slim\Http\Response;
@@ -11,10 +11,8 @@ use Slim\Http\Response;
  * Class TagCloud
  *
  * Slim controller used to render the tag cloud and tag list pages.
- *
- * @package Front\Controller
  */
-class TagCloudController extends ShaarliController
+class TagCloudController extends ShaarliVisitorController
 {
     protected const TYPE_CLOUD = 'cloud';
     protected const TYPE_LIST = 'list';
diff --git a/application/front/controllers/TagController.php b/application/front/controller/visitor/TagController.php
index a1d5ad5b..a0bc1d1b 100644
--- a/application/front/controllers/TagController.php
+++ b/application/front/controller/visitor/TagController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use Slim\Http\Request;
 use Slim\Http\Response;
@@ -11,10 +11,8 @@ use Slim\Http\Response;
  * Class TagController
  *
  * Slim controller handle tags.
- *
- * @package Front\Controller
  */
-class TagController extends ShaarliController
+class TagController extends ShaarliVisitorController
 {
     /**
      * Add another tag in the current search through an HTTP redirection.
diff --git a/application/front/exceptions/LoginBannedException.php b/application/front/exceptions/LoginBannedException.php
index b31a4a14..79d0ea15 100644
--- a/application/front/exceptions/LoginBannedException.php
+++ b/application/front/exceptions/LoginBannedException.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Shaarli\Front\Exception;
 
-class LoginBannedException extends ShaarliException
+class LoginBannedException extends ShaarliFrontException
 {
     public function __construct()
     {
diff --git a/application/front/exceptions/ShaarliException.php b/application/front/exceptions/ShaarliFrontException.php
index 800bfbec..fc8eb92b 100644
--- a/application/front/exceptions/ShaarliException.php
+++ b/application/front/exceptions/ShaarliFrontException.php
@@ -13,7 +13,7 @@ use Throwable;
  *
  * @package Front\Exception
  */
-abstract class ShaarliException extends \Exception
+abstract class ShaarliFrontException extends \Exception
 {
     /** Override parent constructor to force $message and $httpCode parameters to be set. */
     public function __construct(string $message, int $httpCode, Throwable $previous = null)
diff --git a/application/front/exceptions/ThumbnailsDisabledException.php b/application/front/exceptions/ThumbnailsDisabledException.php
index 1b9cf5b7..0ed337f5 100644
--- a/application/front/exceptions/ThumbnailsDisabledException.php
+++ b/application/front/exceptions/ThumbnailsDisabledException.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Shaarli\Front\Exception;
 
-class ThumbnailsDisabledException extends ShaarliException
+class ThumbnailsDisabledException extends ShaarliFrontException
 {
     public function __construct()
     {
diff --git a/application/front/exceptions/UnauthorizedException.php b/application/front/exceptions/UnauthorizedException.php
new file mode 100644
index 00000000..4231094a
--- /dev/null
+++ b/application/front/exceptions/UnauthorizedException.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shaarli\Front\Exception;
+
+/**
+ * Class UnauthorizedException
+ *
+ * Exception raised if the user tries to access a ShaarliAdminController while logged out.
+ */
+class UnauthorizedException extends \Exception
+{
+
+}