commit 6667d13de481e6bd37756ec0b676de9a4a87927a
parent 60ce9294ff271bc311b7d18af97dc78e48e75377
Author: triesap <tyson@radroots.org>
Date: Fri, 23 Oct 2026 17:25:53 +0000
deps: require patched Tokio across shared runtime consumers
- Require Tokio 1.53.3 and lock its necessary Mio and macro companions.
- Preserve unrelated dependencies and explicit version-specific vet review debt.
- Retain existing advisory policy without adding an exception.
- Restore profile refusal and exact tooling guards with current native/portable APIs.
Diffstat:
11 files changed, 108 insertions(+), 79 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -3,15 +3,6 @@
version = 4
[[package]]
-name = "addr2line"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
-dependencies = [
- "gimli",
-]
-
-[[package]]
name = "adler2"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -325,21 +316,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
[[package]]
-name = "backtrace"
-version = "0.3.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-link",
-]
-
-[[package]]
name = "base16ct"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1633,12 +1609,6 @@ dependencies = [
]
[[package]]
-name = "gimli"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
-
-[[package]]
name = "glob"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2108,17 +2078,6 @@ dependencies = [
]
[[package]]
-name = "io-uring"
-version = "0.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9080b15e63775b9a2ac7dca720f7050a8b955e092ea0f6020a4a80f69998cdc0"
-dependencies = [
- "bitflags 2.11.0",
- "cfg-if",
- "libc",
-]
-
-[[package]]
name = "ipnet"
version = "2.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2474,9 +2433,9 @@ dependencies = [
[[package]]
name = "mio"
-version = "1.1.1"
+version = "1.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
+checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee"
dependencies = [
"libc",
"wasi",
@@ -2702,15 +2661,6 @@ dependencies = [
]
[[package]]
-name = "object"
-version = "0.37.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
-dependencies = [
- "memchr",
-]
-
-[[package]]
name = "oid-registry"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4150,12 +4100,6 @@ dependencies = [
]
[[package]]
-name = "rustc-demangle"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb"
-
-[[package]]
name = "rustc-hash"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4959,20 +4903,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.47.1"
+version = "1.53.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+checksum = "ce3335fa71841cda333a58d7615b03901380ecf09d59b3296d21f8bbac0dde4e"
dependencies = [
- "backtrace",
"bytes",
- "io-uring",
"libc",
"mio",
"pin-project-lite",
- "slab",
"socket2",
"tokio-macros",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -4986,13 +4927,13 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "2.5.0"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 3.0.2",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
@@ -271,7 +271,7 @@ sled = { version = "0.34" }
tempfile = { version = "3" }
tar = { version = "0.4" }
thiserror = { version = "1" }
-tokio = { version = "1" }
+tokio = { version = "1.53.3" }
tokio-rustls = { version = "0.26.4", default-features = false }
tokio-util = { version = "0.7", features = ["rt"] }
tokio-tungstenite = { version = "0.28.0", default-features = false, features = [
diff --git a/contracts/architecture/deviations.toml b/contracts/architecture/deviations.toml
@@ -2,6 +2,28 @@ schema_version = 1
architecture_id = "radroots.crates.release.v1"
[[deviation]]
+id = "RCRV1-DEV-056"
+date = "2026-10-23"
+status = "active"
+approval = "The user authorizes the complete approved refactor, necessary dependency repairs across the supported closure, verified commits and master source publication."
+affected_steps = ["050", "130", "140"]
+spec_anchors = ["contracts/crates/release_v1/radroots_crates_release_v1.toml#repository_policy"]
+source_evidence = [
+ "A current consumer supply-chain execution fails RUSTSEC-2026-0386 on Tokio1.50.0; supported locked inputs also retain affected1.47.1,1.51.0 and1.53.1.",
+ "The upstream advisory identifies patched Tokio1.51.6 LTS and1.53.3; Tokio1.53.3 preserves the supported stable compiler minimum and requires its current macros and Mio companions.",
+ "Current workspace Tokio version1 permits vulnerable resolutions. Continuing exact consumer adoption without a supported lower bound would propagate an affected graph.",
+]
+replacement_action = "Before continuing consumer adoption, constrain shared Tokio to>=1.53.3, update the exact lock and required companion packages only, verify current runtime/store/transport/lifecycle and source/license/advisory controls, then publish the provider before exact downstream pin and artifact adoption. Preserve preceding source-scoped results and the failed gate; add no advisory exception."
+verification = [
+ "Review the complete locked graph delta, upstream release/advisory provenance and any existing vet exemption-version updates without claiming independent audits.",
+ "Run current native workspace compilation/tests, strict lint/doc and contract/architecture/source policy, plus meaningful portable boundaries and affected API freshness.",
+ "Qualify each supported consumer and generated artifact against its actual repaired source before coherent parent adoption and final acceptance.",
+]
+unresolved_risk = "Provider repair, supported consumer/artifact adoption and final current acceptance are pending. Existing vet exemptions remain visible accepted review debt, not independent audits."
+normative_architecture_change = false
+adr_required = false
+
+[[deviation]]
id = "RCRV1-DEV-055"
date = "2026-10-23"
status = "active"
diff --git a/crates/protocol/src/listing/input.rs b/crates/protocol/src/listing/input.rs
@@ -140,10 +140,10 @@ impl PublishInput {
// required nulls and all nested domain constructors.
let value: serde_json::Value =
serde_json::from_slice(raw).map_err(|_| CommandError::InvalidInput)?;
- object_shapes(&value)?;
if let Some(profile) = value.get("profile") {
supported(profile)?;
}
+ object_shapes(&value)?;
let input: Input = serde_json::from_slice(raw).map_err(|_| CommandError::InvalidInput)?;
input.validate()
}
diff --git a/crates/radroots_ffi/tests/inputs.rs b/crates/radroots_ffi/tests/inputs.rs
@@ -13,6 +13,14 @@ fn actual_shared_parser_retains_invalid_unsupported_and_limit_failures() {
matches!(ListingInput::parse(input.to_vec()), Err(Error::CommandInput { field, kind: InputFailure::UnsupportedProfile }) if field == "listing_input")
);
}
+ for input in [
+ br#"{"profile":{"profile":"radroots.listing","version":1}}"#.as_slice(),
+ br#"{"profile":[]}"#,
+ ] {
+ assert!(
+ matches!(ListingInput::parse(input.to_vec()), Err(Error::InvalidInput { field }) if field == "listing_input")
+ );
+ }
assert!(
matches!(ListingInput::parse(vec![b' '; 65_537]), Err(Error::CommandInput { field, kind: InputFailure::LimitExceeded }) if field == "listing_input")
);
diff --git a/crates/sdk/src/signing.rs b/crates/sdk/src/signing.rs
@@ -251,7 +251,7 @@ mod tests {
use super::*;
const PUBLIC_KEY: &str = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
- #[cfg(feature = "local-signing")]
+ #[cfg(all(feature = "local-signing", feature = "blossom"))]
const SECRET_KEY: &str = "7e0112ad58b2d2d13fb80532625195dc169b86d72b0e1db48347837a785cae90";
struct ScriptedSigner {
@@ -320,7 +320,7 @@ mod tests {
)
}
- #[cfg(feature = "local-signing")]
+ #[cfg(all(feature = "local-signing", feature = "blossom"))]
fn local_signer() -> radroots_nostr::signing::LocalSigner {
radroots_nostr::signing::LocalSigner::new(
radroots_nostr::key::SecretKey::parse(SECRET_KEY).expect("secret fixture"),
diff --git a/crates/signing/tests/package_boundary.rs b/crates/signing/tests/package_boundary.rs
@@ -20,6 +20,7 @@ fn manifest_has_final_identity_features_and_dependencies() {
"version = \"0.1.0-alpha\"",
"publish = [\"crates-io\"]",
"default = [\"std\", \"serde\"]",
+ "artifacts = [\"radroots_protocol/chat\", \"radroots_protocol/listing\"]",
"radroots_domain = { workspace = true, default-features = false }",
"radroots_event = { workspace = true, default-features = false }",
"radroots_event_codec = { workspace = true, default-features = false }",
@@ -33,7 +34,7 @@ fn manifest_has_final_identity_features_and_dependencies() {
}
assert_eq!(
table_keys(MANIFEST, "[features]"),
- BTreeSet::from(["chat", "default", "serde", "std"])
+ BTreeSet::from(["artifacts", "chat", "default", "serde", "std"])
);
assert_eq!(
table_keys(MANIFEST, "[dependencies]"),
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
@@ -1289,8 +1289,9 @@ version = "0.8.9"
criteria = "network-parser-reviewed"
[[exemptions.mio]]
-version = "1.1.1"
+version = "1.2.4"
criteria = "network-parser-reviewed"
+notes = "Existing version-specific review debt advanced as the required Tokio1.53.3 companion after RUSTSEC-2026-0386. Independent full-crate review remains outstanding; source compatibility, current policy checks and runtime tests do not claim that audit."
[[exemptions.negentropy]]
version = "0.5.0"
@@ -2080,12 +2081,14 @@ version = "0.1.1"
criteria = "network-parser-reviewed"
[[exemptions.tokio]]
-version = "1.47.1"
+version = "1.53.3"
criteria = "network-parser-reviewed"
+notes = "Existing version-specific review debt advanced to the upstream patched branch after RUSTSEC-2026-0386. Independent full-crate review remains outstanding; advisory remediation, current policy checks and runtime tests do not claim that audit. No advisory exception is added."
[[exemptions.tokio-macros]]
-version = "2.5.0"
+version = "2.7.2"
criteria = "network-parser-reviewed"
+notes = "Existing version-specific review debt advanced as the required Tokio1.53.3 macro companion after RUSTSEC-2026-0386. Independent full-crate review remains outstanding; compiler and runtime tests do not claim that audit."
[[exemptions.tokio-rustls]]
version = "0.26.4"
diff --git a/tools/xtask/src/architecture/dependency_boundary.rs b/tools/xtask/src/architecture/dependency_boundary.rs
@@ -610,7 +610,7 @@ mod tests {
fn policy_covers_the_exact_architecture_catalog() {
let policy = policy();
let placements = placements(&policy);
- assert_eq!(placements.len(), 21);
+ assert_eq!(placements.len(), 22);
}
#[test]
diff --git a/tools/xtask/src/main.rs b/tools/xtask/src/main.rs
@@ -1169,7 +1169,10 @@ mod tests {
assert!(invalid_dto_roots.contains("--check|--write"));
let invalid_generate =
run(&["generate".to_string()]).expect_err("generate requires a target and mode");
- assert!(invalid_generate.contains("generate protocol --check|--write"));
+ assert_eq!(
+ invalid_generate,
+ "usage: cargo xtask generate protocol|data-notices --check|--write"
+ );
let removed_sdk = run(&["sdk".to_string(), "validate".to_string()])
.expect_err("removed sdk command namespace");
diff --git a/tools/xtask/src/safety_qualification.rs b/tools/xtask/src/safety_qualification.rs
@@ -116,8 +116,8 @@ fn validate(contract: &Contract, packages: &BTreeSet<String>) -> Result<(), Stri
}
for lane in &contract.sanitizer {
- if lane.kind != "address" || lane.targets.len() != 4 || lane.packages.len() != 3 {
- return Err("native sanitizer authority must cover address checks on four hosts and three boundaries".to_owned());
+ if lane.kind != "address" || lane.targets.len() != 4 || lane.packages.len() != 4 {
+ return Err("native sanitizer authority must cover address checks on four hosts and four boundaries".to_owned());
}
validate_authority(&lane.authority)?;
let targets = lane.targets.iter().collect::<BTreeSet<_>>();
@@ -125,6 +125,32 @@ fn validate(contract: &Contract, packages: &BTreeSet<String>) -> Result<(), Stri
if targets.len() != lane.targets.len() || lane_packages.len() != lane.packages.len() {
return Err("sanitizer targets and packages must be unique".to_owned());
}
+ if targets
+ .into_iter()
+ .map(String::as_str)
+ .collect::<BTreeSet<_>>()
+ != BTreeSet::from([
+ "aarch64-apple-darwin",
+ "x86_64-apple-darwin",
+ "aarch64-unknown-linux-gnu",
+ "x86_64-unknown-linux-gnu",
+ ])
+ || lane_packages
+ .into_iter()
+ .map(String::as_str)
+ .collect::<BTreeSet<_>>()
+ != BTreeSet::from([
+ "radroots_ffi",
+ "radroots_sdk_ffi",
+ "radroots_storage_sqlite",
+ "radroots_runtime_manager",
+ ])
+ {
+ return Err(
+ "native sanitizer hosts and boundaries must match the exact governed inventory"
+ .to_owned(),
+ );
+ }
for package in &lane.packages {
validate_identifier("sanitizer package", package)?;
if !packages.contains(package) {
@@ -344,4 +370,29 @@ mod tests {
let packages = workspace_packages(root).expect("workspace packages");
validate(&load(root).expect("contract"), &packages).expect("valid safety matrix");
}
+
+ #[test]
+ fn sanitizer_inventory_refuses_missing_or_substituted_hosts_and_boundaries() {
+ let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
+ .parent()
+ .and_then(std::path::Path::parent)
+ .expect("workspace root");
+ let packages = workspace_packages(root).expect("workspace packages");
+ for replace in [false, true] {
+ let mut contract = load(root).expect("contract");
+ if replace {
+ contract.sanitizer[0].packages[0] = "radroots_core".to_owned();
+ } else {
+ contract.sanitizer[0].packages.remove(0);
+ }
+ assert!(validate(&contract, &packages).is_err());
+ let mut contract = load(root).expect("contract");
+ if replace {
+ contract.sanitizer[0].targets[0] = "wasm32-unknown-unknown".to_owned();
+ } else {
+ contract.sanitizer[0].targets.remove(0);
+ }
+ assert!(validate(&contract, &packages).is_err());
+ }
+ }
}