From 0b6f5e9ad8346fa5686670ba479201a32c51db5f Mon Sep 17 00:00:00 2001
From: TommyLike <tommylikehu@gmail.com>
Date: Sat, 27 May 2023 08:39:26 +0800
Subject: [PATCH] Support display auther email in list/show datakeys

---
 app/src/pages/listShow/PublicTable.vue        | 13 ++++++--
 src/domain/datakey/entity.rs                  |  3 +-
 src/infra/database/model/datakey/dto.rs       |  5 +++-
 .../database/model/datakey/repository.rs      | 30 +++++++++++++++----
 src/infra/encryption/engine.rs                |  1 +
 src/infra/sign_plugin/openpgp.rs              |  6 ++--
 src/infra/sign_plugin/x509.rs                 |  6 ++--
 .../handler/control/model/datakey/dto.rs      |  9 ++++--
 8 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/app/src/pages/listShow/PublicTable.vue b/app/src/pages/listShow/PublicTable.vue
index cf7c646..304054e 100644
--- a/app/src/pages/listShow/PublicTable.vue
+++ b/app/src/pages/listShow/PublicTable.vue
@@ -30,6 +30,13 @@
         {{ scope.row.fingerprint }}
       </template>
     </el-table-column>
+    <el-table-column
+            prop="user_email"
+            label="Author"
+            align="left"
+            width="120"
+            show-overflow-tooltip
+    />
     <el-table-column
       prop="description"
       label="Descirption"
@@ -78,7 +85,7 @@
       prop="attributes.digest_algorithm"
       label="Digest Algorithm"
       align="left"
-      width="140"
+      width="120"
       show-overflow-tooltip
     >
       <template #default="scope">
@@ -225,13 +232,13 @@ const copy = () => {
   let clipboard = new Clipboard(".tag");
   clipboard.on("success", (e) => {
     ElMessage({
-      message: "复制成功",
+      message: "Successfully copied",
       type: "success",
     });
     clipboard.destroy();
   });
   clipboard.on("error", (e) => {
-    ElMessage.error("复制失败");
+    ElMessage.error("Failed to copy");
     clipboard.destroy();
   });
 };
diff --git a/src/domain/datakey/entity.rs b/src/domain/datakey/entity.rs
index 815c4f9..48b8b6d 100644
--- a/src/domain/datakey/entity.rs
+++ b/src/domain/datakey/entity.rs
@@ -104,7 +104,8 @@ pub struct DataKey {
     pub certificate: Vec<u8>,
     pub create_at: DateTime<Utc>,
     pub expire_at: DateTime<Utc>,
-    pub key_state: KeyState
+    pub key_state: KeyState,
+    pub user_email: Option<String>,
 }
 
 impl ExtendableAttributes for DataKey {
diff --git a/src/infra/database/model/datakey/dto.rs b/src/infra/database/model/datakey/dto.rs
index 89674f7..a20bbdf 100644
--- a/src/infra/database/model/datakey/dto.rs
+++ b/src/infra/database/model/datakey/dto.rs
@@ -39,7 +39,8 @@ pub(super) struct DataKeyDTO {
     pub certificate: String,
     pub create_at: DateTime<Utc>,
     pub expire_at: DateTime<Utc>,
-    pub key_state: String
+    pub key_state: String,
+    pub user_email: Option<String>,
 }
 
 
@@ -62,6 +63,7 @@ impl TryFrom<DataKeyDTO> for DataKey {
             create_at: dto.create_at,
             expire_at: dto.expire_at,
             key_state: KeyState::from_str(&dto.key_state)?,
+            user_email: dto.user_email,
         })
     }
 }
@@ -91,6 +93,7 @@ impl TryFrom<DataKey> for DataKeyDTO {
             create_at: data_key.create_at,
             expire_at: data_key.expire_at,
             key_state: data_key.key_state.to_string(),
+            user_email: None
         })
     }
 }
diff --git a/src/infra/database/model/datakey/repository.rs b/src/infra/database/model/datakey/repository.rs
index eda2f72..1f42db0 100644
--- a/src/infra/database/model/datakey/repository.rs
+++ b/src/infra/database/model/datakey/repository.rs
@@ -83,7 +83,10 @@ impl Repository for DataKeyRepository {
     }
 
     async fn get_public_keys(&self) -> Result<Vec<DataKey>> {
-        let dtos: Vec<DataKeyDTO> = sqlx::query_as("SELECT * FROM data_key WHERE key_state != ? and visibility = ?")
+        let dtos: Vec<DataKeyDTO> = sqlx::query_as(
+            "SELECT D.*, U.email AS user_email \
+            FROM data_key D INNER JOIN user U ON D.user = U.id \
+            WHERE D.key_state != ? and D.visibility = ?")
             .bind(KeyState::Deleted.to_string())
             .bind(Visibility::Public.to_string())
             .fetch_all(&self.db_pool)
@@ -96,7 +99,10 @@ impl Repository for DataKeyRepository {
     }
 
     async fn get_all_keys(&self) -> Result<Vec<DataKey>> {
-        let dtos: Vec<DataKeyDTO> = sqlx::query_as("SELECT * FROM data_key WHERE key_state != ?")
+        let dtos: Vec<DataKeyDTO> = sqlx::query_as(
+            "SELECT D.*, U.email AS user_email \
+            FROM data_key D INNER JOIN user U ON D.user = U.id \
+            WHERE D.key_state != ?")
             .bind(KeyState::Deleted.to_string())
             .fetch_all(&self.db_pool)
             .await?;
@@ -107,7 +113,10 @@ impl Repository for DataKeyRepository {
         Ok(results)
     }
     async fn get_private_keys(&self, user_id: i32) -> Result<Vec<DataKey>> {
-        let dtos: Vec<DataKeyDTO> = sqlx::query_as("SELECT * FROM data_key WHERE key_state != ? and visibility = ? and user = ?")
+        let dtos: Vec<DataKeyDTO> = sqlx::query_as(
+            "SELECT D.*, U.email AS user_email \
+            FROM data_key D INNER JOIN user U ON D.user = U.id \
+            WHERE D.key_state != ? and D.visibility = ? and D.user = ?")
             .bind(KeyState::Deleted.to_string())
             .bind(Visibility::Private.to_string())
             .bind(user_id)
@@ -121,7 +130,10 @@ impl Repository for DataKeyRepository {
     }
 
     async fn get_by_id(&self, id: i32) -> Result<DataKey> {
-        let dto: DataKeyDTO = sqlx::query_as("SELECT * FROM data_key WHERE id = ? AND key_state != ?")
+        let dto: DataKeyDTO = sqlx::query_as(
+            "SELECT D.*, U.email AS user_email \
+            FROM data_key D INNER JOIN user U ON D.user = U.id \
+            WHERE D.id = ? AND D.key_state != ?")
             .bind(id)
             .bind(KeyState::Deleted.to_string())
             .fetch_one(&self.db_pool)
@@ -130,7 +142,10 @@ impl Repository for DataKeyRepository {
     }
 
     async fn get_by_name(&self, name: &String) -> Result<DataKey> {
-        let dto: DataKeyDTO = sqlx::query_as("SELECT * FROM data_key WHERE name = ? AND key_state != ?")
+        let dto: DataKeyDTO = sqlx::query_as(
+            "SELECT D.*, U.email AS user_email \
+            FROM data_key D INNER JOIN user U ON D.user = U.id \
+            WHERE D.name = ? AND D.key_state != ?")
             .bind(name)
             .bind(KeyState::Deleted.to_string())
             .fetch_one(&self.db_pool)
@@ -150,7 +165,10 @@ impl Repository for DataKeyRepository {
     }
 
     async fn get_enabled_key_by_type_and_name(&self, key_type: String, name: String) -> Result<DataKey> {
-        let dto: DataKeyDTO = sqlx::query_as("SELECT * FROM data_key WHERE name = ? AND key_type = ? AND key_state = ?")
+        let dto: DataKeyDTO = sqlx::query_as(
+            "SELECT D.*, U.email AS user_email \
+            FROM data_key D INNER JOIN user U ON D.user = U.id \
+            WHERE D.name = ? AND D.key_type = ? AND D.key_state = ?")
             .bind(name)
             .bind(key_type)
             .bind(KeyState::Enabled.to_string())
diff --git a/src/infra/encryption/engine.rs b/src/infra/encryption/engine.rs
index af3d692..4eb603d 100644
--- a/src/infra/encryption/engine.rs
+++ b/src/infra/encryption/engine.rs
@@ -73,6 +73,7 @@ where
         if rotate_in_days  < DEFAULT_ROTATE_IN_DAYS {
             return Err(Error::ConfigError(format!("rotate in days should greater than {}", rotate_in_days)));
         }
+        info!("cluster key will be rotated in {} days", rotate_in_days);
         Ok(EncryptionEngineWithClusterKey {
             cluster_repository,
             encryptor,
diff --git a/src/infra/sign_plugin/openpgp.rs b/src/infra/sign_plugin/openpgp.rs
index 26bd88d..6ba0975 100644
--- a/src/infra/sign_plugin/openpgp.rs
+++ b/src/infra/sign_plugin/openpgp.rs
@@ -39,9 +39,9 @@ use crate::domain::datakey::entity::{DataKey, DataKeyContent, SecDataKey, KeyTyp
 use crate::util::key::encode_u8_to_hex_string;
 use super::util::{validate_utc_time_not_expire, validate_utc_time, attributes_validate};
 
-const VALID_KEY_TYPE: [&'static str; 2] = ["rsa", "eddsa"];
-const VALID_KEY_SIZE: [&'static str; 3] = ["2048", "3072", "4096"];
-const VALID_DIGEST_ALGORITHM: [&'static str; 10] = ["none", "md5", "sha1", "sha1", "sha2_256", "sha2_384","sha2_512","sha2_224","sha3_256", "sha3_512"];
+const VALID_KEY_TYPE: [&str; 2] = ["rsa", "eddsa"];
+const VALID_KEY_SIZE: [&str; 3] = ["2048", "3072", "4096"];
+const VALID_DIGEST_ALGORITHM: [&str; 10] = ["none", "md5", "sha1", "sha1", "sha2_256", "sha2_384","sha2_512","sha2_224","sha3_256", "sha3_512"];
 
 #[derive(Debug, Validate, Deserialize)]
 pub struct PgpKeyImportParameter {
diff --git a/src/infra/sign_plugin/x509.rs b/src/infra/sign_plugin/x509.rs
index 3eab3ab..d7748db 100644
--- a/src/infra/sign_plugin/x509.rs
+++ b/src/infra/sign_plugin/x509.rs
@@ -40,9 +40,9 @@ use crate::domain::sign_plugin::SignPlugins;
 use crate::util::key::encode_u8_to_hex_string;
 use super::util::{validate_utc_time_not_expire, validate_utc_time, attributes_validate};
 
-const VALID_KEY_TYPE: [&'static str; 2] = ["rsa", "dsa"];
-const VALID_KEY_SIZE: [&'static str; 3] = ["2048", "3072", "4096"];
-const VALID_DIGEST_ALGORITHM: [&'static str; 6] = ["md5", "sha1", "sha2_256","sha2_384","sha2_512","sha2_224"];
+const VALID_KEY_TYPE: [&str; 2] = ["rsa", "dsa"];
+const VALID_KEY_SIZE: [&str; 3] = ["2048", "3072", "4096"];
+const VALID_DIGEST_ALGORITHM: [&str; 6] = ["md5", "sha1", "sha2_256","sha2_384","sha2_512","sha2_224"];
 
 #[derive(Debug, Validate, Deserialize)]
 pub struct X509KeyGenerationParameter {
diff --git a/src/presentation/handler/control/model/datakey/dto.rs b/src/presentation/handler/control/model/datakey/dto.rs
index 37429d3..070f5f3 100644
--- a/src/presentation/handler/control/model/datakey/dto.rs
+++ b/src/presentation/handler/control/model/datakey/dto.rs
@@ -131,6 +131,8 @@ pub struct DataKeyDTO {
     pub expire_at: String,
     /// Key state
     pub key_state: String,
+    /// User email
+    pub user_email: Option<String>,
 }
 
 fn validate_utc_time(expire: &str) -> std::result::Result<(), ValidationError> {
@@ -194,7 +196,8 @@ impl DataKey {
             certificate: dto.certificate.into_bytes(),
             create_at: now,
             expire_at: now,
-            key_state: KeyState::default()
+            key_state: KeyState::default(),
+            user_email: None,
         })
     }
 
@@ -223,7 +226,8 @@ impl DataKey {
             certificate: vec![],
             create_at: now,
             expire_at: dto.expire_at.parse()?,
-            key_state: KeyState::default()
+            key_state: KeyState::default(),
+            user_email: None,
         })
     }
 }
@@ -246,6 +250,7 @@ impl TryFrom<DataKey> for DataKeyDTO {
             create_at: dto.create_at.to_string(),
             expire_at: dto.expire_at.to_string(),
             key_state: dto.key_state.to_string(),
+            user_email: dto.user_email,
         })
     }
 }
-- 
Gitee