resourcetype: Proper namespace handling

crates/dav/src/resource/mod.rs

@@ -64,7 +64,7 @@ pub trait Resource: Clone + 'static {
     type Error: ResponseError + From<crate::Error>;
     type PrincipalResource: Resource;
 
-    fn get_resourcetype(&self) -> &'static [&'static str];
+    fn get_resourcetype(&self) -> Resourcetype;
 
     fn list_props() -> Vec<&'static str> {
         [Self::PropName::VARIANTS, CommonPropertiesPropName::VARIANTS].concat()
@@ -78,7 +78,7 @@ pub trait Resource: Clone + 'static {
     ) -> Result<CommonPropertiesProp, Self::Error> {
         Ok(match prop {
             CommonPropertiesPropName::Resourcetype => {
-                CommonPropertiesProp::Resourcetype(Resourcetype(self.get_resourcetype()))
+                CommonPropertiesProp::Resourcetype(self.get_resourcetype())
             }
             CommonPropertiesPropName::CurrentUserPrincipal => {
                 CommonPropertiesProp::CurrentUserPrincipal(

crates/dav/src/resources/root.rs

@@ -1,5 +1,6 @@
 use crate::privileges::UserPrivilegeSet;
 use crate::resource::{Resource, ResourceService};
+use crate::xml::{Resourcetype, ResourcetypeInner};
 use actix_web::dev::ResourceMap;
 use async_trait::async_trait;
 use rustical_store::auth::User;
@@ -37,8 +38,13 @@ impl<PR: Resource> Resource for RootResource<PR> {
     type Error = PR::Error;
     type PrincipalResource = PR;
 
-    fn get_resourcetype(&self) -> &'static [&'static str] {
-        &["collection"]
+    fn get_resourcetype(&self) -> Resourcetype {
+        Resourcetype {
+            inner: &[ResourcetypeInner {
+                ns: crate::namespace::NS_DAV,
+                name: "collection",
+            }],
+        }
     }
 
     fn get_prop(

crates/dav/src/xml/mod.rs

@@ -5,7 +5,7 @@ pub mod tag_list;
 use derive_more::derive::From;
 pub use multistatus::MultistatusElement;
 pub use propfind::{PropElement, PropfindElement, PropfindType, Propname};
-pub use resourcetype::Resourcetype;
+pub use resourcetype::{Resourcetype, ResourcetypeInner};
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 pub use tag_list::TagList;
 

crates/dav/src/xml/resourcetype.rs

@@ -1,47 +1,25 @@
-use std::collections::HashMap;
-
-use quick_xml::events::attributes::Attribute;
-use quick_xml::events::{BytesEnd, BytesStart, Event};
-use quick_xml::name::Namespace;
 use rustical_xml::XmlSerialize;
 
-#[derive(Debug, Clone, PartialEq)]
-pub struct Resourcetype(pub &'static [&'static str]);
+#[derive(Debug, Clone, PartialEq, XmlSerialize)]
+pub struct Resourcetype {
+    #[xml(flatten, ty = "untagged")]
+    pub inner: &'static [ResourcetypeInner],
+}
 
-impl XmlSerialize for Resourcetype {
-    fn serialize<W: std::io::Write>(
-        &self,
-        ns: Option<Namespace>,
-        tag: Option<&[u8]>,
-        namespaces: &HashMap<Namespace, &[u8]>,
-        writer: &mut quick_xml::Writer<W>,
-    ) -> std::io::Result<()> {
-        let tag_str = tag.map(String::from_utf8_lossy);
-        if let Some(tag) = &tag_str {
-            writer.write_event(Event::Start(BytesStart::new(tag.clone())))?;
-        }
-
-        for &ty in self.0 {
-            writer.write_event(Event::Empty(BytesStart::new(ty)))?;
-        }
-
-        if let Some(tag) = &tag_str {
-            writer.write_event(Event::End(BytesEnd::new(tag.clone())))?;
-        }
-        Ok(())
-    }
-
-    #[allow(refining_impl_trait)]
-    fn attributes<'a>(&self) -> Option<Vec<Attribute<'a>>> {
-        None
-    }
+#[derive(Debug, Clone, PartialEq, XmlSerialize)]
+pub struct ResourcetypeInner {
+    #[xml(ty = "namespace")]
+    pub ns: quick_xml::name::Namespace<'static>,
+    #[xml(ty = "tag_name")]
+    pub name: &'static str,
 }
 
 #[cfg(test)]
 mod tests {
-    use super::Resourcetype;
     use rustical_xml::{XmlRootTag, XmlSerialize, XmlSerializeRoot};
 
+    use super::{Resourcetype, ResourcetypeInner};
+
     #[derive(XmlSerialize, XmlRootTag)]
     #[xml(root = b"document")]
     struct Document {
@@ -53,14 +31,25 @@ mod tests {
         let mut buf = Vec::new();
         let mut writer = quick_xml::Writer::new(&mut buf);
         Document {
-            resourcetype: Resourcetype(&["collection", "hello"]),
+            resourcetype: Resourcetype {
+                inner: &[
+                    ResourcetypeInner {
+                        ns: crate::namespace::NS_DAV,
+                        name: "displayname",
+                    },
+                    ResourcetypeInner {
+                        ns: crate::namespace::NS_CALENDARSERVER,
+                        name: "calendar-color",
+                    },
+                ],
+            },
         }
         .serialize_root(&mut writer)
         .unwrap();
         let out = String::from_utf8(buf).unwrap();
         assert_eq!(
             out,
-            "<document><resourcetype><collection/><hello/></resourcetype></document>"
+            "<document><resourcetype><displayname xmlns=\"DAV:\"/><calendar-color xmlns=\"http://calendarserver.org/ns/\"/></resourcetype></document>"
         )
     }
 }