From fe24d0d76e4b81584eff30bc405f13fce95b75dc Mon Sep 17 00:00:00 2001 From: Andy Hsu Date: Mon, 7 Aug 2023 19:04:43 +0800 Subject: [PATCH] fix: change sha256 hash lib --- package.json | 5 +++-- pnpm-lock.yaml | 47 ++++++++++++++++++++------------------- src/pages/login/index.tsx | 2 +- src/utils/hash.ts | 6 ++--- vite.config.ts | 1 + 5 files changed, 32 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 085a0eeea..91d4b3ae9 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "i18n:build": "pnpm crowdin && node ./scripts/i18n.mjs", "i18n:release": "pnpm run crowdin:download && node ./scripts/i18n.mjs", "start": "vite", - "dev": "vite", + "dev": "vite --force", "build": "vite build", "serve": "vite preview", "prepare": "husky install", @@ -37,6 +37,7 @@ "@crowdin/cli": "^3.7.10", "@types/mark.js": "^8.11.8", "@types/node": "^18.7.5", + "@types/sha256": "^0.2.0", "@types/streamsaver": "^2.0.1", "@vitejs/plugin-legacy": "^2.0.1", "husky": "^8.0.2", @@ -71,7 +72,7 @@ "remark-gfm": "^3.0.1", "remark-math": "^5.1.1", "seemly": "^0.3.6", - "sha-anything": "^0.0.4", + "sha256": "^0.2.0", "solid-contextmenu": "0.0.2", "solid-icons": "^1.0.1", "solid-js": "^1.4.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4c151bdcb..01ff24b45 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,9 +71,9 @@ dependencies: seemly: specifier: ^0.3.6 version: 0.3.6 - sha-anything: - specifier: ^0.0.4 - version: 0.0.4 + sha256: + specifier: ^0.2.0 + version: 0.2.0 solid-contextmenu: specifier: 0.0.2 version: 0.0.2(solid-js@1.4.8)(solid-transition-group@0.0.12) @@ -106,6 +106,9 @@ devDependencies: '@types/node': specifier: ^18.7.5 version: 18.7.5 + '@types/sha256': + specifier: ^0.2.0 + version: 0.2.0 '@types/streamsaver': specifier: ^2.0.1 version: 2.0.1 @@ -707,6 +710,12 @@ packages: resolution: {integrity: sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==} dev: false + /@types/sha256@0.2.0: + resolution: {integrity: sha512-QYMr6HuxTQunFWRLZpGopbkgQFoFWOmKTBGgNSYiWMqU/CWnQSTo3edyHvgsRXsOWtOSOG/cmDptPzgCeOsQGw==} + dependencies: + '@types/node': 18.7.5 + dev: true + /@types/sizzle@2.3.3: resolution: {integrity: sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==} dev: true @@ -1014,12 +1023,20 @@ packages: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} dev: true + /convert-hex@0.1.0: + resolution: {integrity: sha512-w20BOb1PiR/sEJdS6wNrUjF5CSfscZFUp7R9NSlXH8h2wynzXVEPFPJECAnkNylZ+cvf3p7TyRUHggDmrwXT9A==} + dev: false + /convert-source-map@1.8.0: resolution: {integrity: sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==} dependencies: safe-buffer: 5.1.2 dev: true + /convert-string@0.1.0: + resolution: {integrity: sha512-1KX9ESmtl8xpT2LN2tFnKSbV4NiarbVi8DVb39ZriijvtTklyrT+4dT1wsGMHKD3CJUjXgvJzstm9qL9ICojGA==} + dev: false + /copy-to-clipboard@3.3.2: resolution: {integrity: sha512-Vme1Z6RUDzrb6xAI7EZlVZ5uvOk2F//GaxKUxajDqm9LhOVM1inxNAD2vy+UZDYsd0uyA9s7b3/FVZPSxqrCfg==} dependencies: @@ -1040,11 +1057,6 @@ packages: which: 2.0.2 dev: true - /crypto-hash@2.0.1: - resolution: {integrity: sha512-t4mkp7Vh6MuCZRBf0XLzBOfhkH3nW6YEAotMDSjshVQ1GffCMGdPLSr7pKH0rdXY02jTjAZ7QW2apD0buaZXcQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dev: false - /css-select@4.3.0: resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==} dependencies: @@ -1395,10 +1407,6 @@ packages: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} dev: false - /fast-sort@3.4.0: - resolution: {integrity: sha512-c/cMBGA5mH3OYjaXedtLIM3hQjv+KuZuiD2QEH5GofNOZeQVDIYIN7Okc2AW1KPhk44g5PTZnXp8t2lOMl8qhQ==} - dev: false - /fd-slicer@1.1.0: resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==} dependencies: @@ -1707,11 +1715,6 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: true - /is-what@4.1.15: - resolution: {integrity: sha512-uKua1wfy3Yt+YqsD6mTUEa2zSi3G1oPlqTflgaPJ7z63vUGN5pxFpnQfeSLMFnJDEsdvOtkp1rUWkYjB4YfhgA==} - engines: {node: '>=12.13'} - dev: false - /is-what@4.1.7: resolution: {integrity: sha512-DBVOQNiPKnGMxRMLIYSwERAS5MVY1B7xYiGnpgctsOFvVDz9f9PFXXxMcTOHuoqYp4NK9qFYQaIC1NRRxLMpBQ==} engines: {node: '>=12.13'} @@ -2625,13 +2628,11 @@ packages: hasBin: true dev: true - /sha-anything@0.0.4: - resolution: {integrity: sha512-g7KCmHJ016M+QHjHeXR6Sx1E6fzAr17zz1oWt1eCxztqTj4MiQz3I7vrSz6hTsJp80ZRAZVDqaFbA/hmEyVYtg==} - engines: {node: '>=12.13'} + /sha256@0.2.0: + resolution: {integrity: sha512-kTWMJUaez5iiT9CcMv8jSq6kMhw3ST0uRdcIWl3D77s6AsLXNXRp3heeqqfu5+Dyfu4hwpQnMzhqHh8iNQxw0w==} dependencies: - crypto-hash: 2.0.1 - fast-sort: 3.4.0 - is-what: 4.1.15 + convert-hex: 0.1.0 + convert-string: 0.1.0 dev: false /shebang-command@2.0.0: diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index c7920f62b..5fe94256e 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -49,7 +49,7 @@ const Login = () => { async (): Promise> => r.post("/auth/login/hash", { username: username(), - password: await hashPwd(password()), + password: hashPwd(password()), otp_code: opt(), }), ) diff --git a/src/utils/hash.ts b/src/utils/hash.ts index bd29a0998..11393c041 100644 --- a/src/utils/hash.ts +++ b/src/utils/hash.ts @@ -1,7 +1,7 @@ -import { sha256 } from "sha-anything" +import sha256 from "sha256" const hash_salt = "https://github.com/alist-org/alist" -export async function hashPwd(pwd: string) { - return await sha256(`${pwd}-${hash_salt}`) +export function hashPwd(pwd: string) { + return sha256(`${pwd}-${hash_salt}`) } diff --git a/vite.config.ts b/vite.config.ts index 5e0318eb6..d2c17dbf8 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -38,6 +38,7 @@ export default defineConfig({ // }, // }, server: { + host: "0.0.0.0", proxy: { "/api": { target: "http://localhost:5244",