aboutsummaryrefslogtreecommitdiff
path: root/src/error.rs
diff options
context:
space:
mode:
authorMartin Fischer <martin@push-f.com>2021-06-24 17:45:54 +0200
committerMartin Fischer <martin@push-f.com>2021-06-24 18:02:30 +0200
commitd49d835e63ec654e3a5bf75b3b365354460382e8 (patch)
tree4fc823707248f770b8595b5537bef7a75e503335 /src/error.rs
parent0bb0af08c3fb7e100e5451e636719ce367fe1138 (diff)
refactor: simplify Controller request interception
In multi-user mode if Alice attempts to access /~bob/ she would get an Unauthorized error since branches are private. To improve the UX we instead already showed Alice a list of which files Bob has shared with her. Previously this was achieved with an before_return_error hook in the Controller trait. While this worked fine, it wasn't elegant, since it required passing the Context struct in all Unauthorized errors, so that the before_return_error hook could access the context. This commit refactors the code to intercept requests to paths like /~bob/ before the regular request handling instead of afterwards. While this could have been implemented in the before_route hook, this would have required either invoking parse_url_path a second time or passing the Result of parse_url_path, both of which would be akward. Therefore this commit also merges before_route into parse_url_path.
Diffstat (limited to 'src/error.rs')
-rw-r--r--src/error.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/error.rs b/src/error.rs
index c006255..8460376 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -2,13 +2,11 @@ use sputnik::hyper_body::FormError;
use sputnik::request::QueryError;
use std::str::Utf8Error;
-use crate::Context;
-
pub enum Error {
/// A 400 bad request error.
BadRequest(String),
/// A 401 unauthorized error.
- Unauthorized(String, Context),
+ Unauthorized(String),
/// A 403 forbidden error.
Forbidden(String),
/// A 404 not found error.