version 0.4.6

see #87

.editorconfig

@@ -2,3 +2,5 @@
 indent_style = space
 indent_size = 4
 
+[docs/**/*.md]
+indent_size = 4

Cargo.lock

@@ -2754,7 +2754,7 @@ dependencies = [
 
 [[package]]
 name = "rustical"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "anyhow",
  "argon2",
@@ -2797,7 +2797,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_caldav"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "async-trait",
  "axum",
@@ -2816,6 +2816,7 @@ dependencies = [
  "rustical_dav_push",
  "rustical_ical",
  "rustical_store",
+ "rustical_store_sqlite",
  "rustical_xml",
  "serde",
  "sha2",
@@ -2832,7 +2833,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_carddav"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "async-trait",
  "axum",
@@ -2864,7 +2865,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "async-trait",
  "axum",
@@ -2889,7 +2890,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav_push"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "async-trait",
  "axum",
@@ -2915,7 +2916,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_frontend"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "askama",
  "askama_web",
@@ -2948,7 +2949,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_ical"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "axum",
  "chrono",
@@ -2966,7 +2967,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_oidc"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "async-trait",
  "axum",
@@ -2981,7 +2982,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3015,7 +3016,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store_sqlite"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "async-trait",
  "chrono",
@@ -3035,7 +3036,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_xml"
-version = "0.4.4"
+version = "0.4.6"
 dependencies = [
  "quick-xml",
  "thiserror 2.0.12",

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.4.4"
+version = "0.4.6"
 edition = "2024"
 description = "A CalDAV server"
 repository = "https://github.com/lennart-k/rustical"

Dockerfile

@@ -1,11 +1,11 @@
-FROM --platform=$BUILDPLATFORM rust:1.86-alpine AS chef
+FROM --platform=$BUILDPLATFORM rust:1.88-alpine AS chef
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 
 # the compiler will otherwise ask for aarch64-linux-musl-gcc
 ENV CC_aarch64_unknown_linux_musl="clang"
-ENV AR_aarch64_unknown_linux_musl="llvm-ar"
+ENV AR_aarch64_unknown_linux_musl="llvm20-ar"
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-Clink-self-contained=yes -Clinker=rust-lld"
 
 # Stupid workaound with tempfiles since environment variables
@@ -16,7 +16,7 @@ RUN case $TARGETPLATFORM in \
   *) echo "Unsupported platform ${TARGETPLATFORM}"; exit 1;;  \
   esac
 
-RUN apk add --no-cache musl-dev llvm19 clang perl pkgconf make \
+RUN apk add --no-cache musl-dev llvm20 clang perl pkgconf make \
   && rustup target add "$(cat /tmp/rust_target)" \
   && cargo install cargo-chef --locked \
   && rm -rf "$CARGO_HOME/registry"

Justfile

@@ -1,2 +1,14 @@
 licenses:
   cargo about generate about.hbs > crates/frontend/public/assets/licenses.html
+
+frontend-dev:
+  cd crates/frontend/js-components && deno task dev
+
+frontend-build:
+  cd crates/frontend/js-components && deno task build
+
+docs:
+  mkdocs build
+
+docs-dev:
+  mkdocs serve

README.md

@@ -3,9 +3,9 @@
 a CalDAV/CardDAV server
 
 > [!WARNING]
-  RustiCal is **not production-ready!**
+  RustiCal is under **active development**!
-  I've been using RustiCal for the last few weeks and I'm slowly becoming more confident,
+  While I've been successfully using RustiCal productively for a few weeks now,
-  however you'd be one of the first testers so expect bugs and rough edges.
+  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. :)
 
 ## Features

crates/caldav/Cargo.toml

@@ -7,6 +7,9 @@ repository.workspace = true
 license.workspace = true
 publish = false
 
+[dev-dependencies]
+rustical_store_sqlite = { workspace = true, features = ["test"] }
+
 [dependencies]
 axum.workspace = true
 axum-extra.workspace = true

crates/caldav/src/principal/mod.rs

@@ -11,8 +11,10 @@ mod service;
 pub use service::*;
 mod prop;
 pub use prop::*;
+#[cfg(test)]
+pub mod tests;
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct PrincipalResource {
     principal: Principal,
     members: Vec<String>,

crates/caldav/src/principal/tests.rs

@@ -0,0 +1,39 @@
+use crate::principal::PrincipalResourceService;
+use rustical_dav::resource::ResourceService;
+use rustical_store::auth::{AuthenticationProvider, Principal, PrincipalType};
+use rustical_store_sqlite::tests::get_test_stores;
+
+#[tokio::test]
+async fn test_principal_resource() {
+    let (_, cal_store, sub_store, auth_provider, _) = get_test_stores().await;
+    let service = PrincipalResourceService {
+        cal_store,
+        sub_store,
+        auth_provider: auth_provider.clone(),
+    };
+
+    auth_provider
+        .insert_principal(
+            Principal {
+                id: "user".to_owned(),
+                displayname: None,
+                memberships: vec![],
+                password: None,
+                principal_type: PrincipalType::Individual,
+            },
+            true,
+        )
+        .await
+        .unwrap();
+
+    assert!(matches!(
+        service.get_resource(&("anonymous".to_owned(),), true).await,
+        Err(crate::Error::NotFound)
+    ));
+
+    let _principal_resource = service
+        .get_resource(&("user".to_owned(),), true)
+        .await
+        .unwrap();
+}
+

crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs

@@ -58,6 +58,7 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
     Ok((result, not_found))
 }
 
+#[allow(clippy::too_many_arguments)]
 pub async fn handle_addressbook_multiget<AS: AddressbookStore>(
     addr_multiget: &AddressbookMultigetRequest,
     prop: &PropfindType<AddressObjectPropWrapperName>,

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

@@ -50,7 +50,7 @@ export class CreateAddressbookForm extends LitElement {
           </label>
           <br>
           <button type="submit">Create</button>
-          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }}> Cancel </button>
+          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
         </form>
       </dialog>
     `

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

@@ -73,7 +73,7 @@ export class CreateCalendarForm extends LitElement {
           `)}
           <br>
           <button type="submit">Create</button>
-          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }}> Cancel </button>
+          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
       </form>
       </dialog>
         `

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

@@ -52,7 +52,7 @@ let CreateAddressbookForm = class extends i {
       event.preventDefault();
       this.dialog.value.close();
       this.form.value.reset();
-    }}> Cancel </button>
+    }} class="cancel">Cancel</button>
         </form>
       </dialog>
     `;

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

@@ -72,7 +72,7 @@ let CreateCalendarForm = class extends i {
       event.preventDefault();
       this.dialog.value.close();
       this.form.value.reset();
-    }}> Cancel </button>
+    }} class="cancel">Cancel</button>
       </form>
       </dialog>
         `;

crates/frontend/public/assets/licenses.html

@@ -44,7 +44,7 @@
     
         <h2>Overview of licenses:</h2>
         <ul class="licenses-overview">
-            <li><a href="#Apache-2.0">Apache License 2.0</a> (278)</li>
+            <li><a href="#Apache-2.0">Apache License 2.0</a> (280)</li>
             <li><a href="#MIT">MIT License</a> (83)</li>
             <li><a href="#Unicode-3.0">Unicode License v3</a> (19)</li>
             <li><a href="#AGPL-3.0">GNU Affero General Public License v3.0</a> (12)</li>
@@ -61,7 +61,7 @@
                 <h3 id="AGPL-3.0">GNU Affero General Public License v3.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical 0.2.2</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical 0.4.5</a></li>
                 </ul>
                 <pre class="license-text">                    GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
@@ -730,16 +730,16 @@ For more information on this, and how to apply and follow the GNU AGPL, see
                 <h3 id="AGPL-3.0">GNU Affero General Public License v3.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_caldav 0.2.2</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_caldav 0.4.5</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_carddav 0.2.2</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_carddav 0.4.5</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_dav 0.2.2</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_dav 0.4.5</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_dav_push 0.2.2</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_dav_push 0.4.5</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_frontend 0.2.2</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_frontend 0.4.5</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_ical 0.2.2</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_ical 0.4.5</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_oidc 0.2.2</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_oidc 0.4.5</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_store 0.2.2</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_store 0.4.5</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_store_sqlite 0.2.2</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_store_sqlite 0.4.5</a></li>
-                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_xml 0.2.2</a></li>
+                    <li><a href=" https://github.com/lennart-k/rustical ">rustical_xml 0.4.5</a></li>
                     <li><a href=" https://crates.io/crates/xml_derive ">xml_derive 0.1.0</a></li>
                 </ul>
                 <pre class="license-text">GNU AFFERO GENERAL PUBLIC LICENSE
@@ -1195,7 +1195,7 @@ You should also get your employer (if you work as a programmer) or school, if an
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide ">miniz_oxide 0.8.8</a></li>
+                    <li><a href=" https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide ">miniz_oxide 0.8.9</a></li>
                     <li><a href=" https://github.com/taiki-e/pin-project-lite ">pin-project-lite 0.2.16</a></li>
                     <li><a href=" https://github.com/Actyx/sync_wrapper ">sync_wrapper 1.0.2</a></li>
                     <li><a href=" https://github.com/time-rs/time ">time-core 0.1.4</a></li>
@@ -2228,7 +2228,7 @@ You should also get your employer (if you work as a programmer) or school, if an
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/bytecodealliance/wasi ">wasi 0.11.0+wasi-snapshot-preview1</a></li>
+                    <li><a href=" https://github.com/bytecodealliance/wasi ">wasi 0.11.1+wasi-snapshot-preview1</a></li>
                     <li><a href=" https://github.com/bytecodealliance/wasi-rs ">wasi 0.14.2+wasi-0.2.4</a></li>
                 </ul>
                 <pre class="license-text">
@@ -2663,6 +2663,191 @@ Software.
    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.
+</pre>
+            </li>
+            <li class="license">
+                <h3 id="Apache-2.0">Apache License 2.0</h3>
+                <h4>Used by:</h4>
+                <ul class="license-used-by">
+                    <li><a href=" https://github.com/alexcrichton/openssl-src-rs ">openssl-src 300.5.0+3.5.0</a></li>
+                </ul>
+                <pre class="license-text">
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      &quot;control&quot; means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      &quot;Source&quot; form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      &quot;Object&quot; form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      &quot;Work&quot; shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      &quot;Contribution&quot; shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
+
+      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
 </pre>
             </li>
             <li class="license">
@@ -2857,7 +3042,7 @@ Software.
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-core 0.61.2</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-implement 0.60.0</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-interface 0.59.1</a></li>
-                    <li><a href=" https://github.com/microsoft/windows-rs ">windows-link 0.1.1</a></li>
+                    <li><a href=" https://github.com/microsoft/windows-rs ">windows-link 0.1.3</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-result 0.3.4</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-strings 0.4.2</a></li>
                     <li><a href=" https://github.com/microsoft/windows-rs ">windows-sys 0.52.0</a></li>
@@ -3288,7 +3473,7 @@ Software.
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/google/zerocopy ">zerocopy 0.8.25</a></li>
+                    <li><a href=" https://github.com/google/zerocopy ">zerocopy 0.8.26</a></li>
                 </ul>
                 <pre class="license-text">                                 Apache License
                            Version 2.0, January 2004
@@ -3492,217 +3677,6 @@ Software.
    See the License for the specific language governing permissions and
    limitations under the License.
 
-</pre>
-            </li>
-            <li class="license">
-                <h3 id="Apache-2.0">Apache License 2.0</h3>
-                <h4>Used by:</h4>
-                <ul class="license-used-by">
-                    <li><a href=" https://github.com/clap-rs/clap ">clap_builder 4.5.39</a></li>
-                    <li><a href=" https://github.com/clap-rs/clap ">clap_derive 4.5.32</a></li>
-                    <li><a href=" https://github.com/clap-rs/clap ">clap_lex 0.7.4</a></li>
-                </ul>
-                <pre class="license-text">                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      &quot;control&quot; means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      &quot;Source&quot; form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      &quot;Object&quot; form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      &quot;Work&quot; shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      &quot;Contribution&quot; shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
-
-      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
-      replaced with your own identifying information. (Don&#x27;t include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same &quot;printed page&quot; as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-   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 &quot;AS IS&quot; 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.
 </pre>
             </li>
             <li class="license">
@@ -4127,7 +4101,6 @@ Software.
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/rust-cli/anstyle.git ">anstyle-parse 0.2.6</a></li>
                     <li><a href=" https://github.com/retep998/winapi-rs ">winapi 0.3.9</a></li>
                 </ul>
                 <pre class="license-text">                                 Apache License
@@ -4337,12 +4310,16 @@ Software.
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/rust-cli/anstyle.git ">anstream 0.6.18</a></li>
+                    <li><a href=" https://github.com/rust-cli/anstyle.git ">anstream 0.6.19</a></li>
-                    <li><a href=" https://github.com/rust-cli/anstyle.git ">anstyle-query 1.1.2</a></li>
+                    <li><a href=" https://github.com/rust-cli/anstyle.git ">anstyle-parse 0.2.7</a></li>
-                    <li><a href=" https://github.com/rust-cli/anstyle.git ">anstyle-wincon 3.0.8</a></li>
+                    <li><a href=" https://github.com/rust-cli/anstyle.git ">anstyle-query 1.1.3</a></li>
-                    <li><a href=" https://github.com/rust-cli/anstyle.git ">anstyle 1.0.10</a></li>
+                    <li><a href=" https://github.com/rust-cli/anstyle.git ">anstyle-wincon 3.0.9</a></li>
-                    <li><a href=" https://github.com/clap-rs/clap ">clap 4.5.39</a></li>
+                    <li><a href=" https://github.com/rust-cli/anstyle.git ">anstyle 1.0.11</a></li>
-                    <li><a href=" https://github.com/rust-cli/anstyle.git ">colorchoice 1.0.3</a></li>
+                    <li><a href=" https://github.com/clap-rs/clap ">clap 4.5.40</a></li>
+                    <li><a href=" https://github.com/clap-rs/clap ">clap_builder 4.5.40</a></li>
+                    <li><a href=" https://github.com/clap-rs/clap ">clap_derive 4.5.40</a></li>
+                    <li><a href=" https://github.com/clap-rs/clap ">clap_lex 0.7.5</a></li>
+                    <li><a href=" https://github.com/rust-cli/anstyle.git ">colorchoice 1.0.4</a></li>
                     <li><a href=" https://github.com/sfackler/foreign-types ">foreign-types-shared 0.1.1</a></li>
                     <li><a href=" https://github.com/sfackler/foreign-types ">foreign-types 0.3.2</a></li>
                     <li><a href=" https://github.com/KokaKiwi/rust-hex ">hex 0.4.3</a></li>
@@ -4350,11 +4327,11 @@ Software.
                     <li><a href=" https://github.com/polyfill-rs/once_cell_polyfill ">once_cell_polyfill 1.70.1</a></li>
                     <li><a href=" https://crates.io/crates/openssl-macros ">openssl-macros 0.1.1</a></li>
                     <li><a href=" https://github.com/sfackler/rust-openssl ">openssl 0.10.73</a></li>
-                    <li><a href=" https://github.com/toml-rs/toml ">serde_spanned 0.6.8</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">serde_spanned 0.6.9</a></li>
-                    <li><a href=" https://github.com/toml-rs/toml ">toml 0.8.22</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">toml 0.8.23</a></li>
-                    <li><a href=" https://github.com/toml-rs/toml ">toml_datetime 0.6.9</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">toml_datetime 0.6.11</a></li>
-                    <li><a href=" https://github.com/toml-rs/toml ">toml_edit 0.22.26</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">toml_edit 0.22.27</a></li>
-                    <li><a href=" https://github.com/toml-rs/toml ">toml_write 0.1.1</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">toml_write 0.1.2</a></li>
                 </ul>
                 <pre class="license-text">                                 Apache License
                            Version 2.0, January 2004
@@ -5171,7 +5148,7 @@ END OF TERMS AND CONDITIONS</pre>
                     <li><a href=" https://github.com/dtolnay/dyn-clone ">dyn-clone 1.0.19</a></li>
                     <li><a href=" https://github.com/SergioBenitez/Figment ">figment 0.10.19</a></li>
                     <li><a href=" https://github.com/dtolnay/itoa ">itoa 1.0.15</a></li>
-                    <li><a href=" https://github.com/rust-lang/libc ">libc 0.2.172</a></li>
+                    <li><a href=" https://github.com/rust-lang/libc ">libc 0.2.174</a></li>
                     <li><a href=" https://github.com/SergioBenitez/proc-macro2-diagnostics ">proc-macro2-diagnostics 0.10.1</a></li>
                     <li><a href=" https://github.com/dtolnay/proc-macro2 ">proc-macro2 1.0.95</a></li>
                     <li><a href=" https://github.com/dtolnay/quote ">quote 1.0.40</a></li>
@@ -5183,7 +5160,7 @@ END OF TERMS AND CONDITIONS</pre>
                     <li><a href=" https://github.com/serde-rs/json ">serde_json 1.0.140</a></li>
                     <li><a href=" https://github.com/dtolnay/path-to-error ">serde_path_to_error 0.1.17</a></li>
                     <li><a href=" https://github.com/nox/serde_urlencoded ">serde_urlencoded 0.7.1</a></li>
-                    <li><a href=" https://github.com/dtolnay/syn ">syn 2.0.101</a></li>
+                    <li><a href=" https://github.com/dtolnay/syn ">syn 2.0.104</a></li>
                     <li><a href=" https://github.com/dtolnay/thiserror ">thiserror-impl 1.0.69</a></li>
                     <li><a href=" https://github.com/dtolnay/thiserror ">thiserror-impl 2.0.12</a></li>
                     <li><a href=" https://github.com/dtolnay/thiserror ">thiserror 1.0.69</a></li>
@@ -6009,7 +5986,7 @@ limitations under the License.</pre>
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/seanmonstar/reqwest ">reqwest 0.12.19</a></li>
+                    <li><a href=" https://github.com/seanmonstar/reqwest ">reqwest 0.12.20</a></li>
                 </ul>
                 <pre class="license-text">                              Apache License
                         Version 2.0, January 2004
@@ -7058,7 +7035,7 @@ limitations under the License.
                     <li><a href=" https://github.com/askama-rs/askama ">askama 0.14.0</a></li>
                     <li><a href=" https://github.com/askama-rs/askama ">askama_derive 0.14.0</a></li>
                     <li><a href=" https://github.com/askama-rs/askama ">askama_parser 0.14.0</a></li>
-                    <li><a href=" https://github.com/rinja-rs/askama_web/ ">askama_web 0.14.3</a></li>
+                    <li><a href=" https://github.com/rinja-rs/askama_web/ ">askama_web 0.14.4</a></li>
                     <li><a href=" https://github.com/rinja-rs/askama_web/ ">askama_web_derive 0.1.0</a></li>
                 </ul>
                 <pre class="license-text">                              Apache License
@@ -8527,15 +8504,15 @@ limitations under the License.</pre>
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/gimli-rs/addr2line ">addr2line 0.24.2</a></li>
                     <li><a href=" https://github.com/smol-rs/atomic-waker ">atomic-waker 1.1.2</a></li>
-                    <li><a href=" https://github.com/Amanieu/atomic-rs ">atomic 0.6.0</a></li>
+                    <li><a href=" https://github.com/Amanieu/atomic-rs ">atomic 0.6.1</a></li>
-                    <li><a href=" https://github.com/cuviper/autocfg ">autocfg 1.4.0</a></li>
+                    <li><a href=" https://github.com/cuviper/autocfg ">autocfg 1.5.0</a></li>
                     <li><a href=" https://github.com/rust-lang/backtrace-rs ">backtrace 0.3.75</a></li>
                     <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64 0.21.7</a></li>
                     <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64 0.22.1</a></li>
                     <li><a href=" https://github.com/bitflags/bitflags ">bitflags 2.9.1</a></li>
-                    <li><a href=" https://github.com/fitzgen/bumpalo ">bumpalo 3.17.0</a></li>
+                    <li><a href=" https://github.com/fitzgen/bumpalo ">bumpalo 3.19.0</a></li>
-                    <li><a href=" https://github.com/rust-lang/cc-rs ">cc 1.2.25</a></li>
+                    <li><a href=" https://github.com/rust-lang/cc-rs ">cc 1.2.27</a></li>
-                    <li><a href=" https://github.com/alexcrichton/cfg-if ">cfg-if 1.0.0</a></li>
+                    <li><a href=" https://github.com/rust-lang/cfg-if ">cfg-if 1.0.1</a></li>
                     <li><a href=" https://github.com/smol-rs/concurrent-queue ">concurrent-queue 2.5.0</a></li>
                     <li><a href=" https://github.com/servo/core-foundation-rs ">core-foundation-sys 0.8.7</a></li>
                     <li><a href=" https://github.com/crossbeam-rs/crossbeam ">crossbeam-queue 0.3.12</a></li>
@@ -8551,10 +8528,10 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/gimli-rs/gimli ">gimli 0.31.1</a></li>
                     <li><a href=" https://github.com/rust-lang/glob ">glob 0.3.2</a></li>
                     <li><a href=" https://github.com/zkcrypto/group ">group 0.13.0</a></li>
-                    <li><a href=" https://github.com/rust-lang/hashbrown ">hashbrown 0.15.3</a></li>
+                    <li><a href=" https://github.com/rust-lang/hashbrown ">hashbrown 0.15.4</a></li>
                     <li><a href=" https://github.com/withoutboats/heck ">heck 0.5.0</a></li>
                     <li><a href=" https://github.com/seanmonstar/httparse ">httparse 1.10.1</a></li>
-                    <li><a href=" https://github.com/rustls/hyper-rustls ">hyper-rustls 0.27.6</a></li>
+                    <li><a href=" https://github.com/rustls/hyper-rustls ">hyper-rustls 0.27.7</a></li>
                     <li><a href=" https://github.com/servo/rust-url/ ">idna 1.0.3</a></li>
                     <li><a href=" https://github.com/hsivonen/idna_adapter ">idna_adapter 1.2.1</a></li>
                     <li><a href=" https://github.com/indexmap-rs/indexmap ">indexmap 2.9.0</a></li>
@@ -8573,6 +8550,7 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/ramosbugs/oauth2-rs ">oauth2 5.0.0</a></li>
                     <li><a href=" https://github.com/gimli-rs/object ">object 0.36.7</a></li>
                     <li><a href=" https://github.com/matklad/once_cell ">once_cell 1.21.3</a></li>
+                    <li><a href=" https://github.com/alexcrichton/openssl-src-rs ">openssl-src 300.5.0+3.5.0</a></li>
                     <li><a href=" https://github.com/smol-rs/parking ">parking 2.2.1</a></li>
                     <li><a href=" https://github.com/Amanieu/parking_lot ">parking_lot 0.12.4</a></li>
                     <li><a href=" https://github.com/Amanieu/parking_lot ">parking_lot_core 0.9.11</a></li>
@@ -8583,24 +8561,24 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/rust-lang/regex/tree/master/regex-syntax ">regex-syntax 0.8.5</a></li>
                     <li><a href=" https://github.com/rust-lang/regex ">regex 1.11.1</a></li>
                     <li><a href=" https://github.com/briansmith/ring ">ring 0.17.14</a></li>
-                    <li><a href=" https://github.com/rust-lang/rustc-demangle ">rustc-demangle 0.1.24</a></li>
+                    <li><a href=" https://github.com/rust-lang/rustc-demangle ">rustc-demangle 0.1.25</a></li>
                     <li><a href=" https://github.com/djc/rustc-version-rs ">rustc_version 0.4.1</a></li>
-                    <li><a href=" https://github.com/rustls/rustls ">rustls 0.23.27</a></li>
+                    <li><a href=" https://github.com/rustls/rustls ">rustls 0.23.28</a></li>
                     <li><a href=" https://github.com/bluss/scopeguard ">scopeguard 1.2.0</a></li>
                     <li><a href=" https://github.com/mitsuhiko/serde-plain ">serde_plain 1.0.2</a></li>
-                    <li><a href=" https://github.com/jonasbb/serde_with/ ">serde_with 3.12.0</a></li>
+                    <li><a href=" https://github.com/jonasbb/serde_with/ ">serde_with 3.13.0</a></li>
-                    <li><a href=" https://github.com/jonasbb/serde_with/ ">serde_with_macros 3.12.0</a></li>
+                    <li><a href=" https://github.com/jonasbb/serde_with/ ">serde_with_macros 3.13.0</a></li>
                     <li><a href=" https://github.com/vorner/signal-hook ">signal-hook-registry 1.4.5</a></li>
-                    <li><a href=" https://github.com/servo/rust-smallvec ">smallvec 1.15.0</a></li>
+                    <li><a href=" https://github.com/servo/rust-smallvec ">smallvec 1.15.1</a></li>
                     <li><a href=" https://github.com/rust-lang/socket2 ">socket2 0.5.10</a></li>
                     <li><a href=" https://github.com/storyyeller/stable_deref_trait ">stable_deref_trait 1.2.0</a></li>
-                    <li><a href=" https://github.com/Amanieu/thread_local-rs ">thread_local 1.1.8</a></li>
+                    <li><a href=" https://github.com/Amanieu/thread_local-rs ">thread_local 1.1.9</a></li>
                     <li><a href=" https://github.com/seanmonstar/unicase ">unicase 2.8.1</a></li>
                     <li><a href=" https://github.com/unicode-rs/unicode-xid ">unicode-xid 0.2.6</a></li>
                     <li><a href=" https://github.com/servo/rust-url ">url 2.5.4</a></li>
                     <li><a href=" https://github.com/uuid-rs/uuid ">uuid 1.17.0</a></li>
                     <li><a href=" https://github.com/SergioBenitez/version_check ">version_check 0.9.5</a></li>
-                    <li><a href=" https://github.com/bytecodealliance/wasi ">wasi 0.11.0+wasi-snapshot-preview1</a></li>
+                    <li><a href=" https://github.com/bytecodealliance/wasi ">wasi 0.11.1+wasi-snapshot-preview1</a></li>
                     <li><a href=" https://github.com/bytecodealliance/wasi-rs ">wasi 0.14.2+wasi-0.2.4</a></li>
                     <li><a href=" https://github.com/rustwasm/wasm-bindgen/tree/master/crates/backend ">wasm-bindgen-backend 0.2.100</a></li>
                     <li><a href=" https://github.com/rustwasm/wasm-bindgen/tree/master/crates/futures ">wasm-bindgen-futures 0.4.50</a></li>
@@ -10271,7 +10249,7 @@ limitations under the License.
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/oyvindln/adler2 ">adler2 2.0.0</a></li>
+                    <li><a href=" https://github.com/oyvindln/adler2 ">adler2 2.0.1</a></li>
                     <li><a href=" https://github.com/bkchr/proc-macro-crate ">proc-macro-crate 3.3.0</a></li>
                 </ul>
                 <pre class="license-text">                              Apache License
@@ -11096,7 +11074,7 @@ limitations under the License.
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/Lokathor/bytemuck ">bytemuck 1.23.0</a></li>
+                    <li><a href=" https://github.com/Lokathor/bytemuck ">bytemuck 1.23.1</a></li>
                 </ul>
                 <pre class="license-text">Apache License
 Version 2.0, January 2004
@@ -11591,7 +11569,7 @@ limitations under the License.
                     <li><a href=" https://github.com/TedDriggs/ident_case ">ident_case 1.0.1</a></li>
                     <li><a href=" https://github.com/SergioBenitez/Pear ">pear 0.2.9</a></li>
                     <li><a href=" https://github.com/SergioBenitez/Pear ">pear_codegen 0.2.9</a></li>
-                    <li><a href=" https://github.com/r-efi/r-efi ">r-efi 5.2.0</a></li>
+                    <li><a href=" https://github.com/r-efi/r-efi ">r-efi 5.3.0</a></li>
                     <li><a href=" https://github.com/udoprog/relative-path ">relative-path 1.9.3</a></li>
                     <li><a href=" https://github.com/fmeringdal/rust-rrule ">rrule 0.14.0</a></li>
                     <li><a href=" https://github.com/jedisct1/rust-siphash ">siphasher 1.0.1</a></li>
@@ -12006,7 +11984,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 <h3 id="CDLA-Permissive-2.0">Community Data License Agreement Permissive 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/rustls/webpki-roots ">webpki-roots 1.0.0</a></li>
+                    <li><a href=" https://github.com/rustls/webpki-roots ">webpki-roots 1.0.1</a></li>
                 </ul>
                 <pre class="license-text"># Community Data License Agreement - Permissive - Version 2.0
 
@@ -12391,7 +12369,7 @@ THE SOFTWARE.
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://gitlab.redox-os.org/redox-os/syscall ">redox_syscall 0.5.12</a></li>
+                    <li><a href=" https://gitlab.redox-os.org/redox-os/syscall ">redox_syscall 0.5.13</a></li>
                 </ul>
                 <pre class="license-text">Copyright (c) 2017 Redox OS Developers
 
@@ -12544,7 +12522,7 @@ THE SOFTWARE.
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/tokio-rs/slab ">slab 0.4.9</a></li>
+                    <li><a href=" https://github.com/tokio-rs/slab ">slab 0.4.10</a></li>
                 </ul>
                 <pre class="license-text">Copyright (c) 2019 Carl Lerche
 
@@ -12631,8 +12609,8 @@ SOFTWARE.
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/tokio-rs/tracing ">tracing-attributes 0.1.28</a></li>
+                    <li><a href=" https://github.com/tokio-rs/tracing ">tracing-attributes 0.1.30</a></li>
-                    <li><a href=" https://github.com/tokio-rs/tracing ">tracing-core 0.1.33</a></li>
+                    <li><a href=" https://github.com/tokio-rs/tracing ">tracing-core 0.1.34</a></li>
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing-log 0.2.0</a></li>
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing-subscriber 0.3.19</a></li>
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing 0.1.41</a></li>
@@ -12835,7 +12813,7 @@ DEALINGS IN THE SOFTWARE.
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/hyperium/hyper-util ">hyper-util 0.1.13</a></li>
+                    <li><a href=" https://github.com/hyperium/hyper-util ">hyper-util 0.1.14</a></li>
                 </ul>
                 <pre class="license-text">Copyright (c) 2023-2025 Sean McArthur
 
@@ -13217,7 +13195,7 @@ SOFTWARE.</pre>
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/winnow-rs/winnow ">winnow 0.7.10</a></li>
+                    <li><a href=" https://github.com/winnow-rs/winnow ">winnow 0.7.11</a></li>
                 </ul>
                 <pre class="license-text">Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -13301,7 +13279,7 @@ SOFTWARE.</pre>
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/tokio-rs/tracing ">tracing-core 0.1.33</a></li>
+                    <li><a href=" https://github.com/tokio-rs/tracing ">tracing-core 0.1.34</a></li>
                 </ul>
                 <pre class="license-text">The MIT License (MIT)
 
@@ -13363,7 +13341,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/BurntSushi/aho-corasick ">aho-corasick 1.1.3</a></li>
                     <li><a href=" https://github.com/BurntSushi/byteorder ">byteorder 1.5.0</a></li>
-                    <li><a href=" https://github.com/BurntSushi/memchr ">memchr 2.7.4</a></li>
+                    <li><a href=" https://github.com/BurntSushi/memchr ">memchr 2.7.5</a></li>
                     <li><a href=" https://github.com/BurntSushi/regex-automata ">regex-automata 0.1.10</a></li>
                     <li><a href=" https://github.com/BurntSushi/walkdir ">walkdir 2.5.0</a></li>
                 </ul>
@@ -13608,7 +13586,7 @@ THE SOFTWARE.
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/BurntSushi/aho-corasick ">aho-corasick 1.1.3</a></li>
                     <li><a href=" https://github.com/BurntSushi/byteorder ">byteorder 1.5.0</a></li>
-                    <li><a href=" https://github.com/BurntSushi/memchr ">memchr 2.7.4</a></li>
+                    <li><a href=" https://github.com/BurntSushi/memchr ">memchr 2.7.5</a></li>
                     <li><a href=" https://github.com/BurntSushi/regex-automata ">regex-automata 0.1.10</a></li>
                     <li><a href=" https://github.com/BurntSushi/same-file ">same-file 1.0.6</a></li>
                     <li><a href=" https://github.com/BurntSushi/walkdir ">walkdir 2.5.0</a></li>

crates/frontend/public/assets/style.css

@@ -1,7 +1,24 @@
+:root {
+  --background-color: #FFF;
+  --background-darker: #EEE;
+  --primary-color: #2F2FE1;
+  --primary-color-dark: color-mix(in srgb, var(--primary-color), #000000 80%);
+  --text-on-primary-color: #FFF;
+  /* --color-red: #FE2060; */
+  /* --color-red: #EE1D59; */
+  --color-red: #E31B39;
+}
+
+html {
+  background-color: var(--background-color);
+}
+
 body {
+  /* position: relative; */
   font-family: sans-serif;
   margin: 0 auto;
   max-width: 1200px;
+  min-height: 100%;
 }
 
 * {
@@ -48,25 +65,11 @@ header {
   align-items: center;
 }
 
-:root {
-  --background-color: #FFF;
-  --background-darker: #EEE;
-  --primary-color: #2F2FE1;
-  --primary-color-dark: color-mix(in srgb, var(--primary-color), #000000 80%);
-  --text-on-primary-color: #FFF;
-  /* --color-red: #FE2060; */
-  --color-red: #EE1D59;
-}
-
-html {
-  background-color: var(--background-color);
-}
-
 button,
 .button {
   border: none;
   background: var(--primary-color);
-  padding: 8px 12px;
+  padding: 10px 16px;
   border-radius: 8px;
   color: var(--text-on-primary-color);
   font-size: 0.9em;
@@ -75,7 +78,8 @@ button,
     filter: brightness(90%);
   }
 
-  &.delete {
+  &.delete,
+  &.cancel {
     background: var(--color-red);
   }
 }
@@ -109,13 +113,13 @@ table {
   box-shadow: 4px 2px 12px -6px black;
   border-collapse: collapse;
   overflow-x: scroll;
-  display: block;
+  width: 100%;
-  width: fit-content;
 
   td,
   th {
     padding: 8px;
     border: 1px solid black;
+    width: max-content;
   }
 
   th {
@@ -236,3 +240,18 @@ table {
 textarea {
   width: 100%;
 }
+
+dialog {
+  border: 1px solid black;
+  border-radius: 16px;
+  padding: 32px;
+}
+
+footer {
+  display: flex;
+  justify-content: center;
+  margin-top: 32px;
+  gap: 24px;
+  /* position: absolute; */
+  bottom: 20px;
+}

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

@@ -0,0 +1,56 @@
+<section>
+  <h2>Addressbooks</h2>
+  <ul>
+    {% for addressbook in addressbooks %}
+    <li class="collection-list-item">
+      <a href="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}">
+        <span class="title">
+          {%- if addressbook.principal != user.id -%}{{ addressbook.principal }}/{%- endif -%}
+          {{ addressbook.displayname.to_owned().unwrap_or(addressbook.id.to_owned()) }}
+        </span>
+        <span class="description">
+          {% if let Some(description) = addressbook.description %}{{ description }}{% endif %}
+        </span>
+        <div class="actions">
+          <form action="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}" target="_blank"
+            method="GET">
+            <button type="submit">Download</button>
+          </form>
+          <delete-button trash
+            href="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}"></delete-button>
+        </div>
+      </a>
+    </li>
+    {% else %}
+    You do not have any addressbooks yet
+    {% endfor %}
+  </ul>
+  {%if !deleted_addressbooks.is_empty() %}
+  <h3>Deleted Addressbooks</h3>
+  <ul>
+    {% for addressbook in deleted_addressbooks %}
+    <li class="collection-list-item">
+      <a href="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}">
+        <span class="title">
+          {%- if addressbook.principal != user.id -%}{{ addressbook.principal }}/{%- endif -%}
+          {{ addressbook.displayname.to_owned().unwrap_or(addressbook.id.to_owned()) }}
+        </span>
+        <span class="description">
+          {% if let Some(description) = addressbook.description %}{{ description }}{% endif %}
+        </span>
+        <div class="actions">
+          <form action="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}/restore"
+            method="POST" class="restore-form">
+            <button type="submit">Restore</button>
+          </form>
+          <delete-button href="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}"></delete-button>
+        </div>
+      </a>
+    </li>
+    {% endfor %}
+  </ul>
+  {% endif %}
+
+  <create-addressbook-form user="{{ user.id }}"></create-addressbook-form>
+
+</section>

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

@@ -0,0 +1,72 @@
+<section>
+  <h2>Calendars</h2>
+  <ul>
+    {% for calendar in calendars %}
+    {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+    <li class="collection-list-item" style="--color: {{ color }}">
+      <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id }}">
+        <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 class="description">
+          {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+        </span>
+        {% if let Some(subscription_url) = calendar.subscription_url %}
+        <span class="subscription-url">{{ subscription_url }}</span>
+        {% endif %}
+        <div class="actions">
+          <form action="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}" target="_blank" method="GET">
+            <button type="submit">Download</button>
+          </form>
+          {% if !calendar.id.starts_with("_birthdays_") %}
+          <delete-button trash href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
+          {% endif %}
+        </div>
+        <div class="color-chip"></div>
+      </a>
+    </li>
+    {% else %}
+    You do not have any calendars yet
+    {% endfor %}
+  </ul>
+  {%if !deleted_calendars.is_empty() %}
+  <h3>Deleted Calendars</h3>
+  <ul>
+    {% for calendar in deleted_calendars %}
+    {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
+    <li class="collection-list-item" style="--color: {{ color }}">
+      <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}">
+        <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 class="description">
+          {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+        </span>
+        <div class="actions">
+          <form action="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}/restore" method="POST"
+            class="restore-form">
+            <button type="submit">Restore</button>
+          </form>
+          <delete-button href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
+        </div>
+        <div class="color-chip"></div>
+      </a>
+    </li>
+    {% endfor %}
+  </ul>
+  {% endif %}
+  <create-calendar-form user="{{ user.id }}"></create-calendar-form>
+
+</section>

crates/frontend/public/templates/components/profile_section.html

@@ -0,0 +1,58 @@
+<section>
+  <h2>Profile</h2>
+
+  {% let groups = user.memberships_without_self() %}
+  {% if groups.len() > 0 %}
+  <h3>Groups</h3>
+  <ul>
+    {% for group in groups %}
+    <li>{{ group }}</li>
+    {% endfor %}
+  </ul>
+  {% endif %}
+
+  <h3>App tokens</h3>
+  <table id="app-tokens">
+    <tr>
+      <th>Name</th>
+      <th>Created at</th>
+      <th></th>
+    </tr>
+    {% for app_token in app_tokens %}
+    <tr>
+      <td>{{ app_token.name }}</td>
+      <td>
+        {% if let Some(created_at) = app_token.created_at %}
+        {{ chrono_humanize::HumanTime::from(created_at.to_owned()) }}
+        {% endif %}
+      </td>
+      <td>
+        <form action="/frontend/user/{{ user.id }}/app_token/{{ app_token.id }}/delete" method="POST">
+          <button type="submit" class="delete">Delete</button>
+        </form>
+      </td>
+    </tr>
+    {% endfor %}
+    <tr class="generate">
+      <td>
+        <form action="/frontend/user/{{ user.id }}/app_token" method="POST" id="form_generate_app_token">
+          <label class="font_bold" for="generate_app_token_name">App name</label>
+          <input type="text" name="name" id="generate_app_token_name" />
+        </form>
+      </td>
+      <td></td>
+      <td>
+        <button type="submit" form="form_generate_app_token">Generate</button>
+        {% if is_apple %}
+        <button type="submit" form="form_generate_app_token" name="apple" value="true">Apple Configuration Profile
+          (contains token)</button>
+        {% endif %}
+      </td>
+    </tr>
+  </table>
+  {% if let Some(hostname) = davx5_hostname %}
+  <a
+    href="intent://{{ hostname | urlencode }}#Intent;action=android.intent.action.VIEW;component=at.bitfire.davdroid.ui.setup.LoginActivity;scheme=davx5;package=at.bitfire.davdroid;S.loginFlow=1;end">Configure
+    in DAVx5</a>
+  {% endif %}
+</section>

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

@@ -23,6 +23,7 @@
   </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>
 </html>

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

@@ -11,171 +11,9 @@
 
 <h1>Welcome {{ user.id }}!</h1>
 
-<section>
+{% include "components/profile_section.html" %}
-  <h2>Profile</h2>
+{% include "components/calendars_section.html" %}
+{% include "components/addressbooks_section.html" %}
 
-  <h3>Groups</h3>
-  <ul>
-    {% for group in user.memberships() %}
-      <li>{{ group }}</li>
-    {% endfor %}
-  </ul>
-
-  <h3>App tokens</h3>
-  <table id="app-tokens">
-    <tr>
-      <th>Name</th>
-      <th>Created at</th>
-      <th></th>
-    </tr>
-    {% for app_token in app_tokens %}
-    <tr>
-      <td>{{ app_token.name }}</td>
-      <td>
-        {% if let Some(created_at) = app_token.created_at %}
-          {{ chrono_humanize::HumanTime::from(created_at.to_owned()) }}
-        {% endif %}
-      </td>
-      <td>
-        <form action="/frontend/user/{{ user.id }}/app_token/{{ app_token.id }}/delete" method="POST">
-          <button type="submit" class="delete">Delete</button>
-        </form>
-      </td>
-    </tr>
-    {% endfor %}
-    <tr class="generate">
-        <td>
-          <form action="/frontend/user/{{ user.id }}/app_token" method="POST" id="form_generate_app_token">
-            <label class="font_bold" for="generate_app_token_name">App name</label>
-            <input type="text" name="name" id="generate_app_token_name" />
-          </form>
-        </td>
-        <td></td>
-        <td>
-          <button type="submit" form="form_generate_app_token">Generate</button>
-          {% if is_apple %}
-          <button type="submit" form="form_generate_app_token" name="apple" value="true">Apple Configuration Profile (contains token)</button>
-          {% endif %}
-        </td>
-    </tr>
-  </table>
-  {% if let Some(hostname) = davx5_hostname %}
-  <a href="intent://{{ hostname | urlencode }}#Intent;action=android.intent.action.VIEW;component=at.bitfire.davdroid.ui.setup.LoginActivity;scheme=davx5;package=at.bitfire.davdroid;S.loginFlow=1;end">Configure in DAVx5</a>
-  {% endif %}
-</section>
-
-<section>
-<h2>Calendars</h2>
-<ul>
-  {% for calendar in calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
-  <li class="collection-list-item" style="--color: {{ color }}">
-    <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id }}">
-      <span class="title">{{ 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 class="description">
-      {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
-      </span>
-      {% if let Some(subscription_url) = calendar.subscription_url %}
-      <span class="subscription-url">{{ subscription_url }}</span>
-      {% endif %}
-      <div class="actions">
-        <form action="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}" target="_blank" method="GET">
-          <button type="submit">Download</button>
-        </form>
-        {% if !calendar.id.starts_with("_birthdays_") %}
-        <delete-button trash href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
-        {% endif %}
-      </div>
-      <div class="color-chip"></div>
-    </a>
-  </li>
-  {% else %}
-  You do not have any calendars yet
-  {% endfor %}
-</ul>
-{%if !deleted_calendars.is_empty() %}
-<h3>Deleted Calendars</h3>
-<ul>
-  {% for calendar in deleted_calendars %}
-  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
-  <li class="collection-list-item" style="--color: {{ color }}">
-    <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}">
-      <span class="title">{{ 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 class="description">
-      {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
-      </span>
-      <div class="actions">
-        <form action="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}/restore" method="POST" class="restore-form">
-          <button type="submit">Restore</button>
-        </form>
-        <delete-button href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
-      </div>
-      <div class="color-chip"></div>
-    </a>
-  </li>
-  {% endfor %}
-</ul>
-{% endif %}
-<create-calendar-form user="{{ user.id }}"></create-calendar-form>
-
-</section>
-
-<section>
-<h2>Addressbooks</h2>
-<ul>
-  {% for addressbook in addressbooks %}
-  <li class="collection-list-item">
-    <a href="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}">
-      <span class="title">{{ addressbook.displayname.to_owned().unwrap_or(addressbook.id.to_owned()) }}</span>
-      <span class="description">
-      {% if let Some(description) = addressbook.description %}{{ description }}{% endif %}
-      </span>
-      <div class="actions">
-        <form action="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}" target="_blank" method="GET">
-          <button type="submit">Download</button>
-        </form>
-        <delete-button trash href="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}"></delete-button>
-      </div>
-    </a>
-  </li>
-  {% else %}
-  You do not have any addressbooks yet
-  {% endfor %}
-</ul>
-{%if !deleted_addressbooks.is_empty() %}
-<h3>Deleted Addressbooks</h3>
-<ul>
-  {% for addressbook in deleted_addressbooks %}
-  <li class="collection-list-item">
-    <a href="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}">
-      <span class="title">{{ addressbook.displayname.to_owned().unwrap_or(addressbook.id.to_owned()) }}</span>
-      <span class="description">
-      {% if let Some(description) = addressbook.description %}{{ description }}{% endif %}
-      </span>
-      <div class="actions">
-        <form action="/frontend/user/{{ addressbook.principal }}/addressbook/{{ addressbook.id}}/restore" method="POST" class="restore-form">
-          <button type="submit">Restore</button>
-        </form>
-        <delete-button href="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}"></delete-button>
-      </div>
-    </a>
-  </li>
-  {% endfor %}
-</ul>
-{% endif %}
-
-<create-addressbook-form user="{{ user.id }}"></create-addressbook-form>
-
-</section>
 {% endblock %}
 

crates/oidc/src/error.rs

@@ -7,6 +7,9 @@ pub enum OidcError {
     #[error("Cannot generate redirect url, something's not configured correctly")]
     OidcParseError(#[from] ParseError),
 
+    #[error("Error fetching user info: {0}")]
+    UserInfo(String),
+
     #[error(transparent)]
     OidcConfigurationError(#[from] ConfigurationError),
 

crates/oidc/src/lib.rs

@@ -41,7 +41,7 @@ struct OidcState {
 #[derive(Debug, Deserialize, Serialize)]
 struct GroupAdditionalClaims {
     #[serde(default)]
-    pub groups: Vec<String>,
+    groups: Option<Vec<String>>,
 }
 
 impl openidconnect::AdditionalClaims for GroupAdditionalClaims {}
@@ -190,12 +190,14 @@ pub async fn route_get_oidc_callback<US: UserStore + Clone>(
         )?
         .request_async(&http_client)
         .await
-        .map_err(|_| OidcError::Other("Error fetching user info"))?;
+        .map_err(|e| OidcError::UserInfo(e.to_string()))?;
 
     if let Some(require_group) = &oidc_config.require_group {
         if !user_info_claims
             .additional_claims()
             .groups
+            .clone()
+            .unwrap_or_default()
             .contains(require_group)
         {
             return Ok((

crates/store/src/auth/mod.rs

@@ -3,7 +3,10 @@ mod principal;
 use crate::error::Error;
 use async_trait::async_trait;
 
-pub use principal::{AppToken, Principal, PrincipalType};
+mod principal_type;
+pub use principal_type::*;
+
+pub use principal::{AppToken, Principal};
 
 #[async_trait]
 pub trait AuthenticationProvider: Send + Sync + 'static {

crates/store/src/auth/principal.rs

@@ -1,3 +1,4 @@
+use crate::{Secret, auth::PrincipalType};
 use axum::{
     body::Body,
     extract::{FromRequestParts, OptionalFromRequestParts},
@@ -6,67 +7,8 @@ use axum::{
 use chrono::{DateTime, Utc};
 use derive_more::Display;
 use http::{HeaderValue, StatusCode, header};
-use rustical_xml::ValueSerialize;
 use serde::{Deserialize, Serialize};
-use std::{convert::Infallible, fmt::Display};
+use std::convert::Infallible;
-
-use crate::Secret;
-
-/// https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.3
-#[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq, clap::ValueEnum)]
-#[serde(rename_all = "lowercase")]
-pub enum PrincipalType {
-    #[default]
-    Individual,
-    Group,
-    Resource,
-    Room,
-    Unknown,
-    // TODO: X-Name, IANA-token
-}
-
-impl TryFrom<&str> for PrincipalType {
-    type Error = crate::Error;
-
-    fn try_from(value: &str) -> Result<Self, Self::Error> {
-        Ok(match value {
-            "INDIVIDUAL" => Self::Individual,
-            "GROUP" => Self::Group,
-            "RESOURCE" => Self::Resource,
-            "ROOM" => Self::Room,
-            "UNKNOWN" => Self::Unknown,
-            _ => {
-                return Err(crate::Error::InvalidPrincipalType(
-                    "Invalid principal type".to_owned(),
-                ));
-            }
-        })
-    }
-}
-
-impl PrincipalType {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            PrincipalType::Individual => "INDIVIDUAL",
-            PrincipalType::Group => "GROUP",
-            PrincipalType::Resource => "RESOURCE",
-            PrincipalType::Room => "ROOM",
-            PrincipalType::Unknown => "UNKNOWN",
-        }
-    }
-}
-
-impl Display for PrincipalType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(self.as_str())
-    }
-}
-
-impl ValueSerialize for PrincipalType {
-    fn serialize(&self) -> String {
-        self.to_string()
-    }
-}
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct AppToken {

crates/store/src/auth/principal_type.rs

@@ -0,0 +1,60 @@
+use std::fmt::Display;
+
+use rustical_xml::ValueSerialize;
+use serde::{Deserialize, Serialize};
+
+/// https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.3
+#[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq, clap::ValueEnum)]
+#[serde(rename_all = "lowercase")]
+pub enum PrincipalType {
+    #[default]
+    Individual,
+    Group,
+    Resource,
+    Room,
+    Unknown,
+    // TODO: X-Name, IANA-token
+}
+
+impl TryFrom<&str> for PrincipalType {
+    type Error = crate::Error;
+
+    fn try_from(value: &str) -> Result<Self, Self::Error> {
+        Ok(match value {
+            "INDIVIDUAL" => Self::Individual,
+            "GROUP" => Self::Group,
+            "RESOURCE" => Self::Resource,
+            "ROOM" => Self::Room,
+            "UNKNOWN" => Self::Unknown,
+            _ => {
+                return Err(crate::Error::InvalidPrincipalType(
+                    "Invalid principal type".to_owned(),
+                ));
+            }
+        })
+    }
+}
+
+impl PrincipalType {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            PrincipalType::Individual => "INDIVIDUAL",
+            PrincipalType::Group => "GROUP",
+            PrincipalType::Resource => "RESOURCE",
+            PrincipalType::Room => "ROOM",
+            PrincipalType::Unknown => "UNKNOWN",
+        }
+    }
+}
+
+impl Display for PrincipalType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(self.as_str())
+    }
+}
+
+impl ValueSerialize for PrincipalType {
+    fn serialize(&self) -> String {
+        self.to_string()
+    }
+}

crates/store/src/lib.rs

@@ -11,6 +11,9 @@ mod secret;
 mod subscription_store;
 pub mod synctoken;
 
+#[cfg(test)]
+pub mod tests;
+
 pub use addressbook_store::AddressbookStore;
 pub use calendar_store::CalendarStore;
 pub use combined_calendar_store::CombinedCalendarStore;

crates/store/tests/examples/event.ics

@@ -1,35 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-X-LIC-LOCATION:Europe/Berlin
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;UNTIL=20370329T010000Z;BYDAY=-1SU;BYMONTH=3
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;UNTIL=20361026T010000Z;BYDAY=-1SU;BYMONTH=10
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:67d830c3e681950b6a12f7c287b316269a19fcf7
-DTSTAMP:20230831T102923Z
-DTSTART;TZID=Europe/Berlin:20230829T043000
-DTEND;TZID=Europe/Berlin:20230829T045500
-SEQUENCE:2
-SUMMARY:asdjlk
-TRANSP:OPAQUE
-CLASS:PUBLIC
-CREATED:20230831T103040Z
-LAST-MODIFIED:20230831T103040Z
-END:VEVENT
-END:VCALENDAR

crates/store/tests/examples/timezone.ics

@@ -1,109 +0,0 @@
-BEGIN:VCALENDAR
-BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-LAST-MODIFIED:20230104T023643Z
-TZURL:https://www.tzurl.org/zoneinfo/Europe/Berlin
-X-LIC-LOCATION:Europe/Berlin
-X-PROLEPTIC-TZNAME:LMT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+005328
-TZOFFSETTO:+0100
-DTSTART:18930401T000632
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19160430T230000
-RDATE:19400401T020000
-RDATE:19430329T020000
-RDATE:19460414T020000
-RDATE:19470406T030000
-RDATE:19480418T020000
-RDATE:19490410T020000
-RDATE:19800406T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19161001T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451118T030000
-RDATE:19461007T030000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYMONTH=4;BYDAY=3MO
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19170917T030000
-RRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYMONTH=9;BYDAY=3MO
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19440403T020000
-RRULE:FREQ=YEARLY;UNTIL=19450402T010000Z;BYMONTH=4;BYDAY=1MO
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:CEMT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19450524T010000
-RDATE:19470511T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-DTSTART:19450924T030000
-RDATE:19470629T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-DTSTART:19460101T000000
-RDATE:19800101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYMONTH=10;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYMONTH=9;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR

crates/store/tests/test_calendar.rs

@@ -1,46 +0,0 @@
-// use rstest::rstest;
-// use rstest_reuse::{self, apply, template};
-// use rustical_store::{CalendarObject, CalendarStore};
-// use rustical_store_sqlite::{calendar_store::SqliteCalendarStore, create_test_db};
-//
-// const TIMEZONE: &str = include_str!("examples/timezone.ics");
-// const EVENT: &str = include_str!("examples/event.ics");
-//
-// #[template]
-// #[rstest]
-// #[case::sqlite(async {
-//      let (send, _recv) = tokio::sync::mpsc::channel(100);
-//      SqliteCalendarStore::new(create_test_db().await.unwrap(), send)
-//  })]
-// async fn cal_store<CS: CalendarStore>(
-//     #[future(awt)]
-//     #[case]
-//     mut store: CS,
-// ) {
-// }
-
-// TODO: Reimplement, add test principal
-// #[apply(cal_store)]
-// #[tokio::test]
-// async fn test_create_event<CS: CalendarStore>(store: CS) {
-//     store
-//         .insert_calendar(rustical_store::Calendar {
-//             id: "test".to_owned(),
-//             displayname: Some("Test Calendar".to_owned()),
-//             principal: "testuser".to_owned(),
-//             timezone: Some(TIMEZONE.to_owned()),
-//             ..Default::default() // timezone: TIMEZONE.to_owned(),
-//         })
-//         .await
-//         .unwrap();
-//
-//     let object = CalendarObject::from_ics("asd".to_owned(), EVENT.to_owned()).unwrap();
-//     store
-//         .put_object("testuser".to_owned(), "test".to_owned(), object, true)
-//         .await
-//         .unwrap();
-//
-//     let event = store.get_object("testuser", "test", "asd").await.unwrap();
-//     assert_eq!(event.get_ics(), EVENT);
-//     assert_eq!(event.get_id(), "asd");
-// }

crates/store_sqlite/Cargo.toml

@@ -7,6 +7,9 @@ repository.workspace = true
 license.workspace = true
 publish = false
 
+[features]
+test = []
+
 [dependencies]
 tokio.workspace = true
 rustical_store = { workspace = true }

crates/store_sqlite/src/lib.rs

@@ -8,6 +8,9 @@ pub mod error;
 pub mod principal_store;
 pub mod subscription_store;
 
+#[cfg(any(test, feature = "test"))]
+pub mod tests;
+
 #[derive(Debug, Clone, Serialize, sqlx::Type)]
 #[serde(rename_all = "kebab-case")]
 pub(crate) enum ChangeOperation {
@@ -42,13 +45,3 @@ pub async fn create_db_pool(db_url: &str, migrate: bool) -> Result<Pool<Sqlite>,
     }
     Ok(db)
 }
-
-pub async fn create_test_db() -> Result<SqlitePool, sqlx::Error> {
-    let db = SqlitePool::connect("sqlite::memory:").await?;
-    sqlx::migrate!("./migrations").run(&db).await?;
-    Ok(db)
-}
-
-pub async fn create_test_store() -> Result<SqliteStore, sqlx::Error> {
-    Ok(SqliteStore::new(create_test_db().await?))
-}

crates/store_sqlite/src/tests/mod.rs

@@ -0,0 +1,42 @@
+use crate::{
+    SqliteStore, addressbook_store::SqliteAddressbookStore, calendar_store::SqliteCalendarStore,
+    principal_store::SqlitePrincipalStore,
+};
+use rustical_store::{
+    AddressbookStore, CalendarStore, CollectionOperation, SubscriptionStore,
+    auth::AuthenticationProvider,
+};
+use sqlx::SqlitePool;
+use std::sync::Arc;
+use tokio::sync::mpsc::Receiver;
+
+pub async fn get_test_stores() -> (
+    Arc<impl AddressbookStore>,
+    Arc<impl CalendarStore>,
+    Arc<impl SubscriptionStore>,
+    Arc<impl AuthenticationProvider>,
+    Receiver<CollectionOperation>,
+) {
+    let db = SqlitePool::connect("sqlite::memory:").await.unwrap();
+    sqlx::migrate!("./migrations").run(&db).await.unwrap();
+    // let db = create_db_pool("sqlite::memory:", true).await.unwrap();
+    // Channel to watch for changes (for DAV Push)
+    let (send, recv) = tokio::sync::mpsc::channel(1000);
+
+    let addressbook_store = Arc::new(SqliteAddressbookStore::new(db.clone(), send.clone()));
+    let cal_store = Arc::new(SqliteCalendarStore::new(db.clone(), send));
+    let subscription_store = Arc::new(SqliteStore::new(db.clone()));
+    let principal_store = Arc::new(SqlitePrincipalStore::new(db.clone()));
+    (
+        addressbook_store,
+        cal_store,
+        subscription_store,
+        principal_store,
+        recv,
+    )
+}
+
+#[tokio::test]
+async fn test_create_store() {
+    get_test_stores().await;
+}

docs/developers/frontend.md

@@ -0,0 +1,7 @@
+# Frontend
+
+The frontend is currently generated through [askama templates](https://askama.readthedocs.io/en/stable/) for server-side rendered pages
+and uses Web Components for interactive elements.
+
+Normally, content that will be statically served by the frontend module (i.e. stylesheet and web components) is embedded into the binary.
+Using the `frontend-dev` feature you can serve it from source to see changes without recompiling RustiCal.

docs/developers/rfcs.md

@@ -3,11 +3,11 @@
 Collection of RFCs relevant to this project
 
 - Versioning Extensions to WebDAV: [RFC 3253](https://datatracker.ietf.org/doc/html/rfc3253)
-  - provides the REPORT method
+    - provides the REPORT method
 - Calendaring Extensions to WebDAV (CalDAV): [RFC 4791](https://datatracker.ietf.org/doc/html/rfc4791)
 - Scheduling Extensions to CalDAV: [RFC 6638](https://datatracker.ietf.org/doc/html/rfc6638)
-  - not sur`e yet whether to implement this
+    - not sure yet whether to implement this
 - Collection Synchronization WebDAV [RFC 6578](https://datatracker.ietf.org/doc/html/rfc6578)
-  - We need to implement sync-token, etc.
+    - We need to implement sync-token, etc.
-  - This is important for more efficient synchronisation
+    - This is important for more efficient synchronisation
 - iCalendar [RFC 2445](https://datatracker.ietf.org/doc/html/rfc2445#section-3.10)

docs/index.md

@@ -3,10 +3,10 @@
 a CalDAV/CardDAV server
 
 !!! warning
-RustiCal is **not production-ready!**
+    RustiCal is under **active development**!
-I've been using it for the last few weeks and I'm slowly becoming more confident,
+    While I've been successfully using RustiCal productively for a few weeks now,
-however you'd be one of the first testers so expect bugs and rough edges.
+    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. :)
+    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. :)
 
 ## Features
 

docs/installation/configuration.md

@@ -0,0 +1,31 @@
+# Configuration
+
+While RustiCal (apart from user management) will work without any configuration you should still know how to configure it. :)
+
+You can either mount a `config.toml` file or use environment variables (recommended).
+
+To see the options you can generate a default configuration using
+
+```sh title="Generate default config.toml"
+rustical gen-config
+```
+
+To see all configuration options available you can browse the [Cargo docs](/rustical/_crate/rustical/config/struct.Config.html).
+
+## Environment variables
+
+The options in `config.toml` can also be configured using environment variables.
+Names translate the following:
+
+```toml title="Example config.toml"
+[data_store.toml]
+path = "asd"
+```
+
+becomes `RUSTICAL_DATA_STORE__TOML__PATH`.
+Every variable is
+
+- uppercase
+- prefixed by `RUSTICAL_`
+- Dots become `__`
+- Arrays are JSON-encoded

docs/installation/index.md

@@ -40,38 +40,6 @@ App tokens are used by your CalDAV/CardDAV client (which can be managed through
 I recommend to generate random app tokens for each CalDAV/CardDAV client.
 Since the app tokens are random they use the faster `pbkdf2` algorithm.
 
-## Configuration
-
-While RustiCal (apart from user management) will work without any configuration you should still know how to configure it. :)
-
-You can either mount a `config.toml` file or use environment variables.
-
-To see the options you can generate a default configuration using
-
-```sh title="Generate default config.toml"
-rustical gen-config
-```
-
-To see all configuration options available you can browse the [Cargo docs](/rustical/_crate/rustical/config/struct.Config.html).
-
-### Environment variables
-
-The options in `config.toml` can also be configured using environment variables.
-Names translate the following:
-
-```toml title="Example config.toml"
-[data_store.toml]
-path = "asd"
-```
-
-becomes `RUSTICAL_DATA_STORE__TOML__PATH`.
-Every variable is
-
-- uppercase
-- prefixed by `RUSTICAL_`
-- Dots become `__`
-- Arrays are JSON-encoded
-
 ## Manual
 
 ```sh

docs/style.css

@@ -0,0 +1,10 @@
+body .md-main {
+  h1 {
+    font-weight: bold;
+    color: var(--md-typeset-color);
+  }
+}
+
+.md-tabs {
+  box-shadow: 0px 0 20px -10px black;
+}

mkdocs.yml

@@ -14,7 +14,7 @@ theme:
         name: Switch to light mode
     - media: "(prefers-color-scheme: light)"
       scheme: default
-      primary: indigo
+      primary: white
       accent: indigo
       toggle:
         icon: material/toggle-switch
@@ -38,6 +38,13 @@ theme:
     - content.tooltips
     - navigation.indices
     - navigation.tabs
+    - navigation.indexes
+    - navigation.indexes
+    - navigation.instant
+    - navigation.footer
+
+extra_css:
+  - style.css
 
 markdown_extensions:
   - fenced_code
@@ -58,10 +65,13 @@ markdown_extensions:
 
 nav:
   - Home: index.md
-  - Installation: installation.md
+  - Installation:
+      - installation/index.md
+      - Configuration: installation/configuration.md
   - OpenID Connect: setup/oidc.md
   - Developers:
       - developers/index.md
       - Relevant RFCs: developers/rfcs.md
+      - Frontend: developers/frontend.md
       - Debugging: developers/debugging.md
   - Cargo docs: /rustical/_crate/rustical/