diff options
| author | metamuffin <metamuffin@disroot.org> | 2023-09-25 17:42:15 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2023-09-25 17:42:15 +0200 |
| commit | 7efece270151d8a22e3d5f209cf9707d989c4ac5 (patch) | |
| tree | bf6fe4e1433b0f83676a07c5924c53ca0a403aa0 /server | |
| parent | 95125ad3a02eb561a41d8b046876cc9a375feb8d (diff) | |
| download | jellything-7efece270151d8a22e3d5f209cf9707d989c4ac5.tar jellything-7efece270151d8a22e3d5f209cf9707d989c4ac5.tar.bz2 jellything-7efece270151d8a22e3d5f209cf9707d989c4ac5.tar.zst | |
move deps to workspace and update rocket to master
Diffstat (limited to 'server')
| -rw-r--r-- | server/Cargo.toml | 4 | ||||
| -rw-r--r-- | server/src/routes/stream.rs | 2 | ||||
| -rw-r--r-- | server/src/routes/ui/account/session/guard.rs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/server/Cargo.toml b/server/Cargo.toml index 1f620da..57592cf 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -14,7 +14,7 @@ serde = { version = "1.0.188", features = ["derive"] } bincode = { version = "2.0.0-rc.3", features = ["serde", "derive"] } serde_json = "1.0.107" -log = "0.4.20" +log = { workspace = true } env_logger = "0.10.0" anyhow = "1.0.75" rand = "0.8.5" @@ -32,7 +32,7 @@ tokio = { version = "1.32.0", features = ["io-util"] } tokio-util = { version = "0.7.9", features = ["io", "io-util"] } markup = "0.13.1" -rocket = { version = "0.5.0-rc.3", features = ["secrets", "json"] } +rocket = { workspace = true, features = ["secrets", "json"] } sled = "0.34.7" typed-sled = "0.2.3" diff --git a/server/src/routes/stream.rs b/server/src/routes/stream.rs index 7e26500..e920341 100644 --- a/server/src/routes/stream.rs +++ b/server/src/routes/stream.rs @@ -176,7 +176,7 @@ impl<'r> FromRequest<'r> for RequestRange { Ok(v) => rocket::outcome::Outcome::Success(v), Err(e) => rocket::outcome::Outcome::Failure((Status::BadRequest, e)), }, - None => rocket::outcome::Outcome::Forward(()), + None => rocket::outcome::Outcome::Forward(Status::Ok), } } } diff --git a/server/src/routes/ui/account/session/guard.rs b/server/src/routes/ui/account/session/guard.rs index 19d68ad..ae1ebd3 100644 --- a/server/src/routes/ui/account/session/guard.rs +++ b/server/src/routes/ui/account/session/guard.rs @@ -52,7 +52,7 @@ impl<'r> FromRequest<'r> for Session { Ok(x) => Outcome::Success(x), Err(e) => { warn!("authentificated route rejected: {e:?}"); - Outcome::Forward(()) + Outcome::Forward(Status::Unauthorized) } } } @@ -77,7 +77,7 @@ impl<'r> FromRequest<'r> for AdminSession { } Err(e) => { warn!("authentificated route rejected: {e:?}"); - Outcome::Forward(()) + Outcome::Forward(Status::Unauthorized) } } } |