From f9190cf6bd142006bbd117f89b0f273609dbc415 Mon Sep 17 00:00:00 2001 From: Smith Date: Thu, 21 Jul 2022 10:03:05 +0200 Subject: [PATCH] fix token validation + error notif --- dist/server.js | 3 +-- public/main.js | 5 ++--- src/server.ts | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dist/server.js b/dist/server.js index 29bf067..ff352f8 100644 --- a/dist/server.js +++ b/dist/server.js @@ -143,8 +143,7 @@ function validateBearerToken(btoken) { if (salt.length > 24 && /^\d{13}$/.test(valid) && /^[a-f0-9]{128}$/.test(hash) - && Date.now() < Number(valid) - && Number(valid) - Date.now() < 3600000 * 12) { + && Date.now() < Number(valid)) { return hash === crypto_1.default.createHash('sha512').update(salt + valid + SECRET).digest('hex'); } return false; diff --git a/public/main.js b/public/main.js index 58b931d..073ce95 100644 --- a/public/main.js +++ b/public/main.js @@ -486,7 +486,7 @@ async function fetchApi(method, endpoint, body) { if (!re) { logout(); - notif('danger', '⚠️ ' + errMsg, 3); + notif('danger', '⚠️ ' + errMsg, undefined, undefined, 3); } return re; @@ -501,8 +501,7 @@ async function getBearerToken() { if (salt.length > 24 && /^\d{13}$/.test(valid) && /^[0-9a-f]{128}$/.test(hash) - && Date.now() < Number(valid) - && Number(valid) - Date.now() < 3600000 * 12) { + && Date.now() < Number(valid)) { return bt; } } diff --git a/src/server.ts b/src/server.ts index 2e79551..ffcd844 100644 --- a/src/server.ts +++ b/src/server.ts @@ -148,8 +148,7 @@ function validateBearerToken(btoken: string) { if (salt.length > 24 && /^\d{13}$/.test(valid) && /^[a-f0-9]{128}$/.test(hash) - && Date.now() < Number(valid) - && Number(valid) - Date.now() < 3600000 * 12) { + && Date.now() < Number(valid)) { return hash === crypto.createHash('sha512').update(salt + valid + SECRET).digest('hex'); }