dav: Make reusable for other projects

crates/dav/src/resource/methods/delete.rs

@@ -1,16 +1,15 @@
+use crate::Error;
 use crate::privileges::UserPrivilege;
 use crate::resource::Resource;
 use crate::resource::ResourceService;
-use crate::Error;
+use actix_web::HttpRequest;
+use actix_web::HttpResponse;
+use actix_web::Responder;
 use actix_web::http::header::IfMatch;
 use actix_web::http::header::IfNoneMatch;
 use actix_web::web;
 use actix_web::web::Data;
 use actix_web::web::Path;
-use actix_web::HttpRequest;
-use actix_web::HttpResponse;
-use actix_web::Responder;
-use rustical_store::auth::User;
 use tracing::instrument;
 use tracing_actix_web::RootSpan;
 
@@ -18,7 +17,7 @@ use tracing_actix_web::RootSpan;
 pub async fn route_delete<R: ResourceService>(
     path: Path<R::PathComponents>,
     req: HttpRequest,
-    user: User,
+    principal: R::Principal,
     resource_service: Data<R>,
     root_span: RootSpan,
     if_match: web::Header<IfMatch>,
@@ -32,7 +31,7 @@ pub async fn route_delete<R: ResourceService>(
 
     let resource = resource_service.get_resource(&path).await?;
 
-    let privileges = resource.get_user_privileges(&user)?;
+    let privileges = resource.get_user_privileges(&principal)?;
     if !privileges.has(&UserPrivilege::Write) {
         return Err(Error::Unauthorized.into());
     }

crates/dav/src/resource/methods/propfind.rs

@@ -1,3 +1,4 @@
+use crate::Error;
 use crate::depth_header::Depth;
 use crate::privileges::UserPrivilege;
 use crate::resource::Resource;
@@ -6,11 +7,9 @@ use crate::xml::MultistatusElement;
 use crate::xml::PropElement;
 use crate::xml::PropfindElement;
 use crate::xml::PropfindType;
-use crate::Error;
+use actix_web::HttpRequest;
 use actix_web::web::Data;
 use actix_web::web::Path;
-use actix_web::HttpRequest;
-use rustical_store::auth::User;
 use rustical_xml::XmlDocument;
 use tracing::instrument;
 use tracing_actix_web::RootSpan;
@@ -21,7 +20,7 @@ pub(crate) async fn route_propfind<R: ResourceService>(
     path: Path<R::PathComponents>,
     body: String,
     req: HttpRequest,
-    user: User,
+    user: R::Principal,
     depth: Depth,
     root_span: RootSpan,
     resource_service: Data<R>,

crates/dav/src/resource/methods/proppatch.rs

@@ -1,15 +1,14 @@
+use crate::Error;
 use crate::privileges::UserPrivilege;
 use crate::resource::Resource;
 use crate::resource::ResourceService;
-use crate::xml::multistatus::{PropstatElement, PropstatWrapper, ResponseElement};
 use crate::xml::MultistatusElement;
 use crate::xml::TagList;
-use crate::Error;
+use crate::xml::multistatus::{PropstatElement, PropstatWrapper, ResponseElement};
 use actix_web::http::StatusCode;
 use actix_web::web::Data;
-use actix_web::{web::Path, HttpRequest};
+use actix_web::{HttpRequest, web::Path};
 use quick_xml::name::Namespace;
-use rustical_store::auth::User;
 use rustical_xml::EnumUnitVariants;
 use rustical_xml::Unparsed;
 use rustical_xml::XmlDeserialize;
@@ -69,7 +68,7 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
     path: Path<R::PathComponents>,
     body: String,
     req: HttpRequest,
-    user: User,
+    principal: R::Principal,
     root_span: RootSpan,
     resource_service: Data<R>,
 ) -> Result<MultistatusElement<String, String>, R::Error> {
@@ -81,7 +80,7 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
     ) = XmlDocument::parse_str(&body).map_err(Error::XmlError)?;
 
     let mut resource = resource_service.get_resource(&path).await?;
-    let privileges = resource.get_user_privileges(&user)?;
+    let privileges = resource.get_user_privileges(&principal)?;
     if !privileges.has(&UserPrivilege::Write) {
         return Err(Error::Unauthorized.into());
     }
@@ -131,7 +130,7 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
                 }
             }
             Operation::Remove(remove_el) => {
-                let propname = remove_el.prop.0 .0;
+                let propname = remove_el.prop.0.0;
                 match <<R::Resource as Resource>::Prop as EnumUnitVariants>::UnitVariants::from_str(
                     &propname,
                 ) {

crates/dav/src/resource/mod.rs

@@ -1,15 +1,14 @@
 use crate::privileges::UserPrivilegeSet;
-use crate::xml::multistatus::{PropTagWrapper, PropstatElement, PropstatWrapper};
 use crate::xml::Resourcetype;
-use crate::xml::{multistatus::ResponseElement, TagList};
-use crate::Error;
+use crate::xml::multistatus::{PropTagWrapper, PropstatElement, PropstatWrapper};
+use crate::xml::{TagList, multistatus::ResponseElement};
+use crate::{Error, Principal};
 use actix_web::dev::ResourceMap;
 use actix_web::http::header::{EntityTag, IfMatch, IfNoneMatch};
-use actix_web::{http::StatusCode, ResponseError};
+use actix_web::{ResponseError, http::StatusCode};
 use itertools::Itertools;
 use quick_xml::name::Namespace;
 pub use resource_service::ResourceService;
-use rustical_store::auth::User;
 use rustical_xml::{EnumUnitVariants, EnumVariants, XmlDeserialize, XmlSerialize};
 use std::str::FromStr;
 
@@ -28,6 +27,7 @@ pub trait Resource: Clone + 'static {
     type Prop: ResourceProp + PartialEq + Clone + EnumVariants + EnumUnitVariants;
     type Error: ResponseError + From<crate::Error>;
     type PrincipalResource: Resource + NamedRoute;
+    type Principal: Principal;
 
     fn get_resourcetype(&self) -> Resourcetype;
 
@@ -38,7 +38,7 @@ pub trait Resource: Clone + 'static {
     fn get_prop(
         &self,
         rmap: &ResourceMap,
-        user: &User,
+        principal: &Self::Principal,
         prop: &<Self::Prop as EnumUnitVariants>::UnitVariants,
     ) -> Result<Self::Prop, Self::Error>;
 
@@ -93,13 +93,16 @@ pub trait Resource: Clone + 'static {
         }
     }
 
-    fn get_user_privileges(&self, user: &User) -> Result<UserPrivilegeSet, Self::Error>;
+    fn get_user_privileges(
+        &self,
+        principal: &Self::Principal,
+    ) -> Result<UserPrivilegeSet, Self::Error>;
 
     fn propfind(
         &self,
         path: &str,
         props: &[&str],
-        user: &User,
+        principal: &Self::Principal,
         rmap: &ResourceMap,
     ) -> Result<ResponseElement<Self::Prop>, Self::Error> {
         let mut props = props.to_vec();
@@ -152,7 +155,7 @@ pub trait Resource: Clone + 'static {
 
         let prop_responses = valid_props
             .into_iter()
-            .map(|prop| self.get_prop(rmap, user, &prop))
+            .map(|prop| self.get_prop(rmap, principal, &prop))
             .collect::<Result<Vec<_>, Self::Error>>()?;
 
         let mut propstats = vec![PropstatWrapper::Normal(PropstatElement {

crates/dav/src/resource/resource_service.rs

@@ -2,20 +2,23 @@ use actix_web::dev::{AppService, HttpServiceFactory};
 use actix_web::error::UrlGenerationError;
 use actix_web::test::TestRequest;
 use actix_web::web::Data;
-use actix_web::{dev::ResourceMap, http::Method, web, ResponseError};
+use actix_web::{ResponseError, dev::ResourceMap, http::Method, web};
 use async_trait::async_trait;
 use serde::Deserialize;
 use std::str::FromStr;
 
-use super::methods::{route_delete, route_propfind, route_proppatch};
+use crate::Principal;
+
 use super::Resource;
+use super::methods::{route_delete, route_propfind, route_proppatch};
 
 #[async_trait(?Send)]
 pub trait ResourceService: Sized + 'static {
-    type MemberType: Resource<Error = Self::Error>;
+    type MemberType: Resource<Error = Self::Error, Principal = Self::Principal>;
     type PathComponents: for<'de> Deserialize<'de> + Sized + Clone + 'static; // defines how the resource URI maps to parameters, i.e. /{principal}/{calendar} -> (String, String)
-    type Resource: Resource<Error = Self::Error>;
+    type Resource: Resource<Error = Self::Error, Principal = Self::Principal>;
     type Error: ResponseError + From<crate::Error>;
+    type Principal: Principal;
 
     async fn get_members(
         &self,