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

principal: Add auth checking and fix member path

Browse Source
This commit is contained in:
Lennart
2024-05-27 15:38:00 +02:00
parent 27d8967413
commit fe5f3207ae
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,8 +97,11 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResource<C> {
async fn new( async fn new(
req: HttpRequest, req: HttpRequest,
auth_info: AuthInfo, auth_info: AuthInfo,
_path_components: Self::PathComponents, (principal,): Self::PathComponents,
) -> Result<Self, rustical_dav::error::Error> { ) -> Result<Self, rustical_dav::error::Error> {
if auth_info.user_id != principal {
return Err(rustical_dav::error::Error::Unauthorized);
}
let cal_store = req let cal_store = req
.app_data::<Data<RwLock<C>>>() .app_data::<Data<RwLock<C>>>()
.ok_or(anyhow!("no calendar store in app_data!"))? .ok_or(anyhow!("no calendar store in app_data!"))?
@@ -108,7 +111,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResource<C> {
Ok(Self { Ok(Self {
cal_store, cal_store,
path: req.path().to_owned(), path: req.path().to_owned(),
principal: auth_info.user_id, principal,
}) })
} }
@@ -129,9 +132,9 @@ impl<C: CalendarStore + ?Sized> ResourceService for PrincipalResource<C> {
Ok(calendars Ok(calendars
.into_iter() .into_iter()
.map(|cal| CalendarFile { .map(|cal| CalendarFile {
path: format!("{}/{}", &self.path, &cal.id),
calendar: cal, calendar: cal,
principal: self.principal.to_owned(), principal: self.principal.to_owned(),
path: self.path.to_owned(),
}) })
.collect()) .collect())
} }