diff --git a/Cargo.lock b/Cargo.lock index 271ce91..683ea07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -346,12 +346,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" -[[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.7" @@ -720,21 +714,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -744,18 +723,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "frank_jwt" -version = "3.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9febc9f09c7569636ba0e3d98a12addd6b11b3b3bc1d7baad06d52c60c1bbadd" -dependencies = [ - "base64 0.13.1", - "openssl", - "serde", - "serde_json", -] - [[package]] name = "fully_pub" version = "0.1.4" @@ -1265,21 +1232,6 @@ dependencies = [ "simple_asn1", ] -[[package]] -name = "jwt" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6204285f77fe7d9784db3fdc449ecce1a0114927a51d5a41c4c7a292011c015f" -dependencies = [ - "base64 0.13.1", - "crypto-common", - "digest", - "hmac", - "serde", - "serde_json", - "sha2", -] - [[package]] name = "lazy_static" version = "1.5.0" @@ -1394,10 +1346,8 @@ dependencies = [ "chrono", "dotenvy", "env_logger", - "frank_jwt", "fully_pub", "jsonwebtoken", - "jwt", "log", "minijinja", "minijinja-embed", @@ -1565,44 +1515,6 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "openssl" -version = "0.10.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "openssl-sys" -version = "0.9.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "parking_lot" version = "0.12.3" diff --git a/Cargo.toml b/Cargo.toml index 8f0903e..eff7740 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,8 +14,14 @@ edition = "2021" anyhow = "1.0" fully_pub = "0.1" argon2 = "0.5" +strum = "0.26.3" strum_macros = "0.26" uuid = { version = "1.8", features = ["serde", "v4"] } +dotenvy = "0.15.7" +base64 = "0.22.1" +rand = "0.8.5" +rand_core = { version = "0.6.4", features = ["std"] } +url = "2.5.3" argh = "0.1" # for CLI # Async @@ -28,6 +34,7 @@ env_logger = "0.11" # Serialization serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" +serde_urlencoded = "0.7.1" toml = "0.8" chrono = { version = "0.4", features = ["serde"] } @@ -38,7 +45,9 @@ redis = { version = "0.27.3", default-features = false, features = ["acl"] } # Web axum = { version = "0.7.7", features = ["json", "multipart"] } +axum-extra = { version = "0.9.4", features = ["cookie"] } axum-template = { version = "2.4.0", features = ["minijinja"] } +axum_typed_multipart = "0.13.1" minijinja = { version = "2.1", features = ["builtins"] } # to make work the static assets server tower-http = { version = "0.6.1", features = ["fs"] } @@ -47,18 +56,7 @@ tower-http = { version = "0.6.1", features = ["fs"] } totp-rs = "5.6" minijinja-embed = "2.3.1" axum-macros = "0.4.2" -jwt = "0.16.0" -dotenvy = "0.15.7" -frank_jwt = "3.1.3" jsonwebtoken = "9.3.0" -axum-extra = { version = "0.9.4", features = ["cookie"] } -axum_typed_multipart = "0.13.1" -base64 = "0.22.1" -rand = "0.8.5" -rand_core = { version = "0.6.4", features = ["std"] } -url = "2.5.3" -strum = "0.26.3" -serde_urlencoded = "0.7.1" [build-dependencies] minijinja-embed = "2.3.1" diff --git a/TODO.md b/TODO.md index 1120e53..cda19a7 100644 --- a/TODO.md +++ b/TODO.md @@ -32,3 +32,4 @@ - [ ] Add admin panel via API - [ ] Add admin CLI +- [ ] add TOTP