zerotier/ratpack
0
0
Fork 0
mirror of https://github.com/zerotier/ratpack.git synced 2026-05-22 16:27:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from zerotier/http-fixes

Browse Source 
Some fixes
This commit is contained in:
Erik Hollensbe
2022-01-27 09:10:35 -08:00
committed by GitHub
parent 85654b5d66 f71be88b75
commit 40ab57ebb5
5 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/auth-with-state.rs
+8 -2
View File
@@ -34,7 +34,10 @@ async fn validate_authtoken(
authstate.authed = Some(state.clone().lock().await.authtoken == token);
Ok((req, resp, authstate))
} else {
Err(Error::StatusCode(StatusCode::UNAUTHORIZED))
Err(Error::StatusCode(
StatusCode::UNAUTHORIZED,
String::default(),
))
}
}
@@ -66,7 +69,10 @@ async fn hello(
));
}
Err(Error::StatusCode(StatusCode::UNAUTHORIZED))
Err(Error::StatusCode(
StatusCode::UNAUTHORIZED,
String::default(),
))
}
// Our global application state; must be `Clone`.
examples/disk-auth.rs
+2 -2
View File
@@ -12,7 +12,7 @@ async fn validate_authtoken(
) -> HTTPResult<NoState> {
let token = req.headers().get("X-AuthToken");
if token.is_none() {
return Err(Error::StatusCode(StatusCode::UNAUTHORIZED));
return Err(Error::StatusCode(StatusCode::UNAUTHORIZED, String::new()));
}
let token = token.unwrap();
@@ -26,7 +26,7 @@ async fn validate_authtoken(
};
if !matches {
return Err(Error::StatusCode(StatusCode::UNAUTHORIZED));
return Err(Error::StatusCode(StatusCode::UNAUTHORIZED, String::new()));
}
return Ok((req, resp, NoState {}));
src/app.rs
+6 -5
View File
@@ -142,10 +142,10 @@ impl<S: 'static + Clone + Send, T: TransientState + 'static + Clone + Send> App<
pub async fn dispatch(&self, req: Request<Body>) -> Result<Response<Body>, Infallible> {
match self.router.dispatch(req, self.clone()).await {
Ok(resp) => Ok(resp),
Err(e) => match e {
Error::StatusCode(sc) => Ok(Response::builder()
Err(e) => match e.clone() {
Error::StatusCode(sc, msg) => Ok(Response::builder()
.status(sc)
.body(Body::default())
.body(Body::from(msg))
.unwrap()),
Error::InternalServerError(e) => Ok(Response::builder()
.status(StatusCode::INTERNAL_SERVER_ERROR)
@@ -181,12 +181,13 @@ impl<S: 'static + Clone + Send, T: TransientState + 'static + Clone + Send> App<
}
}
pub struct TestService<S: Clone + Send + 'static, T: TransientState + 'static + Clone + Send> {
#[derive(Clone)]
pub struct TestApp<S: Clone + Send + 'static, T: TransientState + 'static + Clone + Send> {
app: App<S, T>,
headers: Option<HeaderMap>,
}
impl<S: Clone + Send + 'static, T: TransientState + 'static + Clone + Send> TestService<S, T> {
impl<S: Clone + Send + 'static, T: TransientState + 'static + Clone + Send> TestApp<S, T> {
pub fn new(app: App<S, T>) -> Self {
Self { app, headers: None }
}
src/lib.rs
+16 -5
View File
@@ -35,7 +35,7 @@ where
/// [http::Response] returns.
#[derive(Clone, Debug)]
pub enum Error {
StatusCode(http::StatusCode),
StatusCode(http::StatusCode, String),
InternalServerError(String),
}
@@ -54,9 +54,12 @@ impl Error {
Self::InternalServerError(message.to_string())
}
/// A convenient way to return status codes.
pub fn new_status(error: http::StatusCode) -> Self {
Self::StatusCode(error)
/// A convenient way to return status codes with optional informational bodies.
pub fn new_status<T>(error: http::StatusCode, message: T) -> Self
where
T: ToString,
{
Self::StatusCode(error, message.to_string())
}
}
@@ -69,6 +72,13 @@ where
}
}
pub trait ToStatus
where
Self: ToString,
{
fn to_status(&self) -> Error;
}
/// HTTPResult is the return type for handlers. If a handler terminates at the end of its chain
/// with [std::option::Option::None] as the [http::Response], a 500 Internal Server Error will be
/// returned. If you wish to return Err(), a [http::StatusCode] or [std::string::String] can be
@@ -111,7 +121,8 @@ impl TransientState for NoState {
/// ```
pub mod prelude {
pub use crate::{
app::App, compose_handler, Error, HTTPResult, NoState, Params, ServerError, TransientState,
app::App, compose_handler, Error, HTTPResult, NoState, Params, ServerError, ToStatus,
TransientState,
};
pub use http::{Request, Response, StatusCode};
pub use hyper::Body;
src/router.rs
+12 -3
View File
@@ -52,7 +52,10 @@ impl<S: Clone + Send, T: TransientState> Route<S, T> {
let params = self.path.extract(provided)?;
if self.method != req.method() {
return Err(Error::StatusCode(http::StatusCode::NOT_FOUND));
return Err(Error::StatusCode(
http::StatusCode::NOT_FOUND,
String::new(),
));
}
self.handler.perform(req, None, params, app, state).await
@@ -85,14 +88,20 @@ impl<S: Clone + Send, T: TransientState + Clone + Send> Router<S, T> {
.dispatch(path.to_string(), req, app, T::initial())
.await?;
if response.is_none() {
return Err(Error::StatusCode(http::StatusCode::INTERNAL_SERVER_ERROR));
return Err(Error::StatusCode(
http::StatusCode::INTERNAL_SERVER_ERROR,
String::new(),
));
}
return Ok(response.unwrap());
}
}
Err(Error::StatusCode(http::StatusCode::NOT_FOUND))
Err(Error::StatusCode(
http::StatusCode::METHOD_NOT_ALLOWED,
String::new(),
))
}
}