tests(imap): init fastmail and stalwart tests

Author: soywod

.github/workflows/fastmail-imap-tests.yml

@@ -0,0 +1,17 @@
+name: Fastmail IMAP tests
+
+on:
+  push:
+    branches:
+      - v2
+
+jobs:
+  fastmail-imap-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo test --no-default-features --features imap,rustls-ring --test fastmail-imap -- --ignored
+        env:
+          FASTMAIL_EMAIL: ${{ secrets.FASTMAIL_EMAIL }}
+          FASTMAIL_APP_PASSWORD: ${{ secrets.FASTMAIL_APP_PASSWORD }}

.github/workflows/fastmail-jmap-tests.yml

@@ -14,4 +14,4 @@ jobs:
       - run: cargo test --no-default-features --features jmap,rustls-ring --test fastmail-jmap -- --ignored
         env:
           FASTMAIL_EMAIL: ${{ secrets.FASTMAIL_EMAIL }}
-          FASTMAIL_BEARER_TOKEN: ${{ secrets.FASTMAIL_BEARER_TOKEN }}
+          FASTMAIL_API_TOKEN: ${{ secrets.FASTMAIL_API_TOKEN }}

.github/workflows/stalwart-imap-tests.yml

@@ -0,0 +1,16 @@
+name: Stalwart IMAP tests
+
+on:
+  push:
+    branches:
+      - v2
+
+jobs:
+  stalwart-imap-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - run: ./tests/stalwart.sh
+      - run: cargo test --no-default-features --features imap,rustls-ring --test stalwart-imap -- --ignored
+      - run: docker stop himalaya-tests

.github/workflows/stalwart-jmap-tests.yml

@@ -11,21 +11,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
-      - run: docker run -d --rm --name stalwart-test-for-himalaya -p 8080:8080 stalwartlabs/stalwart:latest-alpine
-      - run: sleep 1
-      - run: |
-          echo "ADMIN_PASSWORD=$(docker logs stalwart-test-for-himalaya 2>&1 | grep -oP "(?<=with password ')[^']+")" >> $GITHUB_ENV
-      - run: |
-          curl -X POST \
-               -u "admin:${ADMIN_PASSWORD}" \
-               -H 'Content-Type: application/json' \
-               -d '{"type":"domain","name":"pimalaya.org"}' \
-               http://localhost:8080/api/principal
-      - run: |
-          curl -X POST \
-               -u "admin:${ADMIN_PASSWORD}" \
-               -H 'Content-Type: application/json' \
-               -d '{"type":"individual","name":"test","emails":["test@pimalaya.org"],"secrets":["test"],"roles":["user"]}' \
-               http://localhost:8080/api/principal
+      - run: ./tests/stalwart.sh
       - run: cargo test --no-default-features --features jmap,rustls-ring --test stalwart-jmap -- --ignored
-      - run: docker stop stalwart-test-for-himalaya
+      - run: docker stop himalaya-tests

Cargo.lock

@@ -18,10 +18,10 @@ rustdoc-args = ["--cfg", "docsrs"]
 [features]
 default = ["imap", "maildir", "smtp", "rustls-ring"]
 
-imap = ["dep:io-imap", "dep:rfc2047-decoder", "pimalaya-toolbox/imap"]
+imap = ["dep:io-imap", "dep:mail-parser", "dep:rfc2047-decoder", "pimalaya-toolbox/imap"]
 jmap = ["dep:io-jmap", "dep:serde_json", "pimalaya-toolbox/jmap"]
-smtp = ["dep:io-smtp", "pimalaya-toolbox/smtp"]
-maildir = ["dep:convert_case", "dep:io-fs", "dep:io-maildir", "dep:mime_guess"]
+smtp = ["dep:io-smtp", "dep:mail-parser", "pimalaya-toolbox/smtp"]
+maildir = ["dep:convert_case", "dep:io-fs", "dep:io-maildir", "dep:mail-parser", "dep:mime_guess"]
 
 native-tls = ["pimalaya-toolbox/native-tls"]
 rustls-aws = ["pimalaya-toolbox/rustls-aws"]
@@ -48,7 +48,7 @@ io-process = { version = "0.0.2", default-features = false }
 io-smtp = { version = "0.0.1", default-features = false, features = ["ext_auth", "starttls"], optional = true }
 io-stream = { version = "0.0.2", default-features = false, features = ["std"] }
 log = "0.4"
-mail-parser = "0.11"
+mail-parser = { version = "0.11", features = ["serde"], optional = true }
 mime_guess = { version = "2", optional = true }
 open = "5"
 pimalaya-toolbox = { version = "0.0.4", default-features = false, features = ["config", "terminal", "secret"] }

Cargo.toml

@@ -242,30 +242,30 @@ fn parse_term(term: &str) -> Result<SearchKey<'static>> {
         }
     }
 
-    bail!("Unknown search term: {term}")
+    bail!("Unknown search term `{term}`")
 }
 
 fn parse_date(s: &str) -> Result<NaiveDate> {
     // Parse YYYY-MM-DD format
     let parts: Vec<&str> = s.split('-').collect();
     if parts.len() != 3 {
-        bail!("Invalid date format '{s}'. Expected YYYY-MM-DD");
+        bail!("Invalid date format `{s}`, expected YYYY-MM-DD");
     }
 
     let year: i32 = parts[0]
         .parse()
-        .map_err(|_| anyhow!("Invalid year in date '{s}'"))?;
+        .map_err(|_| anyhow!("Invalid year in date `{s}`"))?;
     let month: u32 = parts[1]
         .parse()
-        .map_err(|_| anyhow!("Invalid month in date '{s}'"))?;
+        .map_err(|_| anyhow!("Invalid month in date `{s}`"))?;
     let day: u32 = parts[2]
         .parse()
-        .map_err(|_| anyhow!("Invalid day in date '{s}'"))?;
+        .map_err(|_| anyhow!("Invalid day in date `{s}`"))?;
 
     // Create chrono::NaiveDate first
     let chrono_date = chrono::NaiveDate::from_ymd_opt(year, month, day)
-        .ok_or_else(|| anyhow!("Invalid date '{s}'"))?;
+        .ok_or_else(|| anyhow!("Invalid date `{s}`"))?;
 
     // Convert to imap-types NaiveDate
-    NaiveDate::try_from(chrono_date).map_err(|e| anyhow!("Invalid date '{s}': {e}"))
+    NaiveDate::try_from(chrono_date).map_err(|e| anyhow!("Invalid date `{s}`: {e}"))
 }

flake.lock

@@ -110,7 +110,7 @@ fn parse_sort_key(s: &str) -> Result<SortKey> {
         "subject" => Ok(SortKey::Subject),
         "size" => Ok(SortKey::Size),
         _ => bail!(
-            "Unknown sort key: {s}. Valid options: date, arrival, from, to, cc, subject, size"
+            "Unknown sort key `{s}`, valid options: date, arrival, from, to, cc, subject, size"
         ),
     }
 }

src/imap/envelope/search.rs

@@ -105,7 +105,7 @@ fn parse_algorithm(s: &str) -> Result<ThreadingAlgorithm<'static>> {
     match s.to_lowercase().as_str() {
         "references" => Ok(ThreadingAlgorithm::References),
         "orderedsubject" => Ok(ThreadingAlgorithm::OrderedSubject),
-        _ => bail!("Unknown threading algorithm: {s}. Valid options: references, orderedsubject"),
+        _ => bail!("Unknown threading algorithm `{s}`, valid options: references, orderedsubject"),
     }
 }