aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock35
-rw-r--r--Cargo.toml2
-rw-r--r--src/auth.rs2
3 files changed, 21 insertions, 18 deletions
diff --git a/Cargo.lock b/Cargo.lock
index d4dd21f..b6db3c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -244,16 +244,16 @@ dependencies = [
[[package]]
name = "actix-web-httpauth"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6dc1123f18b3548b9fe90c15e9bd77819701b047c6b62c152230aa39243d40d"
+checksum = "6dda62cf04bc3a9ad2ea8f314f721951cfdb4cdacec4e984d20e77c7bb170991"
dependencies = [
- "actix-service",
"actix-utils",
"actix-web",
"base64",
"futures-core",
"futures-util",
+ "log",
"pin-project-lite",
]
@@ -464,9 +464,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e"
[[package]]
name = "bytesize"
@@ -543,9 +543,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "3.2.12"
+version = "3.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8b79fe3946ceb4a0b1c080b4018992b8d27e9ff363644c1c9b6387c854614d"
+checksum = "54635806b078b7925d6e36810b1755f2a4b5b4d57560432c1ecf60bcbe10602b"
dependencies = [
"atty",
"bitflags",
@@ -565,7 +565,7 @@ version = "3.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ead064480dfc4880a10764488415a97fdd36a4cf1bb022d372f02e8faf8386e1"
dependencies = [
- "clap 3.2.12",
+ "clap 3.2.14",
]
[[package]]
@@ -596,7 +596,7 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "937efe4451c32be4ccb3e19549cbb1ea5cb85197f39b87a9662ca1d7b1765d1d"
dependencies = [
- "clap 3.2.12",
+ "clap 3.2.14",
"roff",
]
@@ -1411,7 +1411,7 @@ dependencies = [
"bytesize",
"chrono",
"chrono-humanize",
- "clap 3.2.12",
+ "clap 3.2.14",
"clap_complete",
"clap_mangen",
"futures",
@@ -2135,18 +2135,18 @@ checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
[[package]]
name = "serde"
-version = "1.0.139"
+version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6"
+checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.139"
+version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb"
+checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da"
dependencies = [
"proc-macro2",
"quote",
@@ -2226,9 +2226,12 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
[[package]]
name = "slab"
-version = "0.4.6"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+dependencies = [
+ "autocfg",
+]
[[package]]
name = "smallvec"
diff --git a/Cargo.toml b/Cargo.toml
index b8d90e4..4cc66f1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ panic = 'abort'
actix-web = "4"
actix-files = "0.6"
actix-multipart = "0.4"
-actix-web-httpauth = "0.7"
+actix-web-httpauth = "0.8"
maud = "0.23"
yansi = "0.5"
simplelog = "0.12"
diff --git a/src/auth.rs b/src/auth.rs
index b2c01e3..398fdda 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -16,7 +16,7 @@ impl From<BasicAuth> for BasicAuthParams {
fn from(auth: BasicAuth) -> Self {
Self {
username: auth.user_id().to_string(),
- password: auth.password().unwrap_or(&"".into()).to_string(),
+ password: auth.password().unwrap_or_default().to_string(),
}
}
}