Skip to content

Commit c72c7d5

Browse files
BazookaMusicCopilot
andcommitted
Merge main into Python prompt-injection branch
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2 parents e1d8d27 + 33dfa65 commit c72c7d5

4,457 files changed

Lines changed: 341160 additions & 169102 deletions

File tree

Some content is hidden

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

‎.bazelrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ build --compilation_mode opt
1111
common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub
1212

1313
build --repo_env=CC=clang --repo_env=CXX=clang++
14+
# The standalone Linux toolchain uses gold, which does not support the
15+
# LLD-specific -z nostart-stop-gc workaround enabled by rules_swift.
16+
build:linux --features=-swift.lld_gc_workaround
1417
# Disable Android SDK auto-detection (we don't use it, and rules_android has Bazel 9 compatibility issues)
1518
build --repo_env=ANDROID_HOME=
1619

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.0.0
1+
9.3.1

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
/ruby/extractor/cargo-bazel-lock.json linguist-generated=true
7676
/ruby/extractor/cargo-bazel-lock.json -merge
7777

78+
# GitHub Agentic Workflows compiled output
79+
.github/workflows/*.lock.yml linguist-generated=true
80+
7881
# auto-generated files for the C# build
7982
/csharp/paket.lock linguist-generated=true
8083
# needs eol=crlf, as `paket` touches this file and saves it as crlf

‎.github/dependabot.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,22 @@ updates:
44
directory: "ruby"
55
schedule:
66
interval: "daily"
7+
cooldown:
8+
default-days: 7
79

810
- package-ecosystem: "cargo"
911
directory: "ql"
1012
schedule:
1113
interval: "daily"
14+
cooldown:
15+
default-days: 7
1216

1317
- package-ecosystem: "github-actions"
1418
directory: "/"
1519
schedule:
1620
interval: "daily"
21+
cooldown:
22+
default-days: 7
1723
ignore:
1824
- dependency-name: '*'
1925
update-types: ['version-update:semver-patch', 'version-update:semver-minor']
@@ -22,6 +28,8 @@ updates:
2228
directory: "go/extractor"
2329
schedule:
2430
interval: "daily"
31+
cooldown:
32+
default-days: 7
2533
allow:
2634
- dependency-name: "golang.org/x/mod"
2735
- dependency-name: "golang.org/x/tools"
@@ -36,6 +44,8 @@ updates:
3644
directory: "go/ql/test"
3745
schedule:
3846
interval: "monthly"
47+
cooldown:
48+
default-days: 7
3949
ignore:
4050
- dependency-name: "*"
4151
reviewers:
@@ -45,5 +55,7 @@ updates:
4555
directory: "/"
4656
schedule:
4757
interval: weekly
58+
cooldown:
59+
default-days: 7
4860
exclude-paths:
4961
- "misc/bazel/registry/**"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
applyTo: "**/*.expected"
33
---
4-
Ignore these files. These are generated to be correct by running the tests, and should not be edited manually.
4+
Do not edit these files directly. They are generated by running the tests. If a `.expected` file has a non-empty `testFailures `section it should not be committed - you may want to update the inline expectation comments in the corresponding test source file (e.g. marking expected results as `MISSING` / `SPURIOUS`) then re-run the test.

‎.github/instructions/ql-files.instructions.md‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.github/labeler.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ Swift:
3838
- swift/**/*
3939
- change-notes/**/*swift*
4040

41+
Unified:
42+
- unified/**/*
43+
- change-notes/**/*unified*
44+
4145
Actions:
4246
- actions/**/*
4347
- change-notes/**/*actions*

‎.github/skills/bazel/SKILL.md‎

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
---
2+
name: bazel
3+
description: Conventions for editing Bazel files in the github/codeql repository: the shared `misc/bazel` helpers, `codeql_platform_select` and the `{CODEQL_PLATFORM}` packaging placeholder, adding `MODULE.bazel` dependencies, and the `semmle_code` stub that keeps the standalone build working. Use when editing any `BUILD.bazel`, `*.bzl`, `MODULE.bazel` or `.bazelrc` here, and before validating such an edit.
4+
---
5+
6+
# Bazel in the codeql repository
7+
8+
A bzlmod module named `ql`, repo name `@codeql` ([`MODULE.bazel`](../../../MODULE.bazel)). It builds standalone, and is
9+
also consumed by an internal module; standalone builds replace that module with a stub.
10+
11+
## Traps
12+
13+
Things that will waste your time or produce a wrong edit here. Read this section even if you skip the rest.
14+
15+
* **`//...` does not work.** `bazel build //...`, and even `bazel query //...`, fail at the repo root: the patched
16+
modules under [`misc/bazel/registry`](../../../misc/bazel/registry) are real packages referencing repos that are not
17+
visible from the main repo, and [`.bazelrc`](../../../.bazelrc) notes separately that transitions break `...` builds.
18+
The error names a registry directory unrelated to your edit, so it is easy to misdiagnose. **Validate the specific
19+
target or package you changed**, not a recursive pattern.
20+
* **There is no `MODULE.bazel.lock`, deliberately.** [`.bazelrc`](../../../.bazelrc) sets `--lockfile_mode=off` because
21+
the workspace-relative module override makes a lockfile unstable. Do not add one, and do not "fix" its absence.
22+
* **`linux_arm64` vs `linux-arm64`.** The keyword argument and config setting use an underscore; the platform *string*
23+
substituted into paths and zip names uses a hyphen. They are not interchangeable.
24+
* **Do not stub your way out of a missing internal dependency.** See [Building standalone](#building-standalone) for the
25+
one narrow case where extending the stub is correct.
26+
27+
## Conventions
28+
29+
* **Copy a neighboring target rather than inventing a shape.** Packaging is not uniform: some packages use the
30+
`codeql_*` wrappers, others still use `pkg_files` directly. Copy the closest *working* neighbor, and prefer the
31+
wrapper for new code.
32+
* **Pin anything fetched over the network** with `sha256` or `integrity`. Bazel only *warns* on an unpinned download, so
33+
nothing fails loudly, but the build stops being reproducible and a retagged upstream release silently changes what you
34+
build. `lfs_archive` is the exception: content is pinned by git object.
35+
* **Format with `bazel run //misc/bazel/buildifier`.** It rewrites in place, so do not hand-tune formatting. Also wired
36+
as a `pre-commit` hook ([`.pre-commit-config.yaml`](../../../.pre-commit-config.yaml)).
37+
38+
## Where new code goes
39+
40+
Bazel's own macro / rule / repository-rule distinction applies as usual. What is repo-specific:
41+
42+
| Adding | Goes in |
43+
| --- | --- |
44+
| a new packaging shape | extend [`misc/bazel/pkg.bzl`](../../../misc/bazel/pkg.bzl), do not fork `pkg_files` |
45+
| a new OS or arch split | [`misc/bazel/os.bzl`](../../../misc/bazel/os.bzl), do not hand-roll a `select()` over `@platforms//` |
46+
| a fetch of something external | a repository rule ([`lfs.bzl`](../../../misc/bazel/lfs.bzl), [`ripunzip.bzl`](../../../misc/ripunzip/ripunzip.bzl)), not a `genrule` |
47+
| a wrapper used by one language | next to that language ([`swift/rules.bzl`](../../../swift/rules.bzl)) |
48+
| a wrapper used across languages | `misc/bazel/` |
49+
50+
Prefer inline rules in `BUILD.bazel`. A `.bzl` file earns its `load()` only when the shape repeats across packages or a
51+
value must be computed: [`rust.bzl`](../../../misc/bazel/rust.bzl) is worth it because every Rust binary that ships in a
52+
pack must get the same universal-binary wrapper and symbols test, and forgetting either is a release bug. A local
53+
debugging aid opts out and declares a plain `rust_binary`; see `swift-syntax-parse` in
54+
[`unified/swift-syntax-rs/BUILD.bazel`](../../../unified/swift-syntax-rs/BUILD.bazel). The `_gen_binaries` list in
55+
[`go/BUILD.bazel`](../../../go/BUILD.bazel) does not earn a `.bzl`, because it is shared within a single file, where a
56+
local variable does the job.
57+
58+
Macros here are typically a thin public wrapper around a private rule (`codeql_csharp_binary`, `swift_cc_binary`). Keep
59+
the rule narrow and the ergonomics in the macro. Each macro decorates the caller's `name` to mint its helper targets,
60+
for example `internal/<name>` or `single_arch/<name>`. Their visibility is that macro's choice (private, package
61+
default, or the caller's own), so read the macro instead of assuming. When an error names a target you cannot find in
62+
any source file, a macro minted it: grep the suffix under `misc/bazel/`.
63+
64+
## Shared helpers
65+
66+
Frequently-used pieces, so you load the existing one instead of rewriting it. Read the file for its actual exports.
67+
68+
| `load()` path | Covers |
69+
| --- | --- |
70+
| `//misc/bazel:pkg.bzl` | CodeQL packs and packaging |
71+
| `//misc/bazel:os.bzl` | platform and architecture selection |
72+
| `//misc/bazel:lfs.bzl` | on-demand git-LFS repositories |
73+
| `//misc/bazel:rust.bzl` | Rust binary wrapper |
74+
| `//misc/bazel:csharp.bzl` | C# binary/library/test wrappers |
75+
| `//misc/bazel:utils.bzl` | `select_os`; prefer `os.bzl`'s `os_select` in new code |
76+
77+
[`defs.bzl`](../../../defs.bzl) at the root exports `codeql_platform` for *dependent* modules. It is not the way to get
78+
the platform string here; use `os.bzl`.
79+
80+
## Platform selection
81+
82+
[`codeql_platform_select`](../../../misc/bazel/os.bzl) takes one keyword argument per CodeQL platform: `linux64`,
83+
`linux_arm64`, `osx64` and `win64`. `otherwise` supplies the value for whichever of those you leave unset; it is **not**
84+
a `//conditions:default`. If you only care about the OS, use `os_select`, which gives Linux the same value on both
85+
architectures and has a `posix` shorthand for the shared Linux/macOS value.
86+
87+
In a macro (no `ctx`) it returns a `select()`:
88+
89+
```python
90+
load("//misc/bazel:os.bzl", "codeql_platform_select")
91+
load("//misc/bazel:pkg.bzl", "codeql_pkg_files")
92+
93+
codeql_pkg_files(
94+
name = "extractor-arch",
95+
exes = codeql_platform_select(
96+
otherwise = ["//unified/extractor"],
97+
win64 = ["//unified/extractor-unsupported-os:extractor"],
98+
),
99+
prefix = "tools/{CODEQL_PLATFORM}",
100+
)
101+
```
102+
103+
If implementation code needs to *branch* on the value rather than pass it through, pass `ctx` and add
104+
`OS_DETECTION_ATTRS` to the rule's attributes. The value is then resolved eagerly instead of being an opaque `select()`:
105+
106+
```python
107+
load("//misc/bazel:os.bzl", "OS_DETECTION_ATTRS", "os_select")
108+
109+
def _impl(ctx):
110+
ext = os_select(ctx, windows = ".exe", posix = "")
111+
...
112+
113+
my_rule = rule(
114+
implementation = _impl,
115+
attrs = {"src": attr.label()} | OS_DETECTION_ATTRS,
116+
)
117+
```
118+
119+
## Packs
120+
121+
`codeql_pack` assembles the files that become an extractor pack. See [`unified/BUILD.bazel`](../../../unified/BUILD.bazel)
122+
for a minimal complete example and [`pkg.bzl`](../../../misc/bazel/pkg.bzl) for the arguments. The non-obvious parts:
123+
124+
* **`{CODEQL_PLATFORM}` in a destination path is the routing mechanism**, not just a substitution. A path containing it
125+
is *arch-specific* and lands in the per-architecture zip; every other path is *common*. So `prefix =
126+
"tools/{CODEQL_PLATFORM}"` both places the file and marks it arch-specific. `arch_overrides` forces named
127+
destinations into the arch-specific part without a placeholder.
128+
* **`codeql_pkg_files` splits `srcs` (plain) from `exes` (mode 755)** and **rejects `attributes =`** with an explicit
129+
error. Use `exes` rather than hand-rolling `pkg_attributes(mode = "755")`.
130+
* **`pkg_dirs` and `pkg_symlinks` are unsupported** and fail at analysis time.
131+
* `codeql_pack` also generates an installer and an `install` alias, hence `bazel run //unified:install`. Pass
132+
`installer_alias = None` if one package defines several packs.
133+
* `codeql_pack_group` exists for bundling packs into distribution zips, but nothing in this repo instantiates it.
134+
135+
## Adding a dependency
136+
137+
In order of preference:
138+
139+
1. **A [Bazel Central Registry](https://registry.bazel.build/) module.** Add a `bazel_dep` in
140+
[`MODULE.bazel`](../../../MODULE.bazel).
141+
2. **A patched upstream module.** Add it under [`misc/bazel/registry`](../../../misc/bazel/registry), which `.bazelrc`
142+
puts ahead of the BCR. Put patches in `modules/<repo>/<version>/patches`, rename the version with a `-codeql.N`
143+
suffix, and run [`fix.py`](../../../misc/bazel/registry/fix.py) to realign the metadata.
144+
3. **A raw archive.** Use `http_archive` via `use_repo_rule`, or a repository rule. Copy an adjacent declaration and
145+
keep its checksum field populated.
146+
147+
Vendored Rust crates under [`misc/bazel/3rdparty`](../../../misc/bazel/3rdparty) are generated. Regenerate with
148+
[`update_cargo_deps.sh`](../../../misc/bazel/3rdparty/update_cargo_deps.sh) rather than editing, and keep the
149+
`use_repo` lists in sync, which `bazel mod tidy` does for module extensions.
150+
151+
## Building standalone
152+
153+
[`MODULE.bazel`](../../../MODULE.bazel) declares `semmle_code` with a `local_path_override` pointing at `..`, which
154+
resolves when this repo is checked out inside the internal module. [`.bazelrc`](../../../.bazelrc), which Bazel reads
155+
when invoked in *this* workspace, overrides that with a stub. This line is the whole reason a standalone build resolves:
156+
157+
```
158+
common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub
159+
```
160+
161+
Do not change either the override path or the `local_path_override`; they work as a pair.
162+
163+
[`misc/bazel/semmle_code_stub`](../../../misc/bazel/semmle_code_stub) is an otherwise empty module supplying no-op
164+
versions of the internal helpers that shared `.bzl` files load *unconditionally*. That is its only job, and it is small
165+
enough to read.
166+
167+
**Extend the stub only when a `.bzl` file every standalone target loads gains a new internal `load()`**, which breaks
168+
package loading outright, for everyone. Prefer not needing one. **Never add a stub so that an internal-only target
169+
appears to build**: some targets depend on internal libraries (`grep -rl @semmle_code --include=*.bazel` finds them) and
170+
are correctly unbuildable here. Unlike a `load()`, such a dependency only fails when that target is actually requested.
171+
172+
[`.bazelrc.internal`](../../../.bazelrc.internal) is **not** read here; it carries settings for the internal build. A
173+
setting needed by both has to be written in both files, with paths differing because this repo sits at a different depth
174+
there.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
name: Check change note
22

33
permissions:
4+
contents: read
45
pull-requests: read
56

67
on:
7-
pull_request_target:
8+
pull_request:
89
types: [labeled, unlabeled, opened, synchronize, reopened, ready_for_review]
910
paths:
1011
- "*/ql/src/**/*.ql"
@@ -23,7 +24,7 @@ jobs:
2324
env:
2425
REPO: ${{ github.repository }}
2526
PULL_REQUEST_NUMBER: ${{ github.event.number }}
26-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
GH_TOKEN: ${{ github.token }}
2728
runs-on: ubuntu-latest
2829
steps:
2930

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup dotnet
3535
uses: actions/setup-dotnet@v4
3636
with:
37-
dotnet-version: 10.0.100
37+
dotnet-version: 10.0.201
3838

3939
- name: Checkout repository
4040
uses: actions/checkout@v5

0 commit comments

Comments
 (0)