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

Implement workaround to allow GNOME Accounts setup

Browse Source
This commit is contained in:
Lennart
2025-06-11 15:37:59 +02:00
parent dac49f853a
commit bd0684dcbc
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/dav/src/resource/axum_service.rs
View File

@@ -114,6 +114,9 @@ where
} }
async fn route_options<RS: ResourceService + AxumMethods>() -> Response<Body> { async fn route_options<RS: ResourceService + AxumMethods>() -> Response<Body> {
// Semantically NO_CONTENT would also make sense,
// but GNOME Accounts only works when returning OK
// https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/blob/master/src/goabackend/goadavclient.c#L289
let mut resp = Response::builder().status(StatusCode::OK); let mut resp = Response::builder().status(StatusCode::OK);
let headers = resp.headers_mut().unwrap(); let headers = resp.headers_mut().unwrap();
headers.insert("DAV", HeaderValue::from_static(RS::DAV_HEADER)); headers.insert("DAV", HeaderValue::from_static(RS::DAV_HEADER));

24
src/app.rs
View File

@@ -1,9 +1,11 @@
use crate::config::NextcloudLoginConfig; use crate::config::NextcloudLoginConfig;
use axum::Router; use axum::Router;
use axum::body::Body;
use axum::extract::Request; use axum::extract::Request;
use axum::response::Response; use axum::response::{IntoResponse, Response};
use axum::routing::options;
use headers::{HeaderMapExt, UserAgent}; use headers::{HeaderMapExt, UserAgent};
use http::StatusCode; use http::{HeaderValue, StatusCode};
use rustical_caldav::caldav_router; use rustical_caldav::caldav_router;
use rustical_carddav::carddav_router; use rustical_carddav::carddav_router;
use rustical_frontend::nextcloud_login::nextcloud_login_router; use rustical_frontend::nextcloud_login::nextcloud_login_router;
@@ -46,6 +48,24 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
subscription_store.clone(), subscription_store.clone(),
)); ));
// GNOME Accounts needs to discover a WebDAV Files endpoint to complete the setup
// It looks at / as well as /remote.php/dav (Nextcloud)
// This is not nice but we offer this as a sacrificial route to ensure the CalDAV/CardDAV setup
// works.
// See:
// https://github.com/GNOME/gnome-online-accounts/blob/master/src/goabackend/goadavclient.c
// https://github.com/GNOME/gnome-online-accounts/blob/master/src/goabackend/goawebdavprovider.c
router = router.route(
"/remote.php/dav",
options(async || {
let mut resp = Response::builder().status(StatusCode::OK);
resp.headers_mut()
.unwrap()
.insert("DAV", HeaderValue::from_static("1"));
resp.body(Body::empty()).unwrap()
}),
);
let session_store = MemoryStore::default(); let session_store = MemoryStore::default();
if frontend_config.enabled { if frontend_config.enabled {
router = router.merge(frontend_router( router = router.merge(frontend_router(