actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-06-25 18:09:22 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into user-agent

Browse Source
This commit is contained in:
Nikolay Kim
2018-06-04 14:04:45 -07:00
committed by GitHub
parent b07c50860a ae7a0e993d
commit 5004821cda
6 changed files with 269 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/middleware/errhandlers.rs
View File

@ -84,8 +84,12 @@ impl<S: 'static> Middleware<S> for ErrorHandlers<S> {
#[cfg(test)]
mod tests {
use super::*;
use error::{Error, ErrorInternalServerError};
use http::header::CONTENT_TYPE;
use http::StatusCode;
use httpmessage::HttpMessage;
use middleware::Started;
use test;
fn render_500<S>(_: &mut HttpRequest<S>, resp: HttpResponse) -> Result<Response> {
let mut builder = resp.into_builder();
@ -113,4 +117,27 @@ mod tests {
};
assert!(!resp.headers().contains_key(CONTENT_TYPE));
}
struct MiddlewareOne;
impl<S> Middleware<S> for MiddlewareOne {
fn start(&mut self, _req: &mut HttpRequest<S>) -> Result<Started, Error> {
Err(ErrorInternalServerError("middleware error"))
}
}
#[test]
fn test_middleware_start_error() {
let mut srv = test::TestServer::new(move |app| {
app.middleware(
ErrorHandlers::new()
.handler(StatusCode::INTERNAL_SERVER_ERROR, render_500),
).middleware(MiddlewareOne)
.handler(|_| HttpResponse::Ok())
});
let request = srv.get().finish().unwrap();
let response = srv.execute(request.send()).unwrap();
assert_eq!(response.headers().get(CONTENT_TYPE).unwrap(), "0001");
}
}

12
src/pipeline.rs
View File

@ -249,7 +249,8 @@ impl<S: 'static, H: PipelineHandler<S>> StartMiddlewares<S, H> {
let reply = unsafe { &mut *hnd.get() }.handle(info.req().clone(), htype);
return WaitingResponse::init(info, reply);
} else {
let state = info.mws.borrow_mut()[info.count as usize].start(info.req_mut());
let state =
info.mws.borrow_mut()[info.count as usize].start(info.req_mut());
match state {
Ok(Started::Done) => info.count += 1,
Ok(Started::Response(resp)) => {
@ -263,7 +264,7 @@ impl<S: 'static, H: PipelineHandler<S>> StartMiddlewares<S, H> {
_s: PhantomData,
})
}
Err(err) => return ProcessResponse::init(err.into()),
Err(err) => return RunMiddlewares::init(info, err.into()),
}
}
}
@ -297,13 +298,13 @@ impl<S: 'static, H: PipelineHandler<S>> StartMiddlewares<S, H> {
continue 'outer;
}
Err(err) => {
return Some(ProcessResponse::init(err.into()))
return Some(RunMiddlewares::init(info, err.into()))
}
}
}
}
}
Err(err) => return Some(ProcessResponse::init(err.into())),
Err(err) => return Some(RunMiddlewares::init(info, err.into())),
}
}
}
@ -403,7 +404,8 @@ impl<S: 'static, H> RunMiddlewares<S, H> {
if self.curr == len {
return Some(ProcessResponse::init(resp));
} else {
let state = info.mws.borrow_mut()[self.curr].response(info.req_mut(), resp);
let state =
info.mws.borrow_mut()[self.curr].response(info.req_mut(), resp);
match state {
Err(err) => return Some(ProcessResponse::init(err.into())),
Ok(Response::Done(r)) => {

18
src/route.rs
View File

@ -289,7 +289,8 @@ impl<S: 'static> ComposeState<S> {
impl<S: 'static> Compose<S> {
fn new(
req: HttpRequest<S>, mws: Rc<RefCell<Vec<Box<Middleware<S>>>>>, handler: InnerHandler<S>,
req: HttpRequest<S>, mws: Rc<RefCell<Vec<Box<Middleware<S>>>>>,
handler: InnerHandler<S>,
) -> Self {
let mut info = ComposeInfo {
count: 0,
@ -350,7 +351,7 @@ impl<S: 'static> StartMiddlewares<S> {
_s: PhantomData,
})
}
Err(err) => return FinishingMiddlewares::init(info, err.into()),
Err(err) => return RunMiddlewares::init(info, err.into()),
}
}
}
@ -371,7 +372,8 @@ impl<S: 'static> StartMiddlewares<S> {
let reply = info.handler.handle(info.req.clone());
return Some(WaitingResponse::init(info, reply));
} else {
let state = info.mws.borrow_mut()[info.count].start(&mut info.req);
let state =
info.mws.borrow_mut()[info.count].start(&mut info.req);
match state {
Ok(MiddlewareStarted::Done) => info.count += 1,
Ok(MiddlewareStarted::Response(resp)) => {
@ -382,16 +384,13 @@ impl<S: 'static> StartMiddlewares<S> {
continue 'outer;
}
Err(err) => {
return Some(FinishingMiddlewares::init(
info,
err.into(),
))
return Some(RunMiddlewares::init(info, err.into()))
}
}
}
}
}
Err(err) => return Some(FinishingMiddlewares::init(info, err.into())),
Err(err) => return Some(RunMiddlewares::init(info, err.into())),
}
}
}
@ -483,7 +482,8 @@ impl<S: 'static> RunMiddlewares<S> {
if self.curr == len {
return Some(FinishingMiddlewares::init(info, resp));
} else {
let state = info.mws.borrow_mut()[self.curr].response(&mut info.req, resp);
let state =
info.mws.borrow_mut()[self.curr].response(&mut info.req, resp);
match state {
Err(err) => {
return Some(FinishingMiddlewares::init(info, err.into()))

14
src/scope.rs
View File

@ -519,7 +519,7 @@ impl<S: 'static> StartMiddlewares<S> {
_s: PhantomData,
})
}
Err(err) => return Response::init(err.into()),
Err(err) => return RunMiddlewares::init(info, err.into()),
}
}
}
@ -546,7 +546,8 @@ impl<S: 'static> StartMiddlewares<S> {
};
return Some(WaitingResponse::init(info, reply));
} else {
let state = info.mws.borrow_mut()[info.count].start(&mut info.req);
let state =
info.mws.borrow_mut()[info.count].start(&mut info.req);
match state {
Ok(MiddlewareStarted::Done) => info.count += 1,
Ok(MiddlewareStarted::Response(resp)) => {
@ -556,12 +557,14 @@ impl<S: 'static> StartMiddlewares<S> {
self.fut = Some(fut);
continue 'outer;
}
Err(err) => return Some(Response::init(err.into())),
Err(err) => {
return Some(RunMiddlewares::init(info, err.into()))
}
}
}
}
}
Err(err) => return Some(Response::init(err.into())),
Err(err) => return Some(RunMiddlewares::init(info, err.into())),
}
}
}
@ -653,7 +656,8 @@ impl<S: 'static> RunMiddlewares<S> {
if self.curr == len {
return Some(FinishingMiddlewares::init(info, resp));
} else {
let state = info.mws.borrow_mut()[self.curr].response(&mut info.req, resp);
let state =
info.mws.borrow_mut()[self.curr].response(&mut info.req, resp);
match state {
Err(err) => {
return Some(FinishingMiddlewares::init(info, err.into()))