Bump Rocket

wdes · Feb 12, 2024 · 1b77745 · 1b77745
1 parent 8ae85f4
commit 1b77745
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ dotenv = "0.15.0"
 addr = "0.15.3"
 
 # Webserver
-rocket = { version = "0.5.0-rc.2", features = ["json"] }
+rocket = { version = "0.5.0", features = ["json"] }
 
 # Serialization/Deserialization
 quick-xml = { version = "0.27.1", default-features = false, features = [ "serialize" ] }

diff --git a/src/host_header.rs b/src/host_header.rs
@@ -1,5 +1,6 @@
 // Source: https://github.com/SergioBenitez/Rocket/issues/823#issuecomment-1157761369
 use addr::parse_domain_name;
+use rocket::http::Status;
 use rocket::request::FromRequest;
 use rocket::request::Outcome;
 use rocket::Request;
@@ -23,7 +24,7 @@ fn get_base_domain<'a>(header: &'a str) -> String {
 
 #[rocket::async_trait]
 impl<'r> FromRequest<'r> for HostHeader<'r> {
-    type Error = ();
+    type Error = String;
 
     async fn from_request(req: &'r Request<'_>) -> Outcome<Self, Self::Error> {
         let header_name: &str = match req.headers().contains("X-Forwarded-Host") {
@@ -36,7 +37,10 @@ impl<'r> FromRequest<'r> for HostHeader<'r> {
                 host: h,
                 base_domain: get_base_domain(h),
             }),
-            None => Outcome::Forward(()),
+            None => Outcome::Error((
+                Status::UnprocessableEntity,
+                "Missing a Host or X-Forwarded-Host header".to_string(),
+            )),
         }
     }
 }

diff --git a/src/main.rs b/src/main.rs
@@ -54,6 +54,7 @@ fn rocket() -> _ {
             routes::autoconfig::post_mail_autodiscover_microsoft_case,
             routes::autoconfig::post_mail_autodiscover_microsoft_camel_case,
             routes::autoconfig::post_mail_autodiscover_microsoft_json,
+            routes::autoconfig::post_mail_autodiscover_microsoft_json_legacy,
         ],
     );
     if cfg!(feature = "apple") {

diff --git a/src/ressources/AutoDiscoverXml.rs b/src/ressources/AutoDiscoverXml.rs
@@ -1,12 +1,12 @@
+use quick_xml::de::from_str;
+use quick_xml::DeError;
 use rocket::data::ByteUnit;
 use rocket::data::{self, Capped, Data, FromData};
 use rocket::http::{ContentType, Status};
 use rocket::request::Request;
 use rocket::response::{self, Responder, Response};
 use rocket_dyn_templates::Template;
 use serde::Deserialize;
-use quick_xml::de::from_str;
-use quick_xml::DeError;
 use std::io;
 
 #[derive(Debug)]
@@ -45,7 +45,7 @@ impl<'r> FromData<'r> for AutoDiscoverXmlPayload {
     type Error = XmlError;
 
     async fn from_data(req: &'r Request<'_>, data: Data<'r>) -> data::Outcome<'r, Self> {
-        use rocket::outcome::Outcome::*;
+        use rocket::outcome::Outcome::{Error, Success};
         let size_limit = req.limits().get("xml").unwrap_or(ByteUnit::Kilobyte(4096));
 
         let contents: Result<Capped<std::string::String>, std::io::Error> =
@@ -55,13 +55,13 @@ impl<'r> FromData<'r> for AutoDiscoverXmlPayload {
                 let payload: Result<AutoDiscoverXmlPayload, DeError> = from_str(&dd);
                 match payload {
                     Ok(d) => Success(d),
-                    Err(e) => Failure((
+                    Err(e) => Error((
                         Status::UnprocessableEntity,
                         XmlError::Parse(dd.to_string(), e),
                     )),
                 }
             }
-            Err(e) => Failure((Status::UnprocessableEntity, XmlError::Io(e))),
+            Err(e) => Error((Status::UnprocessableEntity, XmlError::Io(e))),
         }
     }
 }

diff --git a/src/routes/autoconfig.rs b/src/routes/autoconfig.rs
@@ -62,12 +62,43 @@ pub fn well_known_mail_config_v11(host: HostHeader, emailaddress: Option<&str>)
 // Example: /autodiscover/autodiscover.json?Email=test%40wdes.fr&Protocol=ActiveSync&RedirectCount=1
 // Example: /autodiscover/autodiscover.json?Email=test%40wdes.fr&Protocol=Autodiscoverv1&RedirectCount=1
 #[get("/autodiscover/autodiscover.json?<Email>&<Protocol>&<RedirectCount>")]
+#[allow(unused_variables)]
+#[allow(non_snake_case)]
+pub fn post_mail_autodiscover_microsoft_json(
+    host: HostHeader,
+    Email: Option<&str>,
+    Protocol: Option<&str>,
+    RedirectCount: Option<&str>,
+) -> Result<Json<AutoDiscoverJson>, AutoDiscoverJsonError> {
+    match Protocol {
+        Some("AutodiscoverV1") => Ok(Json(AutoDiscoverJson {
+            Protocol: "AutodiscoverV1".to_string(),
+            Url: "https://".to_owned() + &host.host + "/Autodiscover/Autodiscover.xml",
+        })),
+        Some("Autodiscoverv1") => Ok(Json(AutoDiscoverJson {
+            Protocol: "Autodiscoverv1".to_string(),
+            Url: "https://".to_owned() + &host.host + "/Autodiscover/Autodiscover.xml",
+        })),
+        /*
+        Some("ActiveSync") => Some(AutoDiscoverJson {
+            Protocol: "ActiveSync".to_string(),
+            Url: "https://".to_owned() + &host.host + "/Microsoft-Server-ActiveSync",
+        }),*/
+        _ => Err(AutoDiscoverJsonError {
+            ErrorCode: "InvalidProtocol".to_string(),
+            ErrorMessage:
+                "The given protocol value is invalid. Supported values are \"AutodiscoverV1\" or \"Autodiscoverv1\"."
+                    .to_string(),
+        }),
+    }
+}
+
 // Used by Microsoft Office 2009 (to be confirmed)
 // Example: /autodiscover/autodiscover.json/v1.0/infos%40domain.tld?Protocol=ActiveSync&RedirectCount=1
 #[get("/autodiscover/autodiscover.json/v1.0/infos?<Email>&<Protocol>&<RedirectCount>")]
 #[allow(unused_variables)]
 #[allow(non_snake_case)]
-pub fn post_mail_autodiscover_microsoft_json(
+pub fn post_mail_autodiscover_microsoft_json_legacy(
     host: HostHeader,
     Email: Option<&str>,
     Protocol: Option<&str>,