Skip to content

Commit 4122b60

Browse files
NapalysNapalys
committed
Add RegExpIntersection class to support intersection terms in regex
1 parent 13b49d9 commit 4122b60

File tree

3 files changed

+38
-14
lines changed

3 files changed

+38
-14
lines changed

‎javascript/ql/lib/semmle/javascript/MembershipCandidates.qll‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ module MembershipCandidate {
146146
child instanceof RegExpDollar or
147147
child instanceof RegExpConstant or
148148
child instanceof RegExpAlt or
149+
child instanceof RegExpIntersection or
149150
child instanceof RegExpGroup
150151
) and
151152
// exclude "length matches" that match every string

‎javascript/ql/lib/semmle/javascript/Regexp.qll‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,29 @@ class RegExpAlt extends RegExpTerm, @regexp_alt {
301301
override string getAPrimaryQlClass() { result = "RegExpAlt" }
302302
}
303303

304+
/**
305+
* An intersection term, that is, a term of the form `a&&b`.
306+
*
307+
* Example:
308+
*
309+
* ```
310+
* /\p{Script_Extensions=Greek}&&\p{Letter}/v
311+
* ```
312+
*/
313+
class RegExpIntersection extends RegExpTerm, @regexp_intersection {
314+
/** Gets an intersected term of this term. */
315+
RegExpTerm getIntersectedTerm() { result = this.getAChild() }
316+
317+
/** Gets the number of intersected terms of this term. */
318+
int getNumIntersectedTerm() { result = this.getNumChild() }
319+
320+
override predicate isNullable() { this.getIntersectedTerm().isNullable() }
321+
322+
override string getAMatchedString() { result = this.getIntersectedTerm().getAMatchedString() }
323+
324+
override string getAPrimaryQlClass() { result = "RegExpIntersection" }
325+
}
326+
304327
/**
305328
* A sequence term.
306329
*

‎javascript/ql/test/library-tests/RegExp/RegExpIntersection/printAst.expected‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ nodes
33
| intersection.js:1:1:1:18 | [ExprStmt] /[[abc]&&[bcd]]/v; | semmle.label | [ExprStmt] /[[abc]&&[bcd]]/v; |
44
| intersection.js:1:1:1:18 | [ExprStmt] /[[abc]&&[bcd]]/v; | semmle.order | 1 |
55
| intersection.js:1:2:1:7 | [RegExpCharacterClass] [[abc] | semmle.label | [RegExpCharacterClass] [[abc] |
6-
| intersection.js:1:2:1:15 | [???] [[abc]&&[bcd]] | semmle.label | [???] [[abc]&&[bcd]] |
6+
| intersection.js:1:2:1:15 | [RegExpIntersection] [[abc]&&[bcd]] | semmle.label | [RegExpIntersection] [[abc]&&[bcd]] |
77
| intersection.js:1:3:1:3 | [RegExpNormalConstant] [ | semmle.label | [RegExpNormalConstant] [ |
88
| intersection.js:1:4:1:4 | [RegExpNormalConstant] a | semmle.label | [RegExpNormalConstant] a |
99
| intersection.js:1:5:1:5 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
@@ -22,7 +22,7 @@ nodes
2222
| intersection.js:3:1:3:16 | [ExprStmt] /[abc]&&[bcd]/v; | semmle.label | [ExprStmt] /[abc]&&[bcd]/v; |
2323
| intersection.js:3:1:3:16 | [ExprStmt] /[abc]&&[bcd]/v; | semmle.order | 3 |
2424
| intersection.js:3:2:3:6 | [RegExpCharacterClass] [abc] | semmle.label | [RegExpCharacterClass] [abc] |
25-
| intersection.js:3:2:3:13 | [???] [abc]&&[bcd] | semmle.label | [???] [abc]&&[bcd] |
25+
| intersection.js:3:2:3:13 | [RegExpIntersection] [abc]&&[bcd] | semmle.label | [RegExpIntersection] [abc]&&[bcd] |
2626
| intersection.js:3:3:3:3 | [RegExpNormalConstant] a | semmle.label | [RegExpNormalConstant] a |
2727
| intersection.js:3:4:3:4 | [RegExpNormalConstant] b | semmle.label | [RegExpNormalConstant] b |
2828
| intersection.js:3:5:3:5 | [RegExpNormalConstant] c | semmle.label | [RegExpNormalConstant] c |
@@ -43,8 +43,8 @@ nodes
4343
| intersection.js:7:9:7:9 | [RegExpNormalConstant] c | semmle.label | [RegExpNormalConstant] c |
4444
| intersection.js:7:10:7:10 | [RegExpNormalConstant] d | semmle.label | [RegExpNormalConstant] d |
4545
edges
46-
| intersection.js:1:1:1:17 | [RegExpLiteral] /[[abc]&&[bcd]]/v | intersection.js:1:2:1:15 | [???] [[abc]&&[bcd]] | semmle.label | 0 |
47-
| intersection.js:1:1:1:17 | [RegExpLiteral] /[[abc]&&[bcd]]/v | intersection.js:1:2:1:15 | [???] [[abc]&&[bcd]] | semmle.order | 0 |
46+
| intersection.js:1:1:1:17 | [RegExpLiteral] /[[abc]&&[bcd]]/v | intersection.js:1:2:1:15 | [RegExpIntersection] [[abc]&&[bcd]] | semmle.label | 0 |
47+
| intersection.js:1:1:1:17 | [RegExpLiteral] /[[abc]&&[bcd]]/v | intersection.js:1:2:1:15 | [RegExpIntersection] [[abc]&&[bcd]] | semmle.order | 0 |
4848
| intersection.js:1:1:1:18 | [ExprStmt] /[[abc]&&[bcd]]/v; | intersection.js:1:1:1:17 | [RegExpLiteral] /[[abc]&&[bcd]]/v | semmle.label | 1 |
4949
| intersection.js:1:1:1:18 | [ExprStmt] /[[abc]&&[bcd]]/v; | intersection.js:1:1:1:17 | [RegExpLiteral] /[[abc]&&[bcd]]/v | semmle.order | 1 |
5050
| intersection.js:1:2:1:7 | [RegExpCharacterClass] [[abc] | intersection.js:1:3:1:3 | [RegExpNormalConstant] [ | semmle.label | 0 |
@@ -55,10 +55,10 @@ edges
5555
| intersection.js:1:2:1:7 | [RegExpCharacterClass] [[abc] | intersection.js:1:5:1:5 | [RegExpNormalConstant] b | semmle.order | 2 |
5656
| intersection.js:1:2:1:7 | [RegExpCharacterClass] [[abc] | intersection.js:1:6:1:6 | [RegExpNormalConstant] c | semmle.label | 3 |
5757
| intersection.js:1:2:1:7 | [RegExpCharacterClass] [[abc] | intersection.js:1:6:1:6 | [RegExpNormalConstant] c | semmle.order | 3 |
58-
| intersection.js:1:2:1:15 | [???] [[abc]&&[bcd]] | intersection.js:1:2:1:7 | [RegExpCharacterClass] [[abc] | semmle.label | 0 |
59-
| intersection.js:1:2:1:15 | [???] [[abc]&&[bcd]] | intersection.js:1:2:1:7 | [RegExpCharacterClass] [[abc] | semmle.order | 0 |
60-
| intersection.js:1:2:1:15 | [???] [[abc]&&[bcd]] | intersection.js:1:10:1:15 | [RegExpSequence] [bcd]] | semmle.label | 1 |
61-
| intersection.js:1:2:1:15 | [???] [[abc]&&[bcd]] | intersection.js:1:10:1:15 | [RegExpSequence] [bcd]] | semmle.order | 1 |
58+
| intersection.js:1:2:1:15 | [RegExpIntersection] [[abc]&&[bcd]] | intersection.js:1:2:1:7 | [RegExpCharacterClass] [[abc] | semmle.label | 0 |
59+
| intersection.js:1:2:1:15 | [RegExpIntersection] [[abc]&&[bcd]] | intersection.js:1:2:1:7 | [RegExpCharacterClass] [[abc] | semmle.order | 0 |
60+
| intersection.js:1:2:1:15 | [RegExpIntersection] [[abc]&&[bcd]] | intersection.js:1:10:1:15 | [RegExpSequence] [bcd]] | semmle.label | 1 |
61+
| intersection.js:1:2:1:15 | [RegExpIntersection] [[abc]&&[bcd]] | intersection.js:1:10:1:15 | [RegExpSequence] [bcd]] | semmle.order | 1 |
6262
| intersection.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | intersection.js:1:11:1:11 | [RegExpNormalConstant] b | semmle.label | 0 |
6363
| intersection.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | intersection.js:1:11:1:11 | [RegExpNormalConstant] b | semmle.order | 0 |
6464
| intersection.js:1:10:1:14 | [RegExpCharacterClass] [bcd] | intersection.js:1:12:1:12 | [RegExpNormalConstant] c | semmle.label | 1 |
@@ -73,8 +73,8 @@ edges
7373
| intersection.js:2:1:2:11 | [RegExpLiteral] /abc&&bcd/v | intersection.js:2:2:2:9 | [RegExpNormalConstant] abc&&bcd | semmle.order | 0 |
7474
| intersection.js:2:1:2:12 | [ExprStmt] /abc&&bcd/v; | intersection.js:2:1:2:11 | [RegExpLiteral] /abc&&bcd/v | semmle.label | 1 |
7575
| intersection.js:2:1:2:12 | [ExprStmt] /abc&&bcd/v; | intersection.js:2:1:2:11 | [RegExpLiteral] /abc&&bcd/v | semmle.order | 1 |
76-
| intersection.js:3:1:3:15 | [RegExpLiteral] /[abc]&&[bcd]/v | intersection.js:3:2:3:13 | [???] [abc]&&[bcd] | semmle.label | 0 |
77-
| intersection.js:3:1:3:15 | [RegExpLiteral] /[abc]&&[bcd]/v | intersection.js:3:2:3:13 | [???] [abc]&&[bcd] | semmle.order | 0 |
76+
| intersection.js:3:1:3:15 | [RegExpLiteral] /[abc]&&[bcd]/v | intersection.js:3:2:3:13 | [RegExpIntersection] [abc]&&[bcd] | semmle.label | 0 |
77+
| intersection.js:3:1:3:15 | [RegExpLiteral] /[abc]&&[bcd]/v | intersection.js:3:2:3:13 | [RegExpIntersection] [abc]&&[bcd] | semmle.order | 0 |
7878
| intersection.js:3:1:3:16 | [ExprStmt] /[abc]&&[bcd]/v; | intersection.js:3:1:3:15 | [RegExpLiteral] /[abc]&&[bcd]/v | semmle.label | 1 |
7979
| intersection.js:3:1:3:16 | [ExprStmt] /[abc]&&[bcd]/v; | intersection.js:3:1:3:15 | [RegExpLiteral] /[abc]&&[bcd]/v | semmle.order | 1 |
8080
| intersection.js:3:2:3:6 | [RegExpCharacterClass] [abc] | intersection.js:3:3:3:3 | [RegExpNormalConstant] a | semmle.label | 0 |
@@ -83,10 +83,10 @@ edges
8383
| intersection.js:3:2:3:6 | [RegExpCharacterClass] [abc] | intersection.js:3:4:3:4 | [RegExpNormalConstant] b | semmle.order | 1 |
8484
| intersection.js:3:2:3:6 | [RegExpCharacterClass] [abc] | intersection.js:3:5:3:5 | [RegExpNormalConstant] c | semmle.label | 2 |
8585
| intersection.js:3:2:3:6 | [RegExpCharacterClass] [abc] | intersection.js:3:5:3:5 | [RegExpNormalConstant] c | semmle.order | 2 |
86-
| intersection.js:3:2:3:13 | [???] [abc]&&[bcd] | intersection.js:3:2:3:6 | [RegExpCharacterClass] [abc] | semmle.label | 0 |
87-
| intersection.js:3:2:3:13 | [???] [abc]&&[bcd] | intersection.js:3:2:3:6 | [RegExpCharacterClass] [abc] | semmle.order | 0 |
88-
| intersection.js:3:2:3:13 | [???] [abc]&&[bcd] | intersection.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | semmle.label | 1 |
89-
| intersection.js:3:2:3:13 | [???] [abc]&&[bcd] | intersection.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | semmle.order | 1 |
86+
| intersection.js:3:2:3:13 | [RegExpIntersection] [abc]&&[bcd] | intersection.js:3:2:3:6 | [RegExpCharacterClass] [abc] | semmle.label | 0 |
87+
| intersection.js:3:2:3:13 | [RegExpIntersection] [abc]&&[bcd] | intersection.js:3:2:3:6 | [RegExpCharacterClass] [abc] | semmle.order | 0 |
88+
| intersection.js:3:2:3:13 | [RegExpIntersection] [abc]&&[bcd] | intersection.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | semmle.label | 1 |
89+
| intersection.js:3:2:3:13 | [RegExpIntersection] [abc]&&[bcd] | intersection.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | semmle.order | 1 |
9090
| intersection.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | intersection.js:3:10:3:10 | [RegExpNormalConstant] b | semmle.label | 0 |
9191
| intersection.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | intersection.js:3:10:3:10 | [RegExpNormalConstant] b | semmle.order | 0 |
9292
| intersection.js:3:9:3:13 | [RegExpCharacterClass] [bcd] | intersection.js:3:11:3:11 | [RegExpNormalConstant] c | semmle.label | 1 |

0 commit comments

Comments
 (0)