Merge pull request #967 from snyk/fix/context-var-uppercasing-and-sanitization

fix: uppercase and log sanitize contexts variables

Author: aarlaud

lib/hybrid-sdk/client/config/remoteConfig.ts

@@ -65,7 +65,9 @@ export const retrieveConnectionsForDeployment = async (
     const connectionRelationships = connections[i].relationships ?? [];
     const contextMap: Object = {};
     for (const context of connectionRelationships) {
-      contextMap[context.id] = { ...context.attributes.context };
+      contextMap[context.id] = {
+        ...ContextKeysToUpperCase(context.attributes.context),
+      };
     }
 
     connectionsObjectForFile.CONNECTIONS[
@@ -80,3 +82,16 @@ export const retrieveConnectionsForDeployment = async (
   writeFileSync(universalFilePath, JSON.stringify(universalConfigFile));
   return;
 };
+
+function ContextKeysToUpperCase(
+  record: Record<string, string>,
+): Record<string, string> {
+  const capitalizedRecord: Record<string, string> = {};
+  for (const key in record) {
+    if (record.hasOwnProperty(key)) {
+      const capitalizedKey = key.toUpperCase();
+      capitalizedRecord[capitalizedKey] = record[key];
+    }
+  }
+  return capitalizedRecord;
+}

lib/logs/logger.ts

@@ -41,6 +41,36 @@ const sanitiseConnectionConfigVariables = (
   return raw;
 };
 
+const sanitiseConnectionContextConfigVariables = (
+  raw,
+  variable,
+  connections,
+  connectionKey,
+) => {
+  if (connections[connectionKey].contexts) {
+    const contextKeys = Object.keys(connections[connectionKey].contexts);
+    for (const contextKey of contextKeys) {
+      for (const cfgVar of Object.keys(
+        connections[connectionKey].contexts[contextKey],
+      )) {
+        if (cfgVar == variable) {
+          raw = raw.replace(
+            new RegExp(
+              escapeRegExp(
+                connections[connectionKey].contexts[contextKey][cfgVar],
+              ),
+              'igm',
+            ),
+            '${' + variable + '}',
+          );
+        }
+      }
+    }
+  }
+
+  return raw;
+};
+
 const sanitisePluginsConfigVariables = (raw, variable, pluginConfig) => {
   for (const cfgVar of Object.keys(pluginConfig)) {
     if (cfgVar == variable) {
@@ -132,6 +162,12 @@ export const sanitise = (raw) => {
           config.connections,
           connectionKey,
         );
+        raw = sanitiseConnectionContextConfigVariables(
+          raw,
+          variable,
+          config.connections,
+          connectionKey,
+        );
       }
     }
     for (const variable of universalBrokerPluginsVariables) {