commit 01d91d3914541a8e7a15ae3ad2ac41da714cfbaa
parent 46b2e3e7866068e64edd1c88f5ba941c686c6d22
Author: triesap <tyson@radroots.org>
Date: Wed, 14 Oct 2026 19:40:11 +0000
fix: Omit native upload request fields from Rust diagnostics
- Preserve request fields and the existing UniFFI record contract.
- Retain compact, pretty, nested and field-access regressions.
- Regenerate native provenance from the exact staged source.
- Verify Rust, Linux, Swift, Kotlin and simulator consumers.
Diffstat:
7 files changed, 164 insertions(+), 51 deletions(-)
diff --git a/TeraFFI/provenance.json b/TeraFFI/provenance.json
@@ -22,9 +22,9 @@
"sha256": "3ed9b7ece2f86e5b5d1ddc6ecbb97deb49c46ca2ea91a930eaec1b580232345c"
},
{
- "bytes": 82227592,
+ "bytes": 82227672,
"path": "TeraFFI.xcframework/ios-arm64-simulator/libtera_ffi.a",
- "sha256": "d6b146f6100310b8d206dfe315874ce34b8c13a3840b606f10678ef9ed251ef4"
+ "sha256": "999f6754ba0242a105f376d4cae5fb1c2b09b467193ff85f682a3c1e6de1e9c4"
},
{
"bytes": 106232,
@@ -37,9 +37,9 @@
"sha256": "3ed9b7ece2f86e5b5d1ddc6ecbb97deb49c46ca2ea91a930eaec1b580232345c"
},
{
- "bytes": 82284576,
+ "bytes": 82285984,
"path": "TeraFFI.xcframework/ios-arm64/libtera_ffi.a",
- "sha256": "03c9b749d07a71e74dd377c24008895726d7911125c9f846b4efc03ccd58ddc8"
+ "sha256": "00aa1a1633674c450abc8d4bcdabe3398b6dd9e37e9654bd8bcc6cb65b5a7588"
},
{
"bytes": 65428,
@@ -62,9 +62,9 @@
"sha256": "3ed9b7ece2f86e5b5d1ddc6ecbb97deb49c46ca2ea91a930eaec1b580232345c"
},
{
- "bytes": 812706,
+ "bytes": 812784,
"path": "generated/TeraKitBindings.swift",
- "sha256": "8ec3f7528ccf040eb5e0a8e80a91d6f89bb92645ac5703727f177806ee0338e1"
+ "sha256": "356a6fb4c2f498a5af0c8369c794710a568a4af96dec5fd622d789c1ed07acce"
},
{
"bytes": 106232,
@@ -79,32 +79,32 @@
{
"bytes": 24565344,
"path": "native/aarch64-apple-darwin/libtera_ffi.dylib",
- "sha256": "0da38cbe2dc6a898987d2693bb4d492219a86ba171eca46729c10ca132f4b5dc"
+ "sha256": "2177ea4f215e04cc4fa413ca04fb02e84d3a44696cdf93f6aceef4b8f1da7d43"
},
{
- "bytes": 82227592,
+ "bytes": 82227672,
"path": "native/aarch64-apple-ios-sim/libtera_ffi.a",
- "sha256": "d6b146f6100310b8d206dfe315874ce34b8c13a3840b606f10678ef9ed251ef4"
+ "sha256": "999f6754ba0242a105f376d4cae5fb1c2b09b467193ff85f682a3c1e6de1e9c4"
},
{
- "bytes": 82284576,
+ "bytes": 82285984,
"path": "native/aarch64-apple-ios/libtera_ffi.a",
- "sha256": "03c9b749d07a71e74dd377c24008895726d7911125c9f846b4efc03ccd58ddc8"
+ "sha256": "00aa1a1633674c450abc8d4bcdabe3398b6dd9e37e9654bd8bcc6cb65b5a7588"
},
{
- "bytes": 171063,
+ "bytes": 171337,
"path": "source/aarch64-apple-darwin.json",
- "sha256": "e8faf6fb1764062ab27970b21212466f9e870709dae7c73f368414d61eda4e15"
+ "sha256": "10f66e95caa30622450d2a07131707967cfa221e2b4d05eb1d87fc16fa79cb71"
},
{
- "bytes": 170988,
+ "bytes": 171262,
"path": "source/aarch64-apple-ios-sim.json",
- "sha256": "391965b35424d843b422a6e0edec47f718cb1eec592491c20c583f1c31ba601d"
+ "sha256": "c4cd9ec6c0c61682d08239c0b7f7aea779bd58b32821a9eaeb2a74c75886ee88"
},
{
- "bytes": 170958,
+ "bytes": 171232,
"path": "source/aarch64-apple-ios.json",
- "sha256": "095ab7e32c967d68743bf2f69997fb85f87c803944e2cbdf8aea3aa0573be885"
+ "sha256": "7a4e058b34a9edcf2436e1e8dfab3cf7ebf1e0a1d391c62a88b6a814beb19807"
}
],
"language": "swift",
@@ -112,7 +112,7 @@
"schema": "radroots.artifact-manifest.v2",
"source": {
"repository": "https://github.com/radrootslabs/tera",
- "tree": "36670dc22376a94606ce1c2128034212bb455721"
+ "tree": "d1f8b0b3c775fa30525325b842375a0f64468cf6"
},
"source_records": {
"aarch64-apple-darwin": "source/aarch64-apple-darwin.json",
@@ -139,9 +139,9 @@
"sha256": "3ed9b7ece2f86e5b5d1ddc6ecbb97deb49c46ca2ea91a930eaec1b580232345c"
},
{
- "bytes": 82227592,
+ "bytes": 82227672,
"path": "Tera/Frameworks/TeraFFI.xcframework/ios-arm64-simulator/libtera_ffi.a",
- "sha256": "d6b146f6100310b8d206dfe315874ce34b8c13a3840b606f10678ef9ed251ef4"
+ "sha256": "999f6754ba0242a105f376d4cae5fb1c2b09b467193ff85f682a3c1e6de1e9c4"
},
{
"bytes": 106232,
@@ -154,14 +154,14 @@
"sha256": "3ed9b7ece2f86e5b5d1ddc6ecbb97deb49c46ca2ea91a930eaec1b580232345c"
},
{
- "bytes": 82284576,
+ "bytes": 82285984,
"path": "Tera/Frameworks/TeraFFI.xcframework/ios-arm64/libtera_ffi.a",
- "sha256": "03c9b749d07a71e74dd377c24008895726d7911125c9f846b4efc03ccd58ddc8"
+ "sha256": "00aa1a1633674c450abc8d4bcdabe3398b6dd9e37e9654bd8bcc6cb65b5a7588"
},
{
- "bytes": 812706,
+ "bytes": 812784,
"path": "Tera/Generated/TeraKitBindings.swift",
- "sha256": "8ec3f7528ccf040eb5e0a8e80a91d6f89bb92645ac5703727f177806ee0338e1"
+ "sha256": "356a6fb4c2f498a5af0c8369c794710a568a4af96dec5fd622d789c1ed07acce"
},
{
"bytes": 65428,
@@ -174,19 +174,19 @@
"sha256": "0f2ed40dd373866f25dccb3d8665eaf145660a08ba7b15ba169c8fc2b08e9c11"
},
{
- "bytes": 171063,
+ "bytes": 171337,
"path": "TeraFFI/source/aarch64-apple-darwin.json",
- "sha256": "e8faf6fb1764062ab27970b21212466f9e870709dae7c73f368414d61eda4e15"
+ "sha256": "10f66e95caa30622450d2a07131707967cfa221e2b4d05eb1d87fc16fa79cb71"
},
{
- "bytes": 170988,
+ "bytes": 171262,
"path": "TeraFFI/source/aarch64-apple-ios-sim.json",
- "sha256": "391965b35424d843b422a6e0edec47f718cb1eec592491c20c583f1c31ba601d"
+ "sha256": "c4cd9ec6c0c61682d08239c0b7f7aea779bd58b32821a9eaeb2a74c75886ee88"
},
{
- "bytes": 170958,
+ "bytes": 171232,
"path": "TeraFFI/source/aarch64-apple-ios.json",
- "sha256": "095ab7e32c967d68743bf2f69997fb85f87c803944e2cbdf8aea3aa0573be885"
+ "sha256": "7a4e058b34a9edcf2436e1e8dfab3cf7ebf1e0a1d391c62a88b6a814beb19807"
}
],
"schema": "tera.installed-native-artifacts.v1"
diff --git a/TeraFFI/source.lock b/TeraFFI/source.lock
@@ -1,7 +1,7 @@
schema = "tera.installed-source.v1"
repository = "https://github.com/radrootslabs/tera"
-source_tree = "36670dc22376a94606ce1c2128034212bb455721"
-manifest_sha256 = "06c64647d126b2581d2bec5c3b882bc516437171cb8bdffbf2892f88ea1651f0"
+source_tree = "d1f8b0b3c775fa30525325b842375a0f64468cf6"
+manifest_sha256 = "4357ff61c2abe0109bdbddcc6cc6e0af66bc8563a795f9076f6c1d3f4d1943a7"
source_date_epoch = 1787871027
[foundation]
diff --git a/TeraFFI/source/aarch64-apple-darwin.json b/TeraFFI/source/aarch64-apple-darwin.json
@@ -385,7 +385,7 @@
"generator_profile_overrides": {
"CARGO_PROFILE_DEV_DEBUG": "line-tables-only"
},
- "path_sha256": "33410984d9f13f1b1c2f58a6ebb9bd7df36c715feb05efdcba2c605c1e3d8a3f"
+ "path_sha256": "d3b3c9948edc72d578b04b9aff7dd44a2204731196171d8a3c7ce6039caee571"
},
"inspection_limits": {
"maximum_inspection_seconds": 120,
@@ -618,7 +618,7 @@
"generator_profile_overrides": {
"CARGO_PROFILE_DEV_DEBUG": "line-tables-only"
},
- "path_sha256": "33410984d9f13f1b1c2f58a6ebb9bd7df36c715feb05efdcba2c605c1e3d8a3f"
+ "path_sha256": "d3b3c9948edc72d578b04b9aff7dd44a2204731196171d8a3c7ce6039caee571"
},
"inspection_limits": {
"maximum_inspection_seconds": 120,
@@ -2516,10 +2516,10 @@
"sha256": "e05c1d8778f8482039ed4ffac1b213d08d3d8bba6e33580d354e435346a07819"
},
"core/crates/tera_ffi/src/dto.rs": {
- "bytes": 108105,
- "git_blob": "b6de28dc374175325a83249d15f563570c450dab",
+ "bytes": 108470,
+ "git_blob": "80cc64dc2537c34fb5bbbd27ffa13baf79283dc4",
"mode": "100644",
- "sha256": "91f0c37ad28b40d5f63762898a33c377d2d10a0da4d44786ff1c938defd16cf3"
+ "sha256": "bcb7538d358cdebfd9aa91fd2cd0327b8eb7b102eb753f3675aba15025aba7bf"
},
"core/crates/tera_ffi/src/dto/calendar.rs": {
"bytes": 2040,
@@ -2539,6 +2539,12 @@
"mode": "100644",
"sha256": "32a763eda1e03db233091613fde98ea639578abd91ba7e2146e65883d5b7062c"
},
+ "core/crates/tera_ffi/src/dto/native_upload_job_tests.rs": {
+ "bytes": 2986,
+ "git_blob": "e915b9dc89bd9c738107a55ddca2d9f48f51db56",
+ "mode": "100644",
+ "sha256": "af5d4014329527359d0eb665e73c629171da9a7e0ce781839770cd430d1f5a19"
+ },
"core/crates/tera_ffi/src/dto/today_sync.rs": {
"bytes": 4837,
"git_blob": "b80972c1517fcda4be3593bc92015316c582b4e4",
@@ -3633,6 +3639,6 @@
}
},
"policy": "staged_inputs",
- "tree": "36670dc22376a94606ce1c2128034212bb455721"
+ "tree": "d1f8b0b3c775fa30525325b842375a0f64468cf6"
}
}
diff --git a/TeraFFI/source/aarch64-apple-ios-sim.json b/TeraFFI/source/aarch64-apple-ios-sim.json
@@ -387,7 +387,7 @@
"generator_profile_overrides": {
"CARGO_PROFILE_DEV_DEBUG": "line-tables-only"
},
- "path_sha256": "33410984d9f13f1b1c2f58a6ebb9bd7df36c715feb05efdcba2c605c1e3d8a3f"
+ "path_sha256": "d3b3c9948edc72d578b04b9aff7dd44a2204731196171d8a3c7ce6039caee571"
},
"inspection_limits": {
"maximum_inspection_seconds": 120,
@@ -616,7 +616,7 @@
"generator_profile_overrides": {
"CARGO_PROFILE_DEV_DEBUG": "line-tables-only"
},
- "path_sha256": "33410984d9f13f1b1c2f58a6ebb9bd7df36c715feb05efdcba2c605c1e3d8a3f"
+ "path_sha256": "d3b3c9948edc72d578b04b9aff7dd44a2204731196171d8a3c7ce6039caee571"
},
"inspection_limits": {
"maximum_inspection_seconds": 120,
@@ -2514,10 +2514,10 @@
"sha256": "e05c1d8778f8482039ed4ffac1b213d08d3d8bba6e33580d354e435346a07819"
},
"core/crates/tera_ffi/src/dto.rs": {
- "bytes": 108105,
- "git_blob": "b6de28dc374175325a83249d15f563570c450dab",
+ "bytes": 108470,
+ "git_blob": "80cc64dc2537c34fb5bbbd27ffa13baf79283dc4",
"mode": "100644",
- "sha256": "91f0c37ad28b40d5f63762898a33c377d2d10a0da4d44786ff1c938defd16cf3"
+ "sha256": "bcb7538d358cdebfd9aa91fd2cd0327b8eb7b102eb753f3675aba15025aba7bf"
},
"core/crates/tera_ffi/src/dto/calendar.rs": {
"bytes": 2040,
@@ -2537,6 +2537,12 @@
"mode": "100644",
"sha256": "32a763eda1e03db233091613fde98ea639578abd91ba7e2146e65883d5b7062c"
},
+ "core/crates/tera_ffi/src/dto/native_upload_job_tests.rs": {
+ "bytes": 2986,
+ "git_blob": "e915b9dc89bd9c738107a55ddca2d9f48f51db56",
+ "mode": "100644",
+ "sha256": "af5d4014329527359d0eb665e73c629171da9a7e0ce781839770cd430d1f5a19"
+ },
"core/crates/tera_ffi/src/dto/today_sync.rs": {
"bytes": 4837,
"git_blob": "b80972c1517fcda4be3593bc92015316c582b4e4",
@@ -3631,6 +3637,6 @@
}
},
"policy": "staged_inputs",
- "tree": "36670dc22376a94606ce1c2128034212bb455721"
+ "tree": "d1f8b0b3c775fa30525325b842375a0f64468cf6"
}
}
diff --git a/TeraFFI/source/aarch64-apple-ios.json b/TeraFFI/source/aarch64-apple-ios.json
@@ -387,7 +387,7 @@
"generator_profile_overrides": {
"CARGO_PROFILE_DEV_DEBUG": "line-tables-only"
},
- "path_sha256": "33410984d9f13f1b1c2f58a6ebb9bd7df36c715feb05efdcba2c605c1e3d8a3f"
+ "path_sha256": "d3b3c9948edc72d578b04b9aff7dd44a2204731196171d8a3c7ce6039caee571"
},
"inspection_limits": {
"maximum_inspection_seconds": 120,
@@ -616,7 +616,7 @@
"generator_profile_overrides": {
"CARGO_PROFILE_DEV_DEBUG": "line-tables-only"
},
- "path_sha256": "33410984d9f13f1b1c2f58a6ebb9bd7df36c715feb05efdcba2c605c1e3d8a3f"
+ "path_sha256": "d3b3c9948edc72d578b04b9aff7dd44a2204731196171d8a3c7ce6039caee571"
},
"inspection_limits": {
"maximum_inspection_seconds": 120,
@@ -2514,10 +2514,10 @@
"sha256": "e05c1d8778f8482039ed4ffac1b213d08d3d8bba6e33580d354e435346a07819"
},
"core/crates/tera_ffi/src/dto.rs": {
- "bytes": 108105,
- "git_blob": "b6de28dc374175325a83249d15f563570c450dab",
+ "bytes": 108470,
+ "git_blob": "80cc64dc2537c34fb5bbbd27ffa13baf79283dc4",
"mode": "100644",
- "sha256": "91f0c37ad28b40d5f63762898a33c377d2d10a0da4d44786ff1c938defd16cf3"
+ "sha256": "bcb7538d358cdebfd9aa91fd2cd0327b8eb7b102eb753f3675aba15025aba7bf"
},
"core/crates/tera_ffi/src/dto/calendar.rs": {
"bytes": 2040,
@@ -2537,6 +2537,12 @@
"mode": "100644",
"sha256": "32a763eda1e03db233091613fde98ea639578abd91ba7e2146e65883d5b7062c"
},
+ "core/crates/tera_ffi/src/dto/native_upload_job_tests.rs": {
+ "bytes": 2986,
+ "git_blob": "e915b9dc89bd9c738107a55ddca2d9f48f51db56",
+ "mode": "100644",
+ "sha256": "af5d4014329527359d0eb665e73c629171da9a7e0ce781839770cd430d1f5a19"
+ },
"core/crates/tera_ffi/src/dto/today_sync.rs": {
"bytes": 4837,
"git_blob": "b80972c1517fcda4be3593bc92015316c582b4e4",
@@ -3631,6 +3637,6 @@
}
},
"policy": "staged_inputs",
- "tree": "36670dc22376a94606ce1c2128034212bb455721"
+ "tree": "d1f8b0b3c775fa30525325b842375a0f64468cf6"
}
}
diff --git a/core/crates/tera_ffi/src/dto.rs b/core/crates/tera_ffi/src/dto.rs
@@ -42,6 +42,8 @@ mod calendar;
pub use calendar::{FfiCalendarTiming, FfiCivilDate, TODAY_CARD_FFI_SCHEMA_VERSION};
mod local_network_debug;
+#[cfg(test)]
+mod native_upload_job_tests;
mod today_sync;
pub use today_sync::{
FfiTodayDiscoveryRecord, FfiTodayRelaySyncState, FfiTodaySyncRecord, FfiTodaySyncTermination,
@@ -1156,7 +1158,8 @@ pub struct FfiBlossomUploadIntent {
/// Secret-bearing native job. Hosts may use the authorization header for the
/// immediate OS request but must not persist it in application metadata.
-#[derive(Clone, Debug, Eq, PartialEq, uniffi::Record)]
+/// Debug formatting omits every request field, including nested draft values.
+#[derive(Clone, Eq, PartialEq, uniffi::Record)]
pub struct FfiNativeUploadJobRecord {
pub schema_version: u16,
pub operation_id: String,
@@ -1169,6 +1172,14 @@ pub struct FfiNativeUploadJobRecord {
pub byte_size: u64,
}
+impl std::fmt::Debug for FfiNativeUploadJobRecord {
+ fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ formatter
+ .debug_struct("FfiNativeUploadJobRecord")
+ .finish_non_exhaustive()
+ }
+}
+
#[derive(Clone, Debug, uniffi::Record)]
pub struct FfiNativeUploadCompletionInput {
pub schema_version: u16,
diff --git a/core/crates/tera_ffi/src/dto/native_upload_job_tests.rs b/core/crates/tera_ffi/src/dto/native_upload_job_tests.rs
@@ -0,0 +1,84 @@
+//! Synthetic diagnostic regressions; no credential or external request is used.
+
+use super::*;
+
+const HEADER: &str = "synthetic-transient-upload-header";
+const DETAILS: &str = "synthetic-private-job-details";
+
+fn synthetic_job() -> FfiNativeUploadJobRecord {
+ FfiNativeUploadJobRecord {
+ schema_version: UPLOAD_OUTPUT_FFI_SCHEMA_VERSION,
+ operation_id: DETAILS.to_owned(),
+ draft: FfiDraftStatusRecord {
+ coordinate_writable: false,
+ coordinate_captured: true,
+ schema_version: MOBILE_FFI_SCHEMA_VERSION,
+ draft_id: DETAILS.to_owned(),
+ revision: 2,
+ author_public_key: DETAILS.to_owned(),
+ kind: FfiDraftKind::Add,
+ command_type: FfiAddCommandType::CreatePhotoUpdate,
+ form: None,
+ state: FfiOutboxState::MediaUploading,
+ card_id: DETAILS.to_owned(),
+ operation_id: Some(DETAILS.to_owned()),
+ created_at_unix_ms: 1_800_000_000_000,
+ updated_at_unix_ms: 1_800_000_000_001,
+ media: Vec::new(),
+ settlement: None,
+ is_revision: false,
+ revision_parent_draft_id: None,
+ },
+ remote_url: format!("https://upload.example/{DETAILS}"),
+ upload_url: format!("https://upload.example/{DETAILS}.png"),
+ authorization_header: HEADER.to_owned(),
+ expected_sha256: DETAILS.to_owned(),
+ media_type: "image/png".to_owned(),
+ byte_size: 176,
+ }
+}
+
+fn require_private_fields_omitted(rendered: &str) {
+ assert!(
+ !rendered.contains(HEADER),
+ "transient header must be omitted"
+ );
+ assert!(
+ !rendered.contains(DETAILS),
+ "nested job data must be omitted"
+ );
+ assert!(!rendered.contains("upload.example"), "URLs must be omitted");
+ assert!(rendered.len() <= 128, "job diagnostics must remain bounded");
+ assert!(rendered.contains("FfiNativeUploadJobRecord"));
+}
+
+#[test]
+fn native_upload_job_debug_omits_request_fields() {
+ require_private_fields_omitted(&format!("{:?}", synthetic_job()));
+}
+
+#[test]
+fn native_upload_job_pretty_debug_omits_request_fields() {
+ require_private_fields_omitted(&format!("{:#?}", synthetic_job()));
+}
+
+#[test]
+fn nested_native_upload_job_debug_omits_request_fields() {
+ let job = synthetic_job();
+ require_private_fields_omitted(&format!("{:?}", Some(&job)));
+ require_private_fields_omitted(&format!("{:#?}", Ok::<_, ()>(&job)));
+}
+
+#[test]
+fn native_upload_job_request_fields_remain_exact() {
+ let job = synthetic_job();
+ let original = job.clone();
+ let _ = format!("{job:?}");
+ let _ = format!("{job:#?}");
+ assert!(job == original);
+ assert!(job.authorization_header == HEADER);
+ assert!(job.remote_url == format!("https://upload.example/{DETAILS}"));
+ assert!(job.upload_url == format!("https://upload.example/{DETAILS}.png"));
+ assert_eq!(job.byte_size, 176);
+ assert_eq!(job.draft.revision, 2);
+}