wip

2023-10-12 09:13:06 +07:00
parent 3b46e71525
commit 35650a40f2
36 changed files with 444 additions and 1447 deletions
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -170,18 +170,6 @@ dependencies = [
 "x11rb",
 ]

-[[package]]
-name = "arrayref"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
 [[package]]
 name = "async-broadcast"
 version = "0.5.1"
@@ -406,12 +394,6 @@ dependencies = [
 "rustc-demangle",
 ]

-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.4"
@@ -439,17 +421,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "blake2b_simd"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
-dependencies = [
- "arrayref",
- "arrayvec",
- "constant_time_eq 0.3.0",
-]
-
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -860,12 +831,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"

-[[package]]
-name = "constant_time_eq"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
-
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1051,9 +1016,9 @@ dependencies = [

 [[package]]
 name = "curl-sys"
-version = "0.4.67+curl-8.3.0"
+version = "0.4.68+curl-8.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc35d066510b197a0f72de863736641539957628c8a42e70e27c66849e77c34"
+checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f"
 dependencies = [
 "cc",
 "libc",
@@ -2554,7 +2519,6 @@ name = "lume"
 version = "1.2.6"
 dependencies = [
 "keyring",
- "rust-argon2",
 "serde",
 "serde_json",
 "sqlx-cli",
@@ -3444,7 +3408,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06"
 dependencies = [
- "base64 0.21.4",
+ "base64",
 "indexmap 1.9.3",
 "line-wrap",
 "quick-xml 0.29.0",
@@ -3724,7 +3688,7 @@ dependencies = [
 "aho-corasick",
 "memchr",
 "regex-automata 0.4.1",
- "regex-syntax 0.8.0",
+ "regex-syntax 0.8.1",
 ]

 [[package]]
@@ -3744,7 +3708,7 @@ checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-syntax 0.8.0",
+ "regex-syntax 0.8.1",
 ]

 [[package]]
@@ -3755,9 +3719,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"

 [[package]]
 name = "regex-syntax"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d"
+checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33"

 [[package]]
 name = "reqwest"
@@ -3765,7 +3729,7 @@ version = "0.11.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
 dependencies = [
- "base64 0.21.4",
+ "base64",
 "bytes",
 "encoding_rs",
 "futures-core",
@@ -3861,18 +3825,6 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "rust-argon2"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b50162d19404029c1ceca6f6980fe40d45c8b369f6f44446fa14bb39573b5bb9"
-dependencies = [
- "base64 0.13.1",
- "blake2b_simd",
- "constant_time_eq 0.1.5",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@@ -3932,7 +3884,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
- "base64 0.21.4",
+ "base64",
 ]

 [[package]]
@@ -4167,7 +4119,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
 dependencies = [
- "base64 0.21.4",
+ "base64",
 "chrono",
 "hex",
 "indexmap 1.9.3",
@@ -4521,7 +4473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db"
 dependencies = [
 "atoi",
- "base64 0.21.4",
+ "base64",
 "bitflags 2.4.0",
 "byteorder",
 "bytes",
@@ -4564,7 +4516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624"
 dependencies = [
 "atoi",
- "base64 0.21.4",
+ "base64",
 "bitflags 2.4.0",
 "byteorder",
 "crc",
@@ -4692,9 +4644,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

 [[package]]
 name = "subtle"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"

 [[package]]
 name = "swift-rs"
@@ -4702,7 +4654,7 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bbdb58577b6301f8d17ae2561f32002a5bae056d444e0f69e611e504a276204"
 dependencies = [
- "base64 0.21.4",
+ "base64",
 "serde",
 "serde_json",
 ]
@@ -4924,7 +4876,7 @@ version = "2.0.0-alpha.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8acf40451edf9ccd16d110cb10e9959fec6ccca286c5cc66b859878f8aa9a7b"
 dependencies = [
- "base64 0.21.4",
+ "base64",
 "brotli",
 "ico",
 "json-patch",
@@ -5159,7 +5111,7 @@ name = "tauri-plugin-updater"
 version = "2.0.0-alpha.2"
 source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
 dependencies = [
- "base64 0.21.4",
+ "base64",
 "dirs-next",
 "futures-util",
 "http",
@@ -6340,7 +6292,7 @@ version = "0.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2cb3bc6ed7e3d905a5a963a3e4e9ee5ede76408e50de42d68e523ee75ab1c78a"
 dependencies = [
- "base64 0.21.4",
+ "base64",
 "block",
 "cocoa 0.24.1",
 "core-graphics 0.22.3",
@@ -6527,7 +6479,7 @@ dependencies = [
 "aes 0.8.3",
 "byteorder",
 "bzip2",
- "constant_time_eq 0.1.5",
+ "constant_time_eq",
 "crc32fast",
 "crossbeam-utils",
 "flate2",
@@ -6559,12 +6511,11 @@ dependencies = [

 [[package]]
 name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
+version = "2.0.9+zstd.1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
 dependencies = [
 "cc",
- "libc",
 "pkg-config",
 ]

--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -40,7 +40,6 @@ tauri-plugin-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", b
 sqlx-cli = { version = "0.7.0", default-features = false, features = [
  "sqlite",
 ] }
-rust-argon2 = "1.0"
 webpage = { version = "1.6.0", features = ["serde"] }
 keyring = "2"

--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -99,10 +99,13 @@ fn secure_save(key: String, value: String) -> Result<(), ()> {
 }

 #[tauri::command]
-fn secure_load(key: String) -> Result<String, ()> {
+fn secure_load(key: String) -> Result<String, String> {
  let entry = Entry::new("lume", &key).expect("Failed to create entry");
-  let password = entry.get_password().unwrap();
-  Ok(password)
+  if let Ok(password) = entry.get_password() {
+    Ok(password)
+  } else {
+    Err("not found".to_string())
+  }
 }

 fn main() {