Skip to content

Commit a524735

Browse files
authored
Merge branch 'main' into maikypedia/ldap-injection
2 parents 1559b7d + 31bed36 commit a524735

File tree

3,232 files changed

+143950
-54641
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,232 files changed

+143950
-54641
lines changed

.bazelrc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
build --repo_env=CC=clang --repo_env=CXX=clang++ --cxxopt="-std=c++17"
1+
common --enable_platform_specific_config
2+
3+
build --repo_env=CC=clang --repo_env=CXX=clang++
4+
5+
build:linux --cxxopt=-std=c++20
6+
build:macos --cxxopt=-std=c++20 --cpu=darwin_x86_64
7+
build:windows --cxxopt=/std:c++20 --cxxopt=/Zc:preprocessor
28

39
try-import %workspace%/local.bazelrc

.github/labeler.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Go:
1111
- change-notes/**/*go.*
1212

1313
Java:
14-
- any: [ 'java/**/*', '!java/kotlin-extractor/**/*', '!java/kotlin-explorer/**/*', '!java/ql/test/kotlin/**/*' ]
14+
- any: [ 'java/**/*', '!java/kotlin-extractor/**/*', '!java/ql/test/kotlin/**/*' ]
1515
- change-notes/**/*java.*
1616

1717
JS:
@@ -20,7 +20,6 @@ JS:
2020

2121
Kotlin:
2222
- java/kotlin-extractor/**/*
23-
- java/kotlin-explorer/**/*
2423
- java/ql/test/kotlin/**/*
2524

2625
Python:

.github/workflows/check-change-note.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
- "*/ql/lib/**/*.yml"
1212
- "!**/experimental/**"
1313
- "!ql/**"
14-
- "!swift/**"
1514
- ".github/workflows/check-change-note.yml"
1615

1716
jobs:
@@ -27,9 +26,9 @@ jobs:
2726
run: |
2827
gh api 'repos/${{github.repository}}/pulls/${{github.event.number}}/files' --paginate --jq 'any(.[].filename ; test("/change-notes/.*[.]md$"))' |
2928
grep true -c
30-
- name: Fail if the change note filename doesn't match the expected format. The file name must be of the form 'YYYY-MM-DD.md' or 'YYYY-MM-DD-{title}.md', where '{title}' is arbitrary text.
29+
- name: Fail if the change note filename doesn't match the expected format. The file name must be of the form 'YYYY-MM-DD.md', 'YYYY-MM-DD-{title}.md', where '{title}' is arbitrary text, or released/x.y.z.md for released change-notes
3130
env:
3231
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3332
run: |
34-
gh api 'repos/${{github.repository}}/pulls/${{github.event.number}}/files' --paginate --jq '[.[].filename | select(test("/change-notes/.*[.]md$"))] | all(test("/change-notes/[0-9]{4}-[0-9]{2}-[0-9]{2}.*[.]md$"))' |
33+
gh api 'repos/${{github.repository}}/pulls/${{github.event.number}}/files' --paginate --jq '[.[].filename | select(test("/change-notes/.*[.]md$"))] | all(test("/change-notes/[0-9]{4}-[0-9]{2}-[0-9]{2}.*[.]md$") or test("/change-notes/released/[0-9]*[.][0-9]*[.][0-9]*[.]md$"))' |
3534
grep true -c
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: "Check implicit this warnings"
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
paths:
7+
- "**qlpack.yml"
8+
branches:
9+
- main
10+
- "rc/*"
11+
12+
jobs:
13+
check:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v3
17+
- name: Check that implicit this warnings is enabled for all packs
18+
shell: bash
19+
run: |
20+
EXIT_CODE=0
21+
packs="$(find . -iname 'qlpack.yml')"
22+
for pack_file in ${packs}; do
23+
option="$(yq '.warnOnImplicitThis' ${pack_file})"
24+
if [ "${option}" != "true" ]; then
25+
echo "::error file=${pack_file}::warnOnImplicitThis property must be set to 'true' for pack ${pack_file}"
26+
EXIT_CODE=1
27+
fi
28+
done
29+
exit "${EXIT_CODE}"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- "*/ql/src/**/*.qll"
1111
- "*/ql/lib/**/*.ql"
1212
- "*/ql/lib/**/*.qll"
13+
- "*/ql/lib/ext/**/*.yml"
1314
- "misc/scripts/library-coverage/*.py"
1415
# input data files
1516
- "*/documentation/library-coverage/cwe-sink.csv"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
path: |
3333
ql/extractor-pack/
3434
ql/target/release/buramu
35-
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-extractor-${{ hashFiles('ql/**/Cargo.lock') }}-${{ hashFiles('ql/**/*.rs') }}
35+
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-extractor-${{ hashFiles('ql/**/Cargo.lock') }}-${{ hashFiles('shared/tree-sitter-extractor') }}-${{ hashFiles('ql/**/*.rs') }}
3636
- name: Cache cargo
3737
if: steps.cache-extractor.outputs.cache-hit != 'true'
3838
uses: actions/cache@v3

.github/workflows/ruby-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
ruby/extractor/target/release/codeql-extractor-ruby
6262
ruby/extractor/target/release/codeql-extractor-ruby.exe
6363
ruby/extractor/ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
64-
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-ruby-extractor-${{ hashFiles('ruby/extractor/rust-toolchain.toml', 'ruby/extractor/Cargo.lock') }}--${{ hashFiles('ruby/extractor/**/*.rs') }}
64+
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-ruby-extractor-${{ hashFiles('ruby/extractor/rust-toolchain.toml', 'ruby/extractor/Cargo.lock') }}-${{ hashFiles('shared/tree-sitter-extractor') }}-${{ hashFiles('ruby/extractor/**/*.rs') }}
6565
- uses: actions/cache@v3
6666
if: steps.cache-extractor.outputs.cache-hit != 'true'
6767
with:

.github/workflows/swift.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
branches:
1717
- main
1818
- rc/*
19+
- codeql-cli-*
1920
push:
2021
paths:
2122
- "swift/**"
@@ -30,6 +31,7 @@ on:
3031
branches:
3132
- main
3233
- rc/*
34+
- codeql-cli-*
3335

3436
jobs:
3537
# not using a matrix as you cannot depend on a specific job in a matrix, and we want to start linux checks

.github/workflows/sync-files.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ jobs:
1717
- uses: actions/checkout@v3
1818
- name: Check synchronized files
1919
run: python config/sync-files.py
20+
- name: Check dbscheme fragments
21+
run: python config/sync-dbscheme-fragments.py
2022

.pre-commit-config.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ repos:
55
rev: v3.2.0
66
hooks:
77
- id: trailing-whitespace
8-
exclude: /test/.*$(?<!\.ql)(?<!\.qll)(?<!\.qlref)
8+
exclude: /test/.*$(?<!\.ql)(?<!\.qll)(?<!\.qlref)|.*\.patch
99
- id: end-of-file-fixer
10-
exclude: /test/.*$(?<!\.ql)(?<!\.qll)(?<!\.qlref)
10+
exclude: /test/.*$(?<!\.ql)(?<!\.qll)(?<!\.qlref)|.*\.patch
1111

1212
- repo: https://github.com/pre-commit/mirrors-clang-format
1313
rev: v13.0.1
@@ -21,6 +21,11 @@ repos:
2121
- id: autopep8
2222
files: ^misc/codegen/.*\.py
2323

24+
- repo: https://github.com/warchant/pre-commit-buildifier
25+
rev: 0.0.2
26+
hooks:
27+
- id: buildifier
28+
2429
- repo: local
2530
hooks:
2631
- id: codeql-format

0 commit comments

Comments
 (0)