inject salt configuration into config store

Author: dem1fo

src/config/configStore.ts

@@ -59,15 +59,17 @@ export class ConfigStore {
   loadError: string | undefined;
   usingUI: boolean;
 
+  algorithmId: string;
   appConfig: AppConfigData = DEFAULT_APP_CONFIG;
   filePaths: ConfigStorePaths;
-  algorithmId: string;
+  saltConfiguration?: Config.FileBasedSalt | Config.StringBasedSalt;
 
-  constructor(filePaths: ConfigStorePaths, algorithmId: string, usingUI: boolean = false) {
-    this.lastUpdated = new Date();
+  constructor(filePaths: ConfigStorePaths, algorithmId: string, usingUI: boolean = false, saltConfiguration?: Config.FileBasedSalt | Config.StringBasedSalt) {
+    this.usingUI = usingUI;
     this.filePaths = filePaths;
+    this.lastUpdated = new Date();
     this.algorithmId = algorithmId;
-    this.usingUI = usingUI;
+    this.saltConfiguration = saltConfiguration;
   }
 
   getConfig = () => this.data;
@@ -84,7 +86,12 @@ export class ConfigStore {
     this.appConfig = loadAppConfig(this.getAppConfigFilePath());
 
     // attempt to load the default app config
-    const userConfigLoad = loadConfig({ configPath: this.getConfigFilePath(), algorithmId: this.getAlgorithmId() });
+    const userConfigLoad = loadConfig({
+      configPath: this.getConfigFilePath(),
+      algorithmId: this.getAlgorithmId(),
+      embeddedSalt: this.saltConfiguration,
+      usingUI: true
+    });
 
     // if the load succesds we have a valid config -- use it as a
     // user-provided one
@@ -97,7 +104,12 @@ export class ConfigStore {
     log('User config validation not successful - attempting to load backup config');
     // if the default config load failed use the backup default
     // from the app distribution
-    const backupConfigLoad = loadConfig({ configPath: this.getBackupConfigFilePath(), algorithmId: this.getAlgorithmId()});
+    const backupConfigLoad = loadConfig({
+      configPath: this.getBackupConfigFilePath(),
+      algorithmId: this.getAlgorithmId(),
+      embeddedSalt: this.saltConfiguration,
+      usingUI: true
+    });
 
     // if the load succesds we have a valid config -- use it as
     // a config-from-backup
@@ -136,7 +148,12 @@ export class ConfigStore {
   // The config data used by the application is updated after the save
   updateUserConfig(userConfigFilePath: string) {
     // attempt to load & validate the config data
-    const userConfigLoad = loadConfig({ configPath: userConfigFilePath, algorithmId: this.getAlgorithmId()});
+    const userConfigLoad = loadConfig({
+      configPath: userConfigFilePath,
+      algorithmId: this.getAlgorithmId(),
+      embeddedSalt: this.saltConfiguration,
+      usingUI: true
+    });
 
     // if failed return the error message
     if (!userConfigLoad.success) {
@@ -168,7 +185,12 @@ export class ConfigStore {
     }
 
     log('[removeUserConfig] Trying to load backup config file');
-    const backupConfigLoad = loadConfig({ configPath: this.getBackupConfigFilePath(), algorithmId: this.getAlgorithmId()});
+    const backupConfigLoad = loadConfig({
+      configPath: this.getBackupConfigFilePath(),
+      algorithmId: this.getAlgorithmId(),
+      embeddedSalt: this.saltConfiguration,
+      usingUI: true
+    });
 
     // if failed return the error message (do not delete the user config yet)
     if (!backupConfigLoad.success) {
@@ -273,7 +295,14 @@ export class ConfigStore {
   }
 }
 
-export function makeConfigStore({filePaths, algorithmId, usingUI}: {filePaths: ConfigStorePaths, algorithmId: string, usingUI: boolean}) {
+interface ConfigStoreInput {
+  usingUI: boolean;
+  algorithmId: string;
+  filePaths: ConfigStorePaths;
+  saltConfiguration?: Config.FileBasedSalt | Config.StringBasedSalt;
+}
+
+export function makeConfigStore({ filePaths, algorithmId, usingUI, saltConfiguration }: ConfigStoreInput) {
   if (!filePaths || !algorithmId) throw new Error(`ConfigStore params MUST be provided.`);
-  return new ConfigStore(filePaths, algorithmId, usingUI);
+  return new ConfigStore(filePaths, algorithmId, usingUI, saltConfiguration);
 }

src/config/loadConfig.ts

@@ -116,7 +116,7 @@ export function loadConfig({ configPath, algorithmId, embeddedSalt, usingUI=fals
     return tryLoadSaltFile({ saltFilePath, validatorRegexp, configData, lastUpdateDate, label: "embedded salt" });
   }
 
-  return { success: false, error: `No salt configuration provided: either specify salt in config file, or pass in path on config load.`, isSaltFileError: true, config: configData };
+  return { success: false, error: `No salt configuration provided in conguration file or embedded.`, isSaltFileError: true, config: configData };
 }
 
 interface TryLoadSaltFileInput {
@@ -127,7 +127,7 @@ interface TryLoadSaltFileInput {
   label: string;
 }
 
-function tryLoadSaltFile({ saltFilePath, validatorRegexp, configData, lastUpdateDate, label="salt"}: TryLoadSaltFileInput): LoadConfigResult {
+function tryLoadSaltFile({ saltFilePath, validatorRegexp, configData, lastUpdateDate }: TryLoadSaltFileInput): LoadConfigResult {
   log('[INFO] Loading salt from', saltFilePath);
 
   const loadSaltResponse = loadSaltFile({ saltFilePath, validatorRegexp });
@@ -141,5 +141,7 @@ function tryLoadSaltFile({ saltFilePath, validatorRegexp, configData, lastUpdate
 
   // update the config to be of salt type: "STRING" with loaded file data
   configData.algorithm.salt = { source: "STRING", value: loadSaltResponse.data }
+  // update the signature since we have changed the salt configuration
+  configData.meta.signature = generateConfigHash(configData);
   return { success: true, lastUpdated: lastUpdateDate, config: configData };
 }