integration tests: Also use health command

.gitignore

@@ -3,7 +3,7 @@ crates/*/target
 # For libraries ignore Cargo.lock
 crates/*/Cargo.lock
 
-db.sqlite3*
+**/*.sqlite3*
 config.toml
 principals.toml
 

Cargo.lock

@@ -3319,6 +3319,7 @@ dependencies = [
  "caldata",
  "clap",
  "figment",
+ "futures-util",
  "headers",
  "http",
  "insta",
@@ -3343,7 +3344,9 @@ dependencies = [
  "serde",
  "similar-asserts",
  "sqlx",
+ "tempfile",
  "tokio",
+ "tokio-util",
  "toml 0.9.11+spec-1.1.0",
  "tower",
  "tower-http",
@@ -4471,6 +4474,7 @@ dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
+ "futures-util",
  "pin-project-lite",
  "tokio",
 ]

Cargo.toml

@@ -32,8 +32,11 @@ opentelemetry = [
   "dep:tracing-opentelemetry",
 ]
 
-[profile.dev]
-debug = 0
+[lib]
+doc = true
+name = "rustical"
+path = "src/lib.rs"
+test = true
 
 [workspace.dependencies]
 rustical_dav = { path = "./crates/dav/", features = ["ical"] }
@@ -70,6 +73,7 @@ tokio = { version = "1.48", features = [
   "rt-multi-thread",
   "full",
 ] }
+tokio-util = { version = "0.7", features = ["rt"] }
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
@@ -152,6 +156,7 @@ rstest.workspace = true
 rustical_store_sqlite = { workspace = true, features = ["test"] }
 insta.workspace = true
 similar-asserts.workspace = true
+tempfile = "3.24"
 
 [dependencies]
 rustical_store.workspace = true
@@ -163,6 +168,7 @@ caldata.workspace = true
 toml.workspace = true
 serde.workspace = true
 tokio.workspace = true
+tokio-util.workspace = true
 tracing.workspace = true
 anyhow.workspace = true
 clap.workspace = true
@@ -201,3 +207,4 @@ tower-http.workspace = true
 axum-extra.workspace = true
 headers.workspace = true
 http.workspace = true
+futures-util.workspace = true

README.md

@@ -24,6 +24,7 @@ a CalDAV/CardDAV server
 - Apple configuration profiles (skip copy-pasting passwords and instead generate the configuration in the frontend)
 - **OpenID Connect** support (with option to disable password login)
 - Group-based **sharing**
+- Partial [RFC 7809](https://datatracker.ietf.org/doc/html/rfc7809) support. RustiCal will accept timezones by reference and handle omitted timezones in objects.
 
 ## Getting Started
 

crates/store_sqlite/src/lib.rs

@@ -37,11 +37,11 @@ impl SqliteStore {
 }
 
 pub async fn create_db_pool(db_url: &str, migrate: bool) -> Result<Pool<Sqlite>, sqlx::Error> {
+    let options: SqliteConnectOptions = db_url.parse()?;
+
     let db = SqlitePool::connect_with(
-        SqliteConnectOptions::new()
+        options
             .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
-            .synchronous(sqlx::sqlite::SqliteSynchronous::Normal)
-            .filename(db_url)
             .create_if_missing(true),
     )
     .await?;

crates/store_sqlite/src/tests/mod.rs

@@ -1,6 +1,6 @@
 use crate::{
     SqliteStore, addressbook_store::SqliteAddressbookStore, calendar_store::SqliteCalendarStore,
-    principal_store::SqlitePrincipalStore,
+    create_db_pool, principal_store::SqlitePrincipalStore,
 };
 use rstest::fixture;
 use rustical_store::auth::{AuthenticationProvider, Principal, PrincipalType};
@@ -9,12 +9,23 @@ use sqlx::SqlitePool;
 mod addressbook_store;
 mod calendar_store;
 
-async fn get_test_db() -> SqlitePool {
-    let db = SqlitePool::connect("sqlite::memory:").await.unwrap();
-    sqlx::migrate!("./migrations").run(&db).await.unwrap();
+#[derive(Debug, Clone)]
+pub struct TestStoreContext {
+    pub db: SqlitePool,
+    pub addr_store: SqliteAddressbookStore,
+    pub cal_store: SqliteCalendarStore,
+    pub principal_store: SqlitePrincipalStore,
+    pub sub_store: SqliteStore,
+}
+
+#[fixture]
+pub async fn test_store_context() -> TestStoreContext {
+    let (send_addr, _recv) = tokio::sync::mpsc::channel(1);
+    let (send_cal, _recv) = tokio::sync::mpsc::channel(1);
+    let db = create_db_pool(":memory:", true).await.unwrap();
 
-    // Populate with test data
     let principal_store = SqlitePrincipalStore::new(db.clone());
+    // Populate with test data
     principal_store
         .insert_principal(
             Principal {
@@ -33,28 +44,11 @@ async fn get_test_db() -> SqlitePool {
         .await
         .unwrap();
 
-    db
-}
-
-#[derive(Debug, Clone)]
-pub struct TestStoreContext {
-    pub db: SqlitePool,
-    pub addr_store: SqliteAddressbookStore,
-    pub cal_store: SqliteCalendarStore,
-    pub principal_store: SqlitePrincipalStore,
-    pub sub_store: SqliteStore,
-}
-
-#[fixture]
-pub async fn test_store_context() -> TestStoreContext {
-    let (send_addr, _recv) = tokio::sync::mpsc::channel(1);
-    let (send_cal, _recv) = tokio::sync::mpsc::channel(1);
-    let db = get_test_db().await;
     TestStoreContext {
         db: db.clone(),
         addr_store: SqliteAddressbookStore::new(db.clone(), send_addr, false),
         cal_store: SqliteCalendarStore::new(db.clone(), send_cal, false),
-        principal_store: SqlitePrincipalStore::new(db.clone()),
+        principal_store,
         sub_store: SqliteStore::new(db),
     }
 }

docs/installation/index.md

@@ -48,3 +48,26 @@ Since the app tokens are random they use the faster `pbkdf2` algorithm.
 ```sh
 cargo install --locked --git https://github.com/lennart-k/rustical
 ```
+
+## NixOS (community-maintained by [@PopeRigby](https://github.com/PopeRigby))
+
+!!! warning
+    The NixOS package is not maintained by myself but since I appreciate [@PopeRigby](https://github.com/PopeRigby)'s work on it I want to mention it.
+    Since rustical's development is still quite active I **strongly** recommend installing from the `nixpkgs-unstable` branch.
+
+In the `nixpkgs-unstable` you'll find a `rustical` package you can install.
+
+There's also a service that has not been merged yet. If you know how to add modules from PRs in Nix
+you can already install it <https://github.com/NixOS/nixpkgs/pull/424188>
+and then setup rustical as a service:
+
+```nix title="In your configuration.nix"
+services.rustical = {
+    enable = true;
+    package = inputs.rustical.legacyPackages.${pkgs.stdenv.hostPlatform.system}.rustical;
+    settings = {
+        # Settings the same as in config.toml but in Nix syntax
+        # http.port = 3002;
+    };
+};
+```

src/app.rs

@@ -32,7 +32,8 @@ use tracing::field::display;
 #[allow(
     clippy::too_many_arguments,
     clippy::too_many_lines,
-    clippy::cognitive_complexity
+    clippy::cognitive_complexity,
+    clippy::missing_panics_doc
 )]
 pub fn make_app<
     AS: AddressbookStore + PrefixedCalendarStore,
@@ -109,9 +110,9 @@ pub fn make_app<
         options(async || {
             let mut resp = Response::builder().status(StatusCode::OK);
             resp.headers_mut()
-                .unwrap()
+                .expect("this always works")
                 .insert("DAV", HeaderValue::from_static("1"));
-            resp.body(Body::empty()).unwrap()
+            resp.body(Body::empty()).expect("empty body always works")
         }),
     );
 

src/commands/health.rs

@@ -2,11 +2,12 @@ use crate::config::HttpConfig;
 use clap::Parser;
 use http::Method;
 
-#[derive(Parser, Debug)]
+#[derive(Parser, Debug, Default)]
 pub struct HealthArgs {}
 
 /// Healthcheck for running rustical instance
 /// Currently just pings to see if it's reachable via HTTP
+#[allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 pub async fn cmd_health(http_config: HttpConfig, _health_args: HealthArgs) -> anyhow::Result<()> {
     let client = reqwest::ClientBuilder::new().build().unwrap();
 

src/commands/membership.rs

@@ -33,7 +33,8 @@ pub struct MembershipArgs {
     command: MembershipCommand,
 }
 
-pub async fn handle_membership_command(
+#[allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
+pub async fn cmd_membership(
     user_store: &impl AuthenticationProvider,
     MembershipArgs { command }: MembershipArgs,
 ) -> anyhow::Result<()> {

src/commands/mod.rs

@@ -6,13 +6,17 @@ use clap::Parser;
 use rustical_caldav::CalDavConfig;
 use rustical_frontend::FrontendConfig;
 
-pub mod health;
+mod health;
 pub mod membership;
 pub mod principals;
 
+pub use health::{HealthArgs, cmd_health};
+pub use principals::{PrincipalsArgs, cmd_principals};
+
 #[derive(Debug, Parser)]
 pub struct GenConfigArgs {}
 
+#[allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 pub fn cmd_gen_config(_args: GenConfigArgs) -> anyhow::Result<()> {
     let config = Config {
         http: HttpConfig::default(),

src/commands/principals.rs

@@ -1,56 +1,49 @@
-use super::membership::{MembershipArgs, handle_membership_command};
-use crate::{config::Config, get_data_stores};
+use super::membership::MembershipArgs;
+use crate::{config::Config, get_data_stores, membership::cmd_membership};
 use clap::{Parser, Subcommand};
-use figment::{
-    Figment,
-    providers::{Env, Format, Toml},
-};
 use password_hash::{PasswordHasher, SaltString, rand_core::OsRng};
 use rustical_store::auth::{AuthenticationProvider, Principal, PrincipalType};
 
 #[derive(Parser, Debug)]
 pub struct PrincipalsArgs {
-    #[arg(short, long, env, default_value = "/etc/rustical/config.toml")]
-    config_file: String,
-
     #[command(subcommand)]
-    command: Command,
+    pub command: PrincipalsCommand,
 }
 
 #[derive(Parser, Debug)]
-struct CreateArgs {
-    id: String,
+pub struct CreateArgs {
+    pub id: String,
     #[arg(value_enum, short, long)]
-    principal_type: Option<PrincipalType>,
+    pub principal_type: Option<PrincipalType>,
     #[arg(short, long)]
-    name: Option<String>,
+    pub name: Option<String>,
     #[arg(long, help = "Ask for password input")]
-    password: bool,
+    pub password: bool,
 }
 
 #[derive(Parser, Debug)]
-struct RemoveArgs {
-    id: String,
+pub struct RemoveArgs {
+    pub id: String,
 }
 
 #[derive(Parser, Debug)]
-struct EditArgs {
-    id: String,
+pub struct EditArgs {
+    pub id: String,
     #[arg(long, help = "Ask for password input")]
-    password: bool,
+    pub password: bool,
     #[arg(
         long,
         help = "Remove password (If you only want to use OIDC for example)"
     )]
-    remove_password: bool,
+    pub remove_password: bool,
     #[arg(short, long, help = "Change principal displayname")]
-    name: Option<String>,
+    pub name: Option<String>,
     #[arg(value_enum, short, long, help = "Change the principal type")]
-    principal_type: Option<PrincipalType>,
+    pub principal_type: Option<PrincipalType>,
 }
 
 #[derive(Debug, Subcommand)]
-enum Command {
+pub enum PrincipalsCommand {
     List,
     Create(CreateArgs),
     Remove(RemoveArgs),
@@ -58,16 +51,12 @@ enum Command {
     Membership(MembershipArgs),
 }
 
-pub async fn cmd_principals(args: PrincipalsArgs) -> anyhow::Result<()> {
-    let config: Config = Figment::new()
-        .merge(Toml::file(&args.config_file))
-        .merge(Env::prefixed("RUSTICAL_").split("__"))
-        .extract()?;
-
+#[allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
+pub async fn cmd_principals(args: PrincipalsArgs, config: Config) -> anyhow::Result<()> {
     let (_, _, _, principal_store, _) = get_data_stores(true, &config.data_store).await?;
 
     match args.command {
-        Command::List => {
+        PrincipalsCommand::List => {
             for principal in principal_store.get_principals().await? {
                 println!(
                     "{} (displayname={}) [{}]",
@@ -77,7 +66,7 @@ pub async fn cmd_principals(args: PrincipalsArgs) -> anyhow::Result<()> {
                 );
             }
         }
-        Command::Create(CreateArgs {
+        PrincipalsCommand::Create(CreateArgs {
             id,
             principal_type,
             name,
@@ -111,11 +100,11 @@ pub async fn cmd_principals(args: PrincipalsArgs) -> anyhow::Result<()> {
                 .await?;
             println!("Principal created");
         }
-        Command::Remove(RemoveArgs { id }) => {
+        PrincipalsCommand::Remove(RemoveArgs { id }) => {
             principal_store.remove_principal(&id).await?;
             println!("Principal {id} removed");
         }
-        Command::Edit(EditArgs {
+        PrincipalsCommand::Edit(EditArgs {
             id,
             remove_password,
             password,
@@ -151,8 +140,8 @@ pub async fn cmd_principals(args: PrincipalsArgs) -> anyhow::Result<()> {
             principal_store.insert_principal(principal, true).await?;
             println!("Principal {id} updated");
         }
-        Command::Membership(args) => {
-            handle_membership_command(principal_store.as_ref(), args).await?;
+        PrincipalsCommand::Membership(args) => {
+            cmd_membership(principal_store.as_ref(), args).await?;
         }
     }
     Ok(())

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__delete_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar__mkcalendar_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__0_import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__1_import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__get_body.snap

@@ -1,107 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:RustiCal
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20060206T001121Z
-DTSTART;TZID=US/Eastern:20060104T140000
-DURATION:PT1H
-RECURRENCE-ID;TZID=US/Eastern:20060104T120000
-SUMMARY:Event #2 bis
-UID:[UID]
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20060206T001102Z
-DTSTART;TZID=US/Eastern:20060102T100000
-DURATION:PT1H
-SUMMARY:Event #1
-Description:Go Steelers!
-UID:[UID]
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20060206T001121Z
-DTSTART;TZID=US/Eastern:20060102T120000
-DURATION:PT1H
-RRULE:FREQ=DAILY;COUNT=5
-SUMMARY:Event #2
-UID:[UID]
-END:VEVENT
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus@example.com
-ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
-DTSTAMP:20060206T001220Z
-DTSTART;TZID=US/Eastern:20060104T100000
-DURATION:PT1H
-LAST-MODIFIED:20060206T001330Z
-ORGANIZER:mailto:cyrus@example.com
-SEQUENCE:1
-STATUS:TENTATIVE
-SUMMARY:Event #3
-UID:[UID]
-END:VEVENT
-BEGIN:VTODO
-DTSTAMP:20060205T235335Z
-DUE;VALUE=DATE:20060104
-STATUS:NEEDS-ACTION
-SUMMARY:Task #1
-UID:[UID]
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VTODO
-BEGIN:VTODO
-DTSTAMP:20060205T235300Z
-DUE;VALUE=DATE:20060106
-LAST-MODIFIED:20060205T235308Z
-SEQUENCE:1
-STATUS:NEEDS-ACTION
-SUMMARY:Task #2
-UID:[UID]
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VTODO
-BEGIN:VTODO
-COMPLETED:20051223T122322Z
-DTSTAMP:20060205T235400Z
-DUE;VALUE=DATE:20051225
-LAST-MODIFIED:20060205T235308Z
-SEQUENCE:1
-STATUS:COMPLETED
-SUMMARY:Task #3
-UID:[UID]
-END:VTODO
-BEGIN:VTODO
-DTSTAMP:20060205T235600Z
-DUE;VALUE=DATE:20060101
-LAST-MODIFIED:20060205T235308Z
-SEQUENCE:1
-STATUS:CANCELLED
-SUMMARY:Task #4
-UID:[UID]
-END:VTODO
-END:VCALENDAR

src/integration_tests/caldav/snapshots/rustical__integration_tests__caldav__calendar_import__import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/caldav/calendar_import.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__delete_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__get_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook__mkcol_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook_import__get_body.snap

@@ -1,13 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook_import.rs
-expression: body
----
-BEGIN:VCARD
-VERSION:4.0
-FN:Simon Perreault
-N:Perreault;Simon;;;ing. jr,M.Sc.
-BDAY:--0203
-GENDER:M
-EMAIL;TYPE=work:simon.perreault@viagenie.ca
-UID:[UID]
-END:VCARD

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__addressbook_import__import_body.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/addressbook_import.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__carddav_root-2.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/mod.rs
-expression: body
----
-

src/integration_tests/carddav/snapshots/rustical__integration_tests__carddav__carddav_root.snap

@@ -1,5 +0,0 @@
----
-source: src/integration_tests/carddav/mod.rs
-expression: body
----
-

src/lib.rs

@@ -0,0 +1,165 @@
+#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
+use crate::config::Config;
+use anyhow::Result;
+use app::make_app;
+use axum::ServiceExt;
+use axum::extract::Request;
+use clap::{Parser, Subcommand};
+use config::{DataStoreConfig, SqliteDataStoreConfig};
+use rustical_dav_push::DavPushController;
+use rustical_store::auth::AuthenticationProvider;
+use rustical_store::{
+    AddressbookStore, CalendarStore, CollectionOperation, PrefixedCalendarStore, SubscriptionStore,
+};
+use rustical_store_sqlite::addressbook_store::SqliteAddressbookStore;
+use rustical_store_sqlite::calendar_store::SqliteCalendarStore;
+use rustical_store_sqlite::principal_store::SqlitePrincipalStore;
+use rustical_store_sqlite::{SqliteStore, create_db_pool};
+use setup_tracing::setup_tracing;
+use std::sync::Arc;
+use tokio::sync::Notify;
+use tokio::sync::mpsc::Receiver;
+use tower::Layer;
+use tower_http::normalize_path::NormalizePathLayer;
+use tracing::{info, warn};
+
+pub mod app;
+mod commands;
+pub use commands::*;
+pub mod config;
+mod setup_tracing;
+
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+pub struct Args {
+    #[arg(short, long, env, default_value = "/etc/rustical/config.toml")]
+    pub config_file: String,
+    #[arg(long, env, help = "Do no run database migrations (only for sql store)")]
+    pub no_migrations: bool,
+
+    #[command(subcommand)]
+    pub command: Option<Command>,
+}
+
+#[derive(Debug, Subcommand)]
+pub enum Command {
+    GenConfig(commands::GenConfigArgs),
+    Principals(PrincipalsArgs),
+    #[command(
+        about = "Healthcheck for running instance (Used for HEALTHCHECK in Docker container)"
+    )]
+    Health(HealthArgs),
+}
+
+#[allow(clippy::missing_errors_doc)]
+pub async fn get_data_stores(
+    migrate: bool,
+    config: &DataStoreConfig,
+) -> Result<(
+    Arc<impl AddressbookStore + PrefixedCalendarStore>,
+    Arc<impl CalendarStore>,
+    Arc<impl SubscriptionStore>,
+    Arc<impl AuthenticationProvider>,
+    Receiver<CollectionOperation>,
+)> {
+    Ok(match &config {
+        DataStoreConfig::Sqlite(SqliteDataStoreConfig {
+            db_url,
+            run_repairs,
+            skip_broken,
+        }) => {
+            let db = create_db_pool(db_url, migrate).await?;
+
+            // 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(),
+                *skip_broken,
+            ));
+            let cal_store = Arc::new(SqliteCalendarStore::new(db.clone(), send, *skip_broken));
+            if *run_repairs {
+                info!("Running repair tasks");
+                addressbook_store.repair_orphans().await?;
+                cal_store.repair_invalid_version_4_0().await?;
+                cal_store.repair_orphans().await?;
+            }
+            let subscription_store = Arc::new(SqliteStore::new(db.clone()));
+            let principal_store = Arc::new(SqlitePrincipalStore::new(db));
+
+            // Validate all calendar objects
+            for principal in principal_store.get_principals().await? {
+                cal_store.validate_objects(&principal.id).await?;
+                addressbook_store.validate_objects(&principal.id).await?;
+            }
+
+            (
+                addressbook_store,
+                cal_store,
+                subscription_store,
+                principal_store,
+                recv,
+            )
+        }
+    })
+}
+
+#[allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
+pub async fn cmd_default(
+    args: Args,
+    config: Config,
+    start_notifier: Option<Arc<Notify>>,
+    tracing: bool,
+) -> Result<()> {
+    if tracing {
+        setup_tracing(&config.tracing);
+    }
+
+    let (addr_store, cal_store, subscription_store, principal_store, update_recv) =
+        get_data_stores(!args.no_migrations, &config.data_store).await?;
+
+    let mut tasks = vec![];
+
+    if config.dav_push.enabled {
+        let dav_push_controller = DavPushController::new(
+            config.dav_push.allowed_push_servers,
+            subscription_store.clone(),
+        );
+        tasks.push(tokio::spawn(async move {
+            dav_push_controller.notifier(update_recv).await;
+        }));
+    }
+
+    let app = make_app(
+        addr_store.clone(),
+        cal_store.clone(),
+        subscription_store.clone(),
+        principal_store.clone(),
+        config.frontend.clone(),
+        config.oidc.clone(),
+        config.caldav,
+        &config.nextcloud_login,
+        config.dav_push.enabled,
+        config.http.session_cookie_samesite_strict,
+        config.http.payload_limit_mb,
+    );
+    let app = ServiceExt::<Request>::into_make_service(
+        NormalizePathLayer::trim_trailing_slash().layer(app),
+    );
+
+    let address = format!("{}:{}", config.http.host, config.http.port);
+    let listener = tokio::net::TcpListener::bind(&address).await?;
+    tasks.push(tokio::spawn(async move {
+        info!("RustiCal serving on http://{address}");
+        if let Some(start_notifier) = start_notifier {
+            start_notifier.notify_waiters();
+        }
+        axum::serve(listener, app).await.unwrap();
+    }));
+
+    for task in tasks {
+        task.await?;
+    }
+    Ok(())
+}

src/main.rs

@@ -1,112 +1,12 @@
 #![warn(clippy::all, clippy::pedantic, clippy::nursery)]
-use crate::commands::health::{HealthArgs, cmd_health};
-use crate::config::Config;
 use anyhow::Result;
-use app::make_app;
-use axum::ServiceExt;
-use axum::extract::Request;
-use clap::{Parser, Subcommand};
-use commands::cmd_gen_config;
-use commands::principals::{PrincipalsArgs, cmd_principals};
-use config::{DataStoreConfig, SqliteDataStoreConfig};
+use clap::Parser;
 use figment::Figment;
 use figment::providers::{Env, Format, Toml};
-use rustical_dav_push::DavPushController;
-use rustical_store::auth::AuthenticationProvider;
-use rustical_store::{
-    AddressbookStore, CalendarStore, CollectionOperation, PrefixedCalendarStore, SubscriptionStore,
-};
-use rustical_store_sqlite::addressbook_store::SqliteAddressbookStore;
-use rustical_store_sqlite::calendar_store::SqliteCalendarStore;
-use rustical_store_sqlite::principal_store::SqlitePrincipalStore;
-use rustical_store_sqlite::{SqliteStore, create_db_pool};
-use setup_tracing::setup_tracing;
-use std::sync::Arc;
-use tokio::sync::mpsc::Receiver;
-use tower::Layer;
-use tower_http::normalize_path::NormalizePathLayer;
-use tracing::{info, warn};
-
-mod app;
-mod commands;
-mod config;
-#[cfg(test)]
-pub mod integration_tests;
-mod setup_tracing;
-
-#[derive(Parser, Debug)]
-#[command(author, version, about, long_about = None)]
-struct Args {
-    #[arg(short, long, env, default_value = "/etc/rustical/config.toml")]
-    config_file: String,
-    #[arg(long, env, help = "Do no run database migrations (only for sql store)")]
-    no_migrations: bool,
-
-    #[command(subcommand)]
-    command: Option<Command>,
-}
-
-#[derive(Debug, Subcommand)]
-enum Command {
-    GenConfig(commands::GenConfigArgs),
-    Principals(PrincipalsArgs),
-    #[command(
-        about = "Healthcheck for running instance (Used for HEALTHCHECK in Docker container)"
-    )]
-    Health(HealthArgs),
-}
-
-async fn get_data_stores(
-    migrate: bool,
-    config: &DataStoreConfig,
-) -> Result<(
-    Arc<impl AddressbookStore + PrefixedCalendarStore>,
-    Arc<impl CalendarStore>,
-    Arc<impl SubscriptionStore>,
-    Arc<impl AuthenticationProvider>,
-    Receiver<CollectionOperation>,
-)> {
-    Ok(match &config {
-        DataStoreConfig::Sqlite(SqliteDataStoreConfig {
-            db_url,
-            run_repairs,
-            skip_broken,
-        }) => {
-            let db = create_db_pool(db_url, migrate).await?;
-            // 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(),
-                *skip_broken,
-            ));
-            let cal_store = Arc::new(SqliteCalendarStore::new(db.clone(), send, *skip_broken));
-            if *run_repairs {
-                info!("Running repair tasks");
-                addressbook_store.repair_orphans().await?;
-                cal_store.repair_invalid_version_4_0().await?;
-                cal_store.repair_orphans().await?;
-            }
-            let subscription_store = Arc::new(SqliteStore::new(db.clone()));
-            let principal_store = Arc::new(SqlitePrincipalStore::new(db));
-
-            // Validate all calendar objects
-            for principal in principal_store.get_principals().await? {
-                cal_store.validate_objects(&principal.id).await?;
-                addressbook_store.validate_objects(&principal.id).await?;
-            }
-
-            (
-                addressbook_store,
-                cal_store,
-                subscription_store,
-                principal_store,
-                recv,
-            )
-        }
-    })
-}
+use rustical::config::Config;
+use rustical::{Args, Command};
+use rustical::{cmd_default, cmd_gen_config, cmd_health, cmd_principals};
+use tracing::warn;
 
 #[tokio::main(flavor = "multi_thread")]
 async fn main() -> Result<()> {
@@ -120,60 +20,17 @@ async fn main() -> Result<()> {
     };
 
     match args.command {
-        Some(Command::GenConfig(gen_config_args)) => cmd_gen_config(gen_config_args)?,
-        Some(Command::Principals(principals_args)) => cmd_principals(principals_args).await?,
+        Some(Command::GenConfig(gen_config_args)) => cmd_gen_config(gen_config_args),
+        Some(Command::Principals(principals_args)) => {
+            cmd_principals(principals_args, parse_config()?).await
+        }
         Some(Command::Health(health_args)) => {
             let config: Config = parse_config()?;
-            cmd_health(config.http, health_args).await?;
+            cmd_health(config.http, health_args).await
         }
         None => {
             let config: Config = parse_config()?;
-
-            setup_tracing(&config.tracing);
-
-            let (addr_store, cal_store, subscription_store, principal_store, update_recv) =
-                get_data_stores(!args.no_migrations, &config.data_store).await?;
-
-            let mut tasks = vec![];
-
-            if config.dav_push.enabled {
-                let dav_push_controller = DavPushController::new(
-                    config.dav_push.allowed_push_servers,
-                    subscription_store.clone(),
-                );
-                tasks.push(tokio::spawn(async move {
-                    dav_push_controller.notifier(update_recv).await;
-                }));
-            }
-
-            let app = make_app(
-                addr_store.clone(),
-                cal_store.clone(),
-                subscription_store.clone(),
-                principal_store.clone(),
-                config.frontend.clone(),
-                config.oidc.clone(),
-                config.caldav,
-                &config.nextcloud_login,
-                config.dav_push.enabled,
-                config.http.session_cookie_samesite_strict,
-                config.http.payload_limit_mb,
-            );
-            let app = ServiceExt::<Request>::into_make_service(
-                NormalizePathLayer::trim_trailing_slash().layer(app),
-            );
-
-            let address = format!("{}:{}", config.http.host, config.http.port);
-            let listener = tokio::net::TcpListener::bind(&address).await?;
-            tasks.push(tokio::spawn(async move {
-                info!("RustiCal serving on http://{address}");
-                axum::serve(listener, app).await.unwrap();
-            }));
-
-            for task in tasks {
-                task.await?;
-            }
+            cmd_default(args, config, None, true).await
         }
     }
-    Ok(())
 }

tests/common/mod.rs

@@ -0,0 +1,84 @@
+use rustical::{
+    Args, cmd_default,
+    config::{Config, DataStoreConfig, HttpConfig, SqliteDataStoreConfig},
+};
+use std::{
+    collections::HashSet,
+    net::{Ipv4Addr, SocketAddrV4, TcpListener},
+    sync::{Arc, Mutex, OnceLock},
+    thread::{self, JoinHandle},
+};
+use tokio::sync::Notify;
+use tokio_util::sync::CancellationToken;
+
+// When running multiple integration tests we need to make sure that they don't get the same port
+static BOUND_PORTS: OnceLock<Mutex<HashSet<u16>>> = OnceLock::new();
+
+pub fn find_free_port() -> Option<u16> {
+    let bound_ports = BOUND_PORTS.get_or_init(Mutex::default);
+    let mut bound_ports_write = bound_ports.lock().unwrap();
+    let mut port = 15000;
+    // Frees the socket on drop such that this function returns a free port
+    while TcpListener::bind(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, port)).is_err()
+        || bound_ports_write.contains(&port)
+    {
+        port += 1;
+
+        if port >= 16000 {
+            return None;
+        }
+    }
+    bound_ports_write.insert(port);
+    Some(port)
+}
+
+pub fn rustical_process(
+    db_url: Option<String>,
+) -> (CancellationToken, u16, JoinHandle<()>, Arc<Notify>) {
+    let port = find_free_port().unwrap();
+    let token = CancellationToken::new();
+    let cloned_token = token.clone();
+    let start_notify = Arc::new(Notify::new());
+    let cloned_start_notify = start_notify.clone();
+
+    let main_process = thread::spawn(move || {
+        let rt = tokio::runtime::Runtime::new().unwrap();
+        let fut = async {
+            cmd_default(
+                Args {
+                    config_file: "asldajldakjsdkj".to_owned(),
+                    no_migrations: false,
+                    command: None,
+                },
+                Config {
+                    data_store: DataStoreConfig::Sqlite(SqliteDataStoreConfig {
+                        db_url: db_url.unwrap_or(":memory:".to_owned()),
+                        run_repairs: true,
+                        skip_broken: false,
+                    }),
+                    http: HttpConfig {
+                        host: "127.0.0.1".to_owned(),
+                        port,
+                        ..Default::default()
+                    },
+                    frontend: Default::default(),
+                    oidc: None,
+                    tracing: Default::default(),
+                    dav_push: Default::default(),
+                    nextcloud_login: Default::default(),
+                    caldav: Default::default(),
+                },
+                Some(cloned_start_notify),
+                false,
+            )
+            .await
+        };
+        rt.block_on(async {
+            tokio::select! {
+                _ = cloned_token.cancelled() => {},
+                _ = fut => {}
+            }
+        });
+    });
+    (token, port, main_process, start_notify)
+}

tests/http_integration.rs

@@ -0,0 +1,137 @@
+// This integration test checks whether the HTTP server works by actually running rustical in a new
+// thread.
+use common::rustical_process;
+use http::{Method, StatusCode};
+use rustical::{
+    PrincipalsArgs, cmd_health, cmd_principals,
+    config::{Config, DataStoreConfig, HttpConfig, SqliteDataStoreConfig},
+    principals::{CreateArgs, PrincipalsCommand},
+};
+use rustical_store::auth::{AuthenticationProvider, PrincipalType};
+use rustical_store_sqlite::{create_db_pool, principal_store::SqlitePrincipalStore};
+use std::time::Duration;
+
+mod common;
+
+pub async fn test_runner<O, F>(db_path: Option<String>, inner: F)
+where
+    O: IntoFuture<Output = ()>,
+    // <O as IntoFuture>::IntoFuture: UnwindSafe,
+    F: FnOnce(u16) -> O,
+{
+    // Start RustiCal process
+    let (token, port, main_process, start_notify) = rustical_process(db_path);
+
+    // Wait for RustiCal server to listen
+    tokio::time::timeout(Duration::new(2, 0), start_notify.notified())
+        .await
+        .unwrap();
+
+    // We use catch_unwind to make sure we'll always correctly stop RustiCal
+    // Otherwise, our process would just run indefinitely
+    inner(port).into_future().await;
+
+    // Signal RustiCal to stop
+    token.cancel();
+    main_process.join().unwrap();
+}
+
+#[tokio::test]
+async fn test_ping() {
+    test_runner(None, async |port| {
+        let origin = format!("http://localhost:{port}");
+        let resp = reqwest::get(origin.clone() + "/ping").await.unwrap();
+        assert_eq!(resp.status(), StatusCode::OK);
+
+        // Ensure that path normalisation works as intended
+        let resp = reqwest::get(origin + "/ping/").await.unwrap();
+        assert_eq!(resp.status(), StatusCode::OK);
+
+        cmd_health(
+            HttpConfig {
+                host: "localhost".to_owned(),
+                port,
+                ..Default::default()
+            },
+            Default::default(),
+        )
+        .await
+        .unwrap();
+    })
+    .await
+}
+
+// When setting a use password from the CLI we effectively have two processes accessing the same
+// database: The server and the CLI.
+// This test ensures that the server correctly picks up the changes made by the CLI.
+#[tokio::test]
+async fn test_initial_setup() {
+    let db_tempfile = tempfile::NamedTempFile::with_suffix(".rustical-test.sqlite3").unwrap();
+    let db_path = db_tempfile.path().to_string_lossy().into_owned();
+
+    test_runner(Some(db_path.clone()), async |port| {
+        let origin = format!("http://localhost:{port}");
+        // Create principal
+        cmd_principals(
+            PrincipalsArgs {
+                command: PrincipalsCommand::Create(CreateArgs {
+                    id: "user".to_owned(),
+                    name: Some("Test User".to_owned()),
+                    password: false,
+                    principal_type: Some(PrincipalType::Individual),
+                }),
+            },
+            Config {
+                data_store: DataStoreConfig::Sqlite(SqliteDataStoreConfig {
+                    db_url: db_path.clone(),
+                    run_repairs: true,
+                    skip_broken: false,
+                }),
+                http: Default::default(),
+                frontend: Default::default(),
+                oidc: None,
+                tracing: Default::default(),
+                dav_push: Default::default(),
+                nextcloud_login: Default::default(),
+                caldav: Default::default(),
+            },
+        )
+        .await
+        .unwrap();
+
+        // Bodge to set password without using command (since that reads stdin)
+        let db = create_db_pool(&db_path, false).await.unwrap();
+        let principal_store = SqlitePrincipalStore::new(db);
+        let app_token = "token";
+        principal_store
+            .add_app_token("user", "Test Token".to_owned(), app_token.to_owned())
+            .await
+            .unwrap();
+
+        let url = origin.clone() + "/caldav/principal/user";
+        let resp = reqwest::Client::new()
+            .request(Method::from_bytes(b"PROPFIND").unwrap(), &url)
+            .send()
+            .await
+            .unwrap();
+        assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
+
+        let resp = reqwest::Client::new()
+            .request(Method::from_bytes(b"PROPFIND").unwrap(), &url)
+            .basic_auth("user", Some("token"))
+            .send()
+            .await
+            .unwrap();
+        assert_eq!(resp.status(), StatusCode::MULTI_STATUS);
+
+        principal_store.remove_principal("user").await.unwrap();
+
+        let resp = reqwest::Client::new()
+            .request(Method::from_bytes(b"PROPFIND").unwrap(), &url)
+            .send()
+            .await
+            .unwrap();
+        assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
+    })
+    .await;
+}

tests/integration_tests/caldav/calendar.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/calendar_import.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/calendar_put.rs

@@ -1,3 +1,4 @@
+use super::{ResponseExtractString, calendar::mkcalendar_template, get_app};
 use axum::body::Body;
 use headers::{Authorization, HeaderMapExt};
 use http::{Request, StatusCode};
@@ -6,10 +7,6 @@ use rustical_store::CalendarMetadata;
 use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};
 use tower::ServiceExt;
 
-use crate::integration_tests::{
-    ResponseExtractString, caldav::calendar::mkcalendar_template, get_app,
-};
-
 #[rstest]
 #[tokio::test]
 async fn test_put_invalid(

tests/integration_tests/caldav/calendar_report.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/mod.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__delete_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__get_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 BEGIN:VCALENDAR

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__mkcalendar_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__multiget_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__propfind_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar__proppatch_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar.rs
+source: tests/integration_tests/caldav/calendar.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_import__0_get_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_import.rs
+source: tests/integration_tests/caldav/calendar_import.rs
 expression: body
 ---
 BEGIN:VCALENDAR

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_import__0_import_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar_import.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_import__1_get_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_import.rs
+source: tests/integration_tests/caldav/calendar_import.rs
 expression: body
 ---
 BEGIN:VCALENDAR

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_import__1_import_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/caldav/calendar_import.rs
+expression: body
+---
+

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_report__0_report_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_report.rs
+source: tests/integration_tests/caldav/calendar_report.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_report__1_report_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_report.rs
+source: tests/integration_tests/caldav/calendar_report.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__calendar_report__2_report_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/calendar_report.rs
+source: tests/integration_tests/caldav/calendar_report.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__propfind_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/mod.rs
+source: tests/integration_tests/caldav/mod.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__propfind_depth_0.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/mod.rs
+source: tests/integration_tests/caldav/mod.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/caldav/snapshots/run_integration_tests__integration_tests__caldav__propfind_depth_1.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/caldav/mod.rs
+source: tests/integration_tests/caldav/mod.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/addressbook.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/carddav/addressbook_import.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};
@@ -27,11 +27,10 @@ async fn test_import(
             .body(Body::from(
                 r"BEGIN:VCARD
 VERSION:4.0
-FN:Simon Perreault
-N:Perreault;Simon;;;ing. jr,M.Sc.
+FN:John Doe
+N:Doe;John;;;,
 BDAY:--0203
 GENDER:M
-EMAIL;TYPE=work:simon.perreault@viagenie.ca
 END:VCARD",
             ))
             .unwrap()

tests/integration_tests/carddav/mod.rs

@@ -1,4 +1,4 @@
-use crate::integration_tests::{ResponseExtractString, get_app};
+use super::{ResponseExtractString, get_app};
 use axum::body::Body;
 use axum::extract::Request;
 use headers::{Authorization, HeaderMapExt};

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__delete_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__get_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__mkcol_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__multiget_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/carddav/addressbook.rs
+source: tests/integration_tests/carddav/addressbook.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__propfind_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/carddav/addressbook.rs
+source: tests/integration_tests/carddav/addressbook.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook__proppatch_body.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/carddav/addressbook.rs
+source: tests/integration_tests/carddav/addressbook.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook_import__get_body.snap

@@ -0,0 +1,12 @@
+---
+source: tests/integration_tests/carddav/addressbook_import.rs
+expression: body
+---
+BEGIN:VCARD
+VERSION:4.0
+FN:John Doe
+N:Doe;John;;;,
+BDAY:--0203
+GENDER:M
+UID:[UID]
+END:VCARD

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__addressbook_import__import_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook_import.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__carddav_root-2.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/mod.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__carddav_root-3.snap

@@ -1,5 +1,5 @@
 ---
-source: src/integration_tests/carddav/mod.rs
+source: tests/integration_tests/carddav/mod.rs
 expression: body
 ---
 <?xml version="1.0" encoding="utf-8"?>

tests/integration_tests/carddav/snapshots/light_integrations__integration_tests__carddav__carddav_root.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/mod.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/run_integration_tests__integration_tests__carddav__addressbook__delete_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/run_integration_tests__integration_tests__carddav__addressbook__get_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/run_integration_tests__integration_tests__carddav__addressbook__mkcol_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/run_integration_tests__integration_tests__carddav__addressbook__multiget_body.snap

@@ -0,0 +1,35 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+<?xml version="1.0" encoding="utf-8"?>
+<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
+    <response>
+        <href>/carddav/principal/user/contacts/newcard.vcf</href>
+        <propstat>
+            <prop>
+                <getetag>&quot;ea0bf4a2ce7ef84606a4cf9235776dbc11b3e7ce351ddf35f27cbc0088acca7e&quot;</getetag>
+                <CARD:address-data>BEGIN:VCARD
+VERSION:3.0
+FN:Cyrus Daboo
+N:Daboo;Cyrus
+ADR;TYPE=POSTAL:;2822 Email HQ;Suite 2821;RFCVille;PA;15213;USA
+EMAIL;TYPE=INTERNET,PREF:cyrus@example.com
+NICKNAME:me
+NOTE:Example VCard.
+ORG:Self Employed
+TEL;TYPE=WORK,VOICE:412 605 0499
+TEL;TYPE=FAX:412 605 0705
+URL:http://www.example.com
+UID:1234-5678-9000-1
+END:VCARD
+        </CARD:address-data>
+            </prop>
+            <status>HTTP/1.1 200 OK</status>
+        </propstat>
+    </response>
+    <response>
+        <href>/home/bernard/addressbook/vcf1.vcf</href>
+        <status>HTTP/1.1 404 Not Found</status>
+    </response>
+</multistatus>

tests/integration_tests/carddav/snapshots/run_integration_tests__integration_tests__carddav__addressbook__propfind_body.snap

@@ -0,0 +1,68 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+<?xml version="1.0" encoding="utf-8"?>
+<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
+    <response>
+        <href>/carddav/principal/user/contacts/</href>
+        <propstat>
+            <prop>
+                <CARD:addressbook-description>Amazing contacts!</CARD:addressbook-description>
+                <CARD:supported-address-data>
+                    <CARD:address-data-type content-type="text/vcard" version="3.0"/>
+                    <CARD:address-data-type content-type="text/vcard" version="4.0"/>
+                </CARD:supported-address-data>
+                <CARD:supported-collation-set>
+                    <CARD:supported-collation>i;ascii-casemap</CARD:supported-collation>
+                    <CARD:supported-collation>i;unicode-casemap</CARD:supported-collation>
+                    <CARD:supported-collation>i;octet</CARD:supported-collation>
+                </CARD:supported-collation-set>
+                <supported-report-set>
+                    <supported-report>
+                        <report>
+                            <CARD:addressbook-multiget/>
+                        </report>
+                    </supported-report>
+                    <supported-report>
+                        <report>
+                            <sync-collection/>
+                        </report>
+                    </supported-report>
+                </supported-report-set>
+                <CARD:max-resource-size>10000000</CARD:max-resource-size>
+                <sync-token>github.com/lennart-k/rustical/ns/0</sync-token>
+                <CS:getctag>github.com/lennart-k/rustical/ns/0</CS:getctag>
+                <PUSH:transports>
+                    <PUSH:web-push/>
+                </PUSH:transports>
+                <PUSH:topic>[PUSH_TOPIC]</PUSH:topic>
+                <PUSH:supported-triggers>
+                    <PUSH:content-update>
+                        <depth>1</depth>
+                    </PUSH:content-update>
+                    <PUSH:property-update>
+                        <depth>1</depth>
+                    </PUSH:property-update>
+                </PUSH:supported-triggers>
+                <resourcetype>
+                    <collection/>
+                    <CARD:addressbook/>
+                </resourcetype>
+                <displayname>Contacts</displayname>
+                <current-user-principal>
+                    <href>/carddav/principal/user/</href>
+                </current-user-principal>
+                <current-user-privilege-set>
+                    <privilege>
+                        <all/>
+                    </privilege>
+                </current-user-privilege-set>
+                <owner>
+                    <href>/carddav/principal/user/</href>
+                </owner>
+            </prop>
+            <status>HTTP/1.1 200 OK</status>
+        </propstat>
+    </response>
+</multistatus>

tests/integration_tests/carddav/snapshots/run_integration_tests__integration_tests__carddav__addressbook__proppatch_body.snap

@@ -0,0 +1,28 @@
+---
+source: tests/integration_tests/carddav/addressbook.rs
+expression: body
+---
+<?xml version="1.0" encoding="utf-8"?>
+<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
+    <response>
+        <href>/carddav/principal/user/contacts</href>
+        <propstat>
+            <prop>
+                <displayname xmlns="DAV:"/>
+                <addressbook-description xmlns="urn:ietf:params:xml:ns:carddav"/>
+                <addressbook-description/>
+            </prop>
+            <status>HTTP/1.1 200 OK</status>
+        </propstat>
+        <propstat>
+            <prop>
+            </prop>
+            <status>HTTP/1.1 404 Not Found</status>
+        </propstat>
+        <propstat>
+            <prop>
+            </prop>
+            <status>HTTP/1.1 409 Conflict</status>
+        </propstat>
+    </response>
+</multistatus>

tests/integration_tests/carddav/snapshots/run_integration_tests__integration_tests__carddav__addressbook_import__get_body.snap

@@ -0,0 +1,12 @@
+---
+source: tests/integration_tests/carddav/addressbook_import.rs
+expression: body
+---
+BEGIN:VCARD
+VERSION:4.0
+FN:John Doe
+N:Doe;John;;;,
+BDAY:--0203
+GENDER:M
+UID:[UID]
+END:VCARD

tests/integration_tests/carddav/snapshots/run_integration_tests__integration_tests__carddav__addressbook_import__import_body.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/addressbook_import.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/run_integration_tests__integration_tests__carddav__carddav_root-2.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/mod.rs
+expression: body
+---
+

tests/integration_tests/carddav/snapshots/run_integration_tests__integration_tests__carddav__carddav_root-3.snap

@@ -0,0 +1,27 @@
+---
+source: tests/integration_tests/carddav/mod.rs
+expression: body
+---
+<?xml version="1.0" encoding="utf-8"?>
+<multistatus xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
+    <response>
+        <href>/carddav/</href>
+        <propstat>
+            <prop>
+                <resourcetype>
+                    <collection/>
+                </resourcetype>
+                <displayname>RustiCal DAV root</displayname>
+                <current-user-principal>
+                    <href>/carddav/principal/user/</href>
+                </current-user-principal>
+                <current-user-privilege-set>
+                    <privilege>
+                        <all/>
+                    </privilege>
+                </current-user-privilege-set>
+            </prop>
+            <status>HTTP/1.1 200 OK</status>
+        </propstat>
+    </response>
+</multistatus>

tests/integration_tests/carddav/snapshots/run_integration_tests__integration_tests__carddav__carddav_root.snap

@@ -0,0 +1,5 @@
+---
+source: tests/integration_tests/carddav/mod.rs
+expression: body
+---
+

tests/integration_tests/mod.rs

@@ -1,7 +1,7 @@
-use crate::{app::make_app, config::NextcloudLoginConfig};
 use axum::extract::Request;
 use axum::{body::Body, response::Response};
 use rstest::rstest;
+use rustical::{app::make_app, config::NextcloudLoginConfig};
 use rustical_caldav::CalDavConfig;
 use rustical_frontend::FrontendConfig;
 use rustical_store_sqlite::tests::{TestStoreContext, test_store_context};

tests/run_integration_tests.rs

@@ -0,0 +1,3 @@
+// This file is just an entrypoint for integration_tests
+// since the test runner only looks for files to run.
+mod integration_tests;