add unsafe checks #331

src/with.rs

@@ -111,8 +111,18 @@ where
     T: FromRequest<S>,
     S: 'static,
 {
-    hnd: Rc<UnsafeCell<F>>,
+    hnd: Rc<WithHnd<T, S, F, R>>,
     cfg: ExtractorConfig<S, T>,
+}
+
+pub struct WithHnd<T, S, F, R>
+where
+    F: Fn(T) -> R,
+    T: FromRequest<S>,
+    S: 'static,
+{
+    hnd: Rc<UnsafeCell<F>>,
+    _t: PhantomData<T>,
     _s: PhantomData<S>,
 }
 
@@ -125,8 +135,11 @@ where
     pub fn new(f: F, cfg: ExtractorConfig<S, T>) -> Self {
         With {
             cfg,
+            hnd: Rc::new(WithHnd {
                 hnd: Rc::new(UnsafeCell::new(f)),
+                _t: PhantomData,
                 _s: PhantomData,
+            }),
         }
     }
 }
@@ -166,7 +179,7 @@ where
     S: 'static,
 {
     started: bool,
-    hnd: Rc<UnsafeCell<F>>,
+    hnd: Rc<WithHnd<T, S, F, R>>,
     cfg: ExtractorConfig<S, T>,
     req: HttpRequest<S>,
     fut1: Option<Box<Future<Item = T, Error = Error>>>,
@@ -206,22 +219,30 @@ where
             }
         };
 
-        let hnd: &mut F = unsafe { &mut *self.hnd.get() };
+        let fut = {
+            // clone handler, inicrease ref counter
+            let h = self.hnd.as_ref().hnd.clone();
+            // Enforce invariants before entering unsafe code.
+            // Only two references could exists With struct owns one, and line above
+            if Rc::weak_count(&h) != 0 && Rc::strong_count(&h) != 2 {
+                panic!("Multiple copies of handler are in use")
+            }
+            let hnd: &mut F = unsafe { &mut *h.as_ref().get() };
             let item = match (*hnd)(item).respond_to(&self.req) {
                 Ok(item) => item.into(),
                 Err(e) => return Err(e.into()),
             };
 
             match item.into() {
-            AsyncResultItem::Err(err) => Err(err),
+                AsyncResultItem::Err(err) => return Err(err),
-            AsyncResultItem::Ok(resp) => Ok(Async::Ready(resp)),
+                AsyncResultItem::Ok(resp) => return Ok(Async::Ready(resp)),
-            AsyncResultItem::Future(fut) => {
+                AsyncResultItem::Future(fut) => fut,
+            }
+        };
         self.fut2 = Some(fut);
         self.poll()
     }
 }
-    }
-}
 
 pub struct WithAsync<T, S, F, R, I, E>
 where
@@ -232,9 +253,8 @@ where
     T: FromRequest<S>,
     S: 'static,
 {
-    hnd: Rc<UnsafeCell<F>>,
+    hnd: Rc<WithHnd<T, S, F, R>>,
     cfg: ExtractorConfig<S, T>,
-    _s: PhantomData<S>,
 }
 
 impl<T, S, F, R, I, E> WithAsync<T, S, F, R, I, E>
@@ -249,8 +269,11 @@ where
     pub fn new(f: F, cfg: ExtractorConfig<S, T>) -> Self {
         WithAsync {
             cfg,
+            hnd: Rc::new(WithHnd {
                 hnd: Rc::new(UnsafeCell::new(f)),
                 _s: PhantomData,
+                _t: PhantomData,
+            }),
         }
     }
 }
@@ -295,7 +318,7 @@ where
     S: 'static,
 {
     started: bool,
-    hnd: Rc<UnsafeCell<F>>,
+    hnd: Rc<WithHnd<T, S, F, R>>,
     cfg: ExtractorConfig<S, T>,
     req: HttpRequest<S>,
     fut1: Option<Box<Future<Item = T, Error = Error>>>,
@@ -356,8 +379,17 @@ where
             }
         };
 
-        let hnd: &mut F = unsafe { &mut *self.hnd.get() };
+        self.fut2 = {
-        self.fut2 = Some((*hnd)(item));
+            // clone handler, inicrease ref counter
+            let h = self.hnd.as_ref().hnd.clone();
+            // Enforce invariants before entering unsafe code.
+            // Only two references could exists With struct owns one, and line above
+            if Rc::weak_count(&h) != 0 && Rc::strong_count(&h) != 2 {
+                panic!("Multiple copies of handler are in use")
+            }
+            let hnd: &mut F = unsafe { &mut *h.as_ref().get() };
+            Some((*hnd)(item))
+        };
         self.poll()
     }
 }

tests/test_handlers.rs

@@ -42,6 +42,28 @@ fn test_path_extractor() {
     assert_eq!(bytes, Bytes::from_static(b"Welcome test!"));
 }
 
+#[test]
+fn test_async_handler() {
+    let mut srv = test::TestServer::new(|app| {
+        app.resource("/{username}/index.html", |r| {
+            r.route().with(|p: Path<PParam>| {
+                Delay::new(Instant::now() + Duration::from_millis(10))
+                    .and_then(move |_| Ok(format!("Welcome {}!", p.username)))
+                    .responder()
+            })
+        });
+    });
+
+    // client request
+    let request = srv.get().uri(srv.url("/test/index.html")).finish().unwrap();
+    let response = srv.execute(request.send()).unwrap();
+    assert!(response.status().is_success());
+
+    // read response
+    let bytes = srv.execute(response.body()).unwrap();
+    assert_eq!(bytes, Bytes::from_static(b"Welcome test!"));
+}
+
 #[test]
 fn test_query_extractor() {
     let mut srv = test::TestServer::new(|app| {