feat(web-server/sgx-wallet-impl): serde_bytes_array hack

This works around serde-rs/bytes#26

Author: PiDelport

web-server/sgx-wallet-impl/Cargo.lock

@@ -29,6 +29,7 @@ thiserror = { git = "https://github.com/mesalock-linux/thiserror-sgx" }
 
 # Our SGX forks
 algonaut = { git = "https://github.com/registreerocks/algonaut-sgx", branch = "v0.3.0-sgx" }
+serde_bytes = { version = "0.11.4", git = "https://github.com/registreerocks/serde-bytes-sgx" } # SGX: registreerocks fork for 0.11.4
 
 [patch.'https://github.com/apache/teaclave-sgx-sdk.git']
 sgx_libc = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "d107bd0718f723221750a4f2973451b386cbf9d2" }

web-server/sgx-wallet-impl/Cargo.toml

@@ -11,4 +11,5 @@ pub mod entities;
 mod macros;
 pub mod msgpack;
 pub mod sealing;
+pub(crate) mod serde_bytes_array;
 pub mod types;

web-server/sgx-wallet-impl/src/schema/mod.rs

@@ -1,21 +1,26 @@
 //! [`SealedMessage`] sealing and unsealing.
 
 use std::error::Error;
-use std::prelude::v1::{Box, Vec};
+use std::prelude::v1::Box;
 
 use secrecy::{ExposeSecret, Secret};
 use serde::{Deserialize, Serialize};
 use zeroize::Zeroize;
 
 use crate::ported::crypto::{CryptoError, Nonce, PublicKey, SecretBytes, SodaBoxCrypto};
 use crate::schema::msgpack::{FromMessagePack, FromMessagePackOwned, ToMessagePack};
+use crate::schema::serde_bytes_array;
+use crate::schema::types::Bytes;
 
 /// A sealed message
 #[derive(Debug)] // core
 #[derive(Deserialize, Serialize)] // serde
 pub struct SealedMessage {
-    pub ciphertext: Vec<u8>,
+    #[serde(with = "serde_bytes")]
+    pub ciphertext: Bytes,
+    #[serde(with = "serde_bytes_array")]
     pub nonce: Nonce,
+    #[serde(with = "serde_bytes_array")]
     pub sender_public_key: PublicKey,
 }
 
@@ -27,7 +32,7 @@ pub fn seal(
 ) -> Result<SealedMessage, CryptoError> {
     let encrypted_message = sender_crypto.encrypt_message(message_bytes, &receiver_public_key)?;
     Ok(SealedMessage {
-        ciphertext: encrypted_message.ciphertext.into_vec(),
+        ciphertext: encrypted_message.ciphertext,
         nonce: encrypted_message.nonce,
         sender_public_key: sender_crypto.get_pubkey(),
     })

web-server/sgx-wallet-impl/src/schema/sealing.rs

@@ -0,0 +1,27 @@
+//! Work around
+
+use core::convert::TryInto;
+
+use serde::de::Error;
+use serde::{Deserializer, Serializer};
+
+/// This just specializes [`serde_bytes::serialize`] to `<T = [u8]>`.
+pub(crate) fn serialize<S>(bytes: &[u8], serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    serde_bytes::serialize(bytes, serializer)
+}
+
+/// This takes the result of [`serde_bytes::deserialize`] from `[u8]` to `[u8; N]`.
+pub(crate) fn deserialize<'de, D, const N: usize>(deserializer: D) -> Result<[u8; N], D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let slice: &[u8] = serde_bytes::deserialize(deserializer)?;
+    let array: [u8; N] = slice.try_into().map_err(|_| {
+        let expected = format!("[u8; {}]", N);
+        D::Error::invalid_length(slice.len(), &expected.as_str())
+    })?;
+    Ok(array)
+}