Skip to content

Commit 53cae4f

Browse files
committed
Merge remote-tracking branch 'origin/main' into js/quality/loop_shift
2 parents 10d1028 + 2e5d52e commit 53cae4f

File tree

737 files changed

+97831
-19947
lines changed

Some content is hidden

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

737 files changed

+97831
-19947
lines changed

.github/workflows/codegen.yml renamed to .github/workflows/python-tooling.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
name: Codegen
1+
name: Python tooling
22

33
on:
44
pull_request:
55
paths:
66
- "misc/bazel/**"
77
- "misc/codegen/**"
8+
- "misc/scripts/models-as-data/bulk_generate_mad.py"
89
- "*.bazel*"
910
- .github/workflows/codegen.yml
1011
- .pre-commit-config.yaml
@@ -17,17 +18,17 @@ permissions:
1718
contents: read
1819

1920
jobs:
20-
codegen:
21+
check-python-tooling:
2122
runs-on: ubuntu-latest
2223
steps:
2324
- uses: actions/checkout@v4
24-
- uses: actions/setup-python@v4
25+
- uses: actions/setup-python@v5
2526
with:
26-
python-version-file: 'misc/codegen/.python-version'
27+
python-version: '3.12'
2728
- uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
2829
name: Check that python code is properly formatted
2930
with:
30-
extra_args: autopep8 --all-files
31+
extra_args: black --all-files
3132
- name: Run codegen tests
3233
shell: bash
3334
run: |

.pre-commit-config.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# See https://pre-commit.com for more information
22
# See https://pre-commit.com/hooks.html for more hooks
3+
default_language_version:
4+
python: python3.12
35
repos:
46
- repo: https://github.com/pre-commit/pre-commit-hooks
57
rev: v3.2.0
@@ -14,11 +16,11 @@ repos:
1416
hooks:
1517
- id: clang-format
1618

17-
- repo: https://github.com/pre-commit/mirrors-autopep8
18-
rev: v2.0.4
19+
- repo: https://github.com/psf/black
20+
rev: 25.1.0
1921
hooks:
20-
- id: autopep8
21-
files: ^misc/codegen/.*\.py
22+
- id: black
23+
files: ^(misc/codegen/.*|misc/scripts/models-as-data/bulk_generate_mad)\.py$
2224

2325
- repo: local
2426
hooks:

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

actions/ql/integration-tests/query-suite/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import pytest
33
from query_suites import *
44

5-
well_known_query_suites = ['actions-code-quality.qls', 'actions-security-and-quality.qls', 'actions-security-extended.qls', 'actions-code-scanning.qls']
5+
well_known_query_suites = ['actions-code-quality.qls', 'actions-code-quality-extended.qls', 'actions-security-and-quality.qls', 'actions-security-extended.qls', 'actions-code-scanning.qls']
66

77
@runs_on.posix
88
@pytest.mark.parametrize("query_suite", well_known_query_suites)

actions/ql/lib/codeql/actions/security/OutputClobberingQuery.qll

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ private module OutputClobberingConfig implements DataFlow::ConfigSig {
214214
)
215215
)
216216
}
217+
218+
predicate observeDiffInformedIncrementalMode() { any() }
217219
}
218220

219221
/** Tracks flow of unsafe user input that is used to construct and evaluate an environment variable. */

actions/ql/lib/codeql/actions/security/RequestForgeryQuery.qll

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ private module RequestForgeryConfig implements DataFlow::ConfigSig {
1616
predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
1717

1818
predicate isSink(DataFlow::Node sink) { sink instanceof RequestForgerySink }
19+
20+
predicate observeDiffInformedIncrementalMode() { any() }
1921
}
2022

2123
/** Tracks flow of unsafe user input that is used to construct and evaluate a system command. */

actions/ql/lib/codeql/actions/security/SecretExfiltrationQuery.qll

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ private module SecretExfiltrationConfig implements DataFlow::ConfigSig {
1515
predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
1616

1717
predicate isSink(DataFlow::Node sink) { sink instanceof SecretExfiltrationSink }
18+
19+
predicate observeDiffInformedIncrementalMode() { any() }
1820
}
1921

2022
/** Tracks flow of unsafe user input that is used in a context where it may lead to a secret exfiltration. */

actions/ql/src/Models/CompositeActionsSinks.ql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ private module MyConfig implements DataFlow::ConfigSig {
2424
predicate isSink(DataFlow::Node sink) {
2525
sink instanceof CodeInjectionSink and not madSink(sink, "code-injection")
2626
}
27+
28+
predicate observeDiffInformedIncrementalMode() { any() }
2729
}
2830

2931
module MyFlow = TaintTracking::Global<MyConfig>;

actions/ql/src/Models/CompositeActionsSources.ql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ private module MyConfig implements DataFlow::ConfigSig {
3434
isSink(node) and
3535
set instanceof DataFlow::FieldContent
3636
}
37+
38+
predicate observeDiffInformedIncrementalMode() { any() }
3739
}
3840

3941
module MyFlow = TaintTracking::Global<MyConfig>;

0 commit comments

Comments
 (0)