Add /.well-known/caldav exception for Apple Calendar

frontend: Fix some HTML syntax errors
rustical_xml: Add :: prefix to quick_xml imports
2025-12-13 13:32:16 +00:00 · 2025-07-20 13:10:52 +02:00 · 2025-07-19 17:50:14 +02:00 · 2025-07-19 16:23:43 +02:00
8 changed files with 30 additions and 23 deletions
--- a/crates/frontend/public/templates/icons/calendar.svg
+++ b/crates/frontend/public/templates/icons/calendar.svg
@@ -1,5 +1,4 @@
 <!-- Adapted from https://iconoir.com/ -->
-<?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="icon">
  <path d="M15 4V2M15 4V6M15 4H10.5M3 10V19C3 20.1046 3.89543 21 5 21H19C20.1046 21 21 20.1046 21 19V10H3Z" stroke-linecap="round" stroke-linejoin="round"></path>
  <path d="M3 10V6C3 4.89543 3.89543 4 5 4H7" stroke-linecap="round" stroke-linejoin="round"></path>
--- a/crates/frontend/public/templates/icons/group.svg
+++ b/crates/frontend/public/templates/icons/group.svg
@@ -1,5 +1,4 @@
 <!-- Adapted from https://iconoir.com/ -->
-<?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="icon">
  <path d="M1 20V19C1 15.134 4.13401 12 8 12V12C11.866 12 15 15.134 15 19V20" stroke-linecap="round"></path>
  <path d="M13 14V14C13 11.2386 15.2386 9 18 9V9C20.7614 9 23 11.2386 23 14V14.5" stroke-linecap="round"></path>
--- a/crates/frontend/public/templates/icons/user.svg
+++ b/crates/frontend/public/templates/icons/user.svg
@@ -1,5 +1,4 @@
 <!-- Adapted from https://iconoir.com/ -->
-<?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="icon">
  <path d="M5 20V19C5 15.134 8.13401 12 12 12V12C15.866 12 19 15.134 19 19V20" stroke-linecap="round" stroke-linejoin="round"></path>
  <path d="M12 12C14.2091 12 16 10.2091 16 8C16 5.79086 14.2091 4 12 4C9.79086 4 8 5.79086 8 8C8 10.2091 9.79086 12 12 12Z" stroke-linecap="round" stroke-linejoin="round"></path>
--- a/crates/frontend/public/templates/layouts/default.html
+++ b/crates/frontend/public/templates/layouts/default.html
@@ -22,9 +22,9 @@
  <div id="app">
    {% block content %}<p>Placeholder</p>{% endblock %}
  </div>
+  <footer>
+      <a href="{{ env!("CARGO_PKG_REPOSITORY") }}" target="_blank">RustiCal {{ env!("CARGO_PKG_VERSION") }}</a>
+      <a href="/frontend/assets/licenses.html" target="_blank">Open Source Licenses</a>
+  </footer>
 </body>
-<footer>
-    <a href="{{ env!("CARGO_PKG_REPOSITORY") }}" target="_blank">RustiCal {{ env!("CARGO_PKG_VERSION") }}</a>
-    <a href="/frontend/assets/licenses.html" target="_blank">Open Source Licenses</a>
-</footer>
 </html>
--- a/crates/frontend/src/lib.rs
+++ b/crates/frontend/src/lib.rs
@@ -141,15 +141,14 @@ async fn unauthorized_handler(mut request: Request, next: Next) -> Response {
        return resp
            .body(Body::new(format!(
                r#"<!Doctype html>
-                <html>
-                    <head>
-                        <meta http-equiv="refresh" content="1; url={login_url}" />
-                    </head>
-                    <body>
-                        Unauthorized, redirecting to <a href="{login_url}">login page</a>
-                    </body>
-                <html>
-            "#,
+<html>
+    <head>
+        <meta http-equiv="refresh" content="1; url={login_url}" />
+    </head>
+    <body>
+        Unauthorized, redirecting to <a href="{login_url}">login page</a>
+    </body>
+</html>"#,
            )))
            .unwrap();
    }
--- a/crates/xml/derive/src/xml_enum/impl_de.rs
+++ b/crates/xml/derive/src/xml_enum/impl_de.rs
@@ -16,8 +16,8 @@ impl Enum {
        quote! {
            impl #impl_generics ::rustical_xml::XmlDeserialize for #name #type_generics #where_clause {
                fn deserialize<R: ::std::io::BufRead>(
-                    reader: &mut quick_xml::NsReader<R>,
-                    start: &quick_xml::events::BytesStart,
+                    reader: &mut ::quick_xml::NsReader<R>,
+                    start: &::quick_xml::events::BytesStart,
                    empty: bool
                ) -> Result<Self, rustical_xml::XmlError> {
                    #(#variant_branches);*
@@ -37,8 +37,8 @@ impl Enum {
        quote! {
            impl #impl_generics ::rustical_xml::XmlDeserialize for #name #type_generics #where_clause {
                fn deserialize<R: std::io::BufRead>(
-                    reader: &mut quick_xml::NsReader<R>,
-                    start: &quick_xml::events::BytesStart,
+                    reader: &mut ::quick_xml::NsReader<R>,
+                    start: &::quick_xml::events::BytesStart,
                    empty: bool
                ) -> Result<Self, rustical_xml::XmlError> {
                    let (_ns, name) = reader.resolve_element(start.name());
--- a/crates/xml/derive/src/xml_struct/mod.rs
+++ b/crates/xml/derive/src/xml_struct/mod.rs
@@ -118,8 +118,8 @@ impl NamedStruct {
        quote! {
            impl #impl_generics ::rustical_xml::XmlDeserialize for #ident #type_generics #where_clause {
                fn deserialize<R: ::std::io::BufRead>(
-                    reader: &mut quick_xml::NsReader<R>,
-                    start: &quick_xml::events::BytesStart,
+                    reader: &mut ::quick_xml::NsReader<R>,
+                    start: &::quick_xml::events::BytesStart,
                    empty: bool
                ) -> Result<Self, rustical_xml::XmlError> {
                    use quick_xml::events::Event;
--- a/src/app.rs
+++ b/src/app.rs
@@ -4,6 +4,7 @@ use axum::body::Body;
 use axum::extract::Request;
 use axum::response::{Redirect, Response};
 use axum::routing::{any, options};
+use axum_extra::TypedHeader;
 use headers::{HeaderMapExt, UserAgent};
 use http::{HeaderValue, StatusCode};
 use rustical_caldav::caldav_router;
@@ -58,7 +59,17 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
        ))
        .route(
            "/.well-known/caldav",
-            any(async || Redirect::permanent("/caldav")),
+            any(async |TypedHeader(ua): TypedHeader<UserAgent>| {
+                if ua.as_str().contains("remindd") {
+                    // remindd is an Apple Calendar User Agent
+                    // Even when explicitly configuring a principal URL in Apple Calendar Apple
+                    // will not respect that configuration but call /.well-known/caldav,
+                    // so sadly we have to do this user-agent filtering. :(
+                    // (I should have never gotten an Apple device)
+                    return Redirect::permanent("/caldav-compat");
+                }
+                Redirect::permanent("/caldav")
+            }),
        )
        .merge(carddav_router(
            "/carddav",
Author	SHA1	Message	Date
Lennart	507cb77e85	Add /.well-known/caldav exception for Apple Calendar	2025-07-20 13:10:52 +02:00
Lennart	8881ea2a05	frontend: Fix some HTML syntax errors	2025-07-19 17:50:14 +02:00
Lennart	119e17a8e1	rustical_xml: Add :: prefix to quick_xml imports	2025-07-19 16:23:43 +02:00