rename witness to pump

erik-krogh · erik-krogh · commit 500b94b50e6b · 2020-11-25T13:57:21.000+01:00
diff --git a/javascript/ql/src/Performance/ReDoS.ql b/javascript/ql/src/Performance/ReDoS.ql
@@ -1069,10 +1069,10 @@ module SuffixConstruction {
 }
 
 /**
- * Holds if `term` may cause exponential backtracking on strings containing many repetitions of `witness`.
+ * Holds if `term` may cause exponential backtracking on strings containing many repetitions of `pump`.
  * Gets the minimum possible string that causes exponential backtracking.
  */
-predicate isReDoSAttackable(RegExpTerm term, string witness, State s) {
+predicate isReDoSAttackable(RegExpTerm term, string pump, State s) {
   exists(int i, string c | s = Match(term, i) |
     c =
       min(string w |
@@ -1081,7 +1081,7 @@ predicate isReDoSAttackable(RegExpTerm term, string witness, State s) {
       |
         w order by w.length(), w
       ) and
-    witness = escape(rotate(c, i))
+    pump = escape(rotate(c, i))
   )
 }
 
@@ -1111,17 +1111,17 @@ string escape(string s) {
 /**
  * Gets `str` with the last `i` characters moved to the front.
  *
- * We use this to adjust the witness string to match with the beginning of
+ * We use this to adjust the pump string to match with the beginning of
  * a RegExpTerm, so it doesn't start in the middle of a constant.
  */
 bindingset[str, i]
 string rotate(string str, int i) {
   result = str.suffix(str.length() - i) + str.prefix(str.length() - i)
 }
 
-from RegExpTerm t, string witness, State s, string prefixMsg
+from RegExpTerm t, string pump, State s, string prefixMsg
 where
-  isReDoSAttackable(t, witness, s) and
+  isReDoSAttackable(t, pump, s) and
   (
     prefixMsg = "starting with '" + escape(PrefixConstruction::prefix(s)) + "' and " and
     not PrefixConstruction::prefix(s) = ""
@@ -1132,4 +1132,4 @@ where
   )
 select t,
   "This part of the regular expression may cause exponential backtracking on strings " + prefixMsg +
-    "containing many repetitions of '" + witness + "'."
+    "containing many repetitions of '" + pump + "'."

Original file line number	Diff line number	Diff line change
`@@ -1069,10 +1069,10 @@ module SuffixConstruction {`
`1069`	`1069`	`}`
`1070`	`1070`
`1071`	`1071`	`/**`
`1072`		- * Holds if `term` may cause exponential backtracking on strings containing many repetitions of `witness`.
	`1072`	+ * Holds if `term` may cause exponential backtracking on strings containing many repetitions of `pump`.
`1073`	`1073`	`* Gets the minimum possible string that causes exponential backtracking.`
`1074`	`1074`	`*/`
`1075`		`-predicate isReDoSAttackable(RegExpTerm term, string witness, State s) {`
	`1075`	`+predicate isReDoSAttackable(RegExpTerm term, string pump, State s) {`
`1076`	`1076`	`exists(int i, string c \| s = Match(term, i) \|`
`1077`	`1077`	`c =`
`1078`	`1078`	`min(string w \|`
`@@ -1081,7 +1081,7 @@ predicate isReDoSAttackable(RegExpTerm term, string witness, State s) {`
`1081`	`1081`	`\|`
`1082`	`1082`	`w order by w.length(), w`
`1083`	`1083`	`) and`
`1084`		`- witness = escape(rotate(c, i))`
	`1084`	`+ pump = escape(rotate(c, i))`
`1085`	`1085`	`)`
`1086`	`1086`	`}`
`1087`	`1087`
`@@ -1111,17 +1111,17 @@ string escape(string s) {`
`1111`	`1111`	`/**`
`1112`	`1112`	* Gets `str` with the last `i` characters moved to the front.
`1113`	`1113`	`*`
`1114`		`- * We use this to adjust the witness string to match with the beginning of`
	`1114`	`+ * We use this to adjust the pump string to match with the beginning of`
`1115`	`1115`	`* a RegExpTerm, so it doesn't start in the middle of a constant.`
`1116`	`1116`	`*/`
`1117`	`1117`	`bindingset[str, i]`
`1118`	`1118`	`string rotate(string str, int i) {`
`1119`	`1119`	`result = str.suffix(str.length() - i) + str.prefix(str.length() - i)`
`1120`	`1120`	`}`
`1121`	`1121`
`1122`		`-from RegExpTerm t, string witness, State s, string prefixMsg`
	`1122`	`+from RegExpTerm t, string pump, State s, string prefixMsg`
`1123`	`1123`	`where`
`1124`		`- isReDoSAttackable(t, witness, s) and`
	`1124`	`+ isReDoSAttackable(t, pump, s) and`
`1125`	`1125`	`(`
`1126`	`1126`	`prefixMsg = "starting with '" + escape(PrefixConstruction::prefix(s)) + "' and " and`
`1127`	`1127`	`not PrefixConstruction::prefix(s) = ""`
`@@ -1132,4 +1132,4 @@ where`
`1132`	`1132`	`)`
`1133`	`1133`	`select t,`
`1134`	`1134`	`"This part of the regular expression may cause exponential backtracking on strings " + prefixMsg +`
`1135`		`- "containing many repetitions of '" + witness + "'."`
	`1135`	`+ "containing many repetitions of '" + pump + "'."`