Skip to content

Commit 361ae17

Browse files
committed
Merge branch 'main' into starcke/automodel-pack
2 parents 3b8b33a + a966944 commit 361ae17

File tree

1,326 files changed

+56688
-39769
lines changed

Some content is hidden

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

1,326 files changed

+56688
-39769
lines changed

.github/workflows/go-tests-other-os.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ on:
77
- .github/workflows/go-tests-other-os.yml
88
- .github/actions/**
99
- codeql-workspace.yml
10+
env:
11+
GO_VERSION: '~1.21.0'
1012
jobs:
1113
test-mac:
1214
name: Test MacOS
1315
runs-on: macos-latest
1416
steps:
15-
- name: Set up Go 1.20
17+
- name: Set up Go ${{ env.GO_VERSION }}
1618
uses: actions/setup-go@v4
1719
with:
18-
go-version: '1.20'
20+
go-version: ${{ env.GO_VERSION }}
1921
id: go
2022

2123
- name: Check out code
@@ -47,10 +49,10 @@ jobs:
4749
name: Test Windows
4850
runs-on: windows-latest-xl
4951
steps:
50-
- name: Set up Go 1.20
52+
- name: Set up Go ${{ env.GO_VERSION }}
5153
uses: actions/setup-go@v4
5254
with:
53-
go-version: '1.20'
55+
go-version: ${{ env.GO_VERSION }}
5456
id: go
5557

5658
- name: Check out code

.github/workflows/go-tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ on:
1515
- .github/workflows/go-tests.yml
1616
- .github/actions/**
1717
- codeql-workspace.yml
18+
env:
19+
GO_VERSION: '~1.21.0'
1820
jobs:
1921
test-linux:
2022
name: Test Linux (Ubuntu)
2123
runs-on: ubuntu-latest-xl
2224
steps:
23-
- name: Set up Go 1.20
25+
- name: Set up Go ${{ env.GO_VERSION }}
2426
uses: actions/setup-go@v4
2527
with:
26-
go-version: '1.20'
28+
go-version: ${{ env.GO_VERSION }}
2729
id: go
2830

2931
- name: Check out code

config/identical-files.json

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@
3232
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForPathname.qll",
3333
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll"
3434
],
35-
"TaintTracking Java/C++/C#/Go/Python/Ruby/Swift": [
36-
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTracking.qll",
37-
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTracking.qll",
38-
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTracking.qll",
39-
"go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTracking.qll",
40-
"java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTracking.qll",
41-
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTracking.qll",
42-
"ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTracking.qll",
43-
"swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTracking.qll"
44-
],
4535
"TaintTracking Legacy Configuration Java/C++/C#/Go/Python/Ruby/Swift": [
4636
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
4737
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
@@ -483,10 +473,6 @@
483473
"ruby/ql/lib/codeql/ruby/security/internal/SensitiveDataHeuristics.qll",
484474
"swift/ql/lib/codeql/swift/security/internal/SensitiveDataHeuristics.qll"
485475
],
486-
"CFG": [
487-
"csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImplShared.qll",
488-
"swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImplShared.qll"
489-
],
490476
"TypeTracker": [
491477
"python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll",
492478
"ruby/ql/lib/codeql/ruby/typetracking/TypeTracker.qll"
@@ -570,5 +556,9 @@
570556
"EncryptionKeySizes Python/Java": [
571557
"python/ql/lib/semmle/python/security/internal/EncryptionKeySizes.qll",
572558
"java/ql/lib/semmle/code/java/security/internal/EncryptionKeySizes.qll"
559+
],
560+
"Python model summaries test extension": [
561+
"python/ql/test/experimental/dataflow/model-summaries/InlineTaintTest.ext.yml",
562+
"python/ql/test/experimental/dataflow/model-summaries/NormalDataflowTest.ext.yml"
573563
]
574564
}

cpp/autobuilder/Semmle.Autobuild.Cpp.Tests/Semmle.Autobuild.Cpp.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<ItemGroup>
1212
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
1313
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
14-
<PackageReference Include="xunit" Version="2.4.2" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
14+
<PackageReference Include="xunit" Version="2.5.0" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1818
</PackageReference>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

cpp/autobuilder/Semmle.Autobuild.Cpp/Semmle.Autobuild.Cpp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Build" Version="17.3.2" />
20+
<PackageReference Include="Microsoft.Build" Version="17.7.2" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

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.9.1
2+
3+
No user-facing changes.
4+
15
## 0.9.0
26

37
### Breaking Changes
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Only the 2 level indirection of `argv` (corresponding to `**argv`) is consided for `FlowSource`.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: feature
3+
---
4+
* Added `DeleteOrDeleteArrayExpr` as a super type of `DeleteExpr` and `DeleteArrayExpr`
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: deprecated
3+
---
4+
* `getAllocatorCall` on `DeleteExpr` and `DeleteArrayExpr` has been deprecated. `getDeallocatorCall` should be used instead.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 0.9.1
2+
3+
No user-facing changes.

0 commit comments

Comments
 (0)