remove copy/paste

Author: khassel

js/node_helper.js

@@ -1,6 +1,7 @@
 const express = require("express");
 const Log = require("logger");
 const Class = require("./class");
+const { replaceSecretPlaceholder } = require("#server_functions");
 
 const NodeHelper = Class.extend({
 	init () {
@@ -90,9 +91,7 @@ const NodeHelper = Class.extend({
 			socket.onAny((notification, payload) => {
 				if (config.hideConfigSecrets && payload && typeof payload === "object") {
 					try {
-						const payloadStr = JSON.stringify(payload).replaceAll(/\*\*(SECRET_[^*]+)\*\*/g, (match, group) => {
-							return process.env[group];
-						});
+						const payloadStr = replaceSecretPlaceholder(JSON.stringify(payload));
 						this.socketNotificationReceived(notification, JSON.parse(payloadStr));
 					} catch (e) {
 						Log.error("Error substituting variables in payload: ", e);

js/server_functions.js

@@ -13,6 +13,17 @@ function getStartup (req, res) {
 	res.send(startUp);
 }
 
+/**
+ * A method that replaces the secret placeholders `**SECRET_ABC**` with the environment variable SECRET_ABC
+ * @param {string} input - the input string
+ * @returns {string} the input with real variable content
+ */
+function replaceSecretPlaceholder (input) {
+	return input.replaceAll(/\*\*(SECRET_[^*]+)\*\*/g, (match, group) => {
+		return process.env[group];
+	});
+}
+
 /**
  * A method that forwards HTTP Get-methods to the internet to avoid CORS-errors.
  *
@@ -35,10 +46,10 @@ async function cors (req, res) {
 			return res.status(400).send(url);
 		} else {
 			url = match[1];
-			if (config.hideConfigSecrets) {
-				url = url.replaceAll(/\*\*(SECRET_[^*]+)\*\*/g, (match, group) => {
-					return process.env[group];
-				});
+			if (typeof config !== "undefined") {
+				if (config.hideConfigSecrets) {
+					url = replaceSecretPlaceholder(url);
+				}
 			}
 
 			const headersToSend = getHeadersToSend(req.url);
@@ -191,4 +202,4 @@ function getConfigFilePath () {
 	return path.resolve(global.configuration_file || `${global.root_path}/config/config.js`);
 }
 
-module.exports = { cors, getHtml, getVersion, getStartup, getEnvVars, getEnvVarsAsObj, getUserAgent, getConfigFilePath };
+module.exports = { cors, getHtml, getVersion, getStartup, getEnvVars, getEnvVarsAsObj, getUserAgent, getConfigFilePath, replaceSecretPlaceholder };