Updated to use new message pack encoding from cipherstash-client

Author: coderdan

Cargo.lock

@@ -62,7 +62,7 @@ impl FlattenedEncryptedAttributes {
             .into_iter()
             .map(|record| {
                 record
-                    .to_vec()
+                    .to_mp_bytes()
                     .map(|data| (FlattenedAttrName::parse(&record.descriptor), data))
                     .map_err(|_| SealError::AssertionFailed("Decryption failed".to_string()))
             })

src/crypto/attrs/flattened_encrypted_attributes.rs

@@ -242,7 +242,7 @@ mod tests {
         let cipher = get_cipher().await?;
         // TODO: Temporary obvs
         let dataset_id = Uuid::parse_str("93e10481-2692-4d65-a619-37e36a496e64").unwrap();
-        let scoped_cipher = ScopedCipherWithCreds::init(cipher, dataset_id).await;
+        let scoped_cipher = ScopedCipherWithCreds::init(cipher, dataset_id).await.unwrap();
 
         let results = SealedTableEntry::unseal_all(vec![], spec, &scoped_cipher)
             .await

src/crypto/sealed.rs

@@ -281,7 +281,7 @@ impl<D> EncryptedTable<D> {
     {
          // TODO: Temporary obvs
          let dataset_id = Uuid::parse_str("93e10481-2692-4d65-a619-37e36a496e64").unwrap();
-         let scoped_cipher = ScopedCipherWithCreds::init(self.cipher.clone(), dataset_id).await?;
+         let scoped_cipher = ScopedCipherWithCreds::init(self.cipher.clone(), dataset_id).await.unwrap();
 
         decrypt_all(&scoped_cipher, items).await
     }
@@ -292,7 +292,7 @@ impl<D> EncryptedTable<D> {
     ) -> Result<DynamoRecordPatch, DeleteError> {
         // TODO: Temporary obvs
         let dataset_id = Uuid::parse_str("93e10481-2692-4d65-a619-37e36a496e64").unwrap();
-        let scoped_cipher = ScopedCipherWithCreds::init(self.cipher.clone(), dataset_id).await;
+        let scoped_cipher = ScopedCipherWithCreds::init(self.cipher.clone(), dataset_id).await.unwrap();
 
         let PrimaryKeyParts { pk, sk } = encrypt_primary_key_parts(&scoped_cipher, delete.primary_key)?;
 
@@ -330,7 +330,7 @@ impl<D> EncryptedTable<D> {
 
         // TODO: Temporary obvs
         let dataset_id = Uuid::parse_str("93e10481-2692-4d65-a619-37e36a496e64").unwrap();
-        let indexable_cipher = ScopedCipherWithCreds::init(self.cipher.clone(), dataset_id).await;
+        let indexable_cipher = ScopedCipherWithCreds::init(self.cipher.clone(), dataset_id).await.unwrap();
 
         let PreparedRecord {
             protected_attributes,
@@ -405,7 +405,7 @@ impl EncryptedTable<Dynamo> {
     {
         // TODO: Temporary obvs
         let dataset_id = Uuid::parse_str("93e10481-2692-4d65-a619-37e36a496e64").unwrap();
-        let scoped_cipher = ScopedCipherWithCreds::init(self.cipher.clone(), dataset_id).await;
+        let scoped_cipher = ScopedCipherWithCreds::init(self.cipher.clone(), dataset_id).await.unwrap();
 
         let PrimaryKeyParts { pk, sk } =
             encrypt_primary_key_parts(&scoped_cipher, PreparedPrimaryKey::new::<T>(k))?;

src/encrypted_table/mod.rs

@@ -134,7 +134,7 @@ where
     {
         // TODO: Temporary obvs
         let dataset_id = Uuid::parse_str("93e10481-2692-4d65-a619-37e36a496e64").unwrap();
-        let scoped_cipher = ScopedCipherWithCreds::init(self.storage.cipher.clone(), dataset_id).await;
+        let scoped_cipher = ScopedCipherWithCreds::init(self.storage.cipher.clone(), dataset_id).await.unwrap();
 
         let storage = self.storage;
         let query = self.build()?;

src/encrypted_table/query.rs

@@ -41,7 +41,7 @@ impl TableAttribute {
         descriptor: &str,
     ) -> Result<EncryptedRecord, SealError> {
         if let TableAttribute::Bytes(s) = self {
-            EncryptedRecord::from_slice(&s[..])
+            EncryptedRecord::from_mp_bytes(&s[..])
                 .map_err(|_| SealError::AssertionFailed("Could not parse EncryptedRecord".to_string()))
                 .and_then(|record| {
                     if record.descriptor == descriptor {

src/encrypted_table/table_attribute.rs

@@ -6,7 +6,6 @@
 pub mod crypto;
 pub mod encrypted_table;
 pub mod traits;
-use encrypted_table::DynamoRecordPatch;
 pub use encrypted_table::{EncryptedTable, QueryBuilder};
 pub use traits::{
     Decryptable, Encryptable, Identifiable, IndexType, Pk, PkSk, PrimaryKey, Searchable,
@@ -21,31 +20,4 @@ pub use cipherstash_dynamodb_derive::{Decryptable, Encryptable, Identifiable, Se
 
 // Re-exports
 pub use cipherstash_client::encryption;
-
-pub type Key = [u8; 32];
-
-
-pub struct Put<T> {
-    record: T,
-}
-
-impl<T> Put<T> where T: Encryptable + Identifiable {
-    pub fn new(record: T) -> Self {
-        Self { record }
-    }
-}
-
-pub struct Cipher {}
-
-impl Cipher {
-}
-
-pub trait IntoPatch<Op> {
-    fn seal(&self, op: Op) -> Result<DynamoRecordPatch, Error>;
-}
-
-impl<T> IntoPatch<Put<T>> for Cipher {
-    fn seal(&self, op: Put<T>) -> Result<DynamoRecordPatch, Error> {
-        unimplemented!()
-    }
-}
+pub type Key = [u8; 32];

src/lib.rs

@@ -90,7 +90,7 @@ async fn test_query_single_exact() {
             .expect("failed to build query");
 
         let dataset_id = Uuid::parse_str("93e10481-2692-4d65-a619-37e36a496e64").unwrap();
-        let scoped_cipher = ScopedCipherWithCreds::init(table.cipher(), dataset_id).await;
+        let scoped_cipher = ScopedCipherWithCreds::init(table.cipher(), dataset_id).await.unwrap();
 
         let term = query
             .encrypt(&scoped_cipher)
@@ -133,7 +133,7 @@ async fn test_query_single_prefix() {
             .expect("failed to init table");
 
         let dataset_id = Uuid::parse_str("93e10481-2692-4d65-a619-37e36a496e64").unwrap();
-        let scoped_cipher = ScopedCipherWithCreds::init(table.cipher(), dataset_id).await;
+        let scoped_cipher = ScopedCipherWithCreds::init(table.cipher(), dataset_id).await.unwrap();
 
         let query = QueryBuilder::<User>::new()
             .starts_with("name", "Dan")
@@ -190,7 +190,7 @@ async fn test_query_compound() {
             .expect("failed to build query");
 
         let dataset_id = Uuid::parse_str("93e10481-2692-4d65-a619-37e36a496e64").unwrap();
-        let scoped_cipher = ScopedCipherWithCreds::init(table.cipher(), dataset_id).await;
+        let scoped_cipher = ScopedCipherWithCreds::init(table.cipher(), dataset_id).await.unwrap();
 
         let term = query
             .encrypt(&scoped_cipher)