Skip to content

Commit 6c1ebd9

Browse files
erik-krogherik-krogh
committed
Merge branch 'main' into delOldDeps
2 parents b875d30 + 25e6b97 commit 6c1ebd9

File tree

979 files changed

+61704
-192814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

979 files changed

+61704
-192814
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# .git-blame-ignore-revs
2+
# Auto-formatted Java
3+
730eae952139209fe9fdf598541d608f4c0c0c84
4+
# Auto-formatted C#
5+
5ad7ed49dd3de03ec6dcfcb6848758a6a987e11c
6+
# Auto-formatted C/C++
7+
ef97e539ec1971494d4bba5cafe82e00bc8217ac
8+
# Auto-formatted Python
9+
21d5fa836b3a7d020ba45e8b8168b145a9772131
10+
# Auto-formatted JavaScript
11+
8d97fe9ed327a9546ff2eaf515cf0f5214deddd9
12+
# Auto-formatted Ruby
13+
a5d229903d2f12d45f2c2c38822f1d0e7504ae7f
14+
# Auto-formatted Go
15+
08c658e66bf867090033ea096e244a93d46c0aa7
16+
# Auto-formatted Swift
17+
711d7057f79fb7d72fc3b35e010bd018f9009169
18+
# Auto-formatted shared ql packs
19+
3640b6d3a8ce9edf8e1d3ed106fe8526cf255bc0
20+
# Auto-formatted taint tracking files
21+
159d8e978c51959b380838c080d891b66e763b19

‎CODEOWNERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
/csharp/ @github/codeql-csharp
33
/go/ @github/codeql-go
44
/java/ @github/codeql-java
5-
/javascript/ @github/codeql-dynamic
6-
/python/ @github/codeql-dynamic
7-
/ruby/ @github/codeql-dynamic
5+
/javascript/ @github/codeql-javascript
6+
/python/ @github/codeql-python
7+
/ruby/ @github/codeql-ruby
88
/swift/ @github/codeql-swift
99
/misc/codegen/ @github/codeql-swift
1010
/java/kotlin-extractor/ @github/codeql-kotlin

‎config/identical-files.json‎

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,67 @@
11
{
22
"DataFlow Java/C++/C#/Go/Python/Ruby/Swift": [
3+
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlow.qll",
4+
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlow.qll",
5+
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlow.qll",
6+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlow.qll",
7+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlow.qll",
8+
"go/ql/lib/semmle/go/dataflow/internal/DataFlow.qll",
9+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlow.qll",
10+
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlow.qll",
11+
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlow.qll"
12+
],
13+
"DataFlowImpl Java/C++/C#/Go/Python/Ruby/Swift": [
314
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll",
15+
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll",
16+
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll",
17+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll",
18+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll",
19+
"go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl.qll",
20+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll",
21+
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll",
22+
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll"
23+
],
24+
"DataFlow Java/C++/C#/Go/Python/Ruby/Swift Legacy Configuration": [
25+
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll",
426
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll",
527
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll",
628
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll",
729
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll",
830
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll",
931
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll",
1032
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForOnActivityResult.qll",
11-
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll",
33+
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll",
1234
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll",
1335
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll",
1436
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll",
1537
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll",
16-
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll",
38+
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll",
1739
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll",
1840
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll",
1941
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll",
20-
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll",
42+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll",
2143
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll",
2244
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll",
2345
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll",
24-
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll",
46+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll",
2547
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll",
2648
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll",
2749
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll",
2850
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll",
2951
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplForContentDataFlow.qll",
30-
"go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl.qll",
52+
"go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll",
3153
"go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll",
3254
"go/ql/lib/semmle/go/dataflow/internal/DataFlowImplForStringsNewReplacer.qll",
33-
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll",
55+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll",
3456
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll",
3557
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll",
3658
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll",
3759
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplForRegExp.qll",
38-
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll",
60+
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll",
3961
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll",
4062
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForHttpClientLibraries.qll",
4163
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForPathname.qll",
42-
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll"
64+
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll"
4365
],
4466
"DataFlow Java/C++/C#/Go/Python/Ruby/Swift Common": [
4567
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll",
@@ -52,7 +74,18 @@
5274
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll",
5375
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImplCommon.qll"
5476
],
55-
"TaintTracking::Configuration Java/C++/C#/Go/Python/Ruby/Swift": [
77+
"TaintTracking Java/C++/C#/Go/Python/Ruby/Swift": [
78+
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTracking.qll",
79+
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTracking.qll",
80+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTracking.qll",
81+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTracking.qll",
82+
"go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTracking.qll",
83+
"java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTracking.qll",
84+
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTracking.qll",
85+
"ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTracking.qll",
86+
"swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTracking.qll"
87+
],
88+
"TaintTracking Legacy Configuration Java/C++/C#/Go/Python/Ruby/Swift": [
5689
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
5790
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
5891
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",

‎cpp/autobuilder/Semmle.Autobuild.Cpp.Tests/BuildScripts.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,15 @@ public void DownloadFile(string address, string fileName)
194194
if (!DownloadFiles.Contains((address, fileName)))
195195
throw new ArgumentException($"Missing DownloadFile, {address}, {fileName}");
196196
}
197+
198+
public IDiagnosticsWriter CreateDiagnosticsWriter(string filename) => new TestDiagnosticWriter();
199+
}
200+
201+
internal class TestDiagnosticWriter : IDiagnosticsWriter
202+
{
203+
public IList<DiagnosticMessage> Diagnostics { get; } = new List<DiagnosticMessage>();
204+
205+
public void AddEntry(DiagnosticMessage message) => this.Diagnostics.Add(message);
197206
}
198207

199208
/// <summary>
@@ -253,7 +262,7 @@ CppAutobuilder CreateAutoBuilder(bool isWindows,
253262
Actions.GetEnvironmentVariable[$"CODEQL_EXTRACTOR_{codeqlUpperLanguage}_TRAP_DIR"] = "";
254263
Actions.GetEnvironmentVariable[$"CODEQL_EXTRACTOR_{codeqlUpperLanguage}_SOURCE_ARCHIVE_DIR"] = "";
255264
Actions.GetEnvironmentVariable[$"CODEQL_EXTRACTOR_{codeqlUpperLanguage}_ROOT"] = $@"C:\codeql\{codeqlUpperLanguage.ToLowerInvariant()}";
256-
Actions.GetEnvironmentVariable[$"CODEQL_EXTRACTOR_{codeqlUpperLanguage}_DIAGNOSTIC_DIR"] = Path.GetTempPath();
265+
Actions.GetEnvironmentVariable[$"CODEQL_EXTRACTOR_{codeqlUpperLanguage}_DIAGNOSTIC_DIR"] = "";
257266
Actions.GetEnvironmentVariable["CODEQL_JAVA_HOME"] = @"C:\codeql\tools\java";
258267
Actions.GetEnvironmentVariable["CODEQL_PLATFORM"] = "win64";
259268
Actions.GetEnvironmentVariable["SEMMLE_DIST"] = @"C:\odasa";

‎cpp/ql/lib/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.5.4
2+
3+
No user-facing changes.
4+
15
## 0.5.3
26

37
No user-facing changes.

‎cpp/ql/lib/change-notes/2023-03-02-dataflow-conf-module.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
category: majorAnalysis
3+
---
4+
* The main data flow and taint tracking APIs have been changed. The old APIs
5+
remain in place for now and translate to the new through a
6+
backwards-compatible wrapper. If multiple configurations are in scope
7+
simultaneously, then this may affect results slightly. The new API is quite
8+
similar to the old, but makes use of a configuration module instead of a
9+
configuration class.

‎cpp/ql/lib/change-notes/released/0.5.4.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 0.5.4
2+
3+
No user-facing changes.

‎cpp/ql/lib/codeql-pack.release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
lastReleaseVersion: 0.5.3
2+
lastReleaseVersion: 0.5.4

‎cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/DataFlow.qll‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@
2222
import cpp
2323

2424
module DataFlow {
25-
import experimental.semmle.code.cpp.ir.dataflow.internal.DataFlowImpl
25+
import experimental.semmle.code.cpp.ir.dataflow.internal.DataFlow
26+
import experimental.semmle.code.cpp.ir.dataflow.internal.DataFlowImpl1
2627
}

‎cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/TaintTracking.qll‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ import semmle.code.cpp.ir.dataflow.DataFlow
1919
import semmle.code.cpp.ir.dataflow.DataFlow2
2020

2121
module TaintTracking {
22+
import experimental.semmle.code.cpp.ir.dataflow.internal.tainttracking1.TaintTracking
2223
import experimental.semmle.code.cpp.ir.dataflow.internal.tainttracking1.TaintTrackingImpl
2324
}

0 commit comments

Comments
 (0)