about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--backend.php12
-rw-r--r--classes/AuthRequired.php10
-rw-r--r--classes/Handler/CoverHandler.php3
-rw-r--r--classes/Handler/DefineHandler.php3
-rw-r--r--classes/Handler/DeletepaginationHandler.php3
-rw-r--r--classes/Handler/DownloadHandler.php3
-rw-r--r--classes/Handler/GetinfoHandler.php3
-rw-r--r--classes/Handler/GetlastreadHandler.php3
-rw-r--r--classes/Handler/GetpaginationHandler.php3
-rw-r--r--classes/Handler/ListHandler.php3
-rw-r--r--classes/Handler/LogoutHandler.php3
-rw-r--r--classes/Handler/StorelastreadHandler.php3
-rw-r--r--classes/Handler/StorepaginationHandler.php3
-rw-r--r--classes/Handler/TogglefavHandler.php3
-rw-r--r--classes/Router.php9
-rw-r--r--tests_integration/run.sh1
16 files changed, 44 insertions, 24 deletions
diff --git a/backend.php b/backend.php
index 631c667..9d08e1a 100644
--- a/backend.php
+++ b/backend.php
@@ -1,10 +1,4 @@
 <?php
-	if (!isset($_COOKIE['epube_sid'])) {
-		header($_SERVER["SERVER_PROTOCOL"]." 401 Unauthorized");
-		echo "Unauthorized";
-		exit;
-	}
-
 	header("Content-type: text/json");
 
 	require_once __DIR__ . "/include/common.php";
@@ -15,12 +9,6 @@
 	define('STATIC_EXPIRES', 86400*14);
 	define('PAGE_RESET_PROGRESS', -1);
 
-	if (!validate_session()) {
-		header($_SERVER["SERVER_PROTOCOL"]." 401 Unauthorized");
-		echo "Unauthorized";
-		exit;
-	}
-
 	$op = $_REQUEST["op"] ?? "";
 
 	$router = new Router();
diff --git a/classes/AuthRequired.php b/classes/AuthRequired.php
new file mode 100644
index 0000000..2f5b85a
--- /dev/null
+++ b/classes/AuthRequired.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * Marker interface for handlers that require an authenticated session.
+ * Handlers that do NOT implement this interface will be accessible
+ * without authentication (public endpoints).
+ */
+interface AuthRequired
+{
+}
diff --git a/classes/Handler/CoverHandler.php b/classes/Handler/CoverHandler.php
index 4b732e6..d219f84 100644
--- a/classes/Handler/CoverHandler.php
+++ b/classes/Handler/CoverHandler.php
@@ -2,13 +2,14 @@
 
 namespace Handler;
 
+use AuthRequired;
 use Config;
 use Request;
 use RequestHandlerInterface;
 use Response;
 use PDO;
 
-class CoverHandler implements RequestHandlerInterface
+class CoverHandler implements RequestHandlerInterface, AuthRequired
 {
     public function handle(Request $request): Response
     {
diff --git a/classes/Handler/DefineHandler.php b/classes/Handler/DefineHandler.php
index 30ae72e..60d5b11 100644
--- a/classes/Handler/DefineHandler.php
+++ b/classes/Handler/DefineHandler.php
@@ -2,12 +2,13 @@
 
 namespace Handler;
 
+use AuthRequired;
 use Config;
 use Request;
 use RequestHandlerInterface;
 use Response;
 
-class DefineHandler implements RequestHandlerInterface
+class DefineHandler implements RequestHandlerInterface, AuthRequired
 {
     /** @return array<string> */
     private function parseDictReply(string $reply): array
diff --git a/classes/Handler/DeletepaginationHandler.php b/classes/Handler/DeletepaginationHandler.php
index 28c1ab9..9ebfa57 100644
--- a/classes/Handler/DeletepaginationHandler.php
+++ b/classes/Handler/DeletepaginationHandler.php
@@ -2,12 +2,13 @@
 
 namespace Handler;
 
+use AuthRequired;
 use ORM;
 use Request;
 use RequestHandlerInterface;
 use Response;
 
-class DeletepaginationHandler implements RequestHandlerInterface
+class DeletepaginationHandler implements RequestHandlerInterface, AuthRequired
 {
     public function handle(Request $request): Response
     {
diff --git a/classes/Handler/DownloadHandler.php b/classes/Handler/DownloadHandler.php
index db8663a..e8ff9e7 100644
--- a/classes/Handler/DownloadHandler.php
+++ b/classes/Handler/DownloadHandler.php
@@ -2,13 +2,14 @@
 
 namespace Handler;
 
+use AuthRequired;
 use Config;
 use Request;
 use RequestHandlerInterface;
 use Response;
 use PDO;
 
-class DownloadHandler implements RequestHandlerInterface
+class DownloadHandler implements RequestHandlerInterface, AuthRequired
 {
     public function handle(Request $request): Response
     {
diff --git a/classes/Handler/GetinfoHandler.php b/classes/Handler/GetinfoHandler.php
index 86772ff..2235ef5 100644
--- a/classes/Handler/GetinfoHandler.php
+++ b/classes/Handler/GetinfoHandler.php
@@ -2,6 +2,7 @@
 
 namespace Handler;
 
+use AuthRequired;
 use Config;
 use Request;
 use RequestHandlerInterface;
@@ -9,7 +10,7 @@ use Response;
 use PDO;
 use Sanitizer;
 
-class GetinfoHandler implements RequestHandlerInterface
+class GetinfoHandler implements RequestHandlerInterface, AuthRequired
 {
     public function handle(Request $request): Response
     {
diff --git a/classes/Handler/GetlastreadHandler.php b/classes/Handler/GetlastreadHandler.php
index 784c6dd..8d0a1f2 100644
--- a/classes/Handler/GetlastreadHandler.php
+++ b/classes/Handler/GetlastreadHandler.php
@@ -2,12 +2,13 @@
 
 namespace Handler;
 
+use AuthRequired;
 use ORM;
 use Request;
 use RequestHandlerInterface;
 use Response;
 
-class GetlastreadHandler implements RequestHandlerInterface
+class GetlastreadHandler implements RequestHandlerInterface, AuthRequired
 {
     public function handle(Request $request): Response
     {
diff --git a/classes/Handler/GetpaginationHandler.php b/classes/Handler/GetpaginationHandler.php
index 8ecf92d..282c724 100644
--- a/classes/Handler/GetpaginationHandler.php
+++ b/classes/Handler/GetpaginationHandler.php
@@ -2,12 +2,13 @@
 
 namespace Handler;
 
+use AuthRequired;
 use ORM;
 use Request;
 use RequestHandlerInterface;
 use Response;
 
-class GetpaginationHandler implements RequestHandlerInterface
+class GetpaginationHandler implements RequestHandlerInterface, AuthRequired
 {
     public function handle(Request $request): Response
     {
diff --git a/classes/Handler/ListHandler.php b/classes/Handler/ListHandler.php
index c8c912f..e4f6455 100644
--- a/classes/Handler/ListHandler.php
+++ b/classes/Handler/ListHandler.php
@@ -2,13 +2,14 @@
 
 namespace Handler;
 
+use AuthRequired;
 use Config;
 use Request;
 use RequestHandlerInterface;
 use Response;
 use PDO;
 
-class ListHandler implements RequestHandlerInterface
+class ListHandler implements RequestHandlerInterface, AuthRequired
 {
     public function handle(Request $request): Response
     {
diff --git a/classes/Handler/LogoutHandler.php b/classes/Handler/LogoutHandler.php
index ad1b70c..79bc74d 100644
--- a/classes/Handler/LogoutHandler.php
+++ b/classes/Handler/LogoutHandler.php
@@ -2,12 +2,13 @@
 
 namespace Handler;
 
+use AuthRequired;
 use function logout_user;
 use Request;
 use RequestHandlerInterface;
 use Response;
 
-class LogoutHandler implements RequestHandlerInterface
+class LogoutHandler implements RequestHandlerInterface, AuthRequired
 {
     public function handle(Request $request): Response
     {
diff --git a/classes/Handler/StorelastreadHandler.php b/classes/Handler/StorelastreadHandler.php
index 1e3a421..2c2d58b 100644
--- a/classes/Handler/StorelastreadHandler.php
+++ b/classes/Handler/StorelastreadHandler.php
@@ -2,12 +2,13 @@
 
 namespace Handler;
 
+use AuthRequired;
 use ORM;
 use Request;
 use RequestHandlerInterface;
 use Response;
 
-class StorelastreadHandler implements RequestHandlerInterface
+class StorelastreadHandler implements RequestHandlerInterface, AuthRequired
 {
     public function handle(Request $request): Response
     {
diff --git a/classes/Handler/StorepaginationHandler.php b/classes/Handler/StorepaginationHandler.php
index b99c804..8d272af 100644
--- a/classes/Handler/StorepaginationHandler.php
+++ b/classes/Handler/StorepaginationHandler.php
@@ -2,12 +2,13 @@
 
 namespace Handler;
 
+use AuthRequired;
 use ORM;
 use Request;
 use RequestHandlerInterface;
 use Response;
 
-class StorepaginationHandler implements RequestHandlerInterface
+class StorepaginationHandler implements RequestHandlerInterface, AuthRequired
 {
     public function handle(Request $request): Response
     {
diff --git a/classes/Handler/TogglefavHandler.php b/classes/Handler/TogglefavHandler.php
index 83e4159..3b203ad 100644
--- a/classes/Handler/TogglefavHandler.php
+++ b/classes/Handler/TogglefavHandler.php
@@ -2,12 +2,13 @@
 
 namespace Handler;
 
+use AuthRequired;
 use ORM;
 use Request;
 use RequestHandlerInterface;
 use Response;
 
-class TogglefavHandler implements RequestHandlerInterface
+class TogglefavHandler implements RequestHandlerInterface, AuthRequired
 {
     public function handle(Request $request): Response
     {
diff --git a/classes/Router.php b/classes/Router.php
index b4f4837..6d46cfd 100644
--- a/classes/Router.php
+++ b/classes/Router.php
@@ -30,6 +30,15 @@ class Router
             exit;
         }
 
+        // Check auth for handlers that require it
+        if ($handler instanceof AuthRequired && empty($_SESSION["owner"])) {
+            $response = (new Response())
+                ->withStatus(401)
+                ->withBody("Unauthorized");
+            $response->send();
+            exit;
+        }
+
         $pipe = $handler->handle(...);
 
         // wrap middleware in reverse order (last added = outermost)
diff --git a/tests_integration/run.sh b/tests_integration/run.sh
index f6214dd..df958a3 100644
--- a/tests_integration/run.sh
+++ b/tests_integration/run.sh
@@ -209,6 +209,7 @@ for i in $(seq 1 30); do
 done
 
 # curl -vsL "http://localhost:$PHP_PORT1/login.php?op=perform-login&user=test&password=test"
+# curl -vs "http://localhost:$PHP_PORT1/backend.php?op=list"
 
 # Step 5: Run PHPUnit
 log "Step 5/5: Running PHPUnit integration tests ..."