Skip to content

Commit 0675066

Browse files
asgerfasgerf
committed
JS: Fixup UriLibraries test
1 parent 443b59e commit 0675066

File tree

2 files changed

+69
-69
lines changed

2 files changed

+69
-69
lines changed

‎javascript/ql/test/library-tests/frameworks/UriLibraries/tests.expected

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -29,73 +29,73 @@ urijs
2929
| urijs.js:10:1:10:3 | URI |
3030
| urijs.js:12:13:12:15 | URI |
3131
uriLibraryStep
32-
| closureUri.js:5:11:5:20 | new Uri(x) | closureUri.js:5:19:5:19 | x | closureUri.js:5:11:5:20 | new Uri(x) |
33-
| closureUri.js:6:1:6:12 | Uri.parse(x) | closureUri.js:6:11:6:11 | x | closureUri.js:6:1:6:12 | Uri.parse(x) |
34-
| closureUri.js:7:1:7:17 | Uri.resolve(x, y) | closureUri.js:7:13:7:13 | x | closureUri.js:7:1:7:17 | Uri.resolve(x, y) |
35-
| closureUri.js:7:1:7:17 | Uri.resolve(x, y) | closureUri.js:7:16:7:16 | y | closureUri.js:7:1:7:17 | Uri.resolve(x, y) |
36-
| closureUri.js:8:1:8:57 | Uri.cre ... , frag) | closureUri.js:8:12:8:17 | scheme | closureUri.js:8:1:8:57 | Uri.cre ... , frag) |
37-
| closureUri.js:8:1:8:57 | Uri.cre ... , frag) | closureUri.js:8:26:8:31 | domain | closureUri.js:8:1:8:57 | Uri.cre ... , frag) |
38-
| closureUri.js:8:1:8:57 | Uri.cre ... , frag) | closureUri.js:8:40:8:43 | path | closureUri.js:8:1:8:57 | Uri.cre ... , frag) |
39-
| closureUri.js:10:1:10:16 | uri.setScheme(x) | closureUri.js:10:1:10:3 | uri | closureUri.js:10:1:10:16 | uri.setScheme(x) |
40-
| closureUri.js:10:1:10:16 | uri.setScheme(x) | closureUri.js:10:15:10:15 | x | closureUri.js:5:11:5:20 | new Uri(x) |
41-
| closureUri.js:11:1:11:18 | uri.setUserInfo(x) | closureUri.js:11:1:11:3 | uri | closureUri.js:11:1:11:18 | uri.setUserInfo(x) |
42-
| closureUri.js:12:1:12:16 | uri.setDomain(x) | closureUri.js:12:1:12:3 | uri | closureUri.js:12:1:12:16 | uri.setDomain(x) |
43-
| closureUri.js:12:1:12:16 | uri.setDomain(x) | closureUri.js:12:15:12:15 | x | closureUri.js:5:11:5:20 | new Uri(x) |
44-
| closureUri.js:13:1:13:14 | uri.setPort(x) | closureUri.js:13:1:13:3 | uri | closureUri.js:13:1:13:14 | uri.setPort(x) |
45-
| closureUri.js:14:1:14:14 | uri.setPath(x) | closureUri.js:14:1:14:3 | uri | closureUri.js:14:1:14:14 | uri.setPath(x) |
46-
| closureUri.js:14:1:14:14 | uri.setPath(x) | closureUri.js:14:13:14:13 | x | closureUri.js:5:11:5:20 | new Uri(x) |
47-
| closureUri.js:15:1:15:15 | uri.setQuery(x) | closureUri.js:15:1:15:3 | uri | closureUri.js:15:1:15:15 | uri.setQuery(x) |
48-
| closureUri.js:16:1:16:18 | uri.setFragment(x) | closureUri.js:16:1:16:3 | uri | closureUri.js:16:1:16:18 | uri.setFragment(x) |
49-
| closureUri.js:18:1:18:15 | uri.setQuery(x) | closureUri.js:18:1:18:3 | uri | closureUri.js:18:1:18:15 | uri.setQuery(x) |
50-
| closureUri.js:18:1:18:26 | uri.set ... Path(y) | closureUri.js:18:1:18:15 | uri.setQuery(x) | closureUri.js:18:1:18:26 | uri.set ... Path(y) |
51-
| closureUri.js:18:1:18:26 | uri.set ... Path(y) | closureUri.js:18:25:18:25 | y | closureUri.js:5:11:5:20 | new Uri(x) |
52-
| closureUri.js:18:1:18:39 | uri.set ... heme(z) | closureUri.js:18:1:18:26 | uri.set ... Path(y) | closureUri.js:18:1:18:39 | uri.set ... heme(z) |
53-
| closureUri.js:18:1:18:39 | uri.set ... heme(z) | closureUri.js:18:38:18:38 | z | closureUri.js:5:11:5:20 | new Uri(x) |
54-
| closureUri.js:22:1:22:25 | utils.a ... uri, z) | closureUri.js:22:19:22:21 | uri | closureUri.js:22:1:22:25 | utils.a ... uri, z) |
55-
| closureUri.js:23:1:23:18 | utils.getPath(uri) | closureUri.js:23:15:23:17 | uri | closureUri.js:23:1:23:18 | utils.getPath(uri) |
56-
| closureUri.js:27:1:27:23 | stringU ... code(x) | closureUri.js:27:22:27:22 | x | closureUri.js:27:1:27:23 | stringU ... code(x) |
57-
| closureUri.js:28:1:28:23 | stringU ... code(x) | closureUri.js:28:22:28:22 | x | closureUri.js:28:1:28:23 | stringU ... code(x) |
58-
| path-parse.js:4:1:4:13 | path.parse(x) | path-parse.js:4:12:4:12 | x | path-parse.js:4:1:4:13 | path.parse(x) |
59-
| path-parse.js:5:1:5:13 | path_parse(x) | path-parse.js:5:12:5:12 | x | path-parse.js:5:1:5:13 | path_parse(x) |
60-
| path-parse.js:6:1:6:19 | path.posix.parse(x) | path-parse.js:6:18:6:18 | x | path-parse.js:6:1:6:19 | path.posix.parse(x) |
61-
| path-parse.js:7:1:7:19 | path_parse.posix(x) | path-parse.js:7:18:7:18 | x | path-parse.js:7:1:7:19 | path_parse.posix(x) |
62-
| path-parse.js:8:1:8:19 | path.win32.parse(x) | path-parse.js:8:18:8:18 | x | path-parse.js:8:1:8:19 | path.win32.parse(x) |
63-
| path-parse.js:9:1:9:19 | path_parse.win32(x) | path-parse.js:9:18:9:18 | x | path-parse.js:9:1:9:19 | path_parse.win32(x) |
64-
| punycode.js:3:9:3:26 | punycode.decode(x) | punycode.js:3:25:3:25 | x | punycode.js:3:9:3:26 | punycode.decode(x) |
65-
| punycode.js:5:5:5:22 | punycode.encode(x) | punycode.js:5:21:5:21 | x | punycode.js:5:5:5:22 | punycode.encode(x) |
66-
| punycode.js:7:5:7:25 | punycod ... code(x) | punycode.js:7:24:7:24 | x | punycode.js:7:5:7:25 | punycod ... code(x) |
67-
| punycode.js:9:5:9:23 | punycode.toASCII(x) | punycode.js:9:22:9:22 | x | punycode.js:9:5:9:23 | punycode.toASCII(x) |
68-
| query-string.js:3:9:3:28 | queryString.parse(x) | query-string.js:3:27:3:27 | x | query-string.js:3:9:3:28 | queryString.parse(x) |
69-
| query-string.js:5:5:5:26 | querySt ... ract(x) | query-string.js:5:25:5:25 | x | query-string.js:5:5:5:26 | querySt ... ract(x) |
70-
| query-string.js:7:5:7:27 | querySt ... eUrl(x) | query-string.js:7:26:7:26 | x | query-string.js:7:5:7:27 | querySt ... eUrl(x) |
71-
| query-string.js:9:5:9:28 | querySt ... gify(x) | query-string.js:9:27:9:27 | x | query-string.js:9:5:9:28 | querySt ... gify(x) |
72-
| query-string_import.js:3:1:3:8 | parse(x) | query-string_import.js:3:7:3:7 | x | query-string_import.js:3:1:3:8 | parse(x) |
73-
| querystring.js:3:9:3:29 | queryst ... cape(x) | querystring.js:3:28:3:28 | x | querystring.js:3:9:3:29 | queryst ... cape(x) |
74-
| querystring.js:5:5:5:24 | querystring.parse(x) | querystring.js:5:23:5:23 | x | querystring.js:5:5:5:24 | querystring.parse(x) |
75-
| querystring.js:7:5:7:28 | queryst ... gify(x) | querystring.js:7:27:7:27 | x | querystring.js:7:5:7:28 | queryst ... gify(x) |
76-
| querystring.js:9:5:9:27 | queryst ... cape(x) | querystring.js:9:26:9:26 | x | querystring.js:9:5:9:27 | queryst ... cape(x) |
77-
| querystringify.js:3:9:3:31 | queryst ... arse(x) | querystringify.js:3:30:3:30 | x | querystringify.js:3:9:3:31 | queryst ... arse(x) |
78-
| querystringify.js:5:5:5:31 | queryst ... gify(x) | querystringify.js:5:30:5:30 | x | querystringify.js:5:5:5:31 | queryst ... gify(x) |
79-
| uri-js.js:3:9:3:20 | URI.parse(x) | uri-js.js:3:19:3:19 | x | uri-js.js:3:9:3:20 | URI.parse(x) |
80-
| uri-js.js:5:5:5:20 | URI.serialize(x) | uri-js.js:5:19:5:19 | x | uri-js.js:5:5:5:20 | URI.serialize(x) |
81-
| uri-js.js:7:5:7:18 | URI.resolve(x) | uri-js.js:7:17:7:17 | x | uri-js.js:7:5:7:18 | URI.resolve(x) |
82-
| uri-js.js:9:5:9:20 | URI.normalize(x) | uri-js.js:9:19:9:19 | x | uri-js.js:9:5:9:20 | URI.normalize(x) |
83-
| urijs.js:12:9:12:18 | new URI(x) | urijs.js:12:17:12:17 | x | urijs.js:12:9:12:18 | new URI(x) |
84-
| urijs.js:14:5:14:17 | u.username(x) | urijs.js:14:5:14:5 | u | urijs.js:14:5:14:17 | u.username(x) |
85-
| urijs.js:14:5:14:17 | u.username(x) | urijs.js:14:16:14:16 | x | urijs.js:14:5:14:17 | u.username(x) |
86-
| urijs.js:16:5:17:16 | u\\n .username(x) | urijs.js:16:5:16:5 | u | urijs.js:16:5:17:16 | u\\n .username(x) |
87-
| urijs.js:16:5:17:16 | u\\n .username(x) | urijs.js:17:15:17:15 | x | urijs.js:16:5:17:16 | u\\n .username(x) |
88-
| urijs.js:16:5:18:11 | u\\n . ... .tld(x) | urijs.js:16:5:17:16 | u\\n .username(x) | urijs.js:16:5:18:11 | u\\n . ... .tld(x) |
89-
| urijs.js:16:5:18:11 | u\\n . ... .tld(x) | urijs.js:18:10:18:10 | x | urijs.js:16:5:18:11 | u\\n . ... .tld(x) |
90-
| urijs.js:20:9:20:26 | u.normalizeQuery() | urijs.js:20:9:20:9 | u | urijs.js:20:9:20:26 | u.normalizeQuery() |
91-
| url-parse.js:3:9:3:19 | parse(x, y) | url-parse.js:3:15:3:15 | x | url-parse.js:3:9:3:19 | parse(x, y) |
92-
| url-parse.js:3:9:3:19 | parse(x, y) | url-parse.js:3:18:3:18 | y | url-parse.js:3:9:3:19 | parse(x, y) |
93-
| url-parse.js:4:5:4:19 | r.set('foo', x) | url-parse.js:4:5:4:5 | r | url-parse.js:4:5:4:19 | r.set('foo', x) |
94-
| url-parse.js:4:5:4:19 | r.set('foo', x) | url-parse.js:4:18:4:18 | x | url-parse.js:4:5:4:19 | r.set('foo', x) |
95-
| url.js:3:9:3:20 | url.parse(x) | url.js:3:19:3:19 | x | url.js:3:9:3:20 | url.parse(x) |
96-
| url.js:5:5:5:17 | url.format(x) | url.js:5:16:5:16 | x | url.js:5:5:5:17 | url.format(x) |
97-
| url.js:7:5:7:21 | url.resolve(x, y) | url.js:7:17:7:17 | x | url.js:7:5:7:21 | url.resolve(x, y) |
98-
| url.js:7:5:7:21 | url.resolve(x, y) | url.js:7:20:7:20 | y | url.js:7:5:7:21 | url.resolve(x, y) |
32+
| closureUri.js:5:19:5:19 | x | closureUri.js:5:11:5:20 | new Uri(x) |
33+
| closureUri.js:6:11:6:11 | x | closureUri.js:6:1:6:12 | Uri.parse(x) |
34+
| closureUri.js:7:13:7:13 | x | closureUri.js:7:1:7:17 | Uri.resolve(x, y) |
35+
| closureUri.js:7:16:7:16 | y | closureUri.js:7:1:7:17 | Uri.resolve(x, y) |
36+
| closureUri.js:8:12:8:17 | scheme | closureUri.js:8:1:8:57 | Uri.cre ... , frag) |
37+
| closureUri.js:8:26:8:31 | domain | closureUri.js:8:1:8:57 | Uri.cre ... , frag) |
38+
| closureUri.js:8:40:8:43 | path | closureUri.js:8:1:8:57 | Uri.cre ... , frag) |
39+
| closureUri.js:10:1:10:3 | uri | closureUri.js:10:1:10:16 | uri.setScheme(x) |
40+
| closureUri.js:10:15:10:15 | x | closureUri.js:5:11:5:20 | new Uri(x) |
41+
| closureUri.js:11:1:11:3 | uri | closureUri.js:11:1:11:18 | uri.setUserInfo(x) |
42+
| closureUri.js:12:1:12:3 | uri | closureUri.js:12:1:12:16 | uri.setDomain(x) |
43+
| closureUri.js:12:15:12:15 | x | closureUri.js:5:11:5:20 | new Uri(x) |
44+
| closureUri.js:13:1:13:3 | uri | closureUri.js:13:1:13:14 | uri.setPort(x) |
45+
| closureUri.js:14:1:14:3 | uri | closureUri.js:14:1:14:14 | uri.setPath(x) |
46+
| closureUri.js:14:13:14:13 | x | closureUri.js:5:11:5:20 | new Uri(x) |
47+
| closureUri.js:15:1:15:3 | uri | closureUri.js:15:1:15:15 | uri.setQuery(x) |
48+
| closureUri.js:16:1:16:3 | uri | closureUri.js:16:1:16:18 | uri.setFragment(x) |
49+
| closureUri.js:18:1:18:3 | uri | closureUri.js:18:1:18:15 | uri.setQuery(x) |
50+
| closureUri.js:18:1:18:15 | uri.setQuery(x) | closureUri.js:18:1:18:26 | uri.set ... Path(y) |
51+
| closureUri.js:18:1:18:26 | uri.set ... Path(y) | closureUri.js:18:1:18:39 | uri.set ... heme(z) |
52+
| closureUri.js:18:25:18:25 | y | closureUri.js:5:11:5:20 | new Uri(x) |
53+
| closureUri.js:18:38:18:38 | z | closureUri.js:5:11:5:20 | new Uri(x) |
54+
| closureUri.js:22:19:22:21 | uri | closureUri.js:22:1:22:25 | utils.a ... uri, z) |
55+
| closureUri.js:23:15:23:17 | uri | closureUri.js:23:1:23:18 | utils.getPath(uri) |
56+
| closureUri.js:27:22:27:22 | x | closureUri.js:27:1:27:23 | stringU ... code(x) |
57+
| closureUri.js:28:22:28:22 | x | closureUri.js:28:1:28:23 | stringU ... code(x) |
58+
| path-parse.js:4:12:4:12 | x | path-parse.js:4:1:4:13 | path.parse(x) |
59+
| path-parse.js:5:12:5:12 | x | path-parse.js:5:1:5:13 | path_parse(x) |
60+
| path-parse.js:6:18:6:18 | x | path-parse.js:6:1:6:19 | path.posix.parse(x) |
61+
| path-parse.js:7:18:7:18 | x | path-parse.js:7:1:7:19 | path_parse.posix(x) |
62+
| path-parse.js:8:18:8:18 | x | path-parse.js:8:1:8:19 | path.win32.parse(x) |
63+
| path-parse.js:9:18:9:18 | x | path-parse.js:9:1:9:19 | path_parse.win32(x) |
64+
| punycode.js:3:25:3:25 | x | punycode.js:3:9:3:26 | punycode.decode(x) |
65+
| punycode.js:5:21:5:21 | x | punycode.js:5:5:5:22 | punycode.encode(x) |
66+
| punycode.js:7:24:7:24 | x | punycode.js:7:5:7:25 | punycod ... code(x) |
67+
| punycode.js:9:22:9:22 | x | punycode.js:9:5:9:23 | punycode.toASCII(x) |
68+
| query-string.js:3:27:3:27 | x | query-string.js:3:9:3:28 | queryString.parse(x) |
69+
| query-string.js:5:25:5:25 | x | query-string.js:5:5:5:26 | querySt ... ract(x) |
70+
| query-string.js:7:26:7:26 | x | query-string.js:7:5:7:27 | querySt ... eUrl(x) |
71+
| query-string.js:9:27:9:27 | x | query-string.js:9:5:9:28 | querySt ... gify(x) |
72+
| query-string_import.js:3:7:3:7 | x | query-string_import.js:3:1:3:8 | parse(x) |
73+
| querystring.js:3:28:3:28 | x | querystring.js:3:9:3:29 | queryst ... cape(x) |
74+
| querystring.js:5:23:5:23 | x | querystring.js:5:5:5:24 | querystring.parse(x) |
75+
| querystring.js:7:27:7:27 | x | querystring.js:7:5:7:28 | queryst ... gify(x) |
76+
| querystring.js:9:26:9:26 | x | querystring.js:9:5:9:27 | queryst ... cape(x) |
77+
| querystringify.js:3:30:3:30 | x | querystringify.js:3:9:3:31 | queryst ... arse(x) |
78+
| querystringify.js:5:30:5:30 | x | querystringify.js:5:5:5:31 | queryst ... gify(x) |
79+
| uri-js.js:3:19:3:19 | x | uri-js.js:3:9:3:20 | URI.parse(x) |
80+
| uri-js.js:5:19:5:19 | x | uri-js.js:5:5:5:20 | URI.serialize(x) |
81+
| uri-js.js:7:17:7:17 | x | uri-js.js:7:5:7:18 | URI.resolve(x) |
82+
| uri-js.js:9:19:9:19 | x | uri-js.js:9:5:9:20 | URI.normalize(x) |
83+
| urijs.js:12:17:12:17 | x | urijs.js:12:9:12:18 | new URI(x) |
84+
| urijs.js:14:5:14:5 | u | urijs.js:14:5:14:17 | u.username(x) |
85+
| urijs.js:14:16:14:16 | x | urijs.js:14:5:14:17 | u.username(x) |
86+
| urijs.js:16:5:16:5 | u | urijs.js:16:5:17:16 | u\\n .username(x) |
87+
| urijs.js:16:5:17:16 | u\\n .username(x) | urijs.js:16:5:18:11 | u\\n . ... .tld(x) |
88+
| urijs.js:17:15:17:15 | x | urijs.js:16:5:17:16 | u\\n .username(x) |
89+
| urijs.js:18:10:18:10 | x | urijs.js:16:5:18:11 | u\\n . ... .tld(x) |
90+
| urijs.js:20:9:20:9 | u | urijs.js:20:9:20:26 | u.normalizeQuery() |
91+
| url-parse.js:3:15:3:15 | x | url-parse.js:3:9:3:19 | parse(x, y) |
92+
| url-parse.js:3:18:3:18 | y | url-parse.js:3:9:3:19 | parse(x, y) |
93+
| url-parse.js:4:5:4:5 | r | url-parse.js:4:5:4:19 | r.set('foo', x) |
94+
| url-parse.js:4:18:4:18 | x | url-parse.js:4:5:4:19 | r.set('foo', x) |
95+
| url.js:3:19:3:19 | x | url.js:3:9:3:20 | url.parse(x) |
96+
| url.js:5:16:5:16 | x | url.js:5:5:5:17 | url.format(x) |
97+
| url.js:7:17:7:17 | x | url.js:7:5:7:21 | url.resolve(x, y) |
98+
| url.js:7:20:7:20 | y | url.js:7:5:7:21 | url.resolve(x, y) |
9999
url
100100
| url.js:3:9:3:17 | url.parse |
101101
| url.js:5:5:5:14 | url.format |

‎javascript/ql/test/library-tests/frameworks/UriLibraries/tests.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ query predicate uridashjs(DataFlow::Node n) { n = uridashjs::uridashjsMember(_)
1212

1313
query predicate urijs(DataFlow::Node n) { n = urijs::urijs() }
1414

15-
query predicate uriLibraryStep(UriLibraryStep step, DataFlow::Node pred, DataFlow::Node succ) {
16-
step.step(pred, succ)
15+
query predicate uriLibraryStep(DataFlow::Node pred, DataFlow::Node succ) {
16+
TaintTracking::uriStep(pred, succ)
1717
}
1818

1919
query predicate url(DataFlow::Node n) { n = url::urlMember(_) }

0 commit comments

Comments
 (0)