From 0934f79cfcf8c7177bc32e7f44562beda3105940 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Tue, 30 Nov 2021 23:10:15 +0800
Subject: [PATCH] migrate-hustoj: fix password check

---
 packages/hydrooj/package.json        | 2 +-
 packages/hydrooj/src/handler/user.ts | 4 ++--
 packages/migrate-hustoj/lib.ts       | 4 ++--
 packages/migrate-hustoj/package.json | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 96baa40e8..5685570d7 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "3.1.43",
+    "version": "3.1.44",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",
diff --git a/packages/hydrooj/src/handler/user.ts b/packages/hydrooj/src/handler/user.ts
index 860a30865..a3f8128b9 100644
--- a/packages/hydrooj/src/handler/user.ts
+++ b/packages/hydrooj/src/handler/user.ts
@@ -125,9 +125,9 @@ class UserLoginHandler extends Handler {
         this.session.uid = udoc._id;
         this.session.scope = PERM.PERM_ALL.toString();
         this.session.save = rememberme;
-        this.response.redirect = redirect || (this.request.referer || '/login').endsWith('/login')
+        this.response.redirect = redirect || ((this.request.referer || '/login').endsWith('/login')
             ? this.url('homepage')
-            : this.request.referer;
+            : this.request.referer);
     }
 }
 
diff --git a/packages/migrate-hustoj/lib.ts b/packages/migrate-hustoj/lib.ts
index 159601ae6..ce21fa5ff 100644
--- a/packages/migrate-hustoj/lib.ts
+++ b/packages/migrate-hustoj/lib.ts
@@ -5,8 +5,8 @@ const RE_MD5 = /^[\da-f]{32}$/;
 function hash($password: string, $saved: string) {
     $password = md5($password);
     if (RE_MD5.test($saved)) return $password === $saved;
-    const $svd = Buffer.from($saved, 'base64').toString();
-    const $salt = $svd.substr(20);
+    const $svd = Buffer.from($saved, 'base64').toString('hex');
+    const $salt = Buffer.from($svd.substr(40), 'hex').toString();
     const $hash = Buffer.concat([
         Buffer.from(sha1($password + $salt), 'hex'),
         Buffer.from($salt),
diff --git a/packages/migrate-hustoj/package.json b/packages/migrate-hustoj/package.json
index e18009696..f26308d89 100644
--- a/packages/migrate-hustoj/package.json
+++ b/packages/migrate-hustoj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hydrooj/migrate-hustoj",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "main": "package.json",
     "repository": "git@github.com:hydro-dev/Hydro.git",
     "author": "undefined <i@undefined.moe>",