feat: 🥅 Checking for errors in frontend code.

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [unreleased]
+## [1.0.2] - 2023-11-25
 
 ### Miscellaneous Tasks
 

src-tauri/Cargo.toml

@@ -56,4 +56,4 @@ panic = "abort"
 strip = true
 
 [dev-dependencies]
-tokio = { version = "1.34.0", features = ["rt-multi-thread"] }
+tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] }

src-tauri/crypto/src/signing.rs

@@ -36,7 +36,7 @@ fn sign(
     Ok(sig_conf.sign(secret_key, passwd_fn, data)?)
 }
 
-/// Sign the given file with the given secret key.
+/// Sign the given file with the specified secret key and password function.
 ///
 /// # Errors
 ///
@@ -70,11 +70,17 @@ where
     Ok(signature_path)
 }
 
-/// .
+/// Verify the given signature with the specified public key.
 ///
 /// # Errors
 ///
-/// This function will return an error if .
+/// This function will return an error if:
+/// - The file, signature or public key cannot be read.
+/// - The signature or public key's format is invalid.
+///
+/// However, these will not be considered an error, a `Ok(false)` is returned instead:
+/// - The signature is signed with a secret key having a key ID different from that of public key.
+/// - The file's hash does not match the one in signature.
 pub async fn verify_file_with_key<S, P>(signature_path: S, public_key_path: P) -> Result<bool>
 where
     S: AsRef<Path> + Send,

src-tauri/src/fs.rs

@@ -11,7 +11,7 @@ pub enum FileType {
     File = 0,
     Dir = 1,
     Other = 2,
-    Inexist = 3,
+    Unavailable = 3,
 }
 
 impl Serialize for FileType {
@@ -35,7 +35,7 @@ pub async fn detect_file_type(path: &Path) -> Result<FileType> {
                 FileType::Other
             }
         }
-        Err(_) => FileType::Inexist,
+        Err(_) => FileType::Unavailable,
     })
 }
 
@@ -46,21 +46,3 @@ pub fn get_file_names(files: Vec<&Path>) -> Vec<&OsStr> {
         .filter_map(|file| file.file_name())
         .collect()
 }
-
-#[cfg(test)]
-mod tests {
-    use std::path::PathBuf;
-
-    use super::detect_file_type;
-
-    #[tokio::test]
-    async fn test() {
-        println!("{:?}", detect_file_type(&PathBuf::from("/home/")).await);
-        println!("{:?}", detect_file_type(&PathBuf::from("/etc/fstab")).await);
-        println!(
-            "{:?}",
-            detect_file_type(&PathBuf::from("/home/inexist")).await
-        );
-        println!("{:?}", detect_file_type(&PathBuf::from("/bin/sh")).await);
-    }
-}

src/command.ts

@@ -21,7 +21,7 @@ export const generateKeyPair = (
 export const enum FileType {
   dir = 1,
   file = 0,
-  inexist = 3,
+  unavailable = 3,
   other = 2,
 }
 

src/views/KeygenView.vue

@@ -30,12 +30,12 @@ const generate = async () => {
       );
       await message(
         "生成成功\n" +
-          `你的私钥路径为：${paths.secretKeyPath}\n` +
+          `您的私钥路径为：${paths.secretKeyPath}\n` +
           `公钥路径为：${paths.publicKeyPath}`,
       );
     }
   } catch (x) {
-    await message("生成失败\n发生如下错误：\n" + x);
+    await message("生成失败，发生了以下错误：\n" + x);
   }
 };
 </script>

src/views/SignView.vue

@@ -51,14 +51,18 @@ const back = () => {
 const submit = async () => {
   if (valid.value) {
     if (step.value === items.value.length) {
-      const signatures = await signFiles(
-        data.filePaths,
-        data.keyPath,
-        data.passwd,
-      );
-      await message(
-        "签名成功。\n您的签名文件保存于：\n" + signatures.join("\n"),
-      );
+      try {
+        const signatures = await signFiles(
+          data.filePaths,
+          data.keyPath,
+          data.passwd,
+        );
+        await message(
+          "签名成功。\n您的签名文件保存于：\n" + signatures.join("\n"),
+        );
+      } catch (error) {
+        await message("校验失败，发生了以下错误：\n" + JSON.stringify(error));
+      }
     } else {
       step.value += 1;
     }

src/views/ValidateView.vue

@@ -50,13 +50,20 @@ const back = () => {
 const submit = async () => {
   if (valid.value) {
     if (step.value === items.value.length) {
-      const results = await verifySignatures(data.signaturePaths, data.keyPath);
-      await message(
-        "校验成功\n" +
-          Object.keys(results)
-            .map((key) => `${key}: ${results[key] ? "✔️" : "❌"}`)
-            .join("\n"),
-      );
+      try {
+        const results = await verifySignatures(
+          data.signaturePaths,
+          data.keyPath,
+        );
+        await message(
+          "校验成功\n" +
+            Object.keys(results)
+              .map((key) => `${key}: ${results[key] ? "✔️" : "❌"}`)
+              .join("\n"),
+        );
+      } catch (error) {
+        await message("校验失败，发生了以下错误：\n" + JSON.stringify(error));
+      }
     } else {
       step.value += 1;
     }