diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2026-05-27 21:19:36 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2026-05-27 21:19:39 +0300 |
| commit | b434f9127fc67d97ed224b22594ecbd232fa4da3 (patch) | |
| tree | 90449be52f3d9b85f449cc65707a75e82cc81b3a /classes | |
| parent | 2b28a847f97395d756d16400ce3fb29b8c8bb75e (diff) | |
| download | the-epube-b434f9127fc67d97ed224b22594ecbd232fa4da3.tar.gz the-epube-b434f9127fc67d97ed224b22594ecbd232fa4da3.tar.xz | |
cleanup return values a bit (more json), move common API test stuff to an ancestor class
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/CsrfMiddleware.php | 2 | ||||
| -rw-r--r-- | classes/Handler/LoginHandler.php | 15 | ||||
| -rw-r--r-- | classes/Handler/LogoutHandler.php | 2 | ||||
| -rw-r--r-- | classes/Router.php | 2 |
4 files changed, 14 insertions, 7 deletions
diff --git a/classes/CsrfMiddleware.php b/classes/CsrfMiddleware.php index 1c4af2e..1a49d48 100644 --- a/classes/CsrfMiddleware.php +++ b/classes/CsrfMiddleware.php @@ -20,7 +20,7 @@ class CsrfMiddleware implements MiddlewareInterface if (!in_array($op, $this->csrfIgnore) && !validate_csrf($csrfToken)) { $response = (new Response()) ->withStatus(401) - ->withBody("Unauthorized (CSRF)"); + ->withBody(json_encode(["error" => "Unauthorized (CSRF)"])); $response->send(); exit; } diff --git a/classes/Handler/LoginHandler.php b/classes/Handler/LoginHandler.php index c97a93e..fbe6894 100644 --- a/classes/Handler/LoginHandler.php +++ b/classes/Handler/LoginHandler.php @@ -35,7 +35,11 @@ class LoginHandler implements RequestHandlerInterface $_SESSION["pass_hash"] = sha1($user->pass); $_SESSION["csrf_token"] = bin2hex(random_bytes(16)); - return ["owner" => $username]; + setcookie("epube_csrf_token", $_SESSION["csrf_token"], time() + Config::get(Config::SESSION_LIFETIME), + "/", "", Config::is_server_https()); + + // csrf_token is passed via cookie, epube_csrf_token, returning it here is not needed atm + return ["result" => "ok", "owner" => $username /* , "csrf_token" => $_SESSION["csrf_token"] */]; } private function doOidcLogin(): void @@ -92,7 +96,10 @@ class LoginHandler implements RequestHandlerInterface $_SESSION["pass_hash"] = sha1($user->pass); $_SESSION["csrf_token"] = bin2hex(random_bytes(16)); - return ["owner" => $username]; + setcookie("epube_csrf_token", $_SESSION["csrf_token"], time() + Config::get(Config::SESSION_LIFETIME), + "/", "", Config::is_server_https()); + + return ["result" => "ok", "owner" => $username, "csrf_token" => $_SESSION["csrf_token"]]; } catch (\Exception $e) { return ["error" => "OIDC Error: " . $e->getMessage()]; @@ -139,7 +146,7 @@ class LoginHandler implements RequestHandlerInterface return (new Response()) ->withHeader("Location", Config::get_self_url() . "/index.php") - ->withBody(json_encode(["result" => "ok", "user" => $result["owner"]])); + ->withBody(json_encode($result)); } // Local username/password login @@ -162,7 +169,7 @@ class LoginHandler implements RequestHandlerInterface } return (new Response()) - ->withBody(json_encode(["result" => "ok", "user" => $result["owner"]])); + ->withBody(json_encode($result)); } return (new Response()) diff --git a/classes/Handler/LogoutHandler.php b/classes/Handler/LogoutHandler.php index 26ae6b6..ac07c31 100644 --- a/classes/Handler/LogoutHandler.php +++ b/classes/Handler/LogoutHandler.php @@ -13,6 +13,6 @@ class LogoutHandler implements RequestHandlerInterface, AuthRequired public function handle(Request $request): Response { logout_user(); - return (new Response())->withBody(json_encode(["result" => "OK"])); + return (new Response())->withBody(json_encode(["result" => "ok"])); } } diff --git a/classes/Router.php b/classes/Router.php index 6afec1e..79882ce 100644 --- a/classes/Router.php +++ b/classes/Router.php @@ -34,7 +34,7 @@ class Router if ($handler instanceof AuthRequired && empty($_SESSION["owner"])) { $response = (new Response()) ->withStatus(401) - ->withBody("Unauthorized"); + ->withBody(json_encode(["error" => "Unauthorized"])); $response->send(); exit; } |
