From cbd6d7e5f26ebc58a7505f2bf3b5ab2c71dabccf Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 27 Mar 2025 16:20:13 +0000 Subject: [PATCH] accept empty DB_AUTH --- src/utils/system/decryptConfig.spec.ts | 2 +- src/utils/system/decryptConfig.ts | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/utils/system/decryptConfig.spec.ts b/src/utils/system/decryptConfig.spec.ts index a7e6b6d..4b2ec7c 100644 --- a/src/utils/system/decryptConfig.spec.ts +++ b/src/utils/system/decryptConfig.spec.ts @@ -37,7 +37,7 @@ describe("decryptConfig", () => { throw new Error("Function did not throw an error"); } catch (error) { if (!(error instanceof Error)) throw error; - expect(error.message).to.equal("Password invalid"); + expect(error.message).to.equal("DB Password invalid"); } }); it("should return raw configs if password protection if off", () => { diff --git a/src/utils/system/decryptConfig.ts b/src/utils/system/decryptConfig.ts index 532fd0a..a3c66e6 100644 --- a/src/utils/system/decryptConfig.ts +++ b/src/utils/system/decryptConfig.ts @@ -6,7 +6,6 @@ export const setDecrypted = (d: boolean) => (decrypted = d); export const decryptConfig = (password: string) => { if ( - !constants.DB_AUTH || !constants.PRIVKEY || !constants.OLD_PRIVKEY || !constants.FEE_COLLECTOR_PUBKEY @@ -26,17 +25,17 @@ export const decryptConfig = (password: string) => { try { if ( - AES.decrypt(constants.DB_AUTH, password).toString(enc.Utf8).length === 0 + constants.DB_AUTH && AES.decrypt(constants.DB_AUTH, password).toString(enc.Utf8).length === 0 ) { - throw new Error("Password invalid"); + throw new Error("DB Password invalid"); } } catch (e) { - throw new Error("Password invalid"); + throw new Error("DB Password invalid"); } setDecrypted(true); return { - DB_AUTH: AES.decrypt(constants.DB_AUTH, password).toString(enc.Utf8), + DB_AUTH: constants.DB_AUTH ? AES.decrypt(constants.DB_AUTH, password).toString(enc.Utf8) : undefined, PRIVKEY: AES.decrypt(constants.PRIVKEY, password).toString(enc.Utf8), OLD_PRIVKEY: AES.decrypt(constants.OLD_PRIVKEY, password).toString( enc.Utf8,