From 5b9144594b65f5c14f4c09e359f7d15ed4ec2616 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Tue, 3 Jan 2023 10:24:04 +0100 Subject: [PATCH 1/5] fix: make clippy 1.66 happy --- plugins/authenticator/src/auth.rs | 8 ++++---- plugins/authenticator/src/u2f.rs | 12 ++++++------ plugins/persisted-scope/src/lib.rs | 4 ++-- plugins/store/src/store.rs | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/authenticator/src/auth.rs b/plugins/authenticator/src/auth.rs index 363b0d11..3241ef72 100644 --- a/plugins/authenticator/src/auth.rs +++ b/plugins/authenticator/src/auth.rs @@ -75,8 +75,8 @@ pub fn register(application: String, timeout: u64, challenge: String) -> crate:: let (key_handle, public_key) = _u2f_get_key_handle_and_public_key_from_register_response(®ister_data).unwrap(); - let key_handle_base64 = encode_config(&key_handle, URL_SAFE_NO_PAD); - let public_key_base64 = encode_config(&public_key, URL_SAFE_NO_PAD); + let key_handle_base64 = encode_config(key_handle, URL_SAFE_NO_PAD); + let public_key_base64 = encode_config(public_key, URL_SAFE_NO_PAD); let register_data_base64 = encode_config(®ister_data, URL_SAFE_NO_PAD); println!("Key Handle: {}", &key_handle_base64); println!("Public Key: {}", &public_key_base64); @@ -108,7 +108,7 @@ pub fn sign( challenge: String, key_handle: String, ) -> crate::Result { - let credential = match decode_config(&key_handle, URL_SAFE_NO_PAD) { + let credential = match decode_config(key_handle, URL_SAFE_NO_PAD) { Ok(v) => v, Err(e) => { return Err(e.into()); @@ -152,7 +152,7 @@ pub fn sign( let (_, handle_used, sign_data, device_info) = sign_result.unwrap(); - let sig = encode_config(&sign_data, URL_SAFE_NO_PAD); + let sig = encode_config(sign_data, URL_SAFE_NO_PAD); println!("Sign result: {}", sig); println!( diff --git a/plugins/authenticator/src/u2f.rs b/plugins/authenticator/src/u2f.rs index b1f2e280..80eb9497 100644 --- a/plugins/authenticator/src/u2f.rs +++ b/plugins/authenticator/src/u2f.rs @@ -15,7 +15,7 @@ static VERSION: &str = "U2F_V2"; pub fn make_challenge(app_id: &str, challenge_bytes: Vec) -> Challenge { let utc: DateTime = Utc::now(); Challenge { - challenge: encode_config(&challenge_bytes, URL_SAFE_NO_PAD), + challenge: encode_config(challenge_bytes, URL_SAFE_NO_PAD), timestamp: format!("{:?}", utc), app_id: app_id.to_string(), } @@ -35,10 +35,10 @@ pub fn verify_registration( register_data: String, client_data: String, ) -> crate::Result { - let challenge_bytes = decode_config(&challenge, URL_SAFE_NO_PAD)?; + let challenge_bytes = decode_config(challenge, URL_SAFE_NO_PAD)?; let challenge = make_challenge(&app_id, challenge_bytes); let client_data_bytes: Vec = client_data.as_bytes().into(); - let client_data_base64 = encode_config(&client_data_bytes, URL_SAFE_NO_PAD); + let client_data_base64 = encode_config(client_data_bytes, URL_SAFE_NO_PAD); let client = U2f::new(app_id); match client.register_response( challenge, @@ -74,12 +74,12 @@ pub fn verify_signature( key_handle: String, pub_key: String, ) -> crate::Result { - let challenge_bytes = decode_config(&challenge, URL_SAFE_NO_PAD)?; + let challenge_bytes = decode_config(challenge, URL_SAFE_NO_PAD)?; let chal = make_challenge(&app_id, challenge_bytes); let client_data_bytes: Vec = client_data.as_bytes().into(); - let client_data_base64 = encode_config(&client_data_bytes, URL_SAFE_NO_PAD); + let client_data_base64 = encode_config(client_data_bytes, URL_SAFE_NO_PAD); let key_handle_bytes = decode_config(&key_handle, URL_SAFE_NO_PAD)?; - let pubkey_bytes = decode_config(&pub_key, URL_SAFE_NO_PAD)?; + let pubkey_bytes = decode_config(pub_key, URL_SAFE_NO_PAD)?; let client = U2f::new(app_id); let mut _counter: u32 = 0; match client.sign_response( diff --git a/plugins/persisted-scope/src/lib.rs b/plugins/persisted-scope/src/lib.rs index 6827e4cd..9fbdf4f7 100644 --- a/plugins/persisted-scope/src/lib.rs +++ b/plugins/persisted-scope/src/lib.rs @@ -56,13 +56,13 @@ pub fn init() -> TauriPlugin { .unwrap_or_default(); for allowed in scope.allowed_paths { // allows the path as is - let _ = fs_scope.allow_file(&allowed); + let _ = fs_scope.allow_file(allowed); #[cfg(feature = "protocol-asset")] let _ = asset_protocol_scope.allow_file(allowed); } for forbidden in scope.forbidden_patterns { // forbid the path as is - let _ = fs_scope.forbid_file(&forbidden); + let _ = fs_scope.forbid_file(forbidden); #[cfg(feature = "protocol-asset")] let _ = asset_protocol_scope.forbid_file(forbidden); } diff --git a/plugins/store/src/store.rs b/plugins/store/src/store.rs index 867bb0cd..af106e30 100644 --- a/plugins/store/src/store.rs +++ b/plugins/store/src/store.rs @@ -176,7 +176,7 @@ impl Store { .expect("failed to resolve app dir"); let store_path = app_dir.join(&self.path); - let bytes = read(&store_path)?; + let bytes = read(store_path)?; self.cache = (self.deserialize)(&bytes).map_err(Error::Deserialize)?; From 102ea4de01a9de3923c3637eef8db5357542c7ad Mon Sep 17 00:00:00 2001 From: Jonas Kruckenberg Date: Fri, 6 Jan 2023 14:25:18 +0100 Subject: [PATCH 2/5] refactor(log): rename builder struct rename builder struct to align with convetion --- plugins/log/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/log/src/lib.rs b/plugins/log/src/lib.rs index 9288fe01..cf25db2d 100644 --- a/plugins/log/src/lib.rs +++ b/plugins/log/src/lib.rs @@ -142,14 +142,14 @@ fn log( logger().log(&builder.args(format_args!("{message}")).build()); } -pub struct LoggerBuilder { +pub struct Builder { dispatch: fern::Dispatch, rotation_strategy: RotationStrategy, max_file_size: u128, targets: Vec, } -impl Default for LoggerBuilder { +impl Default for Builder { fn default() -> Self { let format = time::format_description::parse("[[[year]-[month]-[day]][[[hour]:[minute]:[second]]") @@ -172,7 +172,7 @@ impl Default for LoggerBuilder { } } -impl LoggerBuilder { +impl Builder { pub fn new() -> Self { Default::default() } From ef96f78e6cc4525b4bb552e796c4611edd318cf4 Mon Sep 17 00:00:00 2001 From: Jonas Kruckenberg Date: Fri, 6 Jan 2023 16:34:28 +0100 Subject: [PATCH 3/5] Update README.md --- plugins/positioner/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/positioner/README.md b/plugins/positioner/README.md index 8625f15f..861043cd 100644 --- a/plugins/positioner/README.md +++ b/plugins/positioner/README.md @@ -57,7 +57,7 @@ fn main() { .on_system_tray_event(|app, event| { tauri_plugin_positioner::on_tray_event(app, &event); }) - .run() + .run(tauri::generate_context!()) .expect("error while running tauri application"); } ``` From 3d0d23c9ed7057d8fbedb83224fbd2c1a29c8c09 Mon Sep 17 00:00:00 2001 From: Jonas Kruckenberg Date: Fri, 6 Jan 2023 16:38:13 +0100 Subject: [PATCH 4/5] Update Cargo.lock --- Cargo.lock | 106 ++++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1002e9b4..0a70412a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -149,7 +149,7 @@ dependencies = [ "devd-rs", "libc", "libudev", - "log 0.4.17", + "log", "rand 0.7.3", "runloop", "winapi 0.3.9", @@ -993,7 +993,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a" dependencies = [ - "log 0.4.17", + "log", ] [[package]] @@ -1304,7 +1304,7 @@ checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e" dependencies = [ "cc", "libc", - "log 0.4.17", + "log", "rustversion", "windows", ] @@ -1443,7 +1443,7 @@ dependencies = [ "aho-corasick", "bstr", "fnv", - "log 0.4.17", + "log", "regex", ] @@ -1607,7 +1607,7 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" dependencies = [ - "log 0.4.17", + "log", "mac", "markup5ever", "proc-macro2", @@ -1751,7 +1751,7 @@ dependencies = [ "crossbeam-utils", "globset", "lazy_static", - "log 0.4.17", + "log", "memchr", "regex", "same-file", @@ -1948,7 +1948,7 @@ dependencies = [ "cesu8", "combine", "jni-sys", - "log 0.4.17", + "log", "thiserror", "walkdir", ] @@ -2026,7 +2026,7 @@ dependencies = [ "gtk", "gtk-sys", "libappindicator-sys", - "log 0.4.17", + "log", ] [[package]] @@ -2133,20 +2133,6 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "log" -version = "0.1.0" -dependencies = [ - "byte-unit", - "fern", - "log 0.4.17", - "serde", - "serde_json", - "serde_repr", - "tauri", - "time 0.3.17", -] - [[package]] name = "log" version = "0.4.17" @@ -2193,7 +2179,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ - "log 0.4.17", + "log", "phf 0.8.0", "phf_codegen", "string_cache", @@ -2273,7 +2259,7 @@ dependencies = [ "iovec", "kernel32-sys", "libc", - "log 0.4.17", + "log", "miow", "net2", "slab", @@ -2287,7 +2273,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", - "log 0.4.17", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.42.0", ] @@ -2299,7 +2285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" dependencies = [ "lazycell", - "log 0.4.17", + "log", "mio 0.6.23", "slab", ] @@ -2324,7 +2310,7 @@ checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", - "log 0.4.17", + "log", "openssl", "openssl-probe", "openssl-sys", @@ -3186,7 +3172,7 @@ dependencies = [ "hyper-tls", "ipnet", "js-sys", - "log 0.4.17", + "log", "mime", "native-tls", "once_cell", @@ -3271,7 +3257,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" dependencies = [ - "log 0.4.17", + "log", "ring", "sct", "webpki", @@ -3396,7 +3382,7 @@ dependencies = [ "cssparser", "derive_more", "fxhash", - "log 0.4.17", + "log", "matches", "phf 0.8.0", "phf_codegen", @@ -3735,7 +3721,7 @@ dependencies = [ "itoa 1.0.4", "libc", "libsqlite3-sys", - "log 0.4.17", + "log", "md-5", "memchr", "num-bigint", @@ -3862,7 +3848,7 @@ checksum = "8b00fbacafc4ef96fb95fac07d86cc3ec5e21c8efa94785374ad7913a4a216ba" dependencies = [ "atom", "lazy_static", - "log 0.4.17", + "log", "thiserror", "zeroize", ] @@ -4000,7 +3986,7 @@ dependencies = [ "lazy_static", "libappindicator", "libc", - "log 0.4.17", + "log", "ndk", "ndk-context", "ndk-sys", @@ -4121,7 +4107,7 @@ dependencies = [ "authenticator", "base64 0.13.1", "chrono", - "log 0.4.17", + "log", "once_cell", "rand 0.8.5", "rusty-fork", @@ -4138,7 +4124,7 @@ name = "tauri-plugin-autostart" version = "0.1.0" dependencies = [ "auto-launch", - "log 0.4.17", + "log", "serde", "serde_json", "tauri", @@ -4149,7 +4135,7 @@ dependencies = [ name = "tauri-plugin-fs-extra" version = "0.1.0" dependencies = [ - "log 0.4.17", + "log", "serde", "serde_json", "tauri", @@ -4160,7 +4146,7 @@ dependencies = [ name = "tauri-plugin-fs-watch" version = "0.1.0" dependencies = [ - "log 0.4.17", + "log", "notify", "serde", "serde_json", @@ -4173,7 +4159,7 @@ name = "tauri-plugin-localhost" version = "0.1.0" dependencies = [ "http", - "log 0.4.17", + "log", "serde", "serde_json", "tauri", @@ -4181,12 +4167,26 @@ dependencies = [ "tiny_http", ] +[[package]] +name = "tauri-plugin-log" +version = "0.1.0" +dependencies = [ + "byte-unit", + "fern", + "log", + "serde", + "serde_json", + "serde_repr", + "tauri", + "time 0.3.17", +] + [[package]] name = "tauri-plugin-persisted-scope" version = "0.1.0" dependencies = [ "bincode", - "log 0.4.17", + "log", "serde", "serde_json", "tauri", @@ -4197,7 +4197,7 @@ dependencies = [ name = "tauri-plugin-positioner" version = "0.2.7" dependencies = [ - "log 0.4.17", + "log", "serde", "serde_json", "serde_repr", @@ -4210,7 +4210,7 @@ name = "tauri-plugin-sql" version = "0.1.0" dependencies = [ "futures", - "log 0.4.17", + "log", "serde", "serde_json", "sqlx", @@ -4223,7 +4223,7 @@ dependencies = [ name = "tauri-plugin-store" version = "0.1.0" dependencies = [ - "log 0.4.17", + "log", "serde", "serde_json", "tauri", @@ -4237,7 +4237,7 @@ dependencies = [ "hex", "iota-crypto 0.14.3", "iota_stronghold", - "log 0.4.17", + "log", "rand 0.8.5", "rusty-fork", "serde", @@ -4252,7 +4252,7 @@ name = "tauri-plugin-upload" version = "0.1.0" dependencies = [ "futures", - "log 0.4.17", + "log", "read-progress-stream", "reqwest", "serde", @@ -4268,7 +4268,7 @@ name = "tauri-plugin-websocket" version = "0.1.0" dependencies = [ "futures-util", - "log 0.4.17", + "log", "rand 0.8.5", "serde", "serde_json", @@ -4283,7 +4283,7 @@ name = "tauri-plugin-window-state" version = "0.1.0" dependencies = [ "bincode", - "log 0.4.17", + "log", "serde", "serde_json", "tauri", @@ -4473,7 +4473,7 @@ checksum = "e0d6ef4e10d23c1efb862eecad25c5054429a71958b4eeef85eb5e7170b477ca" dependencies = [ "ascii", "chunked_transfer", - "log 0.4.17", + "log", "time 0.3.17", "url", ] @@ -4549,7 +4549,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" dependencies = [ "futures-util", - "log 0.4.17", + "log", "native-tls", "tokio", "tokio-native-tls", @@ -4625,7 +4625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ "lazy_static", - "log 0.4.17", + "log", "tracing-core", ] @@ -4673,7 +4673,7 @@ dependencies = [ "bytes 1.3.0", "http", "httparse", - "log 0.4.17", + "log", "native-tls", "rand 0.8.5", "sha-1", @@ -4877,7 +4877,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "log 0.4.17", + "log", "try-lock", ] @@ -4916,7 +4916,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" dependencies = [ "bumpalo", - "log 0.4.17", + "log", "once_cell", "proc-macro2", "quote", @@ -5338,7 +5338,7 @@ dependencies = [ "http", "kuchiki", "libc", - "log 0.4.17", + "log", "objc", "objc_id", "once_cell", From deefbd172fd68d96cbb7702cf0b1ff73d028c43a Mon Sep 17 00:00:00 2001 From: Jonas Kruckenberg Date: Fri, 6 Jan 2023 16:42:39 +0100 Subject: [PATCH 5/5] Update README.md --- plugins/authenticator/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/authenticator/README.md b/plugins/authenticator/README.md index fe455bb6..a868a3f8 100644 --- a/plugins/authenticator/README.md +++ b/plugins/authenticator/README.md @@ -15,6 +15,8 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: `src-tauri/Cargo.toml` ```toml [dependencies] +tauri-plugin-authenticator = "0.1" +# or through git tauri-plugin-authenticator = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } ```