handle failed decryption

brafdlog · Sep 5, 2024 · d26a085 · d26a085
1 parent 1c42afe
commit d26a085
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/packages/main/src/backend/configManager/configManager.ts b/packages/main/src/backend/configManager/configManager.ts
@@ -8,6 +8,10 @@ export async function getConfig(configPath: string = configFilePath): Promise<Co
   const configFromFile = await getConfigFromFile(configPath);
   if (configFromFile) {
     const decrypted = await decrypt(configFromFile) as string;
+    if (!decrypted) {
+      console.log('No config file found, returning default config');
+      return configExample;
+    }
     try {
       return JSON.parse(decrypted);
     } catch (e) {

diff --git a/packages/main/src/backend/configManager/encryption/crypto.ts b/packages/main/src/backend/configManager/encryption/crypto.ts
@@ -20,8 +20,17 @@ export async function encrypt(text: string) {
 }
 
 export async function decrypt(text: string) {
-  const salt = await SALT();
-  const decipher = crypto.createDecipher(ALGORITHM, salt);
-  const decrypted = decipher.update(text, 'hex', 'utf8');
-  return decrypted + decipher.final('utf8');
+  try {
+    const salt = await SALT();
+    const decipher = crypto.createDecipher(ALGORITHM, salt);
+    const decrypted = decipher.update(text, 'hex', 'utf8');
+    return decrypted + decipher.final('utf8');
+  } catch (e) {
+    if (!text) {
+      console.info('Failed to decrypt an empty string, returning null');
+      return null;
+    }
+    console.error('Failed to decrypt', e);
+    throw e;
+  }
 }
diff --git a/packages/main/src/backend/configManager/encryption/salt.ts b/packages/main/src/backend/configManager/encryption/salt.ts
@@ -4,7 +4,7 @@ export default async function SALT(defaultValue?: string): Promise<string> {
   const existedSALT = await loadSALT();
   if (existedSALT) return existedSALT;
 
-  if (!defaultValue) throw Error('SALT not exist');
+  if (!defaultValue) throw Error('SALT not existed and no default value provided');
 
   await saveSALT(defaultValue);
   return defaultValue;