Skip to content

Commit 3dd042c

Browse files
alexrfordalexrford
committed
Merge remote-tracking branch 'origin/main' into maikypedia/ruby-jwt
2 parents e204100 + 7994795 commit 3dd042c

File tree

3,270 files changed

+236007
-125289
lines changed

Some content is hidden

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

3,270 files changed

+236007
-125289
lines changed

‎.github/dependabot.yml

+7
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,10 @@ updates:
1717
ignore:
1818
- dependency-name: '*'
1919
update-types: ['version-update:semver-patch', 'version-update:semver-minor']
20+
21+
- package-ecosystem: "gomod"
22+
directory: "go/extractor"
23+
schedule:
24+
interval: "daily"
25+
reviewers:
26+
- "github/codeql-go"

‎.github/labeler.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ documentation:
4545

4646
# Since these are all shared files that need to be synced, just pick _one_ copy of each.
4747
"DataFlow Library":
48-
- "java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll"
49-
- "java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll"
50-
- "java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll"
51-
- "java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll"
52-
- "java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll"
48+
- "shared/dataflow/**/*"
5349

5450
"ATM":
5551
- javascript/ql/experimental/adaptivethreatmodeling/**/*

‎.github/workflows/check-implicit-this.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
check:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Check that implicit this warnings is enabled for all packs
1818
shell: bash
1919
run: |

‎.github/workflows/check-qldoc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 2
2121

‎.github/workflows/check-query-ids.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
name: Check query IDs
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- name: Check for duplicate query IDs
2121
run: python3 misc/scripts/check-query-ids.py

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
dotnet-version: 7.0.102
3434

3535
- name: Checkout repository
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737

3838
# Initializes the CodeQL tools for scanning.
3939
- name: Initialize CodeQL

‎.github/workflows/compile-queries.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest-xl
1414

1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Setup CodeQL
1818
uses: ./.github/actions/fetch-codeql
1919
with:
@@ -29,9 +29,9 @@ jobs:
2929
# run with --check-only if running in a PR (github.sha != main)
3030
if : ${{ github.event_name == 'pull_request' }}
3131
shell: bash
32-
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
32+
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500
3333
- name: compile queries - full
3434
# do full compile if running on main - this populates the cache
3535
if : ${{ github.event_name != 'pull_request' }}
3636
shell: bash
37-
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
37+
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500

‎.github/workflows/csharp-qltest.yml

+29-14
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
qlupgrade:
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3333
- uses: ./.github/actions/fetch-codeql
3434
- name: Check DB upgrade scripts
3535
run: |
@@ -52,8 +52,7 @@ jobs:
5252
matrix:
5353
slice: ["1/2", "2/2"]
5454
steps:
55-
- uses: actions/checkout@v3
56-
- uses: ./.github/actions/fetch-codeql
55+
- uses: actions/checkout@v4
5756
- uses: ./csharp/actions/create-extractor-pack
5857
- name: Cache compilation cache
5958
id: query-cache
@@ -62,25 +61,41 @@ jobs:
6261
key: csharp-qltest-${{ matrix.slice }}
6362
- name: Run QL tests
6463
run: |
65-
CODEQL_PATH=$(gh codeql version --format=json | jq -r .unpackedLocation)
66-
# The legacy ASP extractor is not in this repo, so take the one from the nightly build
67-
mv "$CODEQL_PATH/csharp/tools/extractor-asp.jar" "${{ github.workspace }}/csharp/extractor-pack/tools"
68-
# Safe guard against using the bundled extractor
69-
rm -rf "$CODEQL_PATH/csharp"
70-
codeql test run --threads=0 --ram 50000 --slice ${{ matrix.slice }} --search-path "${{ github.workspace }}/csharp/extractor-pack" --check-databases --check-undefined-labels --check-repeated-labels --check-redefined-labels --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
64+
codeql test run --threads=0 --ram 50000 --slice ${{ matrix.slice }} --search-path extractor-pack --check-databases --check-undefined-labels --check-repeated-labels --check-redefined-labels --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
7165
env:
7266
GITHUB_TOKEN: ${{ github.token }}
7367
unit-tests:
74-
runs-on: ubuntu-latest
68+
strategy:
69+
matrix:
70+
os: [ubuntu-latest, windows-2019]
71+
runs-on: ${{ matrix.os }}
7572
steps:
76-
- uses: actions/checkout@v3
73+
- uses: actions/checkout@v4
7774
- name: Setup dotnet
7875
uses: actions/setup-dotnet@v3
7976
with:
8077
dotnet-version: 7.0.102
8178
- name: Extractor unit tests
8279
run: |
83-
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/csharp/extractor/Semmle.Util.Tests"
84-
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/csharp/extractor/Semmle.Extraction.Tests"
85-
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests"
80+
dotnet test -p:RuntimeFrameworkVersion=7.0.2 extractor/Semmle.Util.Tests
81+
dotnet test -p:RuntimeFrameworkVersion=7.0.2 extractor/Semmle.Extraction.Tests
82+
dotnet test -p:RuntimeFrameworkVersion=7.0.2 autobuilder/Semmle.Autobuild.CSharp.Tests
8683
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests"
84+
shell: bash
85+
stubgentest:
86+
runs-on: ubuntu-latest
87+
steps:
88+
- uses: actions/checkout@v4
89+
- uses: ./csharp/actions/create-extractor-pack
90+
- name: Run stub generator tests
91+
run: |
92+
# Generate (Asp)NetCore stubs
93+
STUBS_PATH=stubs_output
94+
python3 ql/src/Stubs/make_stubs_nuget.py webapp Swashbuckle.AspNetCore.Swagger 6.5.0 "$STUBS_PATH"
95+
rm -rf ql/test/resources/stubs/_frameworks
96+
# Update existing stubs in the repo with the freshly generated ones
97+
mv "$STUBS_PATH/output/stubs/_frameworks" ql/test/resources/stubs/
98+
git status
99+
codeql test run --threads=0 --search-path extractor-pack --check-databases --check-undefined-labels --check-repeated-labels --check-redefined-labels --consistency-queries ql/consistency-queries -- ql/test/library-tests/dataflow/flowsources/aspremote
100+
env:
101+
GITHUB_TOKEN: ${{ github.token }}

‎.github/workflows/csv-coverage-metrics.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323
- name: Setup CodeQL
2424
uses: ./.github/actions/fetch-codeql
2525
- name: Create empty database
@@ -47,7 +47,7 @@ jobs:
4747
runs-on: ubuntu-latest
4848
steps:
4949
- name: Checkout repository
50-
uses: actions/checkout@v3
50+
uses: actions/checkout@v4
5151
- name: Setup CodeQL
5252
uses: ./.github/actions/fetch-codeql
5353
- name: Create empty database

‎.github/workflows/csv-coverage-pr-artifacts.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
GITHUB_CONTEXT: ${{ toJSON(github.event) }}
3232
run: echo "$GITHUB_CONTEXT"
3333
- name: Clone self (github/codeql) - MERGE
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535
with:
3636
path: merge
3737
- name: Clone self (github/codeql) - BASE
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939
with:
4040
fetch-depth: 2
4141
path: base

‎.github/workflows/csv-coverage-pr-comment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
GITHUB_CONTEXT: ${{ toJSON(github.event) }}
2121
run: echo "$GITHUB_CONTEXT"
2222
- name: Clone self (github/codeql)
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
- name: Set up Python 3.8
2525
uses: actions/setup-python@v4
2626
with:

‎.github/workflows/csv-coverage-timeseries.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99

1010
steps:
1111
- name: Clone self (github/codeql)
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
with:
1414
path: script
1515
- name: Clone self (github/codeql) for analysis
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
with:
1818
path: codeqlModels
1919
fetch-depth: 0

‎.github/workflows/csv-coverage-update.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
GITHUB_CONTEXT: ${{ toJSON(github.event) }}
1818
run: echo "$GITHUB_CONTEXT"
1919
- name: Clone self (github/codeql)
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
with:
2222
path: ql
2323
fetch-depth: 0

‎.github/workflows/csv-coverage.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313

1414
steps:
1515
- name: Clone self (github/codeql)
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
with:
1818
path: script
1919
- name: Clone self (github/codeql) for analysis
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
with:
2222
path: codeqlModels
2323
ref: ${{ github.event.inputs.qlModelShaOverride || github.ref }}

‎.github/workflows/fast-forward.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
exit 1
2626
2727
- name: Checkout
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

3030
- name: Git config
3131
shell: bash

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
id: go
2222

2323
- name: Check out code
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525

2626
- name: Set up CodeQL CLI
2727
uses: ./.github/actions/fetch-codeql
@@ -56,7 +56,7 @@ jobs:
5656
id: go
5757

5858
- name: Check out code
59-
uses: actions/checkout@v2
59+
uses: actions/checkout@v4
6060

6161
- name: Set up CodeQL CLI
6262
uses: ./.github/actions/fetch-codeql

‎.github/workflows/go-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
id: go
3030

3131
- name: Check out code
32-
uses: actions/checkout@v2
32+
uses: actions/checkout@v4
3333

3434
- name: Set up CodeQL CLI
3535
uses: ./.github/actions/fetch-codeql

‎.github/workflows/js-ml-tests.yml

-65
This file was deleted.

‎.github/workflows/mad_modelDiff.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
slug: ${{fromJson(github.event.inputs.projects || '["apache/commons-codec", "apache/commons-io", "apache/commons-beanutils", "apache/commons-logging", "apache/commons-fileupload", "apache/commons-lang", "apache/commons-validator", "apache/commons-csv", "apache/dubbo"]' )}}
2828
steps:
2929
- name: Clone github/codeql from PR
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
if: github.event.pull_request
3232
with:
3333
path: codeql-pr
3434
- name: Clone github/codeql from main
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
with:
3737
path: codeql-main
3838
ref: main

‎.github/workflows/mad_regenerate-models.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
ref: "placeholder"
2828
steps:
2929
- name: Clone self (github/codeql)
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
- name: Setup CodeQL binaries
3232
uses: ./.github/actions/fetch-codeql
3333
- name: Clone repositories
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535
with:
3636
path: repos/${{ matrix.ref }}
3737
ref: ${{ matrix.ref }}

‎.github/workflows/qhelp-pr-preview.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if-no-files-found: error
4444
retention-days: 1
4545

46-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
4747
with:
4848
fetch-depth: 2
4949
persist-credentials: false

‎.github/workflows/ql-for-ql-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest-xl
1515
steps:
1616
### Build the queries ###
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020
- name: Find codeql

0 commit comments

Comments
 (0)