diff --git a/Cargo.lock b/Cargo.lock index 8fc5bc4..81940b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -714,7 +714,6 @@ dependencies = [ "thiserror", "toml", "uuid", - "zeroize", ] [[package]] @@ -1499,18 +1498,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - [[package]] name = "termcolor" version = "1.1.3" @@ -1795,12 +1782,6 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" -[[package]] -name = "unicode-xid" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" - [[package]] name = "unicode_categories" version = "0.1.1" @@ -2031,24 +2012,3 @@ name = "windows_x86_64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "zeroize" -version = "1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b578acffd8516a6c3f2a1bdefc1ec37e547bb4e0fb8b6b01a4cafc886b4442" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] diff --git a/core/Cargo.toml b/core/Cargo.toml index c9847c3..10efb7f 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -7,8 +7,6 @@ license = "GPL-3.0-or-later" version = "0.0.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [[bin]] name = "homedisk" path = "./src/main.rs" @@ -16,8 +14,8 @@ path = "./src/main.rs" [dependencies] anyhow = "1.0.58" better-panic = "0.3.0" -log = { version = "0.4.17", features = ["max_level_debug", "release_max_level_warn"] } simplelog = "0.12.0" +log = { version = "0.4.17", features = ["max_level_debug", "release_max_level_warn"] } tokio = { version = "1.19.2", features = ["rt-multi-thread", "macros"] } homedisk-database = { path = "../database" } homedisk-server = { path = "../server" } diff --git a/server/src/middleware/auth.rs b/server/src/middleware/auth.rs index 5317547..f4d8c55 100644 --- a/server/src/middleware/auth.rs +++ b/server/src/middleware/auth.rs @@ -19,13 +19,16 @@ mod tests { use super::validate_jwt; + const USERNAME: &str = "username"; + const PASSWORD: &str = "password"; + const SECRET: &[u8] = b"secret"; const INVALID_SECRET: &[u8] = b"invalid secret"; /// Test a token validation #[test] fn validate_token() { - let user = User::new("username", "password"); + let user = User::new(USERNAME, PASSWORD); let token = create_token(&user, SECRET, 1).unwrap(); @@ -35,7 +38,7 @@ mod tests { /// Test a token validation (invalid secret) #[test] fn validate_token_invalid_secret() { - let user = User::new("username", "password"); + let user = User::new(USERNAME, PASSWORD); let token = create_token(&user, SECRET, 1).unwrap(); diff --git a/server/src/middleware/jwt.rs b/server/src/middleware/jwt.rs index 8cc61b2..a8fc846 100644 --- a/server/src/middleware/jwt.rs +++ b/server/src/middleware/jwt.rs @@ -33,12 +33,16 @@ mod tests { use super::create_token; + const SECRET: &[u8] = b"secret"; + + const USERNAME: &str = "username"; + const PASSWORD: &str = "password"; + /// Test a token creation #[test] fn test_create_token() { - let secret = b"secret"; - - let user = User::new("username", "password"); + let secret = SECRET; + let user = User::new(USERNAME, PASSWORD); create_token(&user, secret, 1).unwrap(); } diff --git a/types/Cargo.toml b/types/Cargo.toml index c8899e8..b69288f 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -12,7 +12,6 @@ thiserror = "1.0.31" uuid = "1.1.2" anyhow = "1.0.58" serde = { version = "1.0.138", features = ["derive"] } -zeroize = { version = "1.5.6", features = ["derive"] } axum = { version = "0.5.11", optional = true } toml = { version = "0.5.9", optional = true } dirs = { version = "4.0.0", optional = true } diff --git a/types/src/auth/login.rs b/types/src/auth/login.rs index 612d2ac..d1b96e6 100644 --- a/types/src/auth/login.rs +++ b/types/src/auth/login.rs @@ -1,10 +1,9 @@ //! HTTP `/auth/login` Request and Response types use serde::{Deserialize, Serialize}; -use zeroize::{Zeroize, ZeroizeOnDrop}; /// HTTP `/auth/login` Request -#[derive(Debug, Serialize, Deserialize, Clone, Zeroize, ZeroizeOnDrop)] +#[derive(Debug, Serialize, Deserialize, Clone)] pub struct Request { /// Username pub username: String, @@ -13,7 +12,7 @@ pub struct Request { } /// HTTP `/auth/login` Response -#[derive(Debug, Serialize, Deserialize, Clone, Zeroize, ZeroizeOnDrop)] +#[derive(Debug, Serialize, Deserialize, Clone)] pub enum Response { LoggedIn { /// User access token