nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 07:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring to move authentication out of the ResourceService layer

Browse Source
This commit is contained in:
Lennart
2024-09-29 15:01:46 +02:00
parent f2f66c95d2
commit 3469252cd3
8 changed files with 29 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/caldav/src/calendar/resource.rs
View File

@@ -3,7 +3,6 @@ use crate::Error;
use actix_web::{web::Data, HttpRequest};
use async_trait::async_trait;
use derive_more::derive::{From, Into};
use rustical_auth::AuthInfo;
use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
use rustical_dav::xml::HrefElement;
use rustical_store::calendar::Calendar;
@@ -224,7 +223,10 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
type Resource = CalendarResource;
type Error = Error;
async fn get_resource(&self) -> Result<Self::Resource, Error> {
async fn get_resource(&self, principal: String) -> Result<Self::Resource, Error> {
if self.principal != principal {
return Err(Error::Unauthorized);
}
let calendar = self
.cal_store
.read()
@@ -235,10 +237,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
Ok(calendar.into())
}
async fn get_members(
&self,
_auth_info: AuthInfo,
) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
async fn get_members(&self) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
// As of now the calendar resource has no members since events are shown with REPORT
Ok(self
.cal_store
@@ -253,7 +252,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
async fn new(
req: &HttpRequest,
auth_info: &AuthInfo,
path_components: Self::PathComponents,
) -> Result<Self, Self::Error> {
let cal_store = req
@@ -264,7 +262,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
Ok(Self {
path: req.path().to_owned(),
principal: auth_info.user_id.to_owned(),
principal: path_components.0,
calendar_id: path_components.1,
cal_store,
})

7
crates/caldav/src/event/resource.rs
View File

@@ -2,7 +2,6 @@ use crate::Error;
use actix_web::{web::Data, HttpRequest};
use async_trait::async_trait;
use derive_more::derive::{From, Into};
use rustical_auth::AuthInfo;
use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
use rustical_store::event::Event;
use rustical_store::CalendarStore;
@@ -72,7 +71,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for EventResourceService<C> {
async fn new(
req: &HttpRequest,
_auth_info: &AuthInfo,
path_components: Self::PathComponents,
) -> Result<Self, Self::Error> {
let (principal, cid, mut uid) = path_components;
@@ -96,7 +94,10 @@ impl<C: CalendarStore + ?Sized> ResourceService for EventResourceService<C> {
})
}
async fn get_resource(&self) -> Result<Self::Resource, Self::Error> {
async fn get_resource(&self, principal: String) -> Result<Self::Resource, Self::Error> {
if self.principal != principal {
return Err(Error::Unauthorized);
}
let event = self
.cal_store
.read()

15
crates/caldav/src/principal/mod.rs
View File

@@ -2,7 +2,6 @@ use crate::Error;
use actix_web::web::Data;
use actix_web::HttpRequest;
use async_trait::async_trait;
use rustical_auth::AuthInfo;
use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
use rustical_dav::xml::HrefElement;
use rustical_store::CalendarStore;
@@ -93,12 +92,8 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResourceService<C>
async fn new(
req: &HttpRequest,
auth_info: &AuthInfo,
(principal,): Self::PathComponents,
) -> Result<Self, Self::Error> {
if auth_info.user_id != principal {
return Err(Error::Unauthorized);
}
let cal_store = req
.app_data::<Data<RwLock<C>>>()
.expect("no calendar store in app_data!")
@@ -112,16 +107,16 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResourceService<C>
})
}
async fn get_resource(&self) -> Result<Self::Resource, Self::Error> {
async fn get_resource(&self, principal: String) -> Result<Self::Resource, Self::Error> {
if self.principal != principal {
return Err(Error::Unauthorized);
}
Ok(PrincipalResource {
principal: self.principal.to_owned(),
})
}
async fn get_members(
&self,
_auth_info: AuthInfo,
) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
async fn get_members(&self) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
let calendars = self
.cal_store
.read()

18
crates/caldav/src/root/mod.rs
View File

@@ -1,15 +1,12 @@
use crate::Error;
use actix_web::HttpRequest;
use async_trait::async_trait;
use rustical_auth::AuthInfo;
use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
use rustical_dav::xml::HrefElement;
use serde::{Deserialize, Serialize};
use strum::{EnumString, VariantNames};
pub struct RootResourceService {
principal: String,
}
pub struct RootResourceService;
#[derive(EnumString, Debug, VariantNames, Clone)]
#[strum(serialize_all = "kebab-case")]
@@ -42,7 +39,7 @@ impl InvalidProperty for RootProp {
#[derive(Clone)]
pub struct RootResource {
pub principal: String,
principal: String,
}
impl Resource for RootResource {
@@ -69,18 +66,13 @@ impl ResourceService for RootResourceService {
async fn new(
_req: &HttpRequest,
auth_info: &AuthInfo,
_path_components: Self::PathComponents,
) -> Result<Self, Self::Error> {
Ok(Self {
principal: auth_info.user_id.to_owned(),
})
Ok(Self)
}
async fn get_resource(&self) -> Result<Self::Resource, Self::Error> {
Ok(RootResource {
principal: self.principal.to_owned(),
})
async fn get_resource(&self, principal: String) -> Result<Self::Resource, Self::Error> {
Ok(RootResource { principal })
}
async fn save_resource(&self, _file: Self::Resource) -> Result<(), Self::Error> {