Lab argument-injections: Move answers

david-a-wheeler · david-a-wheeler · commit 5831af7e7d00 · 2025-01-29T18:02:11.000-05:00
Signed-off-by: David A. Wheeler &lt;dwheeler@dwheeler.com&gt;
diff --git a/docs/labs/argument-injection.html b/docs/labs/argument-injection.html
@@ -10,20 +10,6 @@
 <script src="argument-injection.js"></script>
 <link rel="license" href="https://creativecommons.org/licenses/by/4.0/">
 
-<!-- expected answer -->
-<script id="expected0" type="plain/text">
-  execFile('git', ['blame', '--', filePath], { shell: false }, (error, stdout, stderr) => {
-</script>
-
-<script id="correct0" type="plain/text">
-\s* execFile \(
- ('git'|"git"|`git`) ,
- \[ ('blame'|"blame"|`blame`) , ('--'|"--"|`--`) , filePath \] ,
- (\{ (shell : false)? \} ,)?
- \( [a-zA-Z_$][a-zA-Z0-9_$]* ,
-    [a-zA-Z_$][a-zA-Z0-9_$]* , [a-zA-Z_$][a-zA-Z0-9_$]* \) => \{ \s*
-</script>
-
 </head>
 <body>
 <!-- For GitHub Pages formatting: -->
diff --git a/docs/labs/argument-injection.js b/docs/labs/argument-injection.js
@@ -72,6 +72,18 @@ info =
       text: "The `exec` function should be closed in later lines, not here.\n"
     }
   ],
+  expected: [
+    `execFile('git', ['blame', '--', filePath], { shell: false }, (error, stdout, stderr) => {`
+  ],
+  correct: [
+    String.raw`\s* execFile \(
+      ('git'|"git"|${BACKQUOTE}git${BACKQUOTE}) ,
+      \[ ('blame'|"blame"|${BACKQUOTE}blame${BACKQUOTE}) ,
+         ('--'|"--"|${BACKQUOTE}--${BACKQUOTE}) , filePath \] ,
+      (\{ (shell : false)? \} ,)?
+      \( [a-zA-Z_$][a-zA-Z0-9_$]* ,
+         [a-zA-Z_$][a-zA-Z0-9_$]* , [a-zA-Z_$][a-zA-Z0-9_$]* \) => \{ \s*`
+  ],
   successes: [
     [
       "    execFile('git', ['blame', '--', filePath], { shell: false }, (error, stdout, stderr) => {",
