diff --git a/Cargo.lock b/Cargo.lock index 79ccb86e7..6b69d4fb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11373,11 +11373,12 @@ dependencies = [ "async-trait", "base64 0.23.1", "chrono", + "hex", "log 0.4.34", "md5", "rusqlite", "serde_json", - "sha2 0.10.9", + "sha2 0.11.1", "tempfile", "thiserror 2.0.21", "tokio", @@ -11521,7 +11522,7 @@ dependencies = [ "schemars 0.8.22", "serde", "serde_json", - "sha2 0.10.9", + "sha2 0.11.1", "tempfile", "tokio", "walkdir", @@ -11791,7 +11792,7 @@ dependencies = [ "sea-query-rusqlite", "serde", "serde_json", - "sha2 0.10.9", + "sha2 0.11.1", "thiserror 2.0.21", "ts-rs", "urlencoding", @@ -11834,7 +11835,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "sha2 0.10.9", + "sha2 0.11.1", "thiserror 2.0.21", "tokio", "tokio-tungstenite", diff --git a/Cargo.toml b/Cargo.toml index 639762a15..62fae69d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,7 +66,7 @@ rustls-platform-verifier = "0.7.1" schemars = { version = "0.8.22", features = ["chrono"] } serde = "1.0.228" serde_json = "1.0.145" -sha2 = "0.10.9" +sha2 = "0.11.1" tauri = { version = "2.11.1", default-features = false, features = [ "common-controls-v6", "compression", diff --git a/crates/yaak/Cargo.toml b/crates/yaak/Cargo.toml index ae39db972..9e8afac80 100644 --- a/crates/yaak/Cargo.toml +++ b/crates/yaak/Cargo.toml @@ -7,6 +7,7 @@ publish = false [dependencies] async-trait = "0.1" base64 = "0.23.1" # For carrying body chunks over a text-only plugin transport +hex = { workspace = true } log = { workspace = true } md5 = "0.8.0" sha2 = { workspace = true } diff --git a/crates/yaak/src/import.rs b/crates/yaak/src/import.rs index dadde8ac2..fbbeab3d3 100644 --- a/crates/yaak/src/import.rs +++ b/crates/yaak/src/import.rs @@ -1675,7 +1675,7 @@ fn content_hash(value: Value, keep_order: bool) -> String { fn hash_comparable(value: &Value) -> String { let canonical = serde_json::to_string(&sorted_keys(value.clone())).unwrap_or_default(); - format!("{}{:x}", content_hash_version(value), Sha256::digest(canonical.as_bytes())) + format!("{}{}", content_hash_version(value), hex::encode(Sha256::digest(canonical.as_bytes()))) } /// The fields two comparable forms disagree on, so a preview row can explain itself. @@ -3806,7 +3806,7 @@ mod tests { let mut value = comparable(serde_json::to_value(environment).unwrap()); value["name"] = json!(environment.name); let canonical = serde_json::to_string(&sorted_keys(value)).unwrap(); - let hash = format!("v1:{:x}", Sha256::digest(canonical.as_bytes())); + let hash = format!("v1:{}", hex::encode(Sha256::digest(canonical.as_bytes()))); let row = source_rows(&query_manager, workspace_id) .into_iter() .find(|r| r.model_id.as_deref() == Some(environment.id.as_str()))