Merge pull request #761 from ossf/redos_move_answers

david-a-wheeler · web-flow · commit 8b52e14b070e · 2025-01-29T20:35:47.000-05:00
Lab redos: Move answers to shared JavaScript
diff --git a/docs/labs/redos.html b/docs/labs/redos.html
@@ -12,19 +12,6 @@
 
 <!-- See create_labs.md for how to create your own lab! -->
 
-<!-- Sample expected answer -->
-<script id="expected0" type="plain/text">
-  query('id').isLength({max:50}).matches( /^[A-Z0-9]+$/ ),
-</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct0" type="plain/text">
-\s* query \( ('id'|"id"|`id`) \)
-\. isLength \( \{ max: 50 ,? \} \)
-\. matches \( \/\^\[A-Z0-9\]\+\$\/ \) , \s*
-</script>
-
-
 </head>
 <body>
 <!-- For GitHub Pages formatting: -->
diff --git a/docs/labs/redos.js b/docs/labs/redos.js
@@ -71,5 +71,20 @@ info =
       present: String.raw`\[0-9[Aa]-[Zz]\]`,
       text: "It's conventional to list letters first, so use [A-Z0-9] not [0-9A-Z]"
     }
-  ]
+  ],
+  expected: [
+    "query('id').isLength({max:50}).matches( /^[A-Z0-9]+$/ ),",
+  ],
+  correct: [
+    String.raw`\s* query \(
+      ('id'|"id"|${BACKQUOTE}id${BACKQUOTE}) \)
+      \. isLength \( \{ max: 50 ,? \} \)
+      \. matches \( \/\^\[A-Z0-9\]\+\$\/ \) , \s*`,
+  ],
+  successes: [
+    [ " query ( `id` ) . isLength( {max:50} ).matches( /^[A-Z0-9]+$/ ) , " ],
+  ],
+  failures: [
+    [ "query('id').isLength({max:50}).matches( /^[A-Z]+$/ ),", ],
+  ],
 }
