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

Fix Allow header in OPTION method

Browse Source
This commit is contained in:
Lennart
2025-04-26 15:37:40 +02:00
parent 0311ae4ee1
commit 2521a9b776
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/caldav/src/lib.rs
View File

@@ -1,6 +1,6 @@
use actix_web::HttpResponse; use actix_web::HttpResponse;
use actix_web::dev::{HttpServiceFactory, ServiceResponse}; use actix_web::dev::{HttpServiceFactory, ServiceResponse};
use actix_web::http::header::{HeaderName, HeaderValue}; use actix_web::http::header::{self, HeaderName, HeaderValue};
use actix_web::http::{Method, StatusCode}; use actix_web::http::{Method, StatusCode};
use actix_web::middleware::{ErrorHandlerResponse, ErrorHandlers}; use actix_web::middleware::{ErrorHandlerResponse, ErrorHandlers};
use actix_web::web::{self, Data}; use actix_web::web::{self, Data};
@@ -43,16 +43,19 @@ pub fn caldav_service<
ErrorHandlers::new().handler(StatusCode::METHOD_NOT_ALLOWED, |res| { ErrorHandlers::new().handler(StatusCode::METHOD_NOT_ALLOWED, |res| {
Ok(ErrorHandlerResponse::Response( Ok(ErrorHandlerResponse::Response(
if res.request().method() == Method::OPTIONS { if res.request().method() == Method::OPTIONS {
let response = HttpResponse::Ok() let mut response = HttpResponse::Ok();
.insert_header(( response.insert_header((
HeaderName::from_static("dav"), HeaderName::from_static("dav"),
// https://datatracker.ietf.org/doc/html/rfc4918#section-18 // https://datatracker.ietf.org/doc/html/rfc4918#section-18
HeaderValue::from_static( HeaderValue::from_static(
"1, 3, access-control, calendar-access, extended-mkcol, calendar-no-timezone", "1, 3, access-control, calendar-access, extended-mkcol, calendar-no-timezone",
), ),
)) ));
.finish();
ServiceResponse::new(res.into_parts().0, response).map_into_right_body() if let Some(allow) = res.headers().get(header::ALLOW) {
response.insert_header((header::ALLOW, allow.to_owned()));
}
ServiceResponse::new(res.into_parts().0, response.finish()).map_into_right_body()
} else { } else {
res.map_into_left_body() res.map_into_left_body()
}, },

26
crates/carddav/src/lib.rs
View File

@@ -3,7 +3,7 @@ use actix_web::{
dev::{HttpServiceFactory, ServiceResponse}, dev::{HttpServiceFactory, ServiceResponse},
http::{ http::{
Method, StatusCode, Method, StatusCode,
header::{HeaderName, HeaderValue}, header::{self, HeaderName, HeaderValue},
}, },
middleware::{ErrorHandlerResponse, ErrorHandlers}, middleware::{ErrorHandlerResponse, ErrorHandlers},
web::{self, Data}, web::{self, Data},
@@ -36,16 +36,20 @@ pub fn carddav_service<AP: AuthenticationProvider, A: AddressbookStore, S: Subsc
ErrorHandlers::new().handler(StatusCode::METHOD_NOT_ALLOWED, |res| { ErrorHandlers::new().handler(StatusCode::METHOD_NOT_ALLOWED, |res| {
Ok(ErrorHandlerResponse::Response( Ok(ErrorHandlerResponse::Response(
if res.request().method() == Method::OPTIONS { if res.request().method() == Method::OPTIONS {
let response = HttpResponse::Ok() let mut response = HttpResponse::Ok();
.insert_header(( response.insert_header((
HeaderName::from_static("dav"), HeaderName::from_static("dav"),
// https://datatracker.ietf.org/doc/html/rfc4918#section-18 // https://datatracker.ietf.org/doc/html/rfc4918#section-18
HeaderValue::from_static( HeaderValue::from_static(
"1, 3, access-control, addressbook, extended-mkcol", "1, 3, access-control, addressbook, extended-mkcol",
), ),
)) ));
.finish();
ServiceResponse::new(res.into_parts().0, response).map_into_right_body() if let Some(allow) = res.headers().get(header::ALLOW) {
response.insert_header((header::ALLOW, allow.to_owned()));
}
ServiceResponse::new(res.into_parts().0, response.finish())
.map_into_right_body()
} else { } else {
res.map_into_left_body() res.map_into_left_body()
}, },