Skip to content

ReDoS: add missing additional keywords #11403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2022
Merged

ReDoS: add missing additional keywords #11403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions java/ql/lib/semmle/code/java/regex/RegexTreeView.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ module Impl implements RegexTreeViewSig {
* \p{Digit}
* \p{IsLowerCase}
*/
class RegExpNamedProperty extends RegExpCharacterClassEscape {
additional class RegExpNamedProperty extends RegExpCharacterClassEscape {
boolean inverted;
string name;

Expand Down Expand Up @@ -745,7 +745,7 @@ module Impl implements RegexTreeViewSig {
* \t
* ```
*/
class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
additional class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
RegExpNormalChar() { this = TRegExpNormalChar(re, start, end) }

/**
Expand All @@ -770,7 +770,7 @@ module Impl implements RegexTreeViewSig {
* \Qabc\E
* ```
*/
class RegExpQuote extends RegExpTerm, TRegExpQuote {
additional class RegExpQuote extends RegExpTerm, TRegExpQuote {
string value;

RegExpQuote() {
Expand Down Expand Up @@ -880,7 +880,7 @@ module Impl implements RegexTreeViewSig {
* .
* ```
*/
class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
additional class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
string char;

RegExpSpecialChar() {
Expand Down Expand Up @@ -956,7 +956,7 @@ module Impl implements RegexTreeViewSig {
* (?=\w)
* ```
*/
class RegExpZeroWidthMatch extends RegExpGroup {
additional class RegExpZeroWidthMatch extends RegExpGroup {
RegExpZeroWidthMatch() { re.zeroWidthMatch(start, end) }

override RegExpTerm getChild(int i) { none() }
Expand Down Expand Up @@ -1023,7 +1023,7 @@ module Impl implements RegexTreeViewSig {
* (?!\n)
* ```
*/
class RegExpNegativeLookahead extends RegExpLookahead {
additional class RegExpNegativeLookahead extends RegExpLookahead {
RegExpNegativeLookahead() { re.negativeLookaheadAssertionGroup(start, end) }

override string getPrimaryQLClass() { result = "RegExpNegativeLookahead" }
Expand Down Expand Up @@ -1065,7 +1065,7 @@ module Impl implements RegexTreeViewSig {
* (?<!\\)
* ```
*/
class RegExpNegativeLookbehind extends RegExpLookbehind {
additional class RegExpNegativeLookbehind extends RegExpLookbehind {
RegExpNegativeLookbehind() { re.negativeLookbehindAssertionGroup(start, end) }

override string getPrimaryQLClass() { result = "RegExpNegativeLookbehind" }
Expand Down Expand Up @@ -1159,7 +1159,7 @@ module Impl implements RegexTreeViewSig {
/**
* Gets the flags for `root`, or the empty string if `root` has no flags.
*/
deprecated string getFlags(RegExpTerm root) {
additional deprecated string getFlags(RegExpTerm root) {
root.isRootTerm() and
result = root.getLiteral().getFlags()
}
Expand Down
12 changes: 6 additions & 6 deletions python/ql/lib/semmle/python/RegexTreeView.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ module Impl implements RegexTreeViewSig {
override string getPrimaryQLClass() { result = "RegExpAlt" }
}

class RegExpCharEscape = RegExpEscape;
additional class RegExpCharEscape = RegExpEscape;

/**
* An escaped regular expression term, that is, a regular expression
Expand Down Expand Up @@ -684,7 +684,7 @@ module Impl implements RegexTreeViewSig {
* \t
* ```
*/
class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
additional class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
RegExpNormalChar() { this = TRegExpNormalChar(re, start, end) }

/**
Expand Down Expand Up @@ -792,7 +792,7 @@ module Impl implements RegexTreeViewSig {
* .
* ```
*/
class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
additional class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
string char;

RegExpSpecialChar() {
Expand Down Expand Up @@ -868,7 +868,7 @@ module Impl implements RegexTreeViewSig {
* (?=\w)
* ```
*/
class RegExpZeroWidthMatch extends RegExpGroup {
additional class RegExpZeroWidthMatch extends RegExpGroup {
RegExpZeroWidthMatch() { re.zeroWidthMatch(start, end) }

override RegExpTerm getChild(int i) { none() }
Expand Down Expand Up @@ -937,7 +937,7 @@ module Impl implements RegexTreeViewSig {
* (?!\n)
* ```
*/
class RegExpNegativeLookahead extends RegExpLookahead {
additional class RegExpNegativeLookahead extends RegExpLookahead {
RegExpNegativeLookahead() { re.negativeLookaheadAssertionGroup(start, end) }

override string getPrimaryQLClass() { result = "RegExpNegativeLookahead" }
Expand Down Expand Up @@ -979,7 +979,7 @@ module Impl implements RegexTreeViewSig {
* (?<!\\)
* ```
*/
class RegExpNegativeLookbehind extends RegExpLookbehind {
additional class RegExpNegativeLookbehind extends RegExpLookbehind {
RegExpNegativeLookbehind() { re.negativeLookbehindAssertionGroup(start, end) }

override string getPrimaryQLClass() { result = "RegExpNegativeLookbehind" }
Expand Down
18 changes: 9 additions & 9 deletions ruby/ql/lib/codeql/ruby/regexp/RegExpTreeView.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ private module Impl implements RegexTreeViewSig {
override predicate isNullable() { this.getAChild().isNullable() }
}

class RegExpCharEscape = RegExpEscape;
additional class RegExpCharEscape = RegExpEscape;

/**
* An escaped regular expression term, that is, a regular expression
Expand Down Expand Up @@ -620,7 +620,7 @@ private module Impl implements RegexTreeViewSig {
/**
* A non-word boundary, that is, a regular expression term of the form `\B`.
*/
class RegExpNonWordBoundary extends RegExpSpecialChar {
additional class RegExpNonWordBoundary extends RegExpSpecialChar {
RegExpNonWordBoundary() { this.getChar() = "\\B" }

override string getAPrimaryQlClass() { result = "RegExpNonWordBoundary" }
Expand Down Expand Up @@ -756,7 +756,7 @@ private module Impl implements RegexTreeViewSig {
* \t
* ```
*/
class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
additional class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
RegExpNormalChar() { this = TRegExpNormalChar(re, start, end) }

/**
Expand Down Expand Up @@ -878,7 +878,7 @@ private module Impl implements RegexTreeViewSig {
* .
* ```
*/
class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
additional class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
string char;

RegExpSpecialChar() {
Expand Down Expand Up @@ -926,7 +926,7 @@ private module Impl implements RegexTreeViewSig {
* \A
* ```
*/
class RegExpAnchor extends RegExpSpecialChar {
additional class RegExpAnchor extends RegExpSpecialChar {
RegExpAnchor() { this.getChar() = ["^", "$", "\\A", "\\Z", "\\z"] }

override string getAPrimaryQlClass() { result = "RegExpAnchor" }
Expand Down Expand Up @@ -975,7 +975,7 @@ private module Impl implements RegexTreeViewSig {
* (?=\w)
* ```
*/
class RegExpZeroWidthMatch extends RegExpGroup {
additional class RegExpZeroWidthMatch extends RegExpGroup {
RegExpZeroWidthMatch() { re.zeroWidthMatch(start, end) }

override RegExpTerm getChild(int i) { none() }
Expand Down Expand Up @@ -1050,7 +1050,7 @@ private module Impl implements RegexTreeViewSig {
* (?!\n)
* ```
*/
class RegExpNegativeLookahead extends RegExpLookahead {
additional class RegExpNegativeLookahead extends RegExpLookahead {
RegExpNegativeLookahead() { re.negativeLookaheadAssertionGroup(start, end) }

override string getAPrimaryQlClass() { result = "RegExpNegativeLookahead" }
Expand Down Expand Up @@ -1092,7 +1092,7 @@ private module Impl implements RegexTreeViewSig {
* (?<!\\)
* ```
*/
class RegExpNegativeLookbehind extends RegExpLookbehind {
additional class RegExpNegativeLookbehind extends RegExpLookbehind {
RegExpNegativeLookbehind() { re.negativeLookbehindAssertionGroup(start, end) }

override string getAPrimaryQlClass() { result = "RegExpNegativeLookbehind" }
Expand Down Expand Up @@ -1142,7 +1142,7 @@ private module Impl implements RegexTreeViewSig {
* A named character property. For example, the POSIX bracket expression
* `[[:digit:]]`.
*/
class RegExpNamedCharacterProperty extends RegExpTerm, TRegExpNamedCharacterProperty {
additional class RegExpNamedCharacterProperty extends RegExpTerm, TRegExpNamedCharacterProperty {
RegExpNamedCharacterProperty() { this = TRegExpNamedCharacterProperty(re, start, end) }

override RegExpTerm getChild(int i) { none() }
Expand Down