From 03ae492483a1a4b6e7779695e940c1cbe68188a0 Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Sat, 14 Jun 2025 20:24:50 +0200 Subject: [PATCH] Implement DAV Push --- Cargo.lock | 76 +++ Cargo.toml | 1 + about.toml | 1 + crates/caldav/src/calendar/methods/mod.rs | 4 +- crates/caldav/src/calendar/methods/post.rs | 28 +- crates/caldav/src/calendar/resource.rs | 14 +- crates/caldav/src/calendar/service.rs | 10 +- crates/caldav/src/lib.rs | 1 - crates/caldav/src/subscription.rs | 33 -- crates/carddav/src/addressbook/methods/mod.rs | 4 +- .../carddav/src/addressbook/methods/post.rs | 61 ++- crates/carddav/src/addressbook/service.rs | 10 +- crates/dav_push/Cargo.toml | 5 + crates/dav_push/src/endpoints.rs | 23 + crates/dav_push/src/lib.rs | 211 +++++++- crates/dav_push/src/notifier.rs | 147 ------ crates/frontend/public/assets/licenses.html | 468 +++++++++++++++++- crates/store/src/lib.rs | 15 +- crates/store_sqlite/src/addressbook_store.rs | 40 +- crates/store_sqlite/src/calendar_store.rs | 24 +- src/app.rs | 8 + src/config.rs | 5 + src/main.rs | 1 + 23 files changed, 882 insertions(+), 308 deletions(-) delete mode 100644 crates/caldav/src/subscription.rs create mode 100644 crates/dav_push/src/endpoints.rs delete mode 100644 crates/dav_push/src/notifier.rs diff --git a/Cargo.lock b/Cargo.lock index f33adab..23cdb50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -759,6 +759,24 @@ dependencies = [ "spki", ] +[[package]] +name = "ece" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2ea1d2f2cc974957a4e2575d8e5bb494549bab66338d6320c2789abcfff5746" +dependencies = [ + "base64 0.21.7", + "byteorder", + "hex", + "hkdf", + "lazy_static", + "once_cell", + "openssl", + "serde", + "sha2", + "thiserror 1.0.69", +] + [[package]] name = "ed25519" version = "2.2.3" @@ -903,6 +921,21 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1821,6 +1854,44 @@ dependencies = [ "url", ] +[[package]] +name = "openssl" +version = "0.10.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-sys" +version = "0.9.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "opentelemetry" version = "0.30.0" @@ -2794,12 +2865,17 @@ name = "rustical_dav_push" version = "0.2.2" dependencies = [ "async-trait", + "axum", + "base64 0.22.1", "derive_more", + "ece", "futures-util", "http", "itertools 0.14.0", "log", + "p256", "quick-xml", + "rand 0.9.1", "reqwest", "rustical_dav", "rustical_store", diff --git a/Cargo.toml b/Cargo.toml index 193eeae..782f3ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -135,6 +135,7 @@ reqwest = { version = "0.12", features = [ openidconnect = "4.0" clap = { version = "4.5", features = ["derive", "env"] } matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "f0591d13" } +ece = "2.3" [dependencies] rustical_store = { workspace = true } diff --git a/about.toml b/about.toml index 96ab1b9..41088eb 100644 --- a/about.toml +++ b/about.toml @@ -7,5 +7,6 @@ accepted = [ "CDLA-Permissive-2.0", "Zlib", "AGPL-3.0", + "MPL-2.0", ] workarounds = ["ring", "chrono", "rustls"] diff --git a/crates/caldav/src/calendar/methods/mod.rs b/crates/caldav/src/calendar/methods/mod.rs index 3acf321..70d7d96 100644 --- a/crates/caldav/src/calendar/methods/mod.rs +++ b/crates/caldav/src/calendar/methods/mod.rs @@ -1,4 +1,4 @@ -pub mod mkcalendar; -// pub mod post; pub mod get; +pub mod mkcalendar; +pub mod post; pub mod report; diff --git a/crates/caldav/src/calendar/methods/post.rs b/crates/caldav/src/calendar/methods/post.rs index 1edb953..511c9cb 100644 --- a/crates/caldav/src/calendar/methods/post.rs +++ b/crates/caldav/src/calendar/methods/post.rs @@ -1,8 +1,9 @@ use crate::Error; -use crate::calendar::resource::{CalendarResource, CalendarResourceService}; +use crate::calendar::CalendarResourceService; +use crate::calendar::resource::CalendarResource; use axum::extract::{Path, State}; use axum::response::{IntoResponse, Response}; -use http::{HeaderMap, StatusCode, header}; +use http::{HeaderMap, HeaderValue, StatusCode, header}; use rustical_dav::privileges::UserPrivilege; use rustical_dav::resource::Resource; use rustical_dav_push::register::PushRegister; @@ -73,20 +74,17 @@ pub async fn route_post( .upsert_subscription(subscription) .await?; - // let location = req - // .resource_map() - // .url_for(&req, "subscription", &[sub_id]) - // .unwrap(); - // - let location = "asd"; + // TODO: make nicer + let location = format!("/push_subscription/{sub_id}"); Ok(( StatusCode::CREATED, - HeaderMap::from_iter([(header::LOCATION, location)]), + HeaderMap::from_iter([ + (header::LOCATION, HeaderValue::from_str(&location).unwrap()), + ( + header::EXPIRES, + HeaderValue::from_str(&expires.to_rfc2822()).unwrap(), + ), + ]), ) - .into_response()); - - Ok(HttpResponse::Created() - .append_header((header::LOCATION, location.to_string())) - .append_header((header::EXPIRES, expires.to_rfc2822())) - .finish()) + .into_response()) } diff --git a/crates/caldav/src/calendar/resource.rs b/crates/caldav/src/calendar/resource.rs index 96ae53e..7ed8ca3 100644 --- a/crates/caldav/src/calendar/resource.rs +++ b/crates/caldav/src/calendar/resource.rs @@ -9,7 +9,7 @@ use rustical_dav::extensions::{ use rustical_dav::privileges::UserPrivilegeSet; use rustical_dav::resource::{PrincipalUri, Resource, ResourceName}; use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner, SupportedReportSet}; -use rustical_dav_push::DavPushExtension; +use rustical_dav_push::{DavPushExtension, DavPushExtensionProp}; use rustical_ical::CalDateTime; use rustical_store::Calendar; use rustical_store::auth::User; @@ -58,7 +58,7 @@ pub enum CalendarProp { pub enum CalendarPropWrapper { Calendar(CalendarProp), SyncToken(SyncTokenExtensionProp), - // DavPush(DavPushExtensionProp), + DavPush(DavPushExtensionProp), Common(CommonPropertiesProp), } @@ -168,9 +168,9 @@ impl Resource for CalendarResource { CalendarPropWrapperName::SyncToken(prop) => { CalendarPropWrapper::SyncToken(SyncTokenExtension::get_prop(self, prop)?) } - // CalendarPropWrapperName::DavPush(prop) => { - // CalendarPropWrapper::DavPush(DavPushExtension::get_prop(self, prop)?) - // } + CalendarPropWrapperName::DavPush(prop) => { + CalendarPropWrapper::DavPush(DavPushExtension::get_prop(self, prop)?) + } CalendarPropWrapperName::Common(prop) => CalendarPropWrapper::Common( CommonPropertiesExtension::get_prop(self, puri, user, prop)?, ), @@ -228,7 +228,7 @@ impl Resource for CalendarResource { CalendarProp::MaxDateTime(_) => Err(rustical_dav::Error::PropReadOnly), }, CalendarPropWrapper::SyncToken(prop) => SyncTokenExtension::set_prop(self, prop), - // CalendarPropWrapper::DavPush(prop) => DavPushExtension::set_prop(self, prop), + CalendarPropWrapper::DavPush(prop) => DavPushExtension::set_prop(self, prop), CalendarPropWrapper::Common(prop) => CommonPropertiesExtension::set_prop(self, prop), } } @@ -272,7 +272,7 @@ impl Resource for CalendarResource { CalendarPropName::MaxDateTime => Err(rustical_dav::Error::PropReadOnly), }, CalendarPropWrapperName::SyncToken(prop) => SyncTokenExtension::remove_prop(self, prop), - // CalendarPropWrapperName::DavPush(prop) => DavPushExtension::remove_prop(self, prop), + CalendarPropWrapperName::DavPush(prop) => DavPushExtension::remove_prop(self, prop), CalendarPropWrapperName::Common(prop) => { CommonPropertiesExtension::remove_prop(self, prop) } diff --git a/crates/caldav/src/calendar/service.rs b/crates/caldav/src/calendar/service.rs index aed3cb8..0000f28 100644 --- a/crates/caldav/src/calendar/service.rs +++ b/crates/caldav/src/calendar/service.rs @@ -1,5 +1,6 @@ use crate::calendar::methods::get::route_get; use crate::calendar::methods::mkcalendar::route_mkcalendar; +use crate::calendar::methods::post::route_post; use crate::calendar::methods::report::route_report_calendar; use crate::calendar::resource::CalendarResource; use crate::calendar_object::CalendarObjectResourceService; @@ -50,7 +51,7 @@ impl ResourceService for CalendarResourc type Principal = User; type PrincipalUri = CalDavPrincipalUri; - const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy"; + const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy, webdav-push"; async fn get_resource( &self, @@ -126,6 +127,13 @@ impl AxumMethods for CalendarResourceSer }) } + fn post() -> Option BoxFuture<'static, Result>> { + Some(|state, req| { + let mut service = Handler::with_state(route_post::, state); + Box::pin(Service::call(&mut service, req)) + }) + } + fn mkcalendar() -> Option BoxFuture<'static, Result>> { Some(|state, req| { diff --git a/crates/caldav/src/lib.rs b/crates/caldav/src/lib.rs index b1a8f4a..dc7c89b 100644 --- a/crates/caldav/src/lib.rs +++ b/crates/caldav/src/lib.rs @@ -14,7 +14,6 @@ pub mod calendar; pub mod calendar_object; pub mod error; pub mod principal; -// mod subscription; pub use error::Error; diff --git a/crates/caldav/src/subscription.rs b/crates/caldav/src/subscription.rs deleted file mode 100644 index 77116a8..0000000 --- a/crates/caldav/src/subscription.rs +++ /dev/null @@ -1,33 +0,0 @@ -use std::sync::Arc; - -use actix_web::{ - HttpResponse, - web::{self, Data, Path}, -}; -use rustical_dav::xml::multistatus::PropstatElement; -use rustical_store::SubscriptionStore; -use rustical_xml::{XmlRootTag, XmlSerialize}; - -use crate::calendar::resource::CalendarProp; - -async fn handle_delete( - store: Data, - path: Path, -) -> Result { - let id = path.into_inner(); - store.delete_subscription(&id).await?; - Ok(HttpResponse::NoContent().body("Unregistered")) -} - -pub fn subscription_resource(sub_store: Arc) -> actix_web::Resource { - web::resource("/subscription/{id}") - .app_data(Data::from(sub_store)) - .name("subscription") - .delete(handle_delete::) -} - -#[derive(XmlSerialize, XmlRootTag)] -#[xml(root = b"push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")] -pub struct PushMessage { - propstat: PropstatElement, -} diff --git a/crates/carddav/src/addressbook/methods/mod.rs b/crates/carddav/src/addressbook/methods/mod.rs index bcefbc9..49a98d6 100644 --- a/crates/carddav/src/addressbook/methods/mod.rs +++ b/crates/carddav/src/addressbook/methods/mod.rs @@ -1,5 +1,5 @@ -pub mod mkcol; -// pub mod post; pub mod get; +pub mod mkcol; +pub mod post; pub mod put; pub mod report; diff --git a/crates/carddav/src/addressbook/methods/post.rs b/crates/carddav/src/addressbook/methods/post.rs index f3866de..795865b 100644 --- a/crates/carddav/src/addressbook/methods/post.rs +++ b/crates/carddav/src/addressbook/methods/post.rs @@ -1,33 +1,40 @@ use crate::Error; -use crate::addressbook::resource::AddressbookResourceService; -use actix_web::http::header; -use actix_web::web::{Data, Path}; -use actix_web::{HttpRequest, HttpResponse}; +use crate::addressbook::AddressbookResourceService; +use crate::addressbook::resource::AddressbookResource; +use axum::extract::{Path, State}; +use axum::response::{IntoResponse, Response}; +use http::{HeaderMap, HeaderValue, StatusCode, header}; +use rustical_dav::privileges::UserPrivilege; +use rustical_dav::resource::Resource; use rustical_dav_push::register::PushRegister; use rustical_store::auth::User; use rustical_store::{AddressbookStore, Subscription, SubscriptionStore}; use rustical_xml::XmlDocument; use tracing::instrument; -use tracing_actix_web::RootSpan; -#[instrument(parent = root_span.id(), skip(resource_service, root_span, req))] -pub async fn route_post( - path: Path<(String, String)>, - body: String, +#[instrument(skip(resource_service))] +pub async fn route_post( + Path((principal, addr_id)): Path<(String, String)>, user: User, - resource_service: Data>, - root_span: RootSpan, - req: HttpRequest, -) -> Result { - let (principal, addressbook_id) = path.into_inner(); + State(resource_service): State>, + body: String, +) -> Result { if !user.is_principal(&principal) { return Err(Error::Unauthorized); } let addressbook = resource_service .addr_store - .get_addressbook(&principal, &addressbook_id, false) + .get_addressbook(&principal, &addr_id, false) .await?; + let addressbook_resource = AddressbookResource(addressbook); + if !addressbook_resource + .get_user_privileges(&user)? + .has(&UserPrivilege::Read) + { + return Err(Error::Unauthorized); + } + let request = PushRegister::parse_str(&body)?; let sub_id = uuid::Uuid::new_v4().to_string(); @@ -44,7 +51,7 @@ pub async fn route_post( .web_push_subscription .push_resource .to_owned(), - topic: addressbook.push_topic, + topic: addressbook_resource.0.push_topic, expiration: expires.naive_local(), public_key: request .subscription @@ -63,13 +70,17 @@ pub async fn route_post( .upsert_subscription(subscription) .await?; - let location = req - .resource_map() - .url_for(&req, "subscription", &[sub_id]) - .unwrap(); - - Ok(HttpResponse::Created() - .append_header((header::LOCATION, location.to_string())) - .append_header((header::EXPIRES, expires.to_rfc2822())) - .finish()) + // TODO: make nicer + let location = format!("/push_subscription/{sub_id}"); + Ok(( + StatusCode::CREATED, + HeaderMap::from_iter([ + (header::LOCATION, HeaderValue::from_str(&location).unwrap()), + ( + header::EXPIRES, + HeaderValue::from_str(&expires.to_rfc2822()).unwrap(), + ), + ]), + ) + .into_response()) } diff --git a/crates/carddav/src/addressbook/service.rs b/crates/carddav/src/addressbook/service.rs index f158f81..4ce2911 100644 --- a/crates/carddav/src/addressbook/service.rs +++ b/crates/carddav/src/addressbook/service.rs @@ -3,6 +3,7 @@ use super::methods::report::route_report_addressbook; use crate::address_object::AddressObjectResourceService; use crate::address_object::resource::AddressObjectResource; use crate::addressbook::methods::get::route_get; +use crate::addressbook::methods::post::route_post; use crate::addressbook::methods::put::route_put; use crate::addressbook::resource::AddressbookResource; use crate::{CardDavPrincipalUri, Error}; @@ -53,7 +54,7 @@ impl ResourceService type Principal = User; type PrincipalUri = CardDavPrincipalUri; - const DAV_HEADER: &str = "1, 3, access-control, addressbook"; + const DAV_HEADER: &str = "1, 3, access-control, addressbook, webdav-push"; async fn get_resource( &self, @@ -130,6 +131,13 @@ impl AxumMethods for AddressbookReso }) } + fn post() -> Option BoxFuture<'static, Result>> { + Some(|state, req| { + let mut service = Handler::with_state(route_post::, state); + Box::pin(Service::call(&mut service, req)) + }) + } + fn put() -> Option BoxFuture<'static, Result>> { Some(|state, req| { let mut service = Handler::with_state(route_put::, state); diff --git a/crates/dav_push/Cargo.toml b/crates/dav_push/Cargo.toml index 6779bb5..37661bd 100644 --- a/crates/dav_push/Cargo.toml +++ b/crates/dav_push/Cargo.toml @@ -23,3 +23,8 @@ tokio.workspace = true rustical_dav.workspace = true rustical_store.workspace = true http.workspace = true +base64 = "0.22" +p256 = { version = "0.13", features = ["ecdh"] } +rand.workspace = true +ece = "2.3" +axum.workspace = true diff --git a/crates/dav_push/src/endpoints.rs b/crates/dav_push/src/endpoints.rs new file mode 100644 index 0000000..98c7bb6 --- /dev/null +++ b/crates/dav_push/src/endpoints.rs @@ -0,0 +1,23 @@ +use axum::{ + Router, + extract::{Path, State}, + response::{IntoResponse, Response}, + routing::delete, +}; +use http::StatusCode; +use rustical_store::SubscriptionStore; +use std::sync::Arc; + +async fn handle_delete( + State(store): State>, + Path(id): Path, +) -> Result { + store.delete_subscription(&id).await?; + Ok((StatusCode::NO_CONTENT, "Unregistered").into_response()) +} + +pub fn subscription_service(sub_store: Arc) -> Router { + Router::new() + .route("/push_subscription/{id}", delete(handle_delete::)) + .with_state(sub_store) +} diff --git a/crates/dav_push/src/lib.rs b/crates/dav_push/src/lib.rs index 4571581..ac385f5 100644 --- a/crates/dav_push/src/lib.rs +++ b/crates/dav_push/src/lib.rs @@ -1,14 +1,41 @@ mod extension; -pub mod notifier; mod prop; pub mod register; +use base64::Engine; use derive_more::Constructor; pub use extension::*; +use http::{HeaderValue, Method, header}; pub use prop::*; -use rustical_store::{CollectionOperation, SubscriptionStore}; -use std::sync::Arc; +use reqwest::{Body, Url}; +use rustical_store::{ + CollectionOperation, CollectionOperationInfo, Subscription, SubscriptionStore, +}; +use rustical_xml::{XmlRootTag, XmlSerialize, XmlSerializeRoot}; +use std::{collections::HashMap, sync::Arc, time::Duration}; use tokio::sync::mpsc::Receiver; -use tracing::error; +use tracing::{error, warn}; + +mod endpoints; +pub use endpoints::subscription_service; + +#[derive(XmlSerialize, Debug)] +pub struct ContentUpdate { + #[xml(ns = "rustical_dav::namespace::NS_DAV")] + sync_token: Option, +} + +#[derive(XmlSerialize, XmlRootTag, Debug)] +#[xml(root = b"push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")] +#[xml(ns_prefix( + rustical_dav::namespace::NS_DAVPUSH = b"", + rustical_dav::namespace::NS_DAV = b"D", +))] +struct PushMessage { + #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")] + topic: String, + #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")] + content_update: Option, +} #[derive(Debug, Constructor)] pub struct DavPushController { @@ -18,14 +45,176 @@ pub struct DavPushController { impl DavPushController { pub async fn notifier(&self, mut recv: Receiver) { - while let Some(message) = recv.recv().await { - let subscribers = match self.sub_store.get_subscriptions(&message.topic).await { - Ok(subs) => subs, - Err(err) => { - error!("{err}"); - continue; + loop { + // Make sure we don't flood the subscribers + tokio::time::sleep(Duration::from_secs(10)).await; + let mut messages = vec![]; + recv.recv_many(&mut messages, 100).await; + + // Right now we just have to show the latest content update by topic + // This might become more complicated in the future depending on what kind of updates + // we add + let mut latest_messages = HashMap::new(); + for message in messages { + if matches!(message.data, CollectionOperationInfo::Content { .. }) { + latest_messages.insert(message.topic.to_string(), message); } - }; + } + let messages = latest_messages.into_values(); + + for message in messages { + self.send_message(message).await; + } + } + } + + async fn send_message(&self, message: CollectionOperation) { + let subscriptions = match self.sub_store.get_subscriptions(&message.topic).await { + Ok(subs) => subs, + Err(err) => { + error!("{err}"); + return; + } + }; + + if subscriptions.is_empty() { + return; + } + + if matches!(message.data, CollectionOperationInfo::Delete) { + // Collection has been deleted, but we cannot handle that + return; + } + + let content_update = if let CollectionOperationInfo::Content { sync_token } = message.data { + Some(ContentUpdate { + sync_token: Some(sync_token), + }) + } else { + None + }; + + let push_message = PushMessage { + topic: message.topic, + content_update, + }; + + let mut output: Vec<_> = b"\n".into(); + let mut writer = quick_xml::Writer::new_with_indent(&mut output, b' ', 4); + if let Err(err) = push_message.serialize_root(&mut writer) { + error!("Could not serialize push message: {}", err); + return; + } + let payload = String::from_utf8(output).unwrap(); + + for subsciption in subscriptions { + if let Some(allowed_push_servers) = &self.allowed_push_servers { + if let Ok(url) = Url::parse(&subsciption.push_resource) { + let origin = url.origin().unicode_serialization(); + if !allowed_push_servers.contains(&origin) { + warn!( + "Deleting subscription {} on topic {} because the endpoint is not in the list of allowed push servers", + subsciption.id, subsciption.topic + ); + self.try_delete_subscription(&subsciption.id).await; + } + } else { + warn!( + "Deleting subscription {} on topic {} because of invalid URL", + subsciption.id, subsciption.topic + ); + self.try_delete_subscription(&subsciption.id).await; + }; + } + + if let Err(err) = self.send_payload(&payload, &subsciption).await { + error!("An error occured sending out a push notification: {err}"); + if err.is_permament_error() { + warn!( + "Deleting subscription {} on topic {}", + subsciption.id, subsciption.topic + ); + self.try_delete_subscription(&subsciption.id).await; + } + } + } + } + + async fn try_delete_subscription(&self, sub_id: &str) { + if let Err(err) = self.sub_store.delete_subscription(sub_id).await { + error!("Error deleting subsciption: {err}"); + } + } + + async fn send_payload( + &self, + payload: &str, + subsciption: &Subscription, + ) -> Result<(), NotifierError> { + if subsciption.public_key_type != "p256dh" { + return Err(NotifierError::InvalidPublicKeyType( + subsciption.public_key_type.to_string(), + )); + } + let endpoint = subsciption.push_resource.parse().map_err(|_| { + NotifierError::InvalidEndpointUrl(subsciption.push_resource.to_string()) + })?; + let ua_public = base64::engine::general_purpose::URL_SAFE_NO_PAD + .decode(&subsciption.public_key) + .map_err(|_| NotifierError::InvalidKeyEncoding)?; + let auth_secret = base64::engine::general_purpose::URL_SAFE_NO_PAD + .decode(&subsciption.auth_secret) + .map_err(|_| NotifierError::InvalidKeyEncoding)?; + + let client = reqwest::ClientBuilder::new() + .build() + .map_err(NotifierError::from)?; + + let payload = ece::encrypt(&ua_public, &auth_secret, payload.as_bytes())?; + + let mut request = reqwest::Request::new(Method::POST, endpoint); + *request.body_mut() = Some(Body::from(payload)); + let hdrs = request.headers_mut(); + hdrs.insert( + header::CONTENT_ENCODING, + HeaderValue::from_static("aes128gcm"), + ); + hdrs.insert( + header::CONTENT_TYPE, + HeaderValue::from_static("application/octet-stream"), + ); + client.execute(request).await?; + + Ok(()) + } +} + +#[derive(Debug, thiserror::Error)] +enum NotifierError { + #[error("Invalid public key type: {0}")] + InvalidPublicKeyType(String), + #[error("Invalid endpoint URL: {0}")] + InvalidEndpointUrl(String), + #[error("Invalid key encoding")] + InvalidKeyEncoding, + #[error(transparent)] + EceError(#[from] ece::Error), + #[error(transparent)] + ReqwestError(#[from] reqwest::Error), +} + +impl NotifierError { + // Decide whether the error should cause the subscription to be removed + pub fn is_permament_error(&self) -> bool { + match self { + Self::InvalidPublicKeyType(_) + | Self::InvalidEndpointUrl(_) + | Self::InvalidKeyEncoding => true, + Self::EceError(err) => matches!( + err, + ece::Error::InvalidAuthSecret | ece::Error::InvalidKeyLength + ), + Self::ReqwestError(_) => false, } } } diff --git a/crates/dav_push/src/notifier.rs b/crates/dav_push/src/notifier.rs deleted file mode 100644 index 99e455d..0000000 --- a/crates/dav_push/src/notifier.rs +++ /dev/null @@ -1,147 +0,0 @@ -use http::StatusCode; -use reqwest::{ - Method, Request, - header::{self, HeaderName, HeaderValue}, -}; -use rustical_dav::xml::multistatus::PropstatElement; -use rustical_store::{CollectionOperation, CollectionOperationType, SubscriptionStore}; -use rustical_xml::{XmlRootTag, XmlSerialize, XmlSerializeRoot}; -use std::{str::FromStr, sync::Arc}; -use tokio::sync::mpsc::Receiver; -use tracing::{error, info, warn}; -// use web_push::{SubscriptionInfo, WebPushMessage, WebPushMessageBuilder}; - -#[derive(XmlSerialize, Debug)] -struct PushMessageProp { - #[xml(ns = "rustical_dav::namespace::NS_DAV")] - topic: String, - #[xml(ns = "rustical_dav::namespace::NS_DAV")] - sync_token: Option, -} - -#[derive(XmlSerialize, XmlRootTag, Debug)] -#[xml(root = b"push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")] -#[xml(ns_prefix( - rustical_dav::namespace::NS_DAVPUSH = b"", - rustical_dav::namespace::NS_DAV = b"D", -))] -struct PushMessage { - #[xml(ns = "rustical_dav::namespace::NS_DAV")] - propstat: PropstatElement, -} - -// pub fn build_request(message: WebPushMessage) -> Request { -// // A little janky :) -// let url = reqwest::Url::from_str(&message.endpoint.to_string()).unwrap(); -// let mut builder = Request::new(Method::POST, url); -// -// if let Some(topic) = message.topic { -// builder -// .headers_mut() -// .insert("Topic", HeaderValue::from_str(topic.as_str()).unwrap()); -// } -// -// if let Some(payload) = message.payload { -// builder.headers_mut().insert( -// header::CONTENT_ENCODING, -// HeaderValue::from_static(payload.content_encoding.to_str()), -// ); -// builder.headers_mut().insert( -// header::CONTENT_TYPE, -// HeaderValue::from_static("application/octet-stream"), -// ); -// -// for (k, v) in payload.crypto_headers.into_iter() { -// let v: &str = v.as_ref(); -// builder.headers_mut().insert( -// HeaderName::from_static(k), -// HeaderValue::from_str(&v).unwrap(), -// ); -// } -// -// *builder.body_mut() = Some(reqwest::Body::from(payload.content)); -// } -// builder -// } - -pub async fn push_notifier( - allowed_push_servers: Option>, - mut recv: Receiver, - sub_store: Arc, -) { - let client = reqwest::Client::new(); - - while let Some(message) = recv.recv().await { - let subscribers = match sub_store.get_subscriptions(&message.topic).await { - Ok(subs) => subs, - Err(err) => { - error!("{err}"); - continue; - } - }; - - let status = match message.r#type { - CollectionOperationType::Object => StatusCode::OK, - CollectionOperationType::Delete => StatusCode::NOT_FOUND, - }; - - let push_message = PushMessage { - propstat: PropstatElement { - prop: PushMessageProp { - topic: message.topic, - sync_token: message.sync_token, - }, - status, - }, - }; - - let mut output: Vec<_> = b"\n".into(); - let mut writer = quick_xml::Writer::new_with_indent(&mut output, b' ', 4); - if let Err(err) = push_message.serialize_root(&mut writer) { - error!("Could not serialize push message: {}", err); - continue; - } - let payload = String::from_utf8(output).unwrap(); - // for subscriber in subscribers { - // let push_resource = subscriber.push_resource; - // - // let sub_info = SubscriptionInfo { - // endpoint: push_resource.to_owned(), - // keys: web_push::SubscriptionKeys { - // p256dh: subscriber.public_key, - // auth: subscriber.auth_secret, - // }, - // }; - // let mut builder = WebPushMessageBuilder::new(&sub_info); - // builder.set_payload(web_push::ContentEncoding::Aes128Gcm, payload.as_bytes()); - // let push_message = builder.build().unwrap(); - // let request = build_request(push_message); - // - // let allowed = if let Some(allowed_push_servers) = &allowed_push_servers { - // if let Ok(resource_url) = reqwest::Url::parse(&push_resource) { - // let origin = resource_url.origin().ascii_serialization(); - // allowed_push_servers - // .iter() - // .any(|allowed_push_server| allowed_push_server == &origin) - // } else { - // warn!("Invalid push url: {push_resource}"); - // false - // } - // } else { - // true - // }; - // - // if allowed { - // info!("Sending a push message to {}: {}", push_resource, payload); - // if let Err(err) = client.execute(request).await { - // error!("{err}"); - // } - // } else { - // warn!( - // "Not sending a push notification to {} since it's not allowed in dav_push::allowed_push_servers", - // push_resource - // ); - // } - // } - } -} diff --git a/crates/frontend/public/assets/licenses.html b/crates/frontend/public/assets/licenses.html index 520a898..1beca2b 100644 --- a/crates/frontend/public/assets/licenses.html +++ b/crates/frontend/public/assets/licenses.html @@ -44,13 +44,14 @@

Overview of licenses:

@@ -60,7 +61,7 @@

GNU Affero General Public License v3.0

Used by:

                    GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
@@ -729,16 +730,16 @@ For more information on this, and how to apply and follow the GNU AGPL, see
                 
GNU Affero General Public License v3.0

                 
Used by:

                 
                 
GNU AFFERO GENERAL PUBLIC LICENSE
@@ -4342,9 +4343,13 @@ Software.
                     
  • anstyle 1.0.10
    • 
                     
  • clap 4.5.39
    • 
                     
  • colorchoice 1.0.3
    • 
+                    
  • foreign-types-shared 0.1.1
    • 
+                    
  • foreign-types 0.3.2
    • 
                     
  • hex 0.4.3
    • 
                     
  • is_terminal_polyfill 1.70.1
    • 
                     
  • once_cell_polyfill 1.70.1
    • 
+                    
  • openssl-macros 0.1.1
    • 
+                    
  • openssl 0.10.73
    • 
                     
  • serde_spanned 0.6.8
    • 
                     
  • toml 0.8.22
    • 
                     
  • toml_datetime 0.6.9
    • 
@@ -11662,6 +11667,29 @@ You may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
    
+            
+            
  • 
+                
    Apache License 2.0
    
+                
    Used by:
    
+                
+                
    Copyright 2011-2017 Google Inc.
+          2013 Jack Lloyd
+          2013-2014 Steven Fackler
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -12128,6 +12156,39 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
    
+            
    • 
+            
  • 
+                
    MIT License
    
+                
    Used by:
    
+                
+                
    Copyright (c) 2014 Alex Crichton
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
    
             
    • 
             
  • 
                 
    MIT License
    
@@ -13556,6 +13617,387 @@ THE SOFTWARE.
                 
    This project is dual-licensed under the Unlicense and MIT licenses.
 
 You may use this code under the terms of either license.
+
    
+            
    • 
+            
  • 
+                
    Mozilla Public License 2.0
    
+                
    Used by:
    
+                
+                
    Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
 
    
             
    • 
             
  • 
diff --git a/crates/store/src/lib.rs b/crates/store/src/lib.rs
index bda62a8..53ad487 100644
--- a/crates/store/src/lib.rs
+++ b/crates/store/src/lib.rs
@@ -22,22 +22,15 @@ pub use addressbook::Addressbook;
 pub use calendar::Calendar;
 
 #[derive(Debug, Clone)]
-pub enum CollectionOperationType {
+pub enum CollectionOperationInfo {
     // Sync-Token increased
-    Object,
+    Content { sync_token: String },
+    // Collection deleted
     Delete,
 }
 
-#[derive(Debug, Clone)]
-pub enum CollectionOperationDomain {
-    Calendar,
-    Addressbook,
-}
-
 #[derive(Debug, Clone)]
 pub struct CollectionOperation {
-    pub r#type: CollectionOperationType,
-    pub domain: CollectionOperationDomain,
     pub topic: String,
-    pub sync_token: Option,
+    pub data: CollectionOperationInfo,
 }
diff --git a/crates/store_sqlite/src/addressbook_store.rs b/crates/store_sqlite/src/addressbook_store.rs
index f926dcb..c2f334b 100644
--- a/crates/store_sqlite/src/addressbook_store.rs
+++ b/crates/store_sqlite/src/addressbook_store.rs
@@ -3,8 +3,8 @@ use async_trait::async_trait;
 use derive_more::derive::Constructor;
 use rustical_ical::AddressObject;
 use rustical_store::{
-    Addressbook, AddressbookStore, CollectionOperation, CollectionOperationDomain,
-    CollectionOperationType, Error, synctoken::format_synctoken,
+    Addressbook, AddressbookStore, CollectionOperation, CollectionOperationInfo, Error,
+    synctoken::format_synctoken,
 };
 use sqlx::{Acquire, Executor, Sqlite, SqlitePool, Transaction};
 use tokio::sync::mpsc::Sender;
@@ -413,10 +413,8 @@ impl AddressbookStore for SqliteAddressbookStore {
 
         if let Some(addressbook) = addressbook {
             if let Err(err) = self.sender.try_send(CollectionOperation {
-                r#type: CollectionOperationType::Delete,
-                domain: CollectionOperationDomain::Addressbook,
+                data: CollectionOperationInfo::Delete,
                 topic: addressbook.push_topic,
-                sync_token: None,
             }) {
                 error!("Push notification about deleted addressbook failed: {err}");
             };
@@ -485,7 +483,7 @@ impl AddressbookStore for SqliteAddressbookStore {
         )
         .await?;
 
-        let synctoken = log_object_operation(
+        let sync_token = log_object_operation(
             &mut tx,
             &principal,
             &addressbook_id,
@@ -498,13 +496,11 @@ impl AddressbookStore for SqliteAddressbookStore {
         tx.commit().await.map_err(crate::Error::from)?;
 
         if let Err(err) = self.sender.try_send(CollectionOperation {
-            r#type: CollectionOperationType::Object,
-            domain: CollectionOperationDomain::Addressbook,
+            data: CollectionOperationInfo::Content { sync_token },
             topic: self
                 .get_addressbook(&principal, &addressbook_id, false)
                 .await?
                 .push_topic,
-            sync_token: Some(synctoken),
         }) {
             error!("Push notification about deleted addressbook failed: {err}");
         };
@@ -524,7 +520,7 @@ impl AddressbookStore for SqliteAddressbookStore {
 
         Self::_delete_object(&mut *tx, principal, addressbook_id, object_id, use_trashbin).await?;
 
-        let synctoken = log_object_operation(
+        let sync_token = log_object_operation(
             &mut tx,
             principal,
             addressbook_id,
@@ -536,16 +532,15 @@ impl AddressbookStore for SqliteAddressbookStore {
 
         tx.commit().await.map_err(crate::Error::from)?;
 
-        // TODO: Watch for errors here?
-        let _ = self.sender.try_send(CollectionOperation {
-            r#type: CollectionOperationType::Object,
-            domain: CollectionOperationDomain::Addressbook,
+        if let Err(err) = self.sender.try_send(CollectionOperation {
+            data: CollectionOperationInfo::Content { sync_token },
             topic: self
                 .get_addressbook(principal, addressbook_id, false)
                 .await?
                 .push_topic,
-            sync_token: Some(synctoken),
-        });
+        }) {
+            error!("Push notification about deleted addressbook failed: {err}");
+        };
         Ok(())
     }
 
@@ -560,7 +555,7 @@ impl AddressbookStore for SqliteAddressbookStore {
 
         Self::_restore_object(&mut *tx, principal, addressbook_id, object_id).await?;
 
-        let synctoken = log_object_operation(
+        let sync_token = log_object_operation(
             &mut tx,
             principal,
             addressbook_id,
@@ -571,16 +566,15 @@ impl AddressbookStore for SqliteAddressbookStore {
         .map_err(crate::Error::from)?;
         tx.commit().await.map_err(crate::Error::from)?;
 
-        // TODO: Watch for errors here?
-        let _ = self.sender.try_send(CollectionOperation {
-            r#type: CollectionOperationType::Object,
-            domain: CollectionOperationDomain::Addressbook,
+        if let Err(err) = self.sender.try_send(CollectionOperation {
+            data: CollectionOperationInfo::Content { sync_token },
             topic: self
                 .get_addressbook(principal, addressbook_id, false)
                 .await?
                 .push_topic,
-            sync_token: Some(synctoken),
-        });
+        }) {
+            error!("Push notification about deleted addressbook failed: {err}");
+        };
 
         Ok(())
     }
diff --git a/crates/store_sqlite/src/calendar_store.rs b/crates/store_sqlite/src/calendar_store.rs
index aa2b0bf..8cd81e8 100644
--- a/crates/store_sqlite/src/calendar_store.rs
+++ b/crates/store_sqlite/src/calendar_store.rs
@@ -6,7 +6,7 @@ use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectType};
 use rustical_store::calendar_store::CalendarQuery;
 use rustical_store::synctoken::format_synctoken;
 use rustical_store::{Calendar, CalendarStore, Error};
-use rustical_store::{CollectionOperation, CollectionOperationType};
+use rustical_store::{CollectionOperation, CollectionOperationInfo};
 use sqlx::types::chrono::NaiveDateTime;
 use sqlx::{Acquire, Executor, Sqlite, SqlitePool, Transaction};
 use tokio::sync::mpsc::Sender;
@@ -518,10 +518,8 @@ impl CalendarStore for SqliteCalendarStore {
 
         if let Some(cal) = cal {
             if let Err(err) = self.sender.try_send(CollectionOperation {
-                r#type: CollectionOperationType::Delete,
-                domain: rustical_store::CollectionOperationDomain::Calendar,
+                data: CollectionOperationInfo::Delete,
                 topic: cal.push_topic,
-                sync_token: None,
             }) {
                 error!("Push notification about deleted calendar failed: {err}");
             };
@@ -585,7 +583,7 @@ impl CalendarStore for SqliteCalendarStore {
         )
         .await?;
 
-        let synctoken = log_object_operation(
+        let sync_token = log_object_operation(
             &mut tx,
             &principal,
             &cal_id,
@@ -597,10 +595,8 @@ impl CalendarStore for SqliteCalendarStore {
         tx.commit().await.map_err(crate::Error::from)?;
 
         if let Err(err) = self.sender.try_send(CollectionOperation {
-            r#type: CollectionOperationType::Object,
-            domain: rustical_store::CollectionOperationDomain::Calendar,
+            data: CollectionOperationInfo::Content { sync_token },
             topic: self.get_calendar(&principal, &cal_id).await?.push_topic,
-            sync_token: Some(synctoken),
         }) {
             error!("Push notification about deleted calendar failed: {err}");
         };
@@ -619,15 +615,13 @@ impl CalendarStore for SqliteCalendarStore {
 
         Self::_delete_object(&mut *tx, principal, cal_id, id, use_trashbin).await?;
 
-        let synctoken =
+        let sync_token =
             log_object_operation(&mut tx, principal, cal_id, id, ChangeOperation::Delete).await?;
         tx.commit().await.map_err(crate::Error::from)?;
 
         if let Err(err) = self.sender.try_send(CollectionOperation {
-            r#type: CollectionOperationType::Object,
-            domain: rustical_store::CollectionOperationDomain::Calendar,
+            data: CollectionOperationInfo::Content { sync_token },
             topic: self.get_calendar(principal, cal_id).await?.push_topic,
-            sync_token: Some(synctoken),
         }) {
             error!("Push notification about deleted calendar failed: {err}");
         };
@@ -645,16 +639,14 @@ impl CalendarStore for SqliteCalendarStore {
 
         Self::_restore_object(&mut *tx, principal, cal_id, object_id).await?;
 
-        let synctoken =
+        let sync_token =
             log_object_operation(&mut tx, principal, cal_id, object_id, ChangeOperation::Add)
                 .await?;
         tx.commit().await.map_err(crate::Error::from)?;
 
         if let Err(err) = self.sender.try_send(CollectionOperation {
-            r#type: CollectionOperationType::Object,
-            domain: rustical_store::CollectionOperationDomain::Calendar,
+            data: CollectionOperationInfo::Content { sync_token },
             topic: self.get_calendar(principal, cal_id).await?.push_topic,
-            sync_token: Some(synctoken),
         }) {
             error!("Push notification about deleted calendar failed: {err}");
         };
diff --git a/src/app.rs b/src/app.rs
index 4b2189c..8b2a42d 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -34,6 +34,7 @@ pub fn make_app(
     frontend_config: FrontendConfig,
     oidc_config: Option,
     nextcloud_login_config: NextcloudLoginConfig,
+    dav_push_enabled: bool,
 ) -> Router<()> {
     let combined_cal_store = Arc::new(CombinedCalendarStore::new(
         cal_store.clone(),
@@ -90,6 +91,13 @@ pub fn make_app(
             nextcloud_login_router(auth_provider.clone()),
         );
     }
+
+    if dav_push_enabled {
+        router = router.merge(rustical_dav_push::subscription_service(
+            subscription_store.clone(),
+        ));
+    }
+
     router
         .layer(
             SessionManagerLayer::new(session_store)
diff --git a/src/config.rs b/src/config.rs
index a8c454f..981bc8e 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -37,9 +37,14 @@ pub struct TracingConfig {
     pub opentelemetry: bool,
 }
 
+fn default_true() -> bool {
+    true
+}
+
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(deny_unknown_fields, default)]
 pub struct DavPushConfig {
+    #[serde(default = "default_true")]
     pub enabled: bool,
     #[serde(default)]
     // Allowed Push servers, accepts any by default
diff --git a/src/main.rs b/src/main.rs
index cde30ea..362b7b7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -117,6 +117,7 @@ async fn main() -> Result<()> {
                 config.frontend.clone(),
                 config.oidc.clone(),
                 config.nextcloud_login.clone(),
+                config.dav_push.enabled,
             );
             let app = ServiceExt::::into_make_service(
                 NormalizePathLayer::trim_trailing_slash().layer(app),