diff options
| author | Sven-Hendrik Haase <svenstaro@gmail.com> | 2021-10-13 02:26:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-13 02:26:38 +0000 |
| commit | 916f9ea6708c9d270133fe27857843e50e814744 (patch) | |
| tree | e9998050ad630e4783dee7c5fdefeac252f8ec6b /src/errors.rs | |
| parent | Merge pull request #617 from svenstaro/dependabot/cargo/strum_macros-0.22.0 (diff) | |
| parent | revert unnecessary changes (diff) | |
| download | miniserve-916f9ea6708c9d270133fe27857843e50e814744.tar.gz miniserve-916f9ea6708c9d270133fe27857843e50e814744.zip | |
Merge pull request #618 from aliemjay/revert-unnecessary
Patially revert #582
Diffstat (limited to 'src/errors.rs')
| -rw-r--r-- | src/errors.rs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/errors.rs b/src/errors.rs index 25d0529..c6fcce3 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -58,10 +58,6 @@ pub enum ContextualError { #[error("{0}")] ArchiveCreationDetailError(String), - /// Might occur when the HTTP credentials are not provided - #[error("Access requires HTTP authentication")] - RequireHttpCredentials, - /// Might occur when the HTTP credentials are not correct #[error("Invalid credentials for HTTP authentication")] InvalidHttpCredentials, @@ -90,20 +86,17 @@ impl ResponseError for ContextualError { Self::ArchiveCreationError(_, err) => err.status_code(), Self::RouteNotFoundError(_) => StatusCode::NOT_FOUND, Self::InsufficientPermissionsError(_) => StatusCode::FORBIDDEN, - Self::InvalidHttpCredentials | Self::RequireHttpCredentials => StatusCode::UNAUTHORIZED, + Self::InvalidHttpCredentials => StatusCode::UNAUTHORIZED, Self::InvalidHttpRequestError(_) => StatusCode::BAD_REQUEST, _ => StatusCode::INTERNAL_SERVER_ERROR, } } fn error_response(&self) -> HttpResponse { - if let Self::RequireHttpCredentials = self { - } else { - log_error_chain(self.to_string()); - } + log_error_chain(self.to_string()); let mut resp = HttpResponse::build(self.status_code()); - if let Self::RequireHttpCredentials | Self::InvalidHttpCredentials = self { + if let Self::InvalidHttpCredentials = self { resp.append_header(( header::WWW_AUTHENTICATE, header::HeaderValue::from_static("Basic realm=\"miniserve\""), |