Skip to content

Commit d64f8c7

Browse files
authored
Merge branch 'main' into rb/sensitive-get-query
2 parents 084efe0 + d0d8ef1 commit d64f8c7

File tree

2,473 files changed

+130221
-68166
lines changed

Some content is hidden

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

2,473 files changed

+130221
-68166
lines changed

.github/workflows/close-stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/stale@v5
15+
- uses: actions/stale@v6
1616
with:
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}
1818
stale-issue-message: 'This issue is stale because it has been open 14 days with no activity. Comment or remove the `Stale` label in order to avoid having this issue closed in 7 days.'

.github/workflows/go-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
env QHELP_OUT_DIR=qhelp-out make qhelp-to-markdown
4444
4545
- name: Upload qhelp markdown
46-
uses: actions/upload-artifact@v2
46+
uses: actions/upload-artifact@v3
4747
with:
4848
name: qhelp-markdown
4949
path: go/qhelp-out/**/*.md

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
- main
2828
- "rc/*"
2929
paths:
30-
- "ruby/**/*.qhelp"
30+
- "**/*.qhelp"
3131

3232
jobs:
3333
qhelp:

.github/workflows/ruby-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ jobs:
197197
- name: Prepare test files
198198
shell: bash
199199
run: |
200-
echo "import ruby select count(File f)" > "test.ql"
200+
echo "import codeql.ruby.AST select count(File f)" > "test.ql"
201201
echo "| 4 |" > "test.expected"
202202
echo 'name: sample-tests
203203
version: 0.0.0

.github/workflows/swift-codegen.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
pull_request:
55
paths:
66
- "swift/**"
7+
- "misc/bazel/**"
8+
- "*.bazel*"
79
- .github/workflows/swift-codegen.yml
810
- .github/actions/fetch-codeql/action.yml
911
branches:

.github/workflows/swift-integration-tests.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
pull_request:
55
paths:
66
- "swift/**"
7+
- "misc/bazel/**"
8+
- "*.bazel*"
79
- .github/workflows/swift-integration-tests.yml
810
- .github/actions/fetch-codeql/action.yml
911
- codeql-workspace.yml
@@ -30,6 +32,14 @@ jobs:
3032
- name: Build Swift extractor
3133
run: |
3234
bazel run //swift:create-extractor-pack
35+
- name: Get Swift version
36+
id: get_swift_version
37+
run: |
38+
VERSION=$(bazel run //swift/extractor -- --version | sed -ne 's/.*version \(\S*\).*/\1/p')
39+
echo "::set-output name=version::$VERSION"
40+
- uses: swift-actions/setup-swift@v1
41+
with:
42+
swift-version: "${{steps.get_swift_version.outputs.version}}"
3343
- name: Run integration tests
3444
run: |
3545
python integration-tests/runner.py

.github/workflows/swift-qltest.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
pull_request:
55
paths:
66
- "swift/**"
7+
- "misc/bazel/**"
8+
- "*.bazel*"
79
- .github/workflows/swift-qltest.yml
810
- .github/actions/fetch-codeql/action.yml
911
- codeql-workspace.yml

CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030

3131
# Bazel (excluding BUILD.bazel files)
3232
WORKSPACE.bazel @github/codeql-ci-reviewers
33+
.bazelversion @github/codeql-ci-reviewers
34+
.bazelrc @github/codeql-ci-reviewers
3335
**/*.bzl @github/codeql-ci-reviewers
3436

3537
# Documentation etc

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ This open source repository contains the standard CodeQL libraries and queries t
44

55
## How do I learn CodeQL and run queries?
66

7-
There is [extensive documentation](https://codeql.github.com/docs/) on getting started with writing CodeQL.
8-
You can use the [CodeQL for Visual Studio Code](https://codeql.github.com/docs/codeql-for-visual-studio-code/) extension or the [interactive query console](https://lgtm.com/help/lgtm/using-query-console) on LGTM.com (Semmle Legacy product) to try out your queries on any open source project that's currently being analyzed.
7+
There is [extensive documentation](https://codeql.github.com/docs/) on getting started with writing CodeQL using the [CodeQL extension for Visual Studio Code](https://codeql.github.com/docs/codeql-for-visual-studio-code/) and the [CodeQL CLI](https://codeql.github.com/docs/codeql-cli/).
98

109
## Contributing
1110

config/identical-files.json

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll",
1818
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll",
1919
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll",
20+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll",
21+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll",
22+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll",
23+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll",
2024
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll",
2125
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll",
2226
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll",
@@ -29,14 +33,16 @@
2933
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll",
3034
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll",
3135
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll",
32-
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForLibraries.qll",
36+
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForRegExp.qll",
3337
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForHttpClientLibraries.qll",
38+
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForPathname.qll",
3439
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll"
3540
],
3641
"DataFlow Java/C++/C#/Python Common": [
3742
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll",
3843
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll",
3944
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll",
45+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll",
4046
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll",
4147
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll",
4248
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll",
@@ -48,6 +54,9 @@
4854
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
4955
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
5056
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
57+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
58+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
59+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
5160
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
5261
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
5362
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
@@ -61,22 +70,24 @@
6170
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll",
6271
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll",
6372
"ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
64-
"ruby/ql/lib/codeql/ruby/dataflow/internal/tainttrackingforlibraries/TaintTrackingImpl.qll",
73+
"ruby/ql/lib/codeql/ruby/dataflow/internal/tainttrackingforregexp/TaintTrackingImpl.qll",
6574
"swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingImpl.qll"
6675
],
6776
"DataFlow Java/C++/C#/Python Consistency checks": [
6877
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll",
6978
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplConsistency.qll",
7079
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll",
80+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll",
7181
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplConsistency.qll",
7282
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplConsistency.qll",
7383
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplConsistency.qll",
7484
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImplConsistency.qll"
7585
],
76-
"DataFlow Java/C# Flow Summaries": [
86+
"DataFlow Java/C#/Ruby/Python/Swift Flow Summaries": [
7787
"java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll",
7888
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll",
7989
"ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll",
90+
"python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll",
8091
"swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll"
8192
],
8293
"SsaReadPosition Java/C#": [
@@ -532,7 +543,7 @@
532543
"java/ql/lib/semmle/code/java/dataflow/internal/AccessPathSyntax.qll",
533544
"javascript/ql/lib/semmle/javascript/frameworks/data/internal/AccessPathSyntax.qll",
534545
"ruby/ql/lib/codeql/ruby/dataflow/internal/AccessPathSyntax.qll",
535-
"python/ql/lib/semmle/python/frameworks/data/internal/AccessPathSyntax.qll",
546+
"python/ql/lib/semmle/python/dataflow/new/internal/AccessPathSyntax.qll",
536547
"swift/ql/lib/codeql/swift/dataflow/internal/AccessPathSyntax.qll"
537548
],
538549
"IncompleteUrlSubstringSanitization": [

0 commit comments

Comments
 (0)