Merge pull request #110 from ebisawa/refactor/consolidate-kv-and-known-key-traits

refactor: consolidate KV value and known-key conversion traits

Author: ebisawa

crates/secretenv-core/src/feature/kv/encrypt.rs

@@ -21,19 +21,6 @@ use uuid::Uuid;
 
 use super::entry_codec::encode_kv_entries_to_tokens;
 
-pub trait KvValueRef {
-    fn as_kv_value(&self) -> &str;
-}
-
-impl<T> KvValueRef for T
-where
-    T: AsRef<str>,
-{
-    fn as_kv_value(&self) -> &str {
-        self.as_ref()
-    }
-}
-
 /// Build KV encryption context: generate master key, create HEAD/WRAP structures
 pub(crate) fn build_kv_encryption(
     members: &[VerifiedRecipientKey],
@@ -74,15 +61,15 @@ pub(crate) fn encrypt_kv_entries<V>(
     disclosed: bool,
 ) -> Result<Vec<(String, KvEntryValue)>>
 where
-    V: KvValueRef,
+    V: AsRef<str>,
 {
     let key_schedule = KvKeySchedule::extract(master_key, sid)?;
     let mut entries: Vec<_> = kv_map
         .iter()
         .map(|(key, value)| {
             encrypt_entry(
                 key,
-                value.as_kv_value(),
+                value.as_ref(),
                 &key_schedule,
                 sid,
                 debug,
@@ -117,7 +104,7 @@ pub fn encrypt_kv_document<V>(
     token_codec: TokenCodec,
 ) -> Result<String>
 where
-    V: KvValueRef,
+    V: AsRef<str>,
 {
     encrypt_kv_document_with_disclosed(kv_map, members, signing, token_codec, false)
 }
@@ -131,7 +118,7 @@ pub(crate) fn encrypt_kv_document_with_disclosed<V>(
     disclosed: bool,
 ) -> Result<String>
 where
-    V: KvValueRef,
+    V: AsRef<str>,
 {
     encrypt_kv_map_with_wrap_mutation(kv_map, members, signing, token_codec, disclosed, |_| Ok(()))
 }
@@ -145,7 +132,7 @@ pub fn encrypt_kv_map_with_wrap_mutation<V, F>(
     mutate_wrap: F,
 ) -> Result<String>
 where
-    V: KvValueRef,
+    V: AsRef<str>,
     F: FnOnce(&mut KvWrap) -> Result<()>,
 {
     let timestamp = crate::support::time::generate_current_timestamp()?;

crates/secretenv-core/src/feature/kv/rewrite_session/encrypt.rs

@@ -3,7 +3,6 @@
 
 use crate::feature::context::crypto::build_signing_context;
 use crate::feature::context::crypto::CryptoContext;
-use crate::feature::kv::encrypt::KvValueRef;
 use crate::format::token::TokenCodec;
 use crate::model::public_key::VerifiedRecipientKey;
 use crate::Result;
@@ -19,7 +18,7 @@ pub(crate) fn encrypt_kv_map_with_key_context<V, F>(
     debug: bool,
 ) -> Result<String>
 where
-    V: KvValueRef,
+    V: AsRef<str>,
     F: FnOnce(&mut crate::model::kv_enc::header::KvWrap) -> Result<()>,
 {
     let signing = build_signing_context(key_ctx, debug)?;

crates/secretenv-core/src/feature/trust/judgment.rs

@@ -13,6 +13,8 @@ mod signer;
 pub use active_member::{build_active_members_by_kid, ActiveMemberSnapshot};
 pub use identity::TrustIdentity;
 pub use known_key::{AdditionalKnownKeyCache, KnownKeyCache};
+
+pub(crate) use identity::{IntoKid, IntoMemberHandle};
 pub use recipient::judge_recipients_trust;
 pub use self_trust::SelfTrustSet;
 pub use signer::{judge_signer_trust, TrustJudgment};

crates/secretenv-core/src/feature/trust/known_keys.rs

@@ -3,6 +3,7 @@
 
 //! Known keys CRUD operations and integrity checks.
 
+use crate::feature::trust::judgment::{IntoKid, IntoMemberHandle};
 use crate::model::identity::{Kid, MemberHandle};
 use crate::model::trust_store::KnownKey;
 use crate::support::kid::resolve_unique_kid;
@@ -25,16 +26,16 @@ pub struct KnownKeyIdentity {
 impl KnownKeyIdentity {
     pub fn new<M, K>(member_handle: M, kid: K) -> Self
     where
-        M: IntoKnownMemberHandle,
-        K: IntoKnownKid,
+        M: IntoMemberHandle,
+        K: IntoKid,
     {
         Self::try_new(member_handle, kid).expect("known key identity inputs must be valid")
     }
 
     pub fn try_new<M, K>(member_handle: M, kid: K) -> Result<Self>
     where
-        M: IntoKnownMemberHandle,
-        K: IntoKnownKid,
+        M: IntoMemberHandle,
+        K: IntoKid,
     {
         Ok(Self {
             member_handle: member_handle.into_member_handle()?,
@@ -59,50 +60,6 @@ impl KnownKeyIdentity {
     }
 }
 
-pub trait IntoKnownMemberHandle {
-    fn into_member_handle(self) -> Result<MemberHandle>;
-}
-
-impl IntoKnownMemberHandle for MemberHandle {
-    fn into_member_handle(self) -> Result<MemberHandle> {
-        Ok(self)
-    }
-}
-
-impl IntoKnownMemberHandle for String {
-    fn into_member_handle(self) -> Result<MemberHandle> {
-        MemberHandle::try_from(self)
-    }
-}
-
-impl IntoKnownMemberHandle for &str {
-    fn into_member_handle(self) -> Result<MemberHandle> {
-        MemberHandle::try_from(self)
-    }
-}
-
-pub trait IntoKnownKid {
-    fn into_kid(self) -> Result<Kid>;
-}
-
-impl IntoKnownKid for Kid {
-    fn into_kid(self) -> Result<Kid> {
-        Ok(self)
-    }
-}
-
-impl IntoKnownKid for String {
-    fn into_kid(self) -> Result<Kid> {
-        Kid::try_from(self)
-    }
-}
-
-impl IntoKnownKid for &str {
-    fn into_kid(self) -> Result<Kid> {
-        Kid::try_from(self)
-    }
-}
-
 /// Add a known key entry.
 ///
 /// - Different subject_handle with same kid -> integrity anomaly error