Merge branch 'deserialize-canon-json'

dlon · dlon · commit e06e8b0f52d4 · 2025-03-21T13:37:23.000+01:00
diff --git a/mullvad-update/src/format/deserializer.rs b/mullvad-update/src/format/deserializer.rs
@@ -106,7 +106,9 @@ pub(super) fn deserialize_and_verify(
 
     Ok(PartialSignedResponse {
         signatures: partial_data.signatures,
-        signed: partial_data.signed,
+        // Deserialize again from canonicalized JSON in case something was lost
+        signed: serde_json::from_slice(&canon_data)
+            .context("Failed to deserialize canonical JSON")?,
     })
 }
 

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,9 @@ pub(super) fn deserialize_and_verify(`
`106`	`106`
`107`	`107`	`Ok(PartialSignedResponse {`
`108`	`108`	`signatures: partial_data.signatures,`
`109`		`- signed: partial_data.signed,`
	`109`	`+ // Deserialize again from canonicalized JSON in case something was lost`
	`110`	`+ signed: serde_json::from_slice(&canon_data)`
	`111`	`+ .context("Failed to deserialize canonical JSON")?,`
`110`	`112`	`})`
`111`	`113`	`}`
`112`	`114`