Branding + fixes

tests/Cargo.toml

@@ -31,7 +31,7 @@ trc = { path = "../crates/trc" }
 managesieve = { path = "../crates/managesieve", features = ["test_mode"] }
 smtp-proto = { version = "0.1" }
 mail-send = { version = "0.4", default-features = false, features = ["cram-md5", "ring", "tls12"] }
-mail-auth = { version = "0.4", features = ["test"] }
+mail-auth = { version = "0.5", features = ["test"] }
 sieve-rs = { version = "0.5" } 
 utils = { path = "../crates/utils", features = ["test_mode"] }
 jmap-client = { version = "0.3", features = ["websockets", "debug", "async"] } 

tests/src/jmap/enterprise.rs

@@ -104,6 +104,7 @@ pub async fn test(params: &mut JMAPTest) {
         }
         .into(),
         metrics_alerts: parse_metric_alerts(&mut config),
+        logo_url: None,
     }
     .into();
     config.assert_no_errors();
@@ -160,6 +161,7 @@ impl EnterpriseCore for Core {
             trace_store: None,
             metrics_store: None,
             metrics_alerts: vec![],
+            logo_url: None,
         }
         .into();
         self

tests/src/jmap/permissions.rs

@@ -13,8 +13,6 @@ use directory::{
     backend::internal::{PrincipalField, PrincipalUpdate, PrincipalValue},
     Permission, Principal, Type,
 };
-use hyper::header::TE;
-use rayon::vec;
 use utils::BlobHash;
 
 use crate::jmap::assert_is_empty;
@@ -360,12 +358,12 @@ pub async fn test(params: &JMAPTest) {
         )
         .await
         .unwrap()
-        .expect_error("notFound");
+        .expect_request_error("Forbidden");
     tenant_api
         .get::<()>("/api/principal/foobar")
         .await
         .unwrap()
-        .expect_error("notFound");
+        .expect_request_error("Forbidden");
     tenant_api
         .get::<()>("/api/principal?type=tenant")
         .await

tests/src/jmap/webhooks.rs

@@ -131,10 +131,7 @@ pub fn spawn_mock_webhook_endpoint() -> Arc<MockWebhookEndpoint> {
                                             endpoint.events.lock().extend(request.events);
 
                                             Ok::<_, hyper::Error>(
-                                                Resource {
-                                                    content_type: "application/json",
-                                                    contents: "[]".to_string().into_bytes(),
-                                                }
+                                                Resource::new("application/json", "[]".to_string().into_bytes())
                                                 .into_http_response().build(),
                                             )
                                         } else {

tests/src/smtp/inbound/antispam.rs

@@ -78,8 +78,8 @@ path = "{PATH}/test_antispam.db"
 #url = "redis://127.0.0.1"
 
 [lookup]
-"spam-free" = {"gmail.com", "googlemail.com", "yahoomail.com", "*.freemail.org"}
-"spam-disposable" = {"guerrillamail.com", "*.disposable.org"}
+"spam-free" = {"gmail.com", "googlemail.com", "yahoomail.com", "*freemail.org"}
+"spam-disposable" = {"guerrillamail.com", "*disposable.org"}
 "spam-redirect" = {"bit.ly", "redirect.io", "redirect.me", "redirect.org", "redirect.com", "redirect.net", "t.ly", "tinyurl.com"}
 "spam-dmarc" = {"dmarc-allow.org"}
 "spam-spdk" = {"spf-dkim-allow.org"}

tests/src/smtp/inbound/milter.rs

@@ -809,10 +809,7 @@ pub fn spawn_mock_mta_hook_server() -> watch::Sender<bool> {
                                         let response = handle_mta_hook(request, tests);
 
                                         Ok::<_, hyper::Error>(
-                                            Resource {
-                                                content_type: "application/json",
-                                                contents: serde_json::to_string(&response).unwrap().into_bytes(),
-                                            }
+                                            Resource::new("application/json", serde_json::to_string(&response).unwrap().into_bytes())
                                             .into_http_response().build(),
                                         )
                                     }

tests/src/smtp/outbound/dane.rs

@@ -35,7 +35,6 @@ use mail_auth::{
     Resolver, MX,
 };
 use rustls_pki_types::CertificateDer;
-use utils::suffixlist::PublicSuffix;
 
 use crate::smtp::{
     inbound::{TestMessage, TestQueueEvent, TestReportingEvent},
@@ -260,7 +259,6 @@ async fn dane_test() {
             tlsa: LruCache::with_capacity(10),
             mta_sts: LruCache::with_capacity(10),
         },
-        psl: PublicSuffix::default(),
     };
     let r = SMTP {
         core: core.into(),