Merge pull request #846 from http-rs/fix-redirect

fix infinite redirection recursion

Author: yoshuawuyts

src/redirect.rs

@@ -97,15 +97,42 @@ where
 }
 
 impl<T: AsRef<str>> From<Redirect<T>> for Response {
-    fn from(redirect: Redirect<T>) -> Response {
-        redirect.into()
+    fn from(redirect: Redirect<T>) -> Self {
+        Response::builder(redirect.status)
+            .header(LOCATION, redirect.location.as_ref())
+            .build()
     }
 }
 
 impl<T: AsRef<str>> From<&Redirect<T>> for Response {
     fn from(redirect: &Redirect<T>) -> Response {
-        let mut res = Response::new(redirect.status);
-        res.insert_header(LOCATION, redirect.location.as_ref());
-        res
+        Response::builder(redirect.status)
+            .header(LOCATION, redirect.location.as_ref())
+            .build()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::*;
+
+    #[test]
+    fn smoke() {
+        let redirect = Redirect::new("https://example.com");
+        let res: Response = redirect.clone().into();
+        assert_eq!(res.status(), StatusCode::Found);
+
+        let redirect = Redirect::temporary("https://example.com");
+        let res: Response = redirect.clone().into();
+        assert_eq!(res.status(), StatusCode::TemporaryRedirect);
+
+        let redirect = Redirect::permanent("https://example.com");
+        let res: Response = redirect.clone().into();
+        assert_eq!(res.status(), StatusCode::PermanentRedirect);
+
+        let redirect = Redirect::see_other("https://example.com");
+        let res: Response = redirect.clone().into();
+        assert_eq!(res.status(), StatusCode::SeeOther);
     }
 }

tests/test_utils.rs

@@ -6,7 +6,8 @@ pub async fn find_port() -> u16 {
     pick_unused_port().expect("No ports free")
 }
 
-use surf::{Client, RequestBuilder};
+use std::convert::TryInto;
+use surf::{Client, Config, RequestBuilder};
 
 /// Trait that adds test request capabilities to tide [`Server`]s
 pub trait ServerTestingExt {
@@ -61,8 +62,9 @@ pub trait ServerTestingExt {
 
 impl<State: Clone + Send + Sync + Unpin + 'static> ServerTestingExt for tide::Server<State> {
     fn client(&self) -> Client {
-        let mut client = Client::with_http_client(self.clone());
-        client.set_base_url(tide::http::Url::parse("http://example.com").unwrap());
-        client
+        let config = Config::new()
+            .set_http_client(self.clone())
+            .set_base_url(tide::http::Url::parse("http://example.com").unwrap());
+        config.try_into().unwrap()
     }
 }