Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 12 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 20 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ turso_core = "0.6"
serial_test = "3"

# Python bindings
pyo3 = { version = "0.28.3", features = ["extension-module", "generate-import-lib"] }
pyo3-async-runtimes = { version = "0.28", features = ["tokio-runtime"] }
pyo3 = { version = "0.29", features = ["extension-module", "generate-import-lib"] }
pyo3-async-runtimes = { version = "0.29", features = ["tokio-runtime"] }

# JavaScript/Node.js bindings (NAPI-RS)
napi = { version = "3.8.6", default-features = false, features = ["napi6", "compat-mode", "tokio_rt"] }
Expand Down Expand Up @@ -147,3 +147,21 @@ strip = "symbols"
inherits = "release"
lto = "fat"
codegen-units = 1

# Important decision (security): pin `jiter` to upstream main so the whole
# workspace can run pyo3 0.29, which fixes GHSA-36hh-v3qg-5jq4 (high, OOB read
# in PyList/PyTuple iterators) and GHSA-chgr-c6px-7xpp (missing `Sync` bound)
# in the bashkit-python extension.
#
# Blocker: `monty` -> `jiter 0.15.0` declares an optional `pyo3 = "^0.28.2"`.
# Although jiter's `python` feature is never activated here (monty only enables
# `num-bigint`), the weak `pyo3?/num-bigint` reference plus pyo3-ffi's
# `links = "python"` global uniqueness force the resolver to honour jiter's
# 0.28 constraint, pinning the whole graph below pyo3 0.29.
#
# jiter `main` is still version 0.15.0 (semver-compatible with monty's
# `^0.15.0`) but already bumped its pyo3 dependency to 0.29, so this patch
# unblocks the upgrade without a fork. Drop it once monty ships a release that
# tracks a published jiter with pyo3 0.29.
[patch.crates-io]
jiter = { git = "https://github.com/pydantic/jiter", rev = "6d57715e01ec78859c62fc5447073c0b5902de39" }
2 changes: 1 addition & 1 deletion crates/bashkit-python/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1777,7 +1777,7 @@ impl PyFileSystem {
fn to_capsule<'py>(&self, py: Python<'py>) -> PyResult<Py<PyCapsule>> {
let fs = self.export_fs(py)?;
let exported = export_filesystem(fs).map_err(|e| PyRuntimeError::new_err(e.to_string()))?;
let capsule = PyCapsule::new(py, exported, Some(FILESYSTEM_CAPSULE_NAME.to_owned()))?;
let capsule = PyCapsule::new_with_value(py, exported, FILESYSTEM_CAPSULE_NAME)?;
Ok(capsule.unbind())
}

Expand Down
6 changes: 5 additions & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,12 @@ deny = []
unknown-registry = "deny"
unknown-git = "deny"

# Allow git sources for Monty (not yet on crates.io) and its ruff deps
# Allow git sources for Monty (not yet on crates.io) and its ruff deps.
# jiter is pinned to upstream main via [patch.crates-io] in the root
# Cargo.toml so the workspace can run pyo3 0.29 (security fix); see the
# patch comment there.
allow-git = [
"https://github.com/pydantic/monty",
"https://github.com/samuelcolvin/ruff",
"https://github.com/pydantic/jiter",
]
16 changes: 6 additions & 10 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1408,31 +1408,27 @@ version = "1.11.0"
criteria = "safe-to-run"

[[exemptions.pyo3]]
version = "0.28.3"
version = "0.29.0"
criteria = "safe-to-deploy"

[[exemptions.pyo3-async-runtimes]]
version = "0.28.0"
version = "0.29.0"
criteria = "safe-to-deploy"

[[exemptions.pyo3-build-config]]
version = "0.28.3"
version = "0.29.0"
criteria = "safe-to-deploy"

[[exemptions.pyo3-ffi]]
version = "0.28.3"
version = "0.29.0"
criteria = "safe-to-deploy"

[[exemptions.pyo3-macros]]
version = "0.28.3"
version = "0.29.0"
criteria = "safe-to-deploy"

[[exemptions.pyo3-macros-backend]]
version = "0.28.3"
criteria = "safe-to-deploy"

[[exemptions.python3-dll-a]]
version = "0.2.15"
version = "0.29.0"
criteria = "safe-to-deploy"

[[exemptions.quick-error]]
Expand Down
Loading