Skip to content

Commit 5181544

Browse files
hvitvedhvitved
committed
Sync shared files
1 parent 5052452 commit 5181544

File tree

4 files changed

+94
-50
lines changed

4 files changed

+94
-50
lines changed

‎javascript/ql/lib/semmle/javascript/security/performance/ExponentialBackTracking.qll‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -277,17 +277,6 @@ private class Trace extends TTrace {
277277
result = "Step(" + s1 + ", " + s2 + ", " + t + ")"
278278
)
279279
}
280-
281-
/** Holds if the `i`th pair of this trace is `(s1, s2)`. */
282-
predicate hasPair(int i, InputSymbol s1, InputSymbol s2) {
283-
this = Step(s1, s2, _) and
284-
i = 0
285-
or
286-
exists(Trace t |
287-
this = Step(_, _, t) and
288-
t.hasPair(i - 1, s1, s2)
289-
)
290-
}
291280
}
292281

293282
/**
@@ -329,14 +318,25 @@ private class RelevantTrace extends Trace {
329318
)
330319
}
331320

321+
private Trace getSuffix(int i) {
322+
i = 0 and
323+
result = this
324+
or
325+
this.getSuffix(i - 1) = Step(_, _, result)
326+
}
327+
328+
private predicate hasTuple(int i, InputSymbol s1, InputSymbol s2) {
329+
this.getSuffix(i) = Step(s1, s2, _)
330+
}
331+
332332
/** Gets a string corresponding to this trace. */
333333
// the pragma is needed for the case where `intersect(s1, s2)` has multiple values,
334334
// not for recursion
335335
language[monotonicAggregates]
336336
string concretise() {
337337
result =
338338
concat(int i, InputSymbol s1, InputSymbol s2 |
339-
this.hasPair(i, s1, s2)
339+
this.hasTuple(i, s1, s2)
340340
|
341341
intersect(s1, s2) order by i desc
342342
)

‎javascript/ql/lib/semmle/javascript/security/performance/SuperlinearBackTracking.qll‎

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -254,17 +254,6 @@ class Trace extends TTrace {
254254
}
255255
}
256256

257-
/**
258-
* Gets a string corresponding to the trace `t`.
259-
*/
260-
string concretise(Trace t) {
261-
t = Nil() and result = ""
262-
or
263-
exists(InputSymbol s1, InputSymbol s2, InputSymbol s3, Trace rest | t = Step(s1, s2, s3, rest) |
264-
result = concretise(rest) + getAThreewayIntersect(s1, s2, s3)
265-
)
266-
}
267-
268257
/**
269258
* Holds if there exists a transition from `r` to `q` in the product automaton.
270259
* Notice that the arguments are flipped, and thus the direction is backwards.
@@ -332,6 +321,39 @@ StateTuple getAnEndTuple(State pivot, State succ) {
332321
result = MkStateTuple(pivot, succ, succ)
333322
}
334323

324+
private class RelevantTrace extends Trace {
325+
RelevantTrace() {
326+
exists(State pivot, State succ, StateTuple q |
327+
isReachableFromStartTuple(pivot, succ, q, this, _) and
328+
q = getAnEndTuple(pivot, succ)
329+
)
330+
}
331+
332+
private Trace getSuffix(int i) {
333+
i = 0 and
334+
result = this
335+
or
336+
this.getSuffix(i - 1) = Step(_, _, _, result)
337+
}
338+
339+
private predicate hasTuple(int i, InputSymbol s1, InputSymbol s2, InputSymbol s3) {
340+
this.getSuffix(i) = Step(s1, s2, s3, _)
341+
}
342+
343+
/** Gets a string corresponding to this trace. */
344+
// the pragma is needed for the case where `getAThreewayIntersect(s1, s2, s3)` has multiple values,
345+
// not for recursion
346+
language[monotonicAggregates]
347+
string concretise() {
348+
result =
349+
concat(int i, InputSymbol s1, InputSymbol s2, InputSymbol s3 |
350+
this.hasTuple(i, s1, s2, s3)
351+
|
352+
getAThreewayIntersect(s1, s2, s3) order by i desc
353+
)
354+
}
355+
}
356+
335357
/**
336358
* Holds if matching repetitions of `pump` can:
337359
* 1) Transition from `pivot` back to `pivot`.
@@ -345,10 +367,10 @@ StateTuple getAnEndTuple(State pivot, State succ) {
345367
* available in the `hasReDoSResult` predicate.
346368
*/
347369
predicate isPumpable(State pivot, State succ, string pump) {
348-
exists(StateTuple q, Trace t |
370+
exists(StateTuple q, RelevantTrace t |
349371
isReachableFromStartTuple(pivot, succ, q, t, _) and
350372
q = getAnEndTuple(pivot, succ) and
351-
pump = concretise(t)
373+
pump = t.concretise()
352374
)
353375
}
354376

‎python/ql/lib/semmle/python/security/performance/ExponentialBackTracking.qll‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -277,17 +277,6 @@ private class Trace extends TTrace {
277277
result = "Step(" + s1 + ", " + s2 + ", " + t + ")"
278278
)
279279
}
280-
281-
/** Holds if the `i`th pair of this trace is `(s1, s2)`. */
282-
predicate hasPair(int i, InputSymbol s1, InputSymbol s2) {
283-
this = Step(s1, s2, _) and
284-
i = 0
285-
or
286-
exists(Trace t |
287-
this = Step(_, _, t) and
288-
t.hasPair(i - 1, s1, s2)
289-
)
290-
}
291280
}
292281

293282
/**
@@ -329,14 +318,25 @@ private class RelevantTrace extends Trace {
329318
)
330319
}
331320

321+
private Trace getSuffix(int i) {
322+
i = 0 and
323+
result = this
324+
or
325+
this.getSuffix(i - 1) = Step(_, _, result)
326+
}
327+
328+
private predicate hasTuple(int i, InputSymbol s1, InputSymbol s2) {
329+
this.getSuffix(i) = Step(s1, s2, _)
330+
}
331+
332332
/** Gets a string corresponding to this trace. */
333333
// the pragma is needed for the case where `intersect(s1, s2)` has multiple values,
334334
// not for recursion
335335
language[monotonicAggregates]
336336
string concretise() {
337337
result =
338338
concat(int i, InputSymbol s1, InputSymbol s2 |
339-
this.hasPair(i, s1, s2)
339+
this.hasTuple(i, s1, s2)
340340
|
341341
intersect(s1, s2) order by i desc
342342
)

‎python/ql/lib/semmle/python/security/performance/SuperlinearBackTracking.qll‎

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -254,17 +254,6 @@ class Trace extends TTrace {
254254
}
255255
}
256256

257-
/**
258-
* Gets a string corresponding to the trace `t`.
259-
*/
260-
string concretise(Trace t) {
261-
t = Nil() and result = ""
262-
or
263-
exists(InputSymbol s1, InputSymbol s2, InputSymbol s3, Trace rest | t = Step(s1, s2, s3, rest) |
264-
result = concretise(rest) + getAThreewayIntersect(s1, s2, s3)
265-
)
266-
}
267-
268257
/**
269258
* Holds if there exists a transition from `r` to `q` in the product automaton.
270259
* Notice that the arguments are flipped, and thus the direction is backwards.
@@ -332,6 +321,39 @@ StateTuple getAnEndTuple(State pivot, State succ) {
332321
result = MkStateTuple(pivot, succ, succ)
333322
}
334323

324+
private class RelevantTrace extends Trace {
325+
RelevantTrace() {
326+
exists(State pivot, State succ, StateTuple q |
327+
isReachableFromStartTuple(pivot, succ, q, this, _) and
328+
q = getAnEndTuple(pivot, succ)
329+
)
330+
}
331+
332+
private Trace getSuffix(int i) {
333+
i = 0 and
334+
result = this
335+
or
336+
this.getSuffix(i - 1) = Step(_, _, _, result)
337+
}
338+
339+
private predicate hasTuple(int i, InputSymbol s1, InputSymbol s2, InputSymbol s3) {
340+
this.getSuffix(i) = Step(s1, s2, s3, _)
341+
}
342+
343+
/** Gets a string corresponding to this trace. */
344+
// the pragma is needed for the case where `getAThreewayIntersect(s1, s2, s3)` has multiple values,
345+
// not for recursion
346+
language[monotonicAggregates]
347+
string concretise() {
348+
result =
349+
concat(int i, InputSymbol s1, InputSymbol s2, InputSymbol s3 |
350+
this.hasTuple(i, s1, s2, s3)
351+
|
352+
getAThreewayIntersect(s1, s2, s3) order by i desc
353+
)
354+
}
355+
}
356+
335357
/**
336358
* Holds if matching repetitions of `pump` can:
337359
* 1) Transition from `pivot` back to `pivot`.
@@ -345,10 +367,10 @@ StateTuple getAnEndTuple(State pivot, State succ) {
345367
* available in the `hasReDoSResult` predicate.
346368
*/
347369
predicate isPumpable(State pivot, State succ, string pump) {
348-
exists(StateTuple q, Trace t |
370+
exists(StateTuple q, RelevantTrace t |
349371
isReachableFromStartTuple(pivot, succ, q, t, _) and
350372
q = getAnEndTuple(pivot, succ) and
351-
pump = concretise(t)
373+
pump = t.concretise()
352374
)
353375
}
354376

0 commit comments

Comments
 (0)