Merge pull request #109 from mxschmitt/fix-validation

fix: validation of input parameters
mxschmitt · Feb 13, 2022 · 8b4e4ac · 8b4e4ac
2 parents bf9f18e + cb96de3
commit 8b4e4ac
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -10282,8 +10282,8 @@ const execShellCommand = (cmd) => {
 
 /**
  * @param {string} key
- * @param {regex} re regex to use for validation
- * @return {string}, {undefined} or throws an error if input doesn't match regex
+ * @param {RegExp} re regex to use for validation
+ * @return {string} {undefined} or throws an error if input doesn't match regex
  */
 const getValidatedInput = (key, re) => {
   const value = core.getInput(key);
@@ -10417,10 +10417,12 @@ async function run() {
       "tmate-server-ed25519-fingerprint": /./,
     }
 
-    for (const opt in options) {
-      const value = getValidatedInput(opt, options[opt]);
+    for (const [key, option] of Object.entries(options)) {
+      if (core.getInput(key) === '')
+        continue;
+      const value = getValidatedInput(key, option);
       if (value !== undefined) {
-        setDefaultCommand = `${setDefaultCommand} set-option -g ${opt} "${value}" \\;`;
+        setDefaultCommand = `${setDefaultCommand} set-option -g ${key} "${value}" \\;`;
       }
     }
 

diff --git a/src/helpers.js b/src/helpers.js
@@ -41,8 +41,8 @@ export const execShellCommand = (cmd) => {
 
 /**
  * @param {string} key
- * @param {regex} re regex to use for validation
- * @return {string}, {undefined} or throws an error if input doesn't match regex
+ * @param {RegExp} re regex to use for validation
+ * @return {string} {undefined} or throws an error if input doesn't match regex
  */
 export const getValidatedInput = (key, re) => {
   const value = core.getInput(key);

diff --git a/src/index.js b/src/index.js
@@ -107,10 +107,12 @@ export async function run() {
       "tmate-server-ed25519-fingerprint": /./,
     }
 
-    for (const opt in options) {
-      const value = getValidatedInput(opt, options[opt]);
+    for (const [key, option] of Object.entries(options)) {
+      if (core.getInput(key) === '')
+        continue;
+      const value = getValidatedInput(key, option);
       if (value !== undefined) {
-        setDefaultCommand = `${setDefaultCommand} set-option -g ${opt} "${value}" \\;`;
+        setDefaultCommand = `${setDefaultCommand} set-option -g ${key} "${value}" \\;`;
       }
     }