Fixed warnings and removed legacy code

Author: coderdan

src/async_map_somes.rs

@@ -1,6 +1,6 @@
 use cipherstash_client::{credentials::{service_credentials::ServiceToken, Credentials}, encryption::{Encryption, EncryptionError}, zero_kms::EncryptedRecord};
 use itertools::Itertools;
-use crate::{crypto::{attrs::flattened_protected_attributes::FlattenedKey, SealError}, encrypted_table::{TableAttributes, TableEntry}, traits::TableAttribute};
+use crate::{crypto::{attrs::flattened_protected_attributes::FlattenedKey, SealError}, encrypted_table::TableAttributes, traits::TableAttribute};
 
 use super::FlattenedProtectedAttributes;
 

src/crypto/attrs/flattened_encrypted_attributes.rs

@@ -1,5 +1,5 @@
 use super::{
-    flattened_encrypted_attributes::FlattenedEncryptedAttributes, normalized_protected_attributes::NormalizedKey, NormalizedProtectedAttributes
+    flattened_encrypted_attributes::FlattenedEncryptedAttributes, normalized_protected_attributes::NormalizedKey
 };
 use crate::crypto::SealError;
 use cipherstash_client::{
@@ -160,10 +160,6 @@ impl FlattenedKey {
         }
     }
 
-    pub(crate) fn has_subkey(&self) -> bool {
-        self.subkey.is_some()
-    }
-
     /// Consume and return the parts of the key (not including the prefix).
     pub fn into_key_parts(self) -> (String, Option<String>) {
         (self.key, self.subkey)

src/crypto/attrs/flattened_protected_attributes.rs

@@ -4,8 +4,3 @@ mod normalized_protected_attributes;
 pub(crate) use flattened_protected_attributes::FlattenedProtectedAttributes;
 pub(crate) use normalized_protected_attributes::NormalizedProtectedAttributes;
 pub(crate) use flattened_encrypted_attributes::FlattenedEncryptedAttributes;
-
-pub(crate) enum ProtectedAttributes {
-    Normalized(NormalizedProtectedAttributes),
-    Flattened(FlattenedProtectedAttributes),
-}

src/crypto/attrs/mod.rs

@@ -1,6 +1,5 @@
-use std::collections::{hash_map, HashMap};
+use std::collections::HashMap;
 use cipherstash_client::encryption::Plaintext;
-use itertools::{Chunk, Chunks, IntoChunks, Itertools};
 use super::flattened_protected_attributes::{
     FlattenedKey, FlattenedProtectedAttribute, FlattenedProtectedAttributes,
 };

src/crypto/attrs/normalized_protected_attributes.rs

@@ -1,15 +1,15 @@
 use crate::{
-    async_map_somes::async_map_somes, crypto::attrs::FlattenedEncryptedAttributes, encrypted_table::TableEntry, traits::{ReadConversionError, TableAttribute, WriteConversionError}, Decryptable
+    crypto::attrs::FlattenedEncryptedAttributes, encrypted_table::TableEntry, traits::{ReadConversionError, WriteConversionError}, Decryptable
 };
 use aws_sdk_dynamodb::{primitives::Blob, types::AttributeValue};
 use cipherstash_client::{
     credentials::{service_credentials::ServiceToken, Credentials},
-    encryption::{Encryption, Plaintext},
+    encryption::Encryption,
 };
 use itertools::Itertools;
-use std::{borrow::Cow, collections::HashMap, ops::Deref};
+use std::{borrow::Cow, collections::HashMap};
 
-use super::{attrs::NormalizedProtectedAttributes, sealer::Sealed, SealError, Unsealed};
+use super::{attrs::NormalizedProtectedAttributes, SealError, Unsealed};
 
 // FIXME: Remove this (only used for debugging)
 #[derive(Debug)]
@@ -61,25 +61,13 @@ impl SealedTableEntry {
         spec: UnsealSpec<'_>,
         cipher: &Encryption<impl Credentials<Token = ServiceToken>>,
     ) -> Result<Vec<Unsealed>, SealError> {
-        //let items = items.as_ref();
 
         let UnsealSpec {
             protected_attributes,
+            // TODO: Why is this here?
             plaintext_attributes,
         } = spec;
 
-
-        // FIXME: The following issues remain:
-        // 1. The pk and sk are not being added to the unsealed
-        // 2. We don't handle the case where protected_attributes is empty
-        // 3. We don't handle the case where plaintext_attributes is empty
-        // 4. The zipped iterator is misaligned
-        // Unsealed item: Unsealed { descriptor: None, protected: {"name": (SmallInt(Some(42)), "/name"), "age": (Utf8Str(Some("value-a")), "/age"), "attrs": (Utf8Str(Some("value-c")), "/attrs")}, unprotected: TableAttributes({"tag": String("sk")}) }
-        // 5. (Minor) The Unsealed is not given a descriptor after decryption
-        // 6. Ciphertexts are unexpectedly large
-        // 7. Determine if pk and sk should be underscored (check the bahaviour in main or tests)
-
-        //let mut plaintext_items: Vec<Vec<Option<&TableAttribute>>> =
         let mut unprotected_items = Vec::with_capacity(items.len());
         let mut protected_items = FlattenedEncryptedAttributes::with_capacity(items.len() * protected_attributes.len());
 

src/crypto/sealed.rs

@@ -412,7 +412,7 @@ impl Sealed {
         mut index_predicate: impl FnMut(&str, &TableAttribute) -> bool,
     ) -> (SealedTableEntry, Vec<SealedTableEntry>) {
         // TODO: Is this normalization necessary? - try removing it
-        let root_attributes = self.attributes.normalize();
+        let root_attributes = self.attributes;
 
         let index_attributes: TableAttributes = root_attributes
             .clone()

src/crypto/sealer.rs

@@ -42,18 +42,14 @@ impl Unsealed {
 
     // TODO: Change this to take_unprotected
     pub fn get_plaintext(&self, name: &str) -> TableAttribute {
-        println!("Getting plaintext for {}", name);
-        println!("unprotected: {:?}", self.unprotected);
-        let r = self.unprotected
-            .get(name);
-        println!("Got plaintext for {}: {:?}", name, r);
-        r
+        self.unprotected
+            .get(name)
             .cloned()
             .unwrap_or(TableAttribute::Null)
     }
 
-    pub fn add_protected(&mut self, name: impl Into<String>, plaintext: Plaintext) {
-        self.protected.insert(name, plaintext);
+    pub fn add_protected(&mut self, name: impl Into<String>, plaintext: impl Into<Plaintext>) {
+        self.protected.insert(name, plaintext.into());
     }
 
     pub fn add_protected_map(&mut self, name: impl Into<String>, map: HashMap<String, Plaintext>) {
@@ -64,11 +60,11 @@ impl Unsealed {
     /// If the map does not exist, it will be created.
     /// If the map exists, the key-value pair will be updated.
     /// If an attribute called `name` already exists but is not a map, this will panic.
-    pub fn add_protected_map_field(&mut self, name: impl Into<String>, subkey: impl Into<String>, value: Plaintext) {
-        self.protected.insert_and_update_map(name, subkey, value);
+    pub fn add_protected_map_field(&mut self, name: impl Into<String>, subkey: impl Into<String>, value: impl Into<Plaintext>) {
+        self.protected.insert_and_update_map(name, subkey, value.into());
     }
 
-    pub fn add_unprotected(&mut self, name: impl Into<String>, attribute: TableAttribute) {
+    pub fn add_unprotected(&mut self, name: impl Into<String>, attribute: impl Into<TableAttribute>) {
         self.unprotected.insert(name.into(), attribute);
     }
 

src/crypto/unsealed.rs

@@ -1,4 +1,3 @@
-mod dynamo;
 pub mod query;
 mod table_attribute;
 mod table_attributes;
@@ -23,7 +22,7 @@ use cipherstash_client::{
         service_credentials::{ServiceCredentials, ServiceToken},
         Credentials,
     },
-    encryption::{Encryption, Plaintext},
+    encryption::Encryption,
     zero_kms::ZeroKMS,
 };
 use log::info;
@@ -32,8 +31,8 @@ use std::{
     collections::{HashMap, HashSet},
     ops::Deref,
 };
-pub use dynamo::DynamoItem;
 
+/// Index terms are truncated to this length
 const DEFAULT_TERM_SIZE: usize = 12;
 
 pub struct Headless;