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

dav: MOVE/COPY remove origin from Destination header

Browse Source
This commit is contained in:
Lennart
2025-06-14 15:46:39 +02:00
parent 4fe28c5b0f
commit 829d4a4385
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/dav/src/resource/methods/copy.rs
View File

@@ -6,7 +6,7 @@ use axum::{
extract::{MatchedPath, Path, State}, extract::{MatchedPath, Path, State},
response::{IntoResponse, Response}, response::{IntoResponse, Response},
}; };
use http::{HeaderMap, StatusCode}; use http::{HeaderMap, StatusCode, Uri};
use matchit_serde::ParamsDeserializer; use matchit_serde::ParamsDeserializer;
use serde::Deserialize; use serde::Deserialize;
use tracing::instrument; use tracing::instrument;
@@ -26,6 +26,9 @@ pub(crate) async fn axum_route_copy<R: ResourceService>(
.ok_or(crate::Error::Forbidden)? .ok_or(crate::Error::Forbidden)?
.to_str() .to_str()
.map_err(|_| crate::Error::Forbidden)?; .map_err(|_| crate::Error::Forbidden)?;
let destination_uri: Uri = destination.parse().map_err(|_| crate::Error::Forbidden)?;
// TODO: Check that host also matches
let destination = destination_uri.path();
let mut router = matchit::Router::new(); let mut router = matchit::Router::new();
router.insert(matched_path.as_str(), ()).unwrap(); router.insert(matched_path.as_str(), ()).unwrap();

5
crates/dav/src/resource/methods/mv.rs
View File

@@ -6,7 +6,7 @@ use axum::{
extract::{MatchedPath, Path, State}, extract::{MatchedPath, Path, State},
response::{IntoResponse, Response}, response::{IntoResponse, Response},
}; };
use http::{HeaderMap, StatusCode}; use http::{HeaderMap, StatusCode, Uri};
use matchit_serde::ParamsDeserializer; use matchit_serde::ParamsDeserializer;
use serde::Deserialize; use serde::Deserialize;
use tracing::instrument; use tracing::instrument;
@@ -26,6 +26,9 @@ pub(crate) async fn axum_route_move<R: ResourceService>(
.ok_or(crate::Error::Forbidden)? .ok_or(crate::Error::Forbidden)?
.to_str() .to_str()
.map_err(|_| crate::Error::Forbidden)?; .map_err(|_| crate::Error::Forbidden)?;
let destination_uri: Uri = destination.parse().map_err(|_| crate::Error::Forbidden)?;
// TODO: Check that host also matches
let destination = destination_uri.path();
let mut router = matchit::Router::new(); let mut router = matchit::Router::new();
router.insert(matched_path.as_str(), ()).unwrap(); router.insert(matched_path.as_str(), ()).unwrap();