about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2026-06-21 12:34:43 +0300
committerAndrew Dolgov <fox@fakecake.org>2026-06-21 12:34:43 +0300
commitb37e5986cf392132b5fd773d9f3e0f25f7f1886b (patch)
tree9faa4a88524c19edae9db6e5a8db0da897f0fb2f
parentce8af39c6504f63fa3d604d4428c830dc95dd294 (diff)
downloadthe-epube-b37e5986cf392132b5fd773d9f3e0f25f7f1886b.tar.gz
the-epube-b37e5986cf392132b5fd773d9f3e0f25f7f1886b.tar.xz
use password_hash() for password hashing and upgrade previous schema passwords on login
-rw-r--r--classes/Handler/LoginHandler.php32
1 files changed, 28 insertions, 4 deletions
diff --git a/classes/Handler/LoginHandler.php b/classes/Handler/LoginHandler.php
index 7fb1449..e317054 100644
--- a/classes/Handler/LoginHandler.php
+++ b/classes/Handler/LoginHandler.php
@@ -11,20 +11,33 @@ use Response;
 
 class LoginHandler implements RequestHandlerInterface
 {
-    /** @return array<string, string>|null */
+    /** @return array{result: string, user: string, csrf_token: string}|null */
     private function doLocalLogin(string $username, string $password): ?array
     {
-        $pass_hash = 'SHA256:' . hash('sha256', "$username:" . $password);
-
         $user = ORM::for_table('epube_users')
             ->where('username', $username)
-            ->where('pass', $pass_hash)
             ->find_one();
 
         if (!$user) {
             return null;
         }
 
+        // Verify password against stored hash (legacy or modern)
+        $legacy = str_starts_with($user->pass, 'SHA256:');
+        $valid  = $legacy
+            ? hash_equals($user->pass, 'SHA256:' . hash('sha256', "$username:$password"))
+            : password_verify($password, $user->pass);
+
+        if (!$valid) {
+            return null;
+        }
+
+        // Upgrade legacy hash to bcrypt
+        if ($legacy) {
+            $this->upgradePassword($user, $password);
+        }
+
+        // Set up session
         if (session_status() != PHP_SESSION_ACTIVE) {
             session_start();
         }
@@ -41,6 +54,17 @@ class LoginHandler implements RequestHandlerInterface
         return ["result" => "ok", "user" => $username, "csrf_token" => $_SESSION["csrf_token"]];
     }
 
+    /**
+     * Upgrade a legacy SHA256 password hash to bcrypt.
+     * Called after successful verification — the plaintext password is already known.
+     */
+    private function upgradePassword(object $user, string $password): void
+    {
+        $newHash = password_hash($password, PASSWORD_BCRYPT);
+        $user->pass = $newHash;
+        $user->save();
+    }
+
     private function doOidcLogin(): void
     {
         $oidc = new OpenIDConnectClient(