From b407de01f8736b02689a54bd5c7f36196ab044cb Mon Sep 17 00:00:00 2001
From: Asger F <asger@semmle.com>
Date: Fri, 22 Nov 2019 12:09:46 +0000
Subject: [PATCH] JS: Update TaintBarriers test

---
 .../library-tests/TaintBarriers/SanitizingGuard.expected  | 6 ++----
 .../test/library-tests/TaintBarriers/TaintedSink.expected | 2 ++
 .../test/library-tests/TaintBarriers/isBarrier.expected   | 2 --
 javascript/ql/test/library-tests/TaintBarriers/tst.js     | 8 ++++----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/javascript/ql/test/library-tests/TaintBarriers/SanitizingGuard.expected b/javascript/ql/test/library-tests/TaintBarriers/SanitizingGuard.expected
index 010375e1ab8..cf568e8c593 100644
--- a/javascript/ql/test/library-tests/TaintBarriers/SanitizingGuard.expected
+++ b/javascript/ql/test/library-tests/TaintBarriers/SanitizingGuard.expected
@@ -1,7 +1,5 @@
-| tst.js:5:9:5:19 | /x/.test(v) | ExampleConfiguration | false | tst.js:5:18:5:18 | v |
-| tst.js:5:9:5:19 | /x/.test(v) | ExampleConfiguration | true | tst.js:5:18:5:18 | v |
-| tst.js:11:9:11:20 | v.match(/x/) | ExampleConfiguration | false | tst.js:11:9:11:9 | v |
-| tst.js:11:9:11:20 | v.match(/x/) | ExampleConfiguration | true | tst.js:11:9:11:9 | v |
+| tst.js:5:9:5:21 | /^x$/.test(v) | ExampleConfiguration | true | tst.js:5:20:5:20 | v |
+| tst.js:11:9:11:25 | v.match(/[^a-z]/) | ExampleConfiguration | false | tst.js:11:9:11:9 | v |
 | tst.js:23:9:23:27 | o.hasOwnProperty(v) | ExampleConfiguration | true | tst.js:23:26:23:26 | v |
 | tst.js:35:9:35:14 | v in o | ExampleConfiguration | true | tst.js:35:9:35:9 | v |
 | tst.js:47:9:47:25 | o[v] == undefined | ExampleConfiguration | false | tst.js:47:11:47:11 | v |
diff --git a/javascript/ql/test/library-tests/TaintBarriers/TaintedSink.expected b/javascript/ql/test/library-tests/TaintBarriers/TaintedSink.expected
index 54b35166b15..61c6e21b491 100644
--- a/javascript/ql/test/library-tests/TaintBarriers/TaintedSink.expected
+++ b/javascript/ql/test/library-tests/TaintBarriers/TaintedSink.expected
@@ -1,4 +1,6 @@
 | tst.js:3:10:3:10 | v | tst.js:2:13:2:20 | SOURCE() |
+| tst.js:8:14:8:14 | v | tst.js:2:13:2:20 | SOURCE() |
+| tst.js:12:14:12:14 | v | tst.js:2:13:2:20 | SOURCE() |
 | tst.js:21:10:21:10 | v | tst.js:20:13:20:20 | SOURCE() |
 | tst.js:26:14:26:14 | v | tst.js:20:13:20:20 | SOURCE() |
 | tst.js:33:10:33:10 | v | tst.js:32:13:32:20 | SOURCE() |
diff --git a/javascript/ql/test/library-tests/TaintBarriers/isBarrier.expected b/javascript/ql/test/library-tests/TaintBarriers/isBarrier.expected
index f650c93185c..07bf646dd13 100644
--- a/javascript/ql/test/library-tests/TaintBarriers/isBarrier.expected
+++ b/javascript/ql/test/library-tests/TaintBarriers/isBarrier.expected
@@ -1,6 +1,4 @@
 | tst.js:6:14:6:14 | v | ExampleConfiguration |
-| tst.js:8:14:8:14 | v | ExampleConfiguration |
-| tst.js:12:14:12:14 | v | ExampleConfiguration |
 | tst.js:14:14:14:14 | v | ExampleConfiguration |
 | tst.js:24:14:24:14 | v | ExampleConfiguration |
 | tst.js:36:14:36:14 | v | ExampleConfiguration |
diff --git a/javascript/ql/test/library-tests/TaintBarriers/tst.js b/javascript/ql/test/library-tests/TaintBarriers/tst.js
index a7a05590540..471471bd09a 100644
--- a/javascript/ql/test/library-tests/TaintBarriers/tst.js
+++ b/javascript/ql/test/library-tests/TaintBarriers/tst.js
@@ -2,16 +2,16 @@ function SanitizingRegExpTest () {
     var v = SOURCE();
     SINK(v);
 
-    if (/x/.test(v)) {
-        SINK(v);
+    if (/^x$/.test(v)) {
+        SINK(v); // sanitized
     } else {
         SINK(v);
     }
 
-    if (v.match(/x/)) {
+    if (v.match(/[^a-z]/)) {
         SINK(v);
     } else {
-        SINK(v);
+        SINK(v); // sanitized
     }
 
 }