Update gix-* crates
Fixes CVE-2026-0810.
The gix crates require updating due to the security vulnerability above.
They require updating together in lock-step so both radicle-fetch
and radicle-oid are affected.
radicle-oid handles the non-exhaustive nature of ObjectId.
radicle-fetch updates to the new API types, however, this comes with
some updates to the ls_refs protocol.
A regression is documented in gitoxide issue 2429.
The regression highlighted that it is the duty of the caller to also
filter the outcome of ls-refs, and ref-prefix is simply an
optimisation.
The ls-refs code is refactored to better represent and handle this operation.
11 files changed
+501
-278
980ed561
→
84320919
modified Cargo.lock
@@ -192,9 +192,12 @@ checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -617,7 +620,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1023,7 +1026,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1170,32 +1172,53 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1206,163 +1229,240 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1371,241 +1471,257 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1614,45 +1730,43 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1660,12 +1774,11 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
|
|
|
|
|
@@ -1696,9 +1809,9 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1726,15 +1839,6 @@ dependencies = [
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -1991,30 +2095,30 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2107,9 +2211,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2130,15 +2234,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -2158,9 +2253,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2722,9 +2817,9 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2829,7 +2924,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2862,7 +2957,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2892,7 +2987,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2916,7 +3011,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2935,7 +3030,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2957,7 +3052,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2979,13 +3074,14 @@ dependencies = [
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3006,7 +3102,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3060,7 +3156,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3100,7 +3196,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3112,7 +3208,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3139,7 +3235,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3192,7 +3288,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3203,7 +3299,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3408,15 +3504,15 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -4076,7 +4172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -4092,14 +4188,14 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -4136,11 +4232,11 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -4156,9 +4252,9 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -5070,6 +5166,15 @@ dependencies = [
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -5274,9 +5379,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -5433,6 +5538,6 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
modified Cargo.toml
@@ -30,7 +30,7 @@ cyphernet = "0.5.2"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-fetch/Cargo.toml
@@ -11,12 +11,13 @@ rust-version.workspace = true
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified crates/radicle-fetch/src/lib.rs
@@ -12,7 +12,7 @@ mod state;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -131,7 +131,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-fetch/src/stage.rs
@@ -32,7 +32,7 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -89,6 +89,72 @@ pub mod error {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -107,7 +173,7 @@ pub mod error {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -163,8 +229,8 @@ pub struct CanonicalId {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -250,17 +316,17 @@ pub struct SpecialRefs {
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -331,12 +397,16 @@ pub struct SigrefsAt {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -421,7 +491,7 @@ pub struct DataRefs {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -617,3 +687,26 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified crates/radicle-fetch/src/state.rs
@@ -1,7 +1,7 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -214,7 +214,7 @@ impl FetchState {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -225,13 +225,13 @@ impl FetchState {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -288,7 +288,7 @@ impl FetchState {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -357,7 +357,7 @@ impl FetchState {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-fetch/src/transport.rs
@@ -10,6 +10,7 @@ use std::sync::Arc;
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -20,6 +21,7 @@ use thiserror::Error;
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -90,11 +92,12 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| + | |
|
|
|
|
|
@@ -104,11 +107,10 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -126,7 +128,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -179,7 +181,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -189,7 +191,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -202,16 +204,25 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -221,15 +232,6 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
modified crates/radicle-fetch/src/transport/fetch.rs
@@ -4,10 +4,9 @@ use std::sync::{atomic::AtomicBool, Arc};
|
|
|
|
|
|
| - | |
|
|
| - | |
|
|
| + | |
|
|
|
|
|
@@ -149,7 +148,7 @@ impl fetch::Negotiate for Negotiate {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-fetch/src/transport/ls_refs.rs
@@ -1,11 +1,14 @@
|
|
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -17,7 +20,7 @@ pub struct Config {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -30,7 +33,7 @@ pub struct Config {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -39,7 +42,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -51,21 +54,39 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| + | |
|
|
|
modified crates/radicle-node/src/tests/e2e.rs
@@ -454,7 +454,7 @@ fn test_fetch_followed_remotes() {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-oid/src/lib.rs
@@ -367,6 +367,7 @@ mod gix {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -383,6 +384,7 @@ mod gix {
|
|
|
|
|
|
| + | |
|
|
|
|
|