Merge pull request 'Merge upstream v0.16.25' (#155) from merge/upstream-v0.16.25 into main

crates/jmap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jmap"
-version = "0.16.24"
+version = "0.16.25"
 edition = "2024"
 
 [dependencies]

crates/jmap/src/registry/mapping/bootstrap.rs

@@ -80,9 +80,9 @@ pub(crate) async fn bootstrap_set(
     mut set: RegistrySetResponse<'_>,
 ) -> trc::Result<RegistrySetResponse<'_>> {
     if !set.server.registry().is_bootstrap_mode() {
-        set.fail_all_create("This operation is only allowed bootstrap mode");
-        set.fail_all_update("This operation is only allowed bootstrap mode");
-        set.fail_all_destroy("This operation is only allowed bootstrap mode");
+        set.fail_all_create("This operation is only allowed in bootstrap mode");
+        set.fail_all_update("This operation is only allowed in bootstrap mode");
+        set.fail_all_destroy("This operation is only allowed in bootstrap mode");
         return Ok(set);
     }
 

crates/jmap/src/registry/mapping/domain.rs

@@ -102,6 +102,10 @@ pub(crate) async fn validate_domain(
     let will_trigger_dkim = matches!(domain.dkim_management, DkimManagement::Automatic(_))
         && old_domain
             .is_none_or(|old| !matches!(old.dkim_management, DkimManagement::Automatic(_)));
+    let will_schedule_dkim = !will_trigger_dkim
+        && matches!(domain.dkim_management, DkimManagement::Automatic(_))
+        && publishes_dkim(domain)
+        && old_domain.is_some_and(|old| !publishes_dkim(old));
     let will_trigger_acme = if let DnsManagement::Automatic(details) = &domain.dns_management
         && old_domain.is_none_or(|old| !matches!(old.dns_management, DnsManagement::Automatic(_)))
     {
@@ -125,11 +129,19 @@ pub(crate) async fn validate_domain(
         }));
         on_success_renew_certificate
     } else {
+        if will_schedule_dkim {
+            tasks.push(Task::DnsManagement(TaskDnsManagement {
+                domain_id: Id::default(),
+                update_records: Map::new(vec![DnsRecordType::Dkim]),
+                on_success_renew_certificate: false,
+                status: TaskStatus::now(),
+            }));
+        }
         false
     };
 
     // Schedule DKIM key rotation task
-    if will_trigger_dkim {
+    if will_trigger_dkim || will_schedule_dkim {
         tasks.push(Task::DkimManagement(TaskDomainManagement {
             domain_id: Id::default(),
             status: TaskStatus::now(),
@@ -176,6 +188,13 @@ pub(crate) async fn validate_domain(
     Ok(Ok(response))
 }
 
+fn publishes_dkim(domain: &Domain) -> bool {
+    matches!(
+        &domain.dns_management,
+        DnsManagement::Automatic(details) if details.publish_records.contains(&DnsRecordType::Dkim)
+    )
+}
+
 pub(crate) async fn validate_dns_server(
     set: &RegistrySetResponse<'_>,
     dns: &mut DnsServer,