diff options
Diffstat (limited to 'classes/Handler')
| -rw-r--r-- | classes/Handler/HealthzHandler.php | 24 | ||||
| -rw-r--r-- | classes/Handler/PaginationHandler.php | 40 |
2 files changed, 52 insertions, 12 deletions
diff --git a/classes/Handler/HealthzHandler.php b/classes/Handler/HealthzHandler.php index 722422c..f12649b 100644 --- a/classes/Handler/HealthzHandler.php +++ b/classes/Handler/HealthzHandler.php @@ -9,38 +9,40 @@ use Request; use RequestHandlerInterface; use Response; +/** + * Public k8s healthcheck endpoint. Intentionally does NOT implement + * AuthRequired. Because it is unauthenticated, it must not leak any + * internals (DSNs, paths, driver errors) — failure details go to the + * PHP error log, the HTTP response only carries 200/503. + */ class HealthzHandler implements RequestHandlerInterface { public function handle(Request $request): Response { - $status = "ok"; - $errors = []; + $healthy = true; // Test Calibre SQLite database try { $caldb = new PDO('sqlite:' . Config::get(Config::CALIBRE_DB)); $caldb->query("SELECT 1 FROM books LIMIT 1"); } catch (\PDOException $e) { - $status = "degraded"; - $errors["calibre_db"] = "Connection failed: " . $e->getMessage(); + $healthy = false; + error_log("healthz: calibre db check failed: " . $e->getMessage()); } // Test main database (via ORM/Db) try { Db::pdo()->query("SELECT 1"); } catch (\PDOException $e) { - $status = "degraded"; - $errors["main_db"] = "Connection failed: " . $e->getMessage(); + $healthy = false; + error_log("healthz: main db check failed: " . $e->getMessage()); } $response = (new Response()) ->withHeader("Content-Type", "application/json") - ->withBody(json_encode([ - "status" => $status, - "errors" => $errors, - ])); + ->withBody(json_encode(["status" => $healthy ? "ok" : "error"])); - if ($status === "degraded") { + if (!$healthy) { $response = $response->withStatus(503); } diff --git a/classes/Handler/PaginationHandler.php b/classes/Handler/PaginationHandler.php index 3c0555b..de22037 100644 --- a/classes/Handler/PaginationHandler.php +++ b/classes/Handler/PaginationHandler.php @@ -3,13 +3,35 @@ namespace Handler; use AuthRequired; +use Config; use ORM; +use PDO; use Request; use RequestHandlerInterface; use Response; class PaginationHandler implements RequestHandlerInterface, AuthRequired { + /** + * Upper bound for stored location payloads. Observed real-world max in + * production is ~3 MB for large books; 16 MiB keeps generous headroom + * while still bounding unbounded storage growth. + */ + private const MAX_PAYLOAD_SIZE = 16 * 1024 * 1024; + + /** + * Verify the id refers to an actual library entry in the Calibre DB. + * The frontend keys pagination by the EPUB 'data' row id, but accept + * a 'books' row id as well for robustness/backwards compatibility. + */ + private function bookExists(int $bookid): bool + { + $caldb = new PDO('sqlite:' . Config::get(Config::CALIBRE_DB)); + $sth = $caldb->prepare("SELECT 1 FROM data WHERE id = ? UNION SELECT 1 FROM books WHERE id = ? LIMIT 1"); + $sth->execute([$bookid, $bookid]); + return (bool)$sth->fetch(); + } + private function handleGet(int $bookid): Response { if ($bookid) { @@ -29,7 +51,23 @@ class PaginationHandler implements RequestHandlerInterface, AuthRequired private function handleStore(int $bookid, ?string $payload): Response { - if ($bookid && $payload) { + // Payload is later served back verbatim with a JSON content type, + // so only accept well-formed JSON arrays (epub.js location format) + // instead of storing arbitrary attacker-controlled bytes. + if ($payload !== null && strlen($payload) <= self::MAX_PAYLOAD_SIZE) { + $decoded = json_decode($payload, true); + if (is_array($decoded)) { + // Normalize (strips surrounding whitespace etc.) while keeping + // the round-trip as byte-faithful as possible. + $payload = json_encode($decoded, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); + } else { + $payload = null; + } + } else { + $payload = null; + } + + if ($bookid && $payload && $this->bookExists($bookid)) { $pag = ORM::for_table('epube_pagination') ->where('bookid', $bookid) ->find_one(); |
