From 7625cd9b9ad71ae51863efbf5445bd2df571c845 Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Sat, 2 Sep 2023 13:41:20 +0800
Subject: [PATCH] feat: update spec.rs

---
 src/spec.rs | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/src/spec.rs b/src/spec.rs
index a5359b5..e5846cc 100644
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -22,15 +22,101 @@ pub struct TinyEncryptMeta {
     pub user_agent: String,
     pub comment: Option<String>,
     pub encrypted_comment: Option<String>,
+    pub encrypted_meta: Option<String>,
+    // ---------------------------------------
     pub pgp_envelop: Option<String>,
     pub pgp_fingerprint: Option<String>,
+    pub age_envelop: Option<String>,
+    pub age_recipient: Option<String>,
+    pub ecdh_envelop: Option<String>,
+    pub ecdh_point: Option<String>,
     pub envelop: Option<String>,
+    // ---------------------------------------
+    pub envelops: Vec<TinyEncryptEnvelop>,
+    pub encryption_algorithm: Option<String>,
     pub nonce: String,
     pub file_length: u64,
     pub file_last_modified: u64,
     pub compress: bool,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TinyEncryptEnvelop {
+    pub r#type: String,
+    pub kid: String,
+    pub desc: Option<String>,
+    pub encrypted_key: String,
+}
+
+// use serde...
+pub enum TinyEncryptEnvelopType {
+    Pgp,
+    Age,
+    Ecdh,
+    Kms,
+}
+
+impl TinyEncryptMeta {
+    pub fn normalize(&mut self) {
+        self.normalize_ppg_envelop();
+        self.normalize_age_envelop();
+        self.normalize_ecdh_envelop();
+        self.normalize_envelop();
+    }
+
+    fn normalize_ppg_envelop(&mut self) {
+        if let (Some(pgp_envelop), Some(pgp_fingerprint)) = (&self.pgp_envelop, &self.pgp_fingerprint) {
+            self.envelops.push(TinyEncryptEnvelop {
+                r#type: "pgp".to_string(),
+                kid: pgp_fingerprint.into(),
+                desc: None,
+                encrypted_key: pgp_envelop.into(),
+            });
+            self.pgp_envelop = None;
+            self.pgp_fingerprint = None;
+        }
+    }
+
+    fn normalize_age_envelop(&mut self) {
+        if let (Some(age_envelop), Some(age_recipient)) = (&self.age_envelop, &self.age_recipient) {
+            self.envelops.push(TinyEncryptEnvelop {
+                r#type: "age".to_string(),
+                kid: age_recipient.into(),
+                desc: None,
+                encrypted_key: age_envelop.into(),
+            });
+            self.age_envelop = None;
+            self.age_recipient = None;
+        }
+    }
+
+    fn normalize_ecdh_envelop(&mut self) {
+        if let (Some(ecdh_envelop), Some(ecdh_point)) = (&self.ecdh_envelop, &self.ecdh_point) {
+            self.envelops.push(TinyEncryptEnvelop {
+                r#type: "ecdh".to_string(),
+                kid: ecdh_point.into(),
+                desc: None,
+                encrypted_key: ecdh_envelop.into(),
+            });
+            self.ecdh_envelop = None;
+            self.ecdh_point = None;
+        }
+    }
+
+    fn normalize_envelop(&mut self) {
+        if let Some(envelop) = &self.envelop {
+            self.envelops.push(TinyEncryptEnvelop {
+                r#type: "kms".to_string(),
+                kid: "#default".into(),
+                desc: None,
+                encrypted_key: envelop.into(),
+            });
+            self.envelop = None;
+        }
+    }
+}
+
 pub fn get_user_agent() -> String {
     format!("TinyEncrypt-rs v{}@{}", env!("CARGO_PKG_VERSION"),
             if cfg!(target_os = "macos") {