Merge pull request #97 from lennart-k/feature/sharing

Fix issues with group collections

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.7.0"
+version = "0.4.13"
 edition = "2024"
 description = "A CalDAV server"
 repository = "https://github.com/lennart-k/rustical"
@@ -96,7 +96,7 @@ strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
 ical = { version = "0.11", features = ["generator", "serde"] }
-toml = "0.9"
+toml = "0.8"
 tower = "0.5"
 tower-http = { version = "0.6", features = [
   "trace",
@@ -126,7 +126,7 @@ syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
 proc-macro2 = "1.0"
 heck = "0.5"
-darling = "0.21"
+darling = "0.20"
 reqwest = { version = "0.12", features = [
   "rustls-tls",
   "charset",
@@ -135,7 +135,6 @@ 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" }
-vtimezones-rs = "0.1"
 ece = { version = "2.3", default-features = false, features = [
   "backend-openssl",
 ] }

README.md

@@ -12,14 +12,13 @@ a CalDAV/CardDAV server
 
 - easy to backup, everything saved in one SQLite database
   - also export feature in the frontend
-- **[WebDAV Push](https://github.com/bitfireAT/webdav-push/)** support, so near-instant synchronisation to DAVx5
+- [WebDAV Push](https://github.com/bitfireAT/webdav-push/) support, so near-instant synchronisation to DAVx5
 - lightweight (the container image contains only one binary)
 - adequately fast (I'd love to say blazingly fast™ :fire: but I don't have any benchmarks)
 - deleted calendars are recoverable
 - Nextcloud login flow (In DAVx5 you can login through the Nextcloud flow and automatically generate an app token)
 - Apple configuration profiles (skip copy-pasting passwords and instead generate the configuration in the frontend)
-- **OpenID Connect** support (with option to disable password login)
+- OpenID Connect support (with option to disable password login)
-- Group-based **sharing**
 
 ## Getting Started
 

compose.oidc.yml

@@ -1,22 +0,0 @@
-services:
-  rustical:
-    image: ghcr.io/lennart-k/rustical:latest
-    restart: unless-stopped
-    environment:
-      RUSTICAL_FRONTEND__ALLOW_PASSWORD_LOGIN: "false"
-      RUSTICAL_OIDC__NAME: "Authelia"
-      RUSTICAL_OIDC__ISSUER: "https://auth.example.com"
-      RUSTICAL_OIDC__CLIENT_ID: "{{ rustical_oidc_client_id }}"
-      RUSTICAL_OIDC__CLIENT_SECRET: "{{ rustical_oidc_client_secret }}"
-      RUSTICAL_OIDC__CLAIM_USERID: "preferred_username"
-      RUSTICAL_OIDC__SCOPES: '["openid", "profile", "groups"]'
-      RUSTICAL_OIDC__REQUIRE_GROUP: "app:rustical" # optional
-      RUSTICAL_OIDC__ALLOW_SIGN_UP: "true"
-    volumes:
-      - data:/var/lib/rustical
-    # Here you probably want to you expose instead
-    ports:
-      - 4000:4000
-
-volumes:
-  data:

crates/caldav/Cargo.toml

@@ -42,4 +42,3 @@ headers.workspace = true
 tower-http.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
-vtimezones-rs.workspace = true

crates/caldav/src/calendar/methods/mkcalendar.rs

@@ -82,25 +82,12 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
         request.displayname = None
     }
 
-    let mut timezone = request.calendar_timezone;
-    if let Some(tzid) = request.calendar_timezone_id.as_ref() {
-        // Validate timezone id and set timezone accordingly
-        timezone = Some(
-            vtimezones_rs::VTIMEZONES
-                .get(tzid)
-                .ok_or(rustical_dav::Error::BadRequest(format!(
-                    "Invalid timezone-id: {tzid}"
-                )))?
-                .to_string(),
-        );
-    }
-
     let calendar = Calendar {
         id: cal_id.to_owned(),
         principal: principal.to_owned(),
         order: request.calendar_order.unwrap_or(0),
         displayname: request.displayname,
-        timezone,
+        timezone: request.calendar_timezone,
         timezone_id: request.calendar_timezone_id,
         color: request.calendar_color,
         description: request.calendar_description,

crates/caldav/src/calendar/methods/report/calendar_query.rs

@@ -16,7 +16,6 @@ pub(crate) struct TimeRangeElement {
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
-// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
 struct ParamFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     is_not_defined: Option<()>,
@@ -33,13 +32,11 @@ struct TextMatchElement {
     #[xml(ty = "attr")]
     collation: String,
     #[xml(ty = "attr")]
-    // "yes" or "no", default: "no"
+    negate_collation: String,
-    negate_condition: Option<String>,
 }
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
-// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
 pub(crate) struct PropFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     is_not_defined: Option<()>,
@@ -49,9 +46,6 @@ pub(crate) struct PropFilterElement {
     text_match: Option<TextMatchElement>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
     param_filter: Vec<ParamFilterElement>,
-
-    #[xml(ty = "attr")]
-    name: String,
 }
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
@@ -67,7 +61,7 @@ pub(crate) struct CompFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
     pub(crate) comp_filter: Vec<CompFilterElement>,
 
-    #[xml(ty = "attr")]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", ty = "attr")]
     pub(crate) name: String,
 }
 
@@ -209,102 +203,3 @@ pub async fn get_objects_calendar_query<C: CalendarStore>(
     }
     Ok(objects)
 }
-
-#[cfg(test)]
-mod tests {
-    use rustical_dav::xml::PropElement;
-    use rustical_xml::XmlDocument;
-
-    use crate::{
-        calendar::methods::report::{
-            ReportRequest,
-            calendar_query::{
-                CalendarQueryRequest, CompFilterElement, FilterElement, ParamFilterElement,
-                PropFilterElement, TextMatchElement,
-            },
-        },
-        calendar_object::{CalendarObjectPropName, CalendarObjectPropWrapperName},
-    };
-
-    #[test]
-    fn calendar_query_7_8_7() {
-        const INPUT: &str = r#"
-            <?xml version="1.0" encoding="utf-8" ?>
-            <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-                <D:prop xmlns:D="DAV:">
-                    <D:getetag/>
-                    <C:calendar-data/>
-                </D:prop>
-                <C:filter>
-                <C:comp-filter name="VCALENDAR">
-                    <C:comp-filter name="VEVENT">
-                        <C:prop-filter name="ATTENDEE">
-                            <C:text-match collation="i;ascii-casemap">mailto:lisa@example.com</C:text-match>
-                            <C:param-filter name="PARTSTAT">
-                                <C:text-match collation="i;ascii-casemap">NEEDS-ACTION</C:text-match>
-                            </C:param-filter>
-                        </C:prop-filter>
-                    </C:comp-filter>
-                </C:comp-filter>
-                </C:filter>
-            </C:calendar-query>
-        "#;
-
-        let report = ReportRequest::parse_str(INPUT).unwrap();
-        let calendar_query: CalendarQueryRequest =
-            if let ReportRequest::CalendarQuery(query) = report {
-                query
-            } else {
-                panic!()
-            };
-        assert_eq!(
-            calendar_query,
-            CalendarQueryRequest {
-                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
-                    vec![
-                        CalendarObjectPropWrapperName::CalendarObject(
-                            CalendarObjectPropName::Getetag,
-                        ),
-                        CalendarObjectPropWrapperName::CalendarObject(
-                            CalendarObjectPropName::CalendarData(Default::default())
-                        ),
-                    ],
-                    vec![]
-                )),
-                filter: Some(FilterElement {
-                    comp_filter: CompFilterElement {
-                        is_not_defined: None,
-                        time_range: None,
-                        prop_filter: vec![],
-                        comp_filter: vec![CompFilterElement {
-                            prop_filter: vec![PropFilterElement {
-                                name: "ATTENDEE".to_owned(),
-                                text_match: Some(TextMatchElement {
-                                    collation: "i;ascii-casemap".to_owned(),
-                                    negate_condition: None
-                                }),
-                                is_not_defined: None,
-                                param_filter: vec![ParamFilterElement {
-                                    is_not_defined: None,
-                                    name: "PARTSTAT".to_owned(),
-                                    text_match: Some(TextMatchElement {
-                                        collation: "i;ascii-casemap".to_owned(),
-                                        negate_condition: None
-                                    }),
-                                }],
-                                time_range: None
-                            }],
-                            comp_filter: vec![],
-                            is_not_defined: None,
-                            name: "VEVENT".to_owned(),
-                            time_range: None
-                        }],
-                        name: "VCALENDAR".to_owned()
-                    }
-                }),
-                timezone: None,
-                timezone_id: None
-            }
-        )
-    }
-}

crates/caldav/src/calendar/resource.rs

@@ -15,6 +15,7 @@ use rustical_store::Calendar;
 use rustical_store::auth::Principal;
 use rustical_xml::{EnumVariants, PropName};
 use rustical_xml::{XmlDeserialize, XmlSerialize};
+use std::str::FromStr;
 
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropName")]
@@ -33,7 +34,7 @@ pub enum CalendarProp {
     CalendarTimezoneId(Option<String>),
     #[xml(ns = "rustical_dav::namespace::NS_ICAL")]
     CalendarOrder(Option<i64>),
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
     SupportedCalendarComponentSet(SupportedCalendarComponentSet),
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
     SupportedCalendarData(SupportedCalendarData),
@@ -192,22 +193,17 @@ impl Resource for CalendarResource {
                 }
                 CalendarProp::CalendarTimezone(timezone) => {
                     // TODO: Ensure that timezone-id is also updated
-                    // We probably want to prohibit non-IANA timezones
                     self.cal.timezone = timezone;
                     Ok(())
                 }
                 CalendarProp::TimezoneServiceSet(_) => Err(rustical_dav::Error::PropReadOnly),
                 CalendarProp::CalendarTimezoneId(timezone_id) => {
                     if let Some(tzid) = &timezone_id {
-                        // Validate timezone id and set timezone accordingly
+                        // Validate timezone id
-                        self.cal.timezone = Some(
+                        chrono_tz::Tz::from_str(tzid).map_err(|_| {
-                            vtimezones_rs::VTIMEZONES
+                            rustical_dav::Error::BadRequest(format!("Invalid timezone-id: {tzid}"))
-                                .get(tzid)
+                        })?;
-                                .ok_or(rustical_dav::Error::BadRequest(format!(
+                        // TODO: Ensure that timezone is also updated (For now hope that clients play nice)
-                                    "Invalid timezone-id: {tzid}"
-                                )))?
-                                .to_string(),
-                        );
                     }
                     self.cal.timezone_id = timezone_id;
                     Ok(())
@@ -309,15 +305,3 @@ impl Resource for CalendarResource {
         ))
     }
 }
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_tzdb_version() {
-        // Ensure that both chrono_tz and vzic_rs use the same tzdb version
-        assert_eq!(
-            chrono_tz::IANA_TZDB_VERSION,
-            vtimezones_rs::IANA_TZDB_VERSION
-        );
-    }
-}

crates/caldav/src/calendar/service.rs

@@ -51,7 +51,7 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
     type Principal = Principal;
     type PrincipalUri = CalDavPrincipalUri;
 
-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, webdav-push";
+    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy, webdav-push";
 
     async fn get_resource(
         &self,

crates/caldav/src/principal/mod.rs

@@ -41,6 +41,11 @@ impl Resource for PrincipalResource {
         Resourcetype(&[
             ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "collection"),
             ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "principal"),
+            // https://github.com/apple/ccs-calendarserver/blob/13c706b985fb728b9aab42dc0fef85aae21921c3/doc/Extensions/caldav-proxy.txt
+            // ResourcetypeInner(
+            //     Some(rustical_dav::namespace::NS_CALENDARSERVER),
+            //     "calendar-proxy-write",
+            // ),
         ])
     }
 
@@ -121,7 +126,7 @@ impl Resource for PrincipalResource {
     }
 
     fn get_user_privileges(&self, user: &Principal) -> Result<UserPrivilegeSet, Self::Error> {
-        Ok(UserPrivilegeSet::owner_only(
+        Ok(UserPrivilegeSet::owner_read(
             user.is_principal(&self.principal.id),
         ))
     }

crates/caldav/src/principal/service.rs

@@ -46,7 +46,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
     type Principal = Principal;
     type PrincipalUri = CalDavPrincipalUri;
 
-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
+    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy";
 
     async fn get_resource(
         &self,

crates/dav/src/resource/methods/proppatch.rs

@@ -26,21 +26,21 @@ enum SetPropertyPropWrapper<T: XmlDeserialize> {
 // We are <prop>
 #[derive(XmlDeserialize, Clone, Debug)]
 struct SetPropertyPropWrapperWrapper<T: XmlDeserialize>(
-    #[xml(ty = "untagged", flatten)] Vec<SetPropertyPropWrapper<T>>,
+    #[xml(ty = "untagged")] SetPropertyPropWrapper<T>,
 );
 
 // We are <set>
 #[derive(XmlDeserialize, Clone, Debug)]
 struct SetPropertyElement<T: XmlDeserialize> {
     #[xml(ns = "crate::namespace::NS_DAV")]
-    prop: SetPropertyPropWrapperWrapper<T>,
+    prop: T,
 }
 
 #[derive(XmlDeserialize, Clone, Debug)]
 struct TagName(#[xml(ty = "tag_name")] String);
 
 #[derive(XmlDeserialize, Clone, Debug)]
-struct PropertyElement(#[xml(ty = "untagged", flatten)] Vec<TagName>);
+struct PropertyElement(#[xml(ty = "untagged")] TagName);
 
 #[derive(XmlDeserialize, Clone, Debug)]
 struct RemovePropertyElement {
@@ -81,8 +81,9 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
     let href = path.to_owned();
 
     // Extract operations
-    let PropertyupdateElement::<<R::Resource as Resource>::Prop>(operations) =
+    let PropertyupdateElement::<SetPropertyPropWrapperWrapper<<R::Resource as Resource>::Prop>>(
-        XmlDocument::parse_str(body).map_err(Error::XmlError)?;
+        operations,
+    ) = XmlDocument::parse_str(body).map_err(Error::XmlError)?;
 
     let mut resource = resource_service
         .get_resource(path_components, false)
@@ -99,17 +100,17 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
     for operation in operations.into_iter() {
         match operation {
             Operation::Set(SetPropertyElement {
-                prop: SetPropertyPropWrapperWrapper(properties),
+                prop: SetPropertyPropWrapperWrapper(property),
             }) => {
-                for property in properties {
                 match property {
                     SetPropertyPropWrapper::Valid(prop) => {
                         let propname: <<R::Resource as Resource>::Prop as PropName>::Names =
                             prop.clone().into();
                         let (ns, propname): (Option<Namespace>, &str) = propname.into();
                         match resource.set_prop(prop) {
-                                Ok(()) => props_ok
+                            Ok(()) => {
-                                    .push((ns.map(NamespaceOwned::from), propname.to_owned())),
+                                props_ok.push((ns.map(NamespaceOwned::from), propname.to_owned()))
+                            }
                             Err(Error::PropReadOnly) => props_conflict
                                 .push((ns.map(NamespaceOwned::from), propname.to_owned())),
                             Err(err) => return Err(err.into()),
@@ -138,12 +139,9 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
                     }
                 }
             }
-            }
             Operation::Remove(remove_el) => {
-                for tagname in remove_el.prop.0 {
+                let propname = remove_el.prop.0.0;
-                    let propname = tagname.0;
+                match <<R::Resource as Resource>::Prop as PropName>::Names::from_str(&propname) {
-                    match <<R::Resource as Resource>::Prop as PropName>::Names::from_str(&propname)
-                    {
                     Ok(prop) => match resource.remove_prop(&prop) {
                         Ok(()) => props_ok.push((None, propname)),
                         Err(Error::PropReadOnly) => props_conflict.push({
@@ -158,7 +156,6 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
             }
         }
     }
-    }
 
     if props_not_found.is_empty() && props_conflict.is_empty() {
         // Only save if no errors occured

crates/dav_push/Cargo.toml

@@ -24,6 +24,7 @@ rustical_dav.workspace = true
 rustical_store.workspace = true
 http.workspace = true
 base64.workspace = true
+rand.workspace = true
 ece.workspace = true
 axum.workspace = true
 openssl.workspace = true

crates/frontend/js-components/lib/create-addressbook-form.ts

@@ -1,6 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { Ref, createRef, ref } from 'lit/directives/ref.js';
+import { createClient } from "webdav";
 import { escapeXml } from ".";
 
 @customElement("create-addressbook-form")
@@ -14,12 +15,14 @@ export class CreateAddressbookForm extends LitElement {
     return this
   }
 
+  client = createClient("/carddav")
+
   @property()
   user: string = ''
   @property()
   principal: string = ''
   @property()
-  addr_id: string = self.crypto.randomUUID()
+  addr_id: string = ''
   @property()
   displayname: string = ''
   @property()
@@ -46,7 +49,7 @@ export class CreateAddressbookForm extends LitElement {
           <br>
           <label>
             id
-            <input type="text" name="id" value=${this.addr_id} @change=${e => this.addr_id = e.target.value} />
+            <input type="text" name="id" @change=${e => this.addr_id = e.target.value} />
           </label>
           <br>
           <label>
@@ -77,12 +80,8 @@ export class CreateAddressbookForm extends LitElement {
       alert("Empty displayname")
       return
     }
-    let response = await fetch(`/carddav/principal/${this.principal || this.user}/${this.addr_id}`, {
+    await this.client.createDirectory(`/principal/${this.principal || this.user}/${this.addr_id}`, {
-      method: 'MKCOL',
+      data: `
-      headers: {
-        'Content-Type': 'application/xml'
-      },
-      body: `
       <mkcol xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
         <set>
           <prop>
@@ -92,14 +91,7 @@ export class CreateAddressbookForm extends LitElement {
         </set>
       </mkcol>
       `
-
     })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
-
     window.location.reload()
     return null
   }

crates/frontend/js-components/lib/create-calendar-form.ts

@@ -1,6 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { Ref, createRef, ref } from 'lit/directives/ref.js';
+import { createClient } from "webdav";
 import { escapeXml } from ".";
 
 @customElement("create-calendar-form")
@@ -13,19 +14,19 @@ export class CreateCalendarForm extends LitElement {
     return this
   }
 
+  client = createClient("/caldav")
+
   @property()
   user: string = ''
   @property()
   principal: string = ''
   @property()
-  cal_id: string = self.crypto.randomUUID()
+  cal_id: string = ''
   @property()
   displayname: string = ''
   @property()
   description: string = ''
   @property()
-  timezone_id: string = ''
-  @property()
   color: string = ''
   @property()
   isSubscription: boolean = false
@@ -37,6 +38,7 @@ export class CreateCalendarForm extends LitElement {
   dialog: Ref<HTMLDialogElement> = createRef()
   form: Ref<HTMLFormElement> = createRef()
 
+
   override render() {
     return html`
       <button @click=${() => this.dialog.value.showModal()}>Create calendar</button>
@@ -55,7 +57,7 @@ export class CreateCalendarForm extends LitElement {
           <br>
           <label>
             id
-            <input type="text" name="id" value=${this.cal_id} @change=${e => this.cal_id = e.target.value} />
+            <input type="text" name="id" @change=${e => this.cal_id = e.target.value} />
           </label>
           <br>
           <label>
@@ -63,11 +65,6 @@ export class CreateCalendarForm extends LitElement {
             <input type="text" name="displayname" value=${this.displayname} @change=${e => this.displayname = e.target.value} />
           </label>
           <br>
-          <label>
-            Timezone (optional)
-            <input type="text" name="timezone" .value=${this.timezone_id} @change=${e => this.timezone_id = e.target.value} />
-          </label>
-          <br>
           <label>
             Description
             <input type="text" name="description" @change=${e => this.description = e.target.value} />
@@ -122,18 +119,12 @@ export class CreateCalendarForm extends LitElement {
       alert("No calendar components selected")
       return
     }
-
+    await this.client.createDirectory(`/principal/${this.principal || this.user}/${this.cal_id}`, {
-    let response = await fetch(`/caldav/principal/${this.principal || this.user}/${this.cal_id}`, {
+      data: `
-      method: 'MKCOL',
-      headers: {
-        'Content-Type': 'application/xml'
-      },
-      body: `
       <mkcol xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
         <set>
           <prop>
             <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ''}
             ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ''}
             ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ''}
             ${(this.isSubscription && this.subscriptionUrl) ? `<CS:source><href>${escapeXml(this.subscriptionUrl)}</href></CS:source>` : ''}
@@ -145,11 +136,6 @@ export class CreateCalendarForm extends LitElement {
       </mkcol>
       `
     })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
     window.location.reload()
     return null
   }

crates/frontend/js-components/lib/edit-addressbook-form.ts

@@ -1,103 +0,0 @@
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators.js";
-import { Ref, createRef, ref } from 'lit/directives/ref.js';
-import { escapeXml } from ".";
-
-@customElement("edit-addressbook-form")
-export class EditAddressbookForm extends LitElement {
-  constructor() {
-    super()
-
-  }
-
-  protected override createRenderRoot() {
-    return this
-  }
-
-  @property()
-  principal: string = ''
-  @property()
-  addr_id: string = ''
-  @property()
-  displayname: string = ''
-  @property()
-  description: string = ''
-
-  dialog: Ref<HTMLDialogElement> = createRef()
-  form: Ref<HTMLFormElement> = createRef()
-
-  override render() {
-    return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
-      <dialog ${ref(this.dialog)}>
-        <h3>Create addressbook</h3>
-        <form @submit=${this.submit} ${ref(this.form)}>
-          <label>
-            Displayname
-            <input type="text" name="displayname" .value=${this.displayname} @change=${e => this.displayname = e.target.value} />
-          </label>
-          <br>
-          <label>
-            Description
-            <input type="text" name="description" .value=${this.description} @change=${e => this.description = e.target.value} />
-          </label>
-          <br>
-          <button type="submit">Submit</button>
-          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
-        </form>
-      </dialog>
-    `
-  }
-
-  async submit(e: SubmitEvent) {
-    e.preventDefault()
-    if (!this.principal) {
-      alert("Empty principal")
-      return
-    }
-    if (!this.addr_id) {
-      alert("Empty id")
-      return
-    }
-    if (!this.displayname) {
-      alert("Empty displayname")
-      return
-    }
-    let response = await fetch(`/carddav/principal/${this.principal}/${this.addr_id}`, {
-      method: 'PROPPATCH',
-      headers: {
-        'Content-Type': 'application/xml'
-      },
-      body: `
-      <propertyupdate xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
-        <set>
-          <prop>
-            <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.description ? `<CARD:addressbook-description>${escapeXml(this.description)}</CARD:addressbook-description>` : ''}
-          </prop>
-        </set>
-        <remove>
-          <prop>
-            ${!this.description ? '<CARD:calendar-description />' : ''}
-          </prop>
-        </remove>
-      </propertyupdate>
-      `
-
-    })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
-
-    window.location.reload()
-    return null
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    'edit-addressbook-form': EditAddressbookForm
-  }
-}

crates/frontend/js-components/lib/edit-calendar-form.ts

@@ -1,142 +0,0 @@
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators.js";
-import { Ref, createRef, ref } from 'lit/directives/ref.js';
-import { escapeXml } from ".";
-
-@customElement("edit-calendar-form")
-export class EditCalendarForm extends LitElement {
-  constructor() {
-    super()
-  }
-
-  protected override createRenderRoot() {
-    return this
-  }
-
-  @property()
-  principal: string
-  @property()
-  cal_id: string
-
-  @property()
-  displayname: string = ''
-  @property()
-  description: string = ''
-  @property()
-  timezone_id: string = ''
-  @property()
-  color: string = ''
-  @property({
-    converter: {
-      fromAttribute: (value, _type) => new Set(value ? JSON.parse(value) : []),
-      toAttribute: (value, _type) => JSON.stringify(value)
-    }
-  })
-  components: Set<"VEVENT" | "VTODO" | "VJOURNAL"> = new Set()
-
-  dialog: Ref<HTMLDialogElement> = createRef()
-  form: Ref<HTMLFormElement> = createRef()
-
-
-  override render() {
-    return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
-      <dialog ${ref(this.dialog)}>
-        <h3>Create calendar</h3>
-        <form @submit=${this.submit} ${ref(this.form)}>
-          <label>
-            Displayname
-            <input type="text" name="displayname" .value=${this.displayname} @change=${e => this.displayname = e.target.value} />
-          </label>
-          <br>
-          <label>
-            Timezone (optional)
-            <input type="text" name="timezone" .value=${this.timezone_id} @change=${e => this.timezone_id = e.target.value} />
-          </label>
-          <br>
-          <label>
-            Description
-            <input type="text" name="description" .value=${this.description} @change=${e => this.description = e.target.value} />
-          </label>
-          <br>
-          <label>
-            Color
-            <input type="color" name="color" .value=${this.color} @change=${e => this.color = e.target.value} />
-          </label>
-          <br>
-          ${["VEVENT", "VTODO", "VJOURNAL"].map(comp => html`
-            <label>
-              Support ${comp}
-              <input type="checkbox" value=${comp} ?checked=${this.components.has(comp)} @change=${e => e.target.checked ? this.components.add(e.target.value) : this.components.delete(e.target.value)} />
-            </label>
-            <br>
-          `)}
-          <br>
-          <button type="submit">Submit</button>
-          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
-      </form>
-      </dialog>
-        `
-  }
-
-  async submit(e: SubmitEvent) {
-    e.preventDefault()
-    if (!this.principal) {
-      alert("Empty principal")
-      return
-    }
-    if (!this.cal_id) {
-      alert("Empty id")
-      return
-    }
-    if (!this.displayname) {
-      alert("Empty displayname")
-      return
-    }
-    if (!this.components.size) {
-      alert("No calendar components selected")
-      return
-    }
-    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
-      method: 'PROPPATCH',
-      headers: {
-        'Content-Type': 'application/xml'
-      },
-      body: `
-      <propertyupdate xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
-        <set>
-          <prop>
-            <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ''}
-            ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ''}
-            ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ''}
-            <CAL:supported-calendar-component-set>
-              ${Array.from(this.components.keys()).map(comp => `<CAL:comp name="${escapeXml(comp)}" />`).join('\n')}
-            </CAL:supported-calendar-component-set>
-          </prop>
-        </set>
-        <remove>
-          <prop>
-            ${!this.description ? '<CAL:calendar-description />' : ''}
-            ${!this.color ? '<ICAL:calendar-color />' : ''}
-          </prop>
-        </remove>
-      </propertyupdate>
-      `
-    })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
-
-    window.location.reload()
-    return null
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    'edit-calendar-form': EditCalendarForm
-  }
-}

crates/frontend/js-components/vite.config.ts

@@ -15,9 +15,7 @@ export default defineConfig({
     rollupOptions: {
       input: [
         "lib/create-calendar-form.ts",
-        "lib/edit-calendar-form.ts",
         "lib/create-addressbook-form.ts",
-        "lib/edit-addressbook-form.ts",
         "lib/delete-button.ts",
       ],
       output: {
@@ -25,7 +23,7 @@ export default defineConfig({
         format: "es",
         manualChunks: {
           lit: ["lit"],
-          // webdav: ["webdav"],
+          webdav: ["webdav"],
         }
       }
     },

crates/frontend/public/assets/js/create-addressbook-form.mjs

@@ -1,6 +1,7 @@
 import { i, x } from "./lit-z6_uA4GX.mjs";
 import { n as n$1, t } from "./property-D0NJdseG.mjs";
 import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { a as an } from "./webdav-D0R7xCzX.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -14,9 +15,10 @@ var __decorateClass = (decorators, target, key, kind) => {
 let CreateAddressbookForm = class extends i {
   constructor() {
     super();
+    this.client = an("/carddav");
     this.user = "";
     this.principal = "";
-    this.addr_id = self.crypto.randomUUID();
+    this.addr_id = "";
     this.displayname = "";
     this.description = "";
     this.dialog = e();
@@ -43,7 +45,7 @@ let CreateAddressbookForm = class extends i {
           <br>
           <label>
             id
-            <input type="text" name="id" value=${this.addr_id} @change=${(e2) => this.addr_id = e2.target.value} />
+            <input type="text" name="id" @change=${(e2) => this.addr_id = e2.target.value} />
           </label>
           <br>
           <label>
@@ -77,12 +79,8 @@ let CreateAddressbookForm = class extends i {
       alert("Empty displayname");
       return;
     }
-    let response = await fetch(`/carddav/principal/${this.principal || this.user}/${this.addr_id}`, {
+    await this.client.createDirectory(`/principal/${this.principal || this.user}/${this.addr_id}`, {
-      method: "MKCOL",
+      data: `
-      headers: {
-        "Content-Type": "application/xml"
-      },
-      body: `
       <mkcol xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
         <set>
           <prop>
@@ -93,10 +91,6 @@ let CreateAddressbookForm = class extends i {
       </mkcol>
       `
     });
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`);
-      return null;
-    }
     window.location.reload();
     return null;
   }

crates/frontend/public/assets/js/create-calendar-form.mjs

@@ -1,6 +1,7 @@
 import { i, x } from "./lit-z6_uA4GX.mjs";
 import { n as n$1, t } from "./property-D0NJdseG.mjs";
 import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { a as an } from "./webdav-D0R7xCzX.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -14,12 +15,12 @@ var __decorateClass = (decorators, target, key, kind) => {
 let CreateCalendarForm = class extends i {
   constructor() {
     super();
+    this.client = an("/caldav");
     this.user = "";
     this.principal = "";
-    this.cal_id = self.crypto.randomUUID();
+    this.cal_id = "";
     this.displayname = "";
     this.description = "";
-    this.timezone_id = "";
     this.color = "";
     this.isSubscription = false;
     this.subscriptionUrl = "";
@@ -48,7 +49,7 @@ let CreateCalendarForm = class extends i {
           <br>
           <label>
             id
-            <input type="text" name="id" value=${this.cal_id} @change=${(e2) => this.cal_id = e2.target.value} />
+            <input type="text" name="id" @change=${(e2) => this.cal_id = e2.target.value} />
           </label>
           <br>
           <label>
@@ -56,11 +57,6 @@ let CreateCalendarForm = class extends i {
             <input type="text" name="displayname" value=${this.displayname} @change=${(e2) => this.displayname = e2.target.value} />
           </label>
           <br>
-          <label>
-            Timezone (optional)
-            <input type="text" name="timezone" .value=${this.timezone_id} @change=${(e2) => this.timezone_id = e2.target.value} />
-          </label>
-          <br>
           <label>
             Description
             <input type="text" name="description" @change=${(e2) => this.description = e2.target.value} />
@@ -118,17 +114,12 @@ let CreateCalendarForm = class extends i {
       alert("No calendar components selected");
       return;
     }
-    let response = await fetch(`/caldav/principal/${this.principal || this.user}/${this.cal_id}`, {
+    await this.client.createDirectory(`/principal/${this.principal || this.user}/${this.cal_id}`, {
-      method: "MKCOL",
+      data: `
-      headers: {
-        "Content-Type": "application/xml"
-      },
-      body: `
       <mkcol xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
         <set>
           <prop>
             <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ""}
             ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ""}
             ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ""}
             ${this.isSubscription && this.subscriptionUrl ? `<CS:source><href>${escapeXml(this.subscriptionUrl)}</href></CS:source>` : ""}
@@ -140,10 +131,6 @@ let CreateCalendarForm = class extends i {
       </mkcol>
       `
     });
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`);
-      return null;
-    }
     window.location.reload();
     return null;
   }
@@ -163,9 +150,6 @@ __decorateClass([
 __decorateClass([
   n$1()
 ], CreateCalendarForm.prototype, "description", 2);
-__decorateClass([
-  n$1()
-], CreateCalendarForm.prototype, "timezone_id", 2);
 __decorateClass([
   n$1()
 ], CreateCalendarForm.prototype, "color", 2);

crates/frontend/public/assets/js/edit-addressbook-form.mjs

@@ -1,113 +0,0 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i2 = decorators.length - 1, decorator; i2 >= 0; i2--)
-    if (decorator = decorators[i2])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
-let EditAddressbookForm = class extends i {
-  constructor() {
-    super();
-    this.principal = "";
-    this.addr_id = "";
-    this.displayname = "";
-    this.description = "";
-    this.dialog = e();
-    this.form = e();
-  }
-  createRenderRoot() {
-    return this;
-  }
-  render() {
-    return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
-      <dialog ${n(this.dialog)}>
-        <h3>Create addressbook</h3>
-        <form @submit=${this.submit} ${n(this.form)}>
-          <label>
-            Displayname
-            <input type="text" name="displayname" .value=${this.displayname} @change=${(e2) => this.displayname = e2.target.value} />
-          </label>
-          <br>
-          <label>
-            Description
-            <input type="text" name="description" .value=${this.description} @change=${(e2) => this.description = e2.target.value} />
-          </label>
-          <br>
-          <button type="submit">Submit</button>
-          <button type="submit" @click=${(event) => {
-      event.preventDefault();
-      this.dialog.value.close();
-      this.form.value.reset();
-    }} class="cancel">Cancel</button>
-        </form>
-      </dialog>
-    `;
-  }
-  async submit(e2) {
-    e2.preventDefault();
-    if (!this.principal) {
-      alert("Empty principal");
-      return;
-    }
-    if (!this.addr_id) {
-      alert("Empty id");
-      return;
-    }
-    if (!this.displayname) {
-      alert("Empty displayname");
-      return;
-    }
-    let response = await fetch(`/carddav/principal/${this.principal}/${this.addr_id}`, {
-      method: "PROPPATCH",
-      headers: {
-        "Content-Type": "application/xml"
-      },
-      body: `
-      <propertyupdate xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
-        <set>
-          <prop>
-            <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.description ? `<CARD:addressbook-description>${escapeXml(this.description)}</CARD:addressbook-description>` : ""}
-          </prop>
-        </set>
-        <remove>
-          <prop>
-            ${!this.description ? "<CARD:calendar-description />" : ""}
-          </prop>
-        </remove>
-      </propertyupdate>
-      `
-    });
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`);
-      return null;
-    }
-    window.location.reload();
-    return null;
-  }
-};
-__decorateClass([
-  n$1()
-], EditAddressbookForm.prototype, "principal", 2);
-__decorateClass([
-  n$1()
-], EditAddressbookForm.prototype, "addr_id", 2);
-__decorateClass([
-  n$1()
-], EditAddressbookForm.prototype, "displayname", 2);
-__decorateClass([
-  n$1()
-], EditAddressbookForm.prototype, "description", 2);
-EditAddressbookForm = __decorateClass([
-  t("edit-addressbook-form")
-], EditAddressbookForm);
-export {
-  EditAddressbookForm
-};

crates/frontend/public/assets/js/edit-calendar-form.mjs

@@ -1,156 +0,0 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i2 = decorators.length - 1, decorator; i2 >= 0; i2--)
-    if (decorator = decorators[i2])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
-let EditCalendarForm = class extends i {
-  constructor() {
-    super();
-    this.displayname = "";
-    this.description = "";
-    this.timezone_id = "";
-    this.color = "";
-    this.components = /* @__PURE__ */ new Set();
-    this.dialog = e();
-    this.form = e();
-  }
-  createRenderRoot() {
-    return this;
-  }
-  render() {
-    return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
-      <dialog ${n(this.dialog)}>
-        <h3>Create calendar</h3>
-        <form @submit=${this.submit} ${n(this.form)}>
-          <label>
-            Displayname
-            <input type="text" name="displayname" .value=${this.displayname} @change=${(e2) => this.displayname = e2.target.value} />
-          </label>
-          <br>
-          <label>
-            Timezone (optional)
-            <input type="text" name="timezone" .value=${this.timezone_id} @change=${(e2) => this.timezone_id = e2.target.value} />
-          </label>
-          <br>
-          <label>
-            Description
-            <input type="text" name="description" .value=${this.description} @change=${(e2) => this.description = e2.target.value} />
-          </label>
-          <br>
-          <label>
-            Color
-            <input type="color" name="color" .value=${this.color} @change=${(e2) => this.color = e2.target.value} />
-          </label>
-          <br>
-          ${["VEVENT", "VTODO", "VJOURNAL"].map((comp) => x`
-            <label>
-              Support ${comp}
-              <input type="checkbox" value=${comp} ?checked=${this.components.has(comp)} @change=${(e2) => e2.target.checked ? this.components.add(e2.target.value) : this.components.delete(e2.target.value)} />
-            </label>
-            <br>
-          `)}
-          <br>
-          <button type="submit">Submit</button>
-          <button type="submit" @click=${(event) => {
-      event.preventDefault();
-      this.dialog.value.close();
-      this.form.value.reset();
-    }} class="cancel">Cancel</button>
-      </form>
-      </dialog>
-        `;
-  }
-  async submit(e2) {
-    e2.preventDefault();
-    if (!this.principal) {
-      alert("Empty principal");
-      return;
-    }
-    if (!this.cal_id) {
-      alert("Empty id");
-      return;
-    }
-    if (!this.displayname) {
-      alert("Empty displayname");
-      return;
-    }
-    if (!this.components.size) {
-      alert("No calendar components selected");
-      return;
-    }
-    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
-      method: "PROPPATCH",
-      headers: {
-        "Content-Type": "application/xml"
-      },
-      body: `
-      <propertyupdate xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
-        <set>
-          <prop>
-            <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ""}
-            ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ""}
-            ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ""}
-            <CAL:supported-calendar-component-set>
-              ${Array.from(this.components.keys()).map((comp) => `<CAL:comp name="${escapeXml(comp)}" />`).join("\n")}
-            </CAL:supported-calendar-component-set>
-          </prop>
-        </set>
-        <remove>
-          <prop>
-            ${!this.description ? "<CAL:calendar-description />" : ""}
-            ${!this.color ? "<ICAL:calendar-color />" : ""}
-          </prop>
-        </remove>
-      </propertyupdate>
-      `
-    });
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`);
-      return null;
-    }
-    window.location.reload();
-    return null;
-  }
-};
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "principal", 2);
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "cal_id", 2);
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "displayname", 2);
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "description", 2);
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "timezone_id", 2);
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "color", 2);
-__decorateClass([
-  n$1({
-    converter: {
-      fromAttribute: (value, _type) => new Set(value ? JSON.parse(value) : []),
-      toAttribute: (value, _type) => JSON.stringify(value)
-    }
-  })
-], EditCalendarForm.prototype, "components", 2);
-EditCalendarForm = __decorateClass([
-  t("edit-calendar-form")
-], EditCalendarForm);
-export {
-  EditCalendarForm
-};

crates/frontend/public/assets/style.css

@@ -224,15 +224,15 @@ ul.collection-list {
       min-height: 80px;
       height: fit-content;
       grid-template-areas:
-        ".                color-chip"
+        ".                .                 color-chip"
-        "title            color-chip"
+        "title            comps             color-chip"
-        "description      color-chip"
+        "description      description       color-chip"
-        "subscription-url color-chip"
+        "subscription-url subscription-url  color-chip"
-        "metadata         color-chip"
+        "metadata         metadata          color-chip"
-        "actions          color-chip"
+        "actions          actions           color-chip"
-        ".                color-chip";
+        ".                .                 color-chip";
       grid-template-rows: 12px auto auto auto auto auto 12px;
-      grid-template-columns: auto 80px;
+      grid-template-columns: min-content auto 80px;
       row-gap: 4px;
       color: inherit;
       text-decoration: none;
@@ -260,7 +260,7 @@ ul.collection-list {
       }
 
       .comps {
-        display: inline;
+        grid-area: comps;
 
         span {
           margin: 0 2px;
@@ -293,7 +293,6 @@ ul.collection-list {
       }
 
       .actions {
-        pointer-events: all;
         grid-area: actions;
         width: fit-content;
         display: flex;

crates/frontend/public/templates/components/sections/addressbooks_section.html

@@ -16,12 +16,6 @@
           method="GET">
           <button type="submit">Download</button>
         </form>
-        <edit-addressbook-form
-          principal="{{ addressbook.principal }}"
-          addr_id="{{ addressbook.id }}"
-          displayname="{{ addressbook.displayname.as_deref().unwrap_or_default() }}"
-          description="{{ addressbook.description.as_deref().unwrap_or_default() }}"
-        ></edit-addressbook-form>
         <delete-button trash
           href="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}"></delete-button>
       </div>

crates/frontend/public/templates/components/sections/calendars_section.html

@@ -8,12 +8,12 @@
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
         {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+      </span>
       <div class="comps">
         {% for comp in calendar.components %}
         <span>{{ comp }}</span>
         {% endfor %}
       </div>
-      </span>
       <span class="description">
         {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
       </span>
@@ -25,15 +25,6 @@
           <button type="submit">Download</button>
         </form>
         {% if !calendar.id.starts_with("_birthdays_") %}
-        <edit-calendar-form
-          principal="{{ calendar.principal }}"
-          cal_id="{{ calendar.id }}"
-          timezone_id="{{ calendar.timezone_id.as_deref().unwrap_or_default() }}"
-          displayname="{{ calendar.displayname.as_deref().unwrap_or_default() }}"
-          description="{{ calendar.description.as_deref().unwrap_or_default() }}"
-          color="{{ calendar.color.as_deref().unwrap_or_default() }}"
-          components="{{ calendar.components | json }}"
-        ></edit-calendar-form>
         <delete-button trash href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
         {% endif %}
       </div>
@@ -58,12 +49,12 @@
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
         {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+      </span>
       <div class="comps">
         {% for comp in calendar.components %}
         <span>{{ comp }}</span>
         {% endfor %}
       </div>
-      </span>
       <span class="description">
         {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
       </span>

crates/frontend/public/templates/icons/calendar.svg

@@ -1,4 +1,5 @@
 <!-- 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>

crates/frontend/public/templates/icons/group.svg

@@ -1,4 +1,5 @@
 <!-- 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>

crates/frontend/public/templates/icons/user.svg

@@ -1,4 +1,5 @@
 <!-- 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>

crates/frontend/public/templates/layouts/default.html

@@ -22,9 +22,9 @@
   <div id="app">
     {% block content %}<p>Placeholder</p>{% endblock %}
   </div>
+</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>
-</body>
 </html>

crates/frontend/public/templates/pages/user.html

@@ -6,9 +6,7 @@
 window.rusticalUser = JSON.parse(document.querySelector('#data-rustical-user').innerHTML)
 </script>
 <script type="module" src="/frontend/assets/js/create-calendar-form.mjs" async></script>
-<script type="module" src="/frontend/assets/js/edit-calendar-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/create-addressbook-form.mjs" async></script>
-<script type="module" src="/frontend/assets/js/edit-addressbook-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/delete-button.mjs" async></script>
 {% endblock %}
 {% block header_center %}

crates/frontend/src/lib.rs

@@ -148,7 +148,8 @@ async fn unauthorized_handler(mut request: Request, next: Next) -> Response {
                     <body>
                         Unauthorized, redirecting to <a href="{login_url}">login page</a>
                     </body>
-</html>"#,
+                <html>
+            "#,
             )))
             .unwrap();
     }

crates/frontend/src/routes/app_token.rs

@@ -56,13 +56,9 @@ pub async fn route_post_app_token<AP: AuthenticationProvider>(
     assert!(!name.is_empty());
     assert_eq!(user_id, user.id);
     let token = generate_app_token();
-    let mut token_id = auth_provider
+    auth_provider
         .add_app_token(&user.id, name.to_owned(), token.clone())
         .await?;
-    // Get first 4 characters of token identifier
-    token_id.truncate(4);
-    // This will be a hint for the token validator which app token hash to verify against
-    let token = format!("{token_id}_{token}");
     if apple {
         let profile = AppleConfig {
             token_name: name,

crates/ical/src/icalendar/object.rs

@@ -15,11 +15,8 @@ use std::{collections::HashMap, io::BufReader};
 #[derive(Debug, Clone, Serialize, PartialEq, Eq, Display)]
 // specified in https://datatracker.ietf.org/doc/html/rfc5545#section-3.6
 pub enum CalendarObjectType {
-    #[serde(rename = "VEVENT")]
     Event = 0,
-    #[serde(rename = "VTODO")]
     Todo = 1,
-    #[serde(rename = "VJOURNAL")]
     Journal = 2,
 }
 

crates/ical/src/timestamp.rs

@@ -208,7 +208,7 @@ impl CalDateTime {
         matches!(&self, Self::Date(_, _))
     }
 
-    pub fn as_datetime(&self) -> Cow<'_, DateTime<CalTimezone>> {
+    pub fn as_datetime(&self) -> Cow<DateTime<CalTimezone>> {
         match self {
             Self::DateTime(datetime) => Cow::Borrowed(datetime),
             Self::Date(date, tz) => Cow::Owned(

crates/store/Cargo.toml

@@ -22,6 +22,7 @@ chrono-tz = { workspace = true }
 derive_more = { workspace = true, features = ["as_ref"] }
 rustical_xml.workspace = true
 tokio.workspace = true
+rand.workspace = true
 clap.workspace = true
 rustical_dav.workspace = true
 rustical_ical.workspace = true

crates/store_sqlite/src/principal_store.rs

@@ -149,23 +149,8 @@ impl AuthenticationProvider for SqlitePrincipalStore {
         user_id: &str,
         token: &str,
     ) -> Result<Option<Principal>, Error> {
-        #[instrument(skip(password))]
-        fn verify_password(password: &str, hash: &str) -> Result<(), password_auth::VerifyError> {
-            password_auth::verify_password(password, hash)
-        }
-
-        // Allow to specify the token id to use to make validation faster
-        // Doesn't match the whole length of the token id to keep the length in bounds
-        // Example: asd_selgkh
-        // where the app token id starts with asd and its value is selgkh
-        let (token_id_prefix, token) = token.split_once('_').unwrap_or(("", token));
-
         for app_token in &self.get_app_tokens(user_id).await? {
-            // Wrong token id
+            if password_auth::verify_password(token, app_token.token.as_ref()).is_ok() {
-            if !app_token.id.starts_with(token_id_prefix) {
-                continue;
-            }
-            if verify_password(token, app_token.token.as_ref()).is_ok() {
                 return self.get_principal(user_id).await;
             }
         }
@@ -221,10 +206,7 @@ impl AuthenticationProvider for SqlitePrincipalStore {
                 None,
                 None,
                 Params {
-                    // The app token has a high entropy so we are quite safe from quessing attacks
+                    rounds: 10,
-                    // Also if an attacker got access to the hashes they'd have already gotten
-                    // access to the whole database.
-                    rounds: 2,
                     ..Default::default()
                 },
                 &salt,

crates/store_sqlite/src/subscription_store.rs

@@ -31,11 +31,6 @@ impl SubscriptionStore for SqliteStore {
     }
 
     async fn upsert_subscription(&self, sub: Subscription) -> Result<bool, Error> {
-        let already_exists = match self.get_subscription(&sub.id).await {
-            Ok(_) => true,
-            Err(Error::NotFound) => false,
-            Err(err) => return Err(err),
-        };
         sqlx::query!(
             r#"INSERT OR REPLACE INTO davpush_subscriptions (id, topic, expiration, push_resource, public_key, public_key_type, auth_secret) VALUES (?, ?, ?, ?, ?, ?, ?)"#,
             sub.id,
@@ -46,7 +41,8 @@ impl SubscriptionStore for SqliteStore {
             sub.public_key_type,
             sub.auth_secret
         ).execute(&self.db).await.map_err(crate::Error::from)?;
-        Ok(already_exists)
+        // TODO: Correctly return whether a subscription already existed
+        Ok(false)
     }
     async fn delete_subscription(&self, id: &str) -> Result<(), Error> {
         sqlx::query!(r#"DELETE FROM davpush_subscriptions WHERE id = ? "#, id)

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>,
+                    reader: &mut quick_xml::NsReader<R>,
-                    start: &::quick_xml::events::BytesStart,
+                    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>,
+                    reader: &mut quick_xml::NsReader<R>,
-                    start: &::quick_xml::events::BytesStart,
+                    start: &quick_xml::events::BytesStart,
                     empty: bool
                 ) -> Result<Self, rustical_xml::XmlError> {
                     let (_ns, name) = reader.resolve_element(start.name());

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>,
+                    reader: &mut quick_xml::NsReader<R>,
-                    start: &::quick_xml::events::BytesStart,
+                    start: &quick_xml::events::BytesStart,
                     empty: bool
                 ) -> Result<Self, rustical_xml::XmlError> {
                     use quick_xml::events::Event;

docs/index.md

@@ -8,20 +8,17 @@ a CalDAV/CardDAV server
     you'd still be one of the first testers so expect bugs and rough edges.
     If you still want to play around with it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
 
-[Installation](installation/index.md){ .md-button }
-
 ## Features
 
 - easy to backup, everything saved in one SQLite database
   - also export feature in the frontend
-- **[WebDAV Push](https://github.com/bitfireAT/webdav-push/)** support, so near-instant synchronisation to DAVx5
+- [WebDAV Push](https://github.com/bitfireAT/webdav-push/) support, so near-instant synchronisation to DAVx5
 - lightweight (the container image contains only one binary)
 - adequately fast (I'd love to say blazingly fast™ :fire: but I don't have any benchmarks)
 - deleted calendars are recoverable
 - Nextcloud login flow (In DAVx5 you can login through the Nextcloud flow and automatically generate an app token)
 - Apple configuration profiles (skip copy-pasting passwords and instead generate the configuration in the frontend)
-- **[OpenID Connect](setup/oidc.md)** support (with option to disable password login)
+- [OpenID Connect](setup/oidc.md) support (with option to disable password login)
-- Group-based **sharing**
 
 ## Tested Clients
 

docs/installation/index.md

@@ -16,9 +16,6 @@ docker run \
 1. Mount config file
 2. Alternatively specify configuration using environment variables
 
-!!! info
-    Note that you are expected to run RustiCal behind a reverse proxy with HTTPS. (The frontend will only work on non-localhost addresses with https) and clients like Apple Calendar also expect HTTPS.
-
 ## User management
 
 In case you already have an OIDC server set up, see [here](setup/oidc.md) how to set up OIDC login and maybe skip this section.

docs/setup/client.md

@@ -72,9 +72,3 @@ For group collections explicitly specify
 ```
 https://<your-host>/caldav-compat/principal/<principal>
 ```
-
-## Thunderbird
-
-- Go to `New Account -> Calendar -> On The Network`
-- Specify the root path of RustiCal
-- Thunderbird will properly discover group calendars

src/app.rs

@@ -1,13 +1,10 @@
 use crate::config::NextcloudLoginConfig;
 use axum::Router;
-use axum::body::{Body, HttpBody};
+use axum::body::Body;
 use axum::extract::Request;
-use axum::middleware::Next;
 use axum::response::{Redirect, Response};
 use axum::routing::{any, options};
-use axum_extra::TypedHeader;
 use headers::{HeaderMapExt, UserAgent};
-use http::header::CONNECTION;
 use http::{HeaderValue, StatusCode};
 use rustical_caldav::caldav_router;
 use rustical_carddav::carddav_router;
@@ -61,17 +58,7 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
         ))
         .route(
             "/.well-known/caldav",
-            any(async |TypedHeader(ua): TypedHeader<UserAgent>| {
+            any(async || Redirect::permanent("/caldav")),
-                if ua.as_str().contains("remindd") || ua.as_str().contains("dataaccessd") {
-                    // 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",
@@ -180,21 +167,4 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
                     },
                 ),
         )
-        .layer(axum::middleware::from_fn(
-            async |req: Request, next: Next| {
-                // Closes the connection if the request body might've not been fully consumed
-                // Otherwise subsequent requests reusing the connection might fail.
-                // See https://github.com/lennart-k/rustical/issues/77
-                let body_empty = req.body().is_end_stream();
-                let mut response = next.run(req).await;
-                if !body_empty
-                    && (response.status().is_server_error() || response.status().is_client_error())
-                {
-                    response
-                        .headers_mut()
-                        .insert(CONNECTION, HeaderValue::from_static("close"));
-                }
-                response
-            },
-        ))
 }