Skip to content

Commit de38570

Browse files
committed
Merge identical-files.json
1 parent 1bf4542 commit de38570

File tree

5 files changed

+32
-103
lines changed

5 files changed

+32
-103
lines changed

.github/workflows/sync-files.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v2
1414
- name: Check synchronized files
15-
run: ruby/scripts/sync-identical-files.py
15+
run: python config/sync-files.py
16+

config/identical-files.json

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@
2424
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll",
2525
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll",
2626
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll",
27-
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll"
27+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll",
28+
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll"
2829
],
2930
"DataFlow Java/C++/C#/Python Common": [
3031
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll",
3132
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll",
3233
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll",
3334
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll",
34-
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll"
35+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll",
36+
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll"
3537
],
3638
"TaintTracking::Configuration Java/C++/C#/Python": [
3739
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
@@ -49,18 +51,21 @@
4951
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll",
5052
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll",
5153
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll",
52-
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll"
54+
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll",
55+
"ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll"
5356
],
5457
"DataFlow Java/C++/C#/Python Consistency checks": [
5558
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll",
5659
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplConsistency.qll",
5760
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll",
5861
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplConsistency.qll",
59-
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplConsistency.qll"
62+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplConsistency.qll",
63+
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplConsistency.qll"
6064
],
6165
"DataFlow Java/C# Flow Summaries": [
6266
"java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll",
63-
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll"
67+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll",
68+
"ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll"
6469
],
6570
"SsaReadPosition Java/C#": [
6671
"java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll",
@@ -368,7 +373,8 @@
368373
"Inline Test Expectations": [
369374
"cpp/ql/test/TestUtilities/InlineExpectationsTest.qll",
370375
"java/ql/test/TestUtilities/InlineExpectationsTest.qll",
371-
"python/ql/test/TestUtilities/InlineExpectationsTest.qll"
376+
"python/ql/test/TestUtilities/InlineExpectationsTest.qll",
377+
"ruby/ql/test/TestUtilities/InlineExpectationsTest.qll"
372378
],
373379
"C++ ExternalAPIs": [
374380
"cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll",
@@ -440,7 +446,8 @@
440446
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll",
441447
"csharp/ql/lib/semmle/code/csharp/controlflow/internal/pressa/SsaImplCommon.qll",
442448
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/basessa/SsaImplCommon.qll",
443-
"csharp/ql/lib/semmle/code/cil/internal/SsaImplCommon.qll"
449+
"csharp/ql/lib/semmle/code/cil/internal/SsaImplCommon.qll",
450+
"ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplCommon.qll"
444451
],
445452
"CryptoAlgorithms Python/JS": [
446453
"javascript/ql/lib/semmle/javascript/security/CryptoAlgorithms.qll",
@@ -460,6 +467,15 @@
460467
],
461468
"ReDoS Polynomial Python/JS": [
462469
"javascript/ql/lib/semmle/javascript/security/performance/SuperlinearBackTracking.qll",
463-
"python/ql/lib/semmle/python/security/performance/SuperlinearBackTracking.qll"
470+
"python/ql/lib/semmle/python/security/performance/SuperlinearBackTracking.qll",
471+
"ruby/ql/lib/codeql/ruby/regexp/SuperlinearBackTracking.qll"
472+
],
473+
"CFG": [
474+
"csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImplShared.qll",
475+
"ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplShared.qll"
476+
],
477+
"TypeTracker": [
478+
"python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll",
479+
"ruby/ql/lib/codeql/ruby/typetracking/TypeTracker.qll"
464480
]
465-
}
481+
}

ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3643,9 +3643,10 @@ private module Subpaths {
36433643
PathNode arg, ParamNodeEx par, SummaryCtxSome sc, CallContext innercc, ReturnKindExt kind,
36443644
NodeEx out, AccessPath apout
36453645
) {
3646-
pathThroughCallable(arg, out, _, apout) and
3646+
pathThroughCallable(arg, out, _, pragma[only_bind_into](apout)) and
36473647
pathIntoCallable(arg, par, _, innercc, sc, _) and
3648-
paramFlowsThrough(kind, innercc, sc, apout, _, unbindConf(arg.getConfiguration()))
3648+
paramFlowsThrough(kind, innercc, sc, pragma[only_bind_into](apout), _,
3649+
unbindConf(arg.getConfiguration()))
36493650
}
36503651

36513652
/**
@@ -3690,8 +3691,8 @@ private module Subpaths {
36903691
*/
36913692
predicate subpaths(PathNode arg, PathNodeImpl par, PathNodeMid ret, PathNodeMid out) {
36923693
exists(ParamNodeEx p, NodeEx o, AccessPath apout |
3693-
arg.getASuccessor() = par and
3694-
arg.getASuccessor() = out and
3694+
pragma[only_bind_into](arg).getASuccessor() = par and
3695+
pragma[only_bind_into](arg).getASuccessor() = out and
36953696
subpaths03(arg, p, ret, o, apout) and
36963697
par.getNodeEx() = p and
36973698
out.getNodeEx() = o and

ruby/scripts/identical-files.json

Lines changed: 0 additions & 43 deletions
This file was deleted.

ruby/scripts/sync-identical-files.py

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)