From ec66d050da24a363988a100f2ccdfc8d2358b2b5 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 12 Dec 2025 14:38:02 +0100
Subject: [PATCH 1/8] Reset addressbook sync status when sync is disabled.

see #3821
---
 modoboa/contacts/serializers.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modoboa/contacts/serializers.py b/modoboa/contacts/serializers.py
index f1922791a..27ee2a753 100644
--- a/modoboa/contacts/serializers.py
+++ b/modoboa/contacts/serializers.py
@@ -235,9 +235,12 @@ class UserPreferencesSerializer(serializers.Serializer):
 
     def post_save(self, request):
         """Create remote cal if necessary."""
-        if not self.validated_data["enable_carddav_sync"]:
-            return
         abook = request.user.addressbook_set.first()
+        if not self.validated_data["enable_carddav_sync"]:
+            abook.last_sync = None
+            abook.sync_token = ""
+            abook.save(update_fields=["last_sync", "sync_token"])
+            return
         if abook.last_sync:
             return
         tasks.create_cdav_addressbook(abook, request.auth)

From c13f4082d08ac9a8a94b667151f82b3b54693369 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 12 Dec 2025 16:47:22 +0100
Subject: [PATCH 2/8] New asynchronous way to synchronize from addressbook.

---
 .../src/components/contacts/ContactList.vue   | 262 +++++++++++-------
 frontend/src/views/contacts/AddressBook.vue   |  24 +-
 .../migrations/0008_addressbook_syncing.py    |  18 ++
 modoboa/contacts/models.py                    |   1 +
 modoboa/contacts/serializers.py               |   2 +-
 modoboa/contacts/tasks.py                     |  12 +-
 modoboa/contacts/viewsets.py                  |   4 +-
 7 files changed, 204 insertions(+), 119 deletions(-)
 create mode 100644 modoboa/contacts/migrations/0008_addressbook_syncing.py

diff --git a/frontend/src/components/contacts/ContactList.vue b/frontend/src/components/contacts/ContactList.vue
index e24839567..0c42cc60a 100644
--- a/frontend/src/components/contacts/ContactList.vue
+++ b/frontend/src/components/contacts/ContactList.vue
@@ -1,97 +1,120 @@
 <template>
-  <v-card class="mt-6">
-    <v-data-table :headers="headers" :items="contacts">
-      <template #top>
-        <v-toolbar color="white" flat>
-          <v-text-field
-            v-model="search"
-            prepend-inner-icon="mdi-magnify"
-            :placeholder="$gettext('Search')"
-            variant="outlined"
-            single-line
-            flat
-            hide-details
-            density="compact"
-            class="flex-grow-0 w-33 mr-4"
-          ></v-text-field>
-          <v-btn color="primary" variant="outlined" @click="showForm = true">
-            {{ $gettext('Add') }}
-          </v-btn>
-          <template v-if="preferences.enable_carddav_sync">
-            <v-btn
-              icon="mdi-information-outline"
-              :title="$gettext('Display address book information')"
-              class="ml-2"
-              @click="showAddressBookInfo = true"
-            />
-            <v-btn
-              v-if="!addressBook.last_sync"
-              icon="mdi-sync"
-              color="success"
-              :title="$gettext('Synchronize contacts with address book')"
-              @click="syncToAddressBook"
-            />
-          </template>
-          <v-chip
-            v-if="$route.params.category"
-            class="my-2 mx-4"
-            label
-            size="small"
-            color="green"
-            prepend-icon="mdi-label"
-            @click="editCategory"
-          >
-            {{ $route.params.category }}
-          </v-chip>
-          <v-spacer></v-spacer>
-        </v-toolbar>
-      </template>
-      <template #[`item.display_name`]="{ item }">
-        <template v-if="item.display_name">
-          {{ item.display_name }}
-        </template>
-        <template v-else> {{ item.first_name }} {{ item.last_name }} </template>
-      </template>
-      <template #[`item.emails`]="{ item }">
-        {{ displayEmails(item.emails) }}
-      </template>
-      <template #[`item.phone_numbers`]="{ item }">
-        {{ displayPhoneNumbers(item.phone_numbers) }}
-      </template>
-      <template #[`item.actions`]="{ item }">
-        <div class="text-right">
-          <v-menu offset-y>
-            <template #activator="{ props }">
-              <v-btn icon="mdi-dots-horizontal" variant="text" v-bind="props">
+  <div>
+    <v-card class="mt-6">
+      <v-data-table :headers="headers" :items="contacts">
+        <template #top>
+          <v-toolbar color="white" flat>
+            <v-text-field
+              v-model="search"
+              prepend-inner-icon="mdi-magnify"
+              :placeholder="$gettext('Search')"
+              variant="outlined"
+              single-line
+              flat
+              hide-details
+              density="compact"
+              class="flex-grow-0 w-33 mr-4"
+            ></v-text-field>
+            <v-btn color="primary" variant="outlined" @click="showForm = true">
+              {{ $gettext('Add') }}
+            </v-btn>
+            <template v-if="preferences.enable_carddav_sync">
+              <v-btn class="ml-2" variant="tonal" icon size="small">
+                <v-icon icon="mdi-cog" />
+                <v-menu activator="parent">
+                  <v-list density="compact">
+                    <v-list-item
+                      v-if="!addressBook.last_sync"
+                      color="success"
+                      :title="
+                        $gettext('Synchronize contacts with address book')
+                      "
+                      prepend-icon="mdi-sync"
+                      @click="syncToAddressBook"
+                    />
+                    <v-list-item
+                      :title="$gettext('Synchronize')"
+                      prepend-icon="mdi-sync"
+                      :disabled="addressBook.syncing"
+                      @click="syncFromAddressBook(true)"
+                    />
+                  </v-list>
+                </v-menu>
               </v-btn>
+              <v-btn
+                icon="mdi-information-outline"
+                :title="$gettext('Display address book information')"
+                @click="showAddressBookInfo = true"
+              />
             </template>
-            <MenuItems :items="contactActions" :obj="item" />
-          </v-menu>
-        </div>
-      </template>
-    </v-data-table>
-  </v-card>
-  <v-dialog v-model="showForm" persistent max-width="800px">
-    <ContactForm
-      :contact="selectedContact"
-      @close="closeForm"
-      @added="fetchContacts"
-      @updated="fetchContacts"
-    />
-  </v-dialog>
-  <v-dialog v-model="showCategoriesForm" persistent max-width="800px">
-    <ContactCategoriesForm
-      :contact="selectedContact"
-      @updated="fetchContacts"
-      @close="closeCategoriesForm"
-    />
-  </v-dialog>
-  <v-dialog v-model="showAddressBookInfo" persistent max-width="800px">
-    <AddressBookInfo
-      :address-book-url="addressBook.url"
-      @close="showAddressBookInfo = false"
-    />
-  </v-dialog>
+            <v-chip
+              v-if="$route.params.category"
+              class="my-2 mx-4"
+              label
+              size="small"
+              color="green"
+              prepend-icon="mdi-label"
+              @click="editCategory"
+            >
+              {{ $route.params.category }}
+            </v-chip>
+            <v-spacer></v-spacer>
+            <v-progress-circular
+              v-if="addressBook.syncing"
+              color="primary"
+              indeterminate
+            ></v-progress-circular>
+          </v-toolbar>
+        </template>
+        <template #[`item.display_name`]="{ item }">
+          <template v-if="item.display_name">
+            {{ item.display_name }}
+          </template>
+          <template v-else>
+            {{ item.first_name }} {{ item.last_name }}
+          </template>
+        </template>
+        <template #[`item.emails`]="{ item }">
+          {{ displayEmails(item.emails) }}
+        </template>
+        <template #[`item.phone_numbers`]="{ item }">
+          {{ displayPhoneNumbers(item.phone_numbers) }}
+        </template>
+        <template #[`item.actions`]="{ item }">
+          <div class="text-right">
+            <v-menu offset-y>
+              <template #activator="{ props }">
+                <v-btn icon="mdi-dots-horizontal" variant="text" v-bind="props">
+                </v-btn>
+              </template>
+              <MenuItems :items="contactActions" :obj="item" />
+            </v-menu>
+          </div>
+        </template>
+      </v-data-table>
+    </v-card>
+    <v-dialog v-model="showForm" persistent max-width="800px">
+      <ContactForm
+        :contact="selectedContact"
+        @close="closeForm"
+        @added="fetchContacts"
+        @updated="fetchContacts"
+      />
+    </v-dialog>
+    <v-dialog v-model="showCategoriesForm" persistent max-width="800px">
+      <ContactCategoriesForm
+        :contact="selectedContact"
+        @updated="fetchContacts"
+        @close="closeCategoriesForm"
+      />
+    </v-dialog>
+    <v-dialog v-model="showAddressBookInfo" persistent max-width="800px">
+      <AddressBookInfo
+        :address-book-url="addressBook.url"
+        @close="showAddressBookInfo = false"
+      />
+    </v-dialog>
+  </div>
 </template>
 
 <script setup>
@@ -191,8 +214,18 @@ function deleteContact(contact) {
   })
 }
 
+async function fetchAddressBook() {
+  const resp = await contactsApi.getDefaultAddressBook()
+  addressBook.value = resp.data
+}
+
+async function fetchPreferences() {
+  const resp = await parametersApi.getUserApplication('contacts')
+  preferences.value = resp.data.params
+}
+
 function fetchContacts() {
-  contactsApi.getContacts(route.params).then((resp) => {
+  return contactsApi.getContacts(route.params).then((resp) => {
     contacts.value = resp.data
   })
 }
@@ -203,20 +236,43 @@ function syncToAddressBook() {
   })
 }
 
-contactsApi.getDefaultAddressBook().then((resp) => {
-  addressBook.value = resp.data
-})
-parametersApi.getUserApplication('contacts').then((resp) => {
-  preferences.value = resp.data.params
-})
-fetchContacts()
+async function monitorAddressBook() {
+  await fetchAddressBook()
+  await fetchContacts()
+  if (!addressBook.value.syncing) {
+    clearInterval(intervalId)
+    intervalId = null
+    startAutomaticSync()
+  }
+}
+
+async function syncFromAddressBook(withNotification) {
+  if (intervalId) {
+    // Stop automatic sync for now.
+    clearInterval(intervalId)
+  }
+  await contactsApi.synchronizeFromAddressBook()
+  if (withNotification) {
+    displayNotification({ msg: $gettext('Synchronization started') })
+  }
+  addressBook.value.syncing = true
+  intervalId = setInterval(monitorAddressBook, 5000)
+}
+
+function startAutomaticSync() {
+  intervalId = setInterval(
+    syncFromAddressBook,
+    preferences.value.sync_frequency * 1000
+  )
+}
+
+await fetchAddressBook()
+await fetchPreferences()
+await fetchContacts()
 
 watch(preferences, (value) => {
   if (value) {
-    intervalId = setInterval(
-      contactsApi.synchronizeFromAddressBook,
-      value.sync_frequency * 1000
-    )
+    startAutomaticSync()
   }
 })
 
diff --git a/frontend/src/views/contacts/AddressBook.vue b/frontend/src/views/contacts/AddressBook.vue
index c26ed92ab..e5623abd6 100644
--- a/frontend/src/views/contacts/AddressBook.vue
+++ b/frontend/src/views/contacts/AddressBook.vue
@@ -1,16 +1,18 @@
 <template>
-  <div class="text-h5 ml-4">
-    {{ $gettext('Contacts') }}
+  <div>
+    <div class="text-h5 ml-4">
+      {{ $gettext('Contacts') }}
+    </div>
+    <ContactList @edit-category="openCategoryForm" />
+    <v-dialog v-model="showCategoryForm" persistent max-width="800px">
+      <CategoryForm
+        :category="contactsStore.currentCategory"
+        @close="closeForm"
+        @added="fetchCategories"
+        @updated="fetchCategories"
+      />
+    </v-dialog>
   </div>
-  <ContactList @edit-category="openCategoryForm" />
-  <v-dialog v-model="showCategoryForm" persistent max-width="800px">
-    <CategoryForm
-      :category="contactsStore.currentCategory"
-      @close="closeForm"
-      @added="fetchCategories"
-      @updated="fetchCategories"
-    />
-  </v-dialog>
 </template>
 
 <script setup>
diff --git a/modoboa/contacts/migrations/0008_addressbook_syncing.py b/modoboa/contacts/migrations/0008_addressbook_syncing.py
new file mode 100644
index 000000000..db39c8c2f
--- /dev/null
+++ b/modoboa/contacts/migrations/0008_addressbook_syncing.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.2.9 on 2025-12-12 14:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("contacts", "0007_alter_contact_address"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="addressbook",
+            name="syncing",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/modoboa/contacts/models.py b/modoboa/contacts/models.py
index 375859835..36dce1ce2 100644
--- a/modoboa/contacts/models.py
+++ b/modoboa/contacts/models.py
@@ -22,6 +22,7 @@ class AddressBook(models.Model):
     name = models.CharField(max_length=50)
     sync_token = models.TextField(blank=True)
     last_sync = models.DateTimeField(null=True)
+    syncing = models.BooleanField(default=False)
     user = models.ForeignKey("core.User", on_delete=models.CASCADE)
     _path = models.TextField()
 
diff --git a/modoboa/contacts/serializers.py b/modoboa/contacts/serializers.py
index 27ee2a753..216934c5e 100644
--- a/modoboa/contacts/serializers.py
+++ b/modoboa/contacts/serializers.py
@@ -14,7 +14,7 @@ class AddressBookSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = models.AddressBook
-        fields = ("pk", "name", "url", "last_sync")
+        fields = ("pk", "name", "url", "last_sync", "syncing")
 
 
 class EmailAddressSerializer(serializers.ModelSerializer):
diff --git a/modoboa/contacts/tasks.py b/modoboa/contacts/tasks.py
index 0726e99ca..f11706b82 100644
--- a/modoboa/contacts/tasks.py
+++ b/modoboa/contacts/tasks.py
@@ -49,12 +49,17 @@ def push_addressbook_to_carddav(request, addressbook):
     addressbook.save(update_fields=["last_sync", "sync_token"])
 
 
-def sync_addressbook_from_cdav(request, addressbook):
+def sync_addressbook_from_cdav(addressbook_id: int, access_token: str):
     """Fetch changes from CardDAV server."""
-    clt = get_cdav_client_from_request(request, addressbook)
+    addressbook = models.AddressBook.objects.get(id=addressbook_id)
+    if addressbook.syncing:
+        return
+    clt = get_cdav_client(addressbook, addressbook.user.email, access_token)
     changes = clt.sync_vcards(addressbook.sync_token)
     if not len(changes["cards"]):
         return
+    addressbook.syncing = True
+    addressbook.save()
     for card in changes["cards"]:
         # UID sometimes embded .vcf extension, sometimes not...
         long_uid = card["href"].split("/")[-1]
@@ -73,7 +78,8 @@ def sync_addressbook_from_cdav(request, addressbook):
             models.Contact.objects.filter(uid__in=[long_uid, short_uid]).delete()
     addressbook.last_sync = timezone.now()
     addressbook.sync_token = changes["token"]
-    addressbook.save(update_fields=["last_sync", "sync_token"])
+    addressbook.syncing = False
+    addressbook.save(update_fields=["last_sync", "sync_token", "syncing"])
 
 
 def push_contact_to_cdav(request, contact):
diff --git a/modoboa/contacts/viewsets.py b/modoboa/contacts/viewsets.py
index 57053ab4c..a283b2b84 100644
--- a/modoboa/contacts/viewsets.py
+++ b/modoboa/contacts/viewsets.py
@@ -1,6 +1,7 @@
 """Contacts viewsets."""
 
 import django_filters.rest_framework
+import django_rq
 from rest_framework.decorators import action
 from rest_framework import filters, response, viewsets
 from rest_framework.permissions import IsAuthenticated
@@ -40,7 +41,8 @@ class AddressBookViewSet(viewsets.GenericViewSet):
         if not abook.last_sync:
             return response.Response()
         if request.user.parameters.get_value("enable_carddav_sync", app="contacts"):
-            tasks.sync_addressbook_from_cdav(request, abook)
+            queue = django_rq.get_queue("modoboa")
+            queue.enqueue(tasks.sync_addressbook_from_cdav, abook.pk, str(request.auth))
         return response.Response({})
 
 

From 1b2834bc16db7f6c495fce36e0f9b307cb585378 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 12 Dec 2025 17:19:24 +0100
Subject: [PATCH 3/8] Updated tests

---
 modoboa/contacts/tests.py | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/modoboa/contacts/tests.py b/modoboa/contacts/tests.py
index b717c37ee..89d2f967b 100644
--- a/modoboa/contacts/tests.py
+++ b/modoboa/contacts/tests.py
@@ -5,10 +5,11 @@ import os
 import httmock
 
 from django.core import management
-
 from django.urls import reverse
 from django.utils import timezone
 
+from django_rq import get_worker
+
 from modoboa.admin import factories as admin_factories
 from modoboa.core import models as core_models
 from modoboa.lib.tests import ModoAPITestCase
@@ -65,13 +66,25 @@ class TestDataMixin:
             )
         self.assertEqual(response.status_code, 200)
 
+    def disable_cdav_sync(self):
+        url = reverse("v2:parameter-user-detail", args=["contacts"])
+        response = self.client.put(
+            url,
+            {
+                "enable_carddav_sync": False,
+                "sync_frequency": 300,
+            },
+            format="json",
+        )
+        self.assertEqual(response.status_code, 200)
+
 
 class ViewsTestCase(TestDataMixin, ModoAPITestCase):
     """Check views."""
 
     def test_user_settings(self):
         """Check that remote collection creation request is sent."""
-        # 1. Addressbook with contacts must be synced manually
+        # 1. Addressbook with contacts must be synced manuelle
         self.client.force_authenticate(self.user)
         self.enable_cdav_sync()
         self.addressbook.refresh_from_db()
@@ -87,6 +100,10 @@ class ViewsTestCase(TestDataMixin, ModoAPITestCase):
         self.enable_cdav_sync()
         abook.refresh_from_db()
         self.assertIsNot(abook.last_sync, None)
+        # And disable sync.
+        self.disable_cdav_sync()
+        abook.refresh_from_db()
+        self.assertIs(abook.last_sync, None)
 
 
 class AddressBookViewSetTestCase(TestDataMixin, ModoAPITestCase):
@@ -118,10 +135,13 @@ class AddressBookViewSetTestCase(TestDataMixin, ModoAPITestCase):
         data = {"username": self.user.username, "password": "toto"}
         response = self.client.post(reverse("core:login"), data)
         self.enable_cdav_sync()
-        self.user.addressbook_set.update(last_sync=timezone.now())
+        last_sync = timezone.now()
+        self.user.addressbook_set.update(last_sync=last_sync)
         with httmock.HTTMock(mocks.options_mock, mocks.report_mock, mocks.get_mock):
             response = self.client.get(reverse("api:addressbook-sync-from-cdav"))
+            get_worker("modoboa").work(burst=True)
         self.assertEqual(response.status_code, 200)
+        self.assertIsNot(self.user.addressbook_set.first().sync_token, None)
 
 
 class CategoryViewSetTestCase(TestDataMixin, ModoAPITestCase):

From 4d4297689de331d9e1fb2260eb0a73135a84e7bd Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 13 Dec 2025 11:14:24 +0100
Subject: [PATCH 4/8] Reduce logs

---
 modoboa/admin/tests/test_mx.py | 52 ++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/modoboa/admin/tests/test_mx.py b/modoboa/admin/tests/test_mx.py
index 3bf6df74f..790d4f006 100644
--- a/modoboa/admin/tests/test_mx.py
+++ b/modoboa/admin/tests/test_mx.py
@@ -55,20 +55,23 @@ class MXTestCase(ModoTestCase):
         mock_getaddrinfo.side_effect = utils.mock_ip_query_result
         mock_g_gethostbyname.return_value = "1.2.3.4"
         self.assertEqual(models.MXRecord.objects.count(), 0)
-        management.call_command("modo", "check_mx", "--no-dnsbl", "--ttl=0")
+        with LogCapture("modoboa.dns"):
+            management.call_command("modo", "check_mx", "--no-dnsbl", "--ttl=0")
         self.assertTrue(models.MXRecord.objects.filter(domain=self.domain).exists())
 
         # we passed a ttl to 0. this will reset the cache this time
         qs = models.MXRecord.objects.filter(domain=self.domain)
         id_ = qs[0].id
-        management.call_command("modo", "check_mx", "--no-dnsbl", "--ttl=7200")
+        with LogCapture("modoboa.dns"):
+            management.call_command("modo", "check_mx", "--no-dnsbl", "--ttl=7200")
         qs = models.MXRecord.objects.filter(domain=self.domain)
         self.assertNotEqual(id_, qs[0].id)
         id_ = qs[0].id
 
         # assume that mxrecords ids are the same. means that we taking care of
         # ttl
-        management.call_command("modo", "check_mx", "--no-dnsbl")
+        with LogCapture("modoboa.dns"):
+            management.call_command("modo", "check_mx", "--no-dnsbl")
         qs = models.MXRecord.objects.filter(domain=self.domain)
         self.assertEqual(id_, qs[0].id)
 
@@ -82,19 +85,24 @@ class MXTestCase(ModoTestCase):
         mock_query.side_effect = utils.mock_dns_query_result
         mock_getaddrinfo.side_effect = utils.mock_ip_query_result
         mock_g_gethostbyname.return_value = "1.2.3.4"
-        management.call_command("modo", "check_mx", "--domain", self.domain.name)
+        with LogCapture("modoboa.dns"):
+            management.call_command("modo", "check_mx", "--domain", self.domain.name)
         self.assertTrue(models.MXRecord.objects.filter(domain=self.domain).exists())
         self.assertFalse(
             models.MXRecord.objects.filter(domain=self.bad_domain).exists()
         )
 
-        management.call_command("modo", "check_mx", "--domain", str(self.bad_domain.pk))
+        with LogCapture("modoboa.dns"):
+            management.call_command(
+                "modo", "check_mx", "--domain", str(self.bad_domain.pk)
+            )
         self.assertFalse(
             models.MXRecord.objects.filter(domain=self.bad_domain).exists()
         )
         self.assertEqual(len(mail.outbox), 1)
 
-        management.call_command("modo", "check_mx", "--domain", "toto.com")
+        with LogCapture("modoboa.dns"):
+            management.call_command("modo", "check_mx", "--domain", "toto.com")
 
     @mock.patch("gevent.socket.gethostbyname")
     @mock.patch("socket.getaddrinfo")
@@ -113,13 +121,15 @@ class MXTestCase(ModoTestCase):
             user__groups=("DomainAdmins",),
         )
         domain.add_admin(mb.user)
-        management.call_command(
-            "modo", "check_mx", "--domain", domain.name, "--no-dnsbl"
-        )
+        with LogCapture("modoboa.dns"):
+            management.call_command(
+                "modo", "check_mx", "--domain", domain.name, "--no-dnsbl"
+            )
         self.assertEqual(domain.alarms.count(), 1)
-        management.call_command(
-            "modo", "check_mx", "--domain", domain.name, "--no-dnsbl"
-        )
+        with LogCapture("modoboa.dns"):
+            management.call_command(
+                "modo", "check_mx", "--domain", domain.name, "--no-dnsbl"
+            )
         self.assertEqual(domain.alarms.count(), 1)
         self.assertEqual(len(mail.outbox), 1)
 
@@ -130,7 +140,8 @@ class MXTestCase(ModoTestCase):
         mock_query.side_effect = utils.mock_dns_query_result
         mock_getaddrinfo.side_effect = utils.mock_ip_query_result
         self.set_global_parameter("custom_dns_server", "123.45.67.89")
-        get_domain_mx_list("does-not-exist.example.com")
+        with LogCapture("modoboa.dns"):
+            get_domain_mx_list("does-not-exist.example.com")
 
     @mock.patch("ipaddress.ip_address")
     @mock.patch.object(dns.resolver.Resolver, "resolve")
@@ -235,7 +246,8 @@ class DNSBLTestCase(ModoTestCase):
         mock_getaddrinfo.side_effect = utils.mock_ip_query_result
         mock_g_gethostbyname.return_value = "1.2.3.4"
         self.assertEqual(models.DNSBLResult.objects.count(), 0)
-        management.call_command("modo", "check_mx")
+        with LogCapture("modoboa.dns"):
+            management.call_command("modo", "check_mx")
         self.assertTrue(models.DNSBLResult.objects.filter(domain=self.domain).exists())
         self.assertFalse(
             models.DNSBLResult.objects.filter(domain=self.domain3).exists()
@@ -251,7 +263,8 @@ class DNSBLTestCase(ModoTestCase):
         mock_query.side_effect = utils.mock_dns_query_result
         mock_getaddrinfo.side_effect = utils.mock_ip_query_result
         mock_g_gethostbyname.return_value = "127.0.0.4"
-        management.call_command("modo", "check_mx", "--email", "user@example.test")
+        with LogCapture("modoboa.dns"):
+            management.call_command("modo", "check_mx", "--email", "user@example.test")
         self.assertEqual(len(mail.outbox), 2)
 
     @mock.patch("gevent.socket.gethostbyname")
@@ -264,7 +277,8 @@ class DNSBLTestCase(ModoTestCase):
         mock_query.side_effect = utils.mock_dns_query_result
         mock_getaddrinfo.side_effect = utils.mock_ip_query_result
         mock_g_gethostbyname.return_value = "127.255.255.254"  # <--Spamhaus response when querying from an open resolver
-        management.call_command("modo", "check_mx", "--email", "user@example.test")
+        with LogCapture("modoboa.dns"):
+            management.call_command("modo", "check_mx", "--email", "user@example.test")
         self.assertEqual(len(mail.outbox), 1)
 
     @mock.patch("gevent.socket.gethostbyname")
@@ -278,7 +292,8 @@ class DNSBLTestCase(ModoTestCase):
         mock_getaddrinfo.side_effect = utils.mock_ip_query_result
         mock_g_gethostbyname.return_value = "1.2.3.4"
         self.assertEqual(models.DNSBLResult.objects.count(), 0)
-        management.call_command("modo", "check_mx", "--no-dnsbl")
+        with LogCapture("modoboa.dns"):
+            management.call_command("modo", "check_mx", "--no-dnsbl")
         self.assertFalse(models.DNSBLResult.objects.filter(domain=self.domain).exists())
 
 
@@ -306,7 +321,8 @@ class DNSChecksTestCase(ModoTestCase):
         self.domain.dkim_public_key = "XXXXX"
         self.domain.save(update_fields=["enable_dkim", "dkim_public_key"])
 
-        management.call_command("modo", "check_mx", "--no-dnsbl", "--ttl=0")
+        with LogCapture("modoboa.dns"):
+            management.call_command("modo", "check_mx", "--no-dnsbl", "--ttl=0")
 
         self.assertIsNot(self.domain.spf_record, None)
         self.assertIsNot(self.domain.dkim_record, None)

From 69a8696c90bb39aa2a985bf53f99e3863c4722b1 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 13 Dec 2025 17:52:29 +0100
Subject: [PATCH 5/8] Try to disable rspamd tests when not needed

---
 modoboa/rspamd/tests.py               | 6 ++++++
 test_project/test_project/settings.py | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/modoboa/rspamd/tests.py b/modoboa/rspamd/tests.py
index 36b21ee8b..5594fb1ba 100644
--- a/modoboa/rspamd/tests.py
+++ b/modoboa/rspamd/tests.py
@@ -2,12 +2,18 @@ import os
 import shutil
 
 from django.core import management
+from django.test import modify_settings
 from django.urls import reverse
 
 from modoboa.admin import factories as admin_factories, models as admin_models
 from modoboa.lib.tests import ModoAPITestCase
 
 
+@modify_settings(
+    INSTALLED_APPS={
+        "append": "modoboa.rspamd",
+    }
+)
 class ManagementCommandTestCase(ModoAPITestCase):
 
     @classmethod
diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py
index 3a55d6b6a..0556ee3d1 100644
--- a/test_project/test_project/settings.py
+++ b/test_project/test_project/settings.py
@@ -353,6 +353,11 @@ LOGGING = {
             "class": "django.utils.log.AdminEmailHandler",
             "include_html": True,
         },
+        "syslog": {
+            "class": "logging.handlers.SysLogHandler",
+            "facility": SysLogHandler.LOG_SYSLOG,
+            "formatter": "syslog",
+        },
         "syslog-auth": {
             "class": "logging.handlers.SysLogHandler",
             "facility": SysLogHandler.LOG_AUTH,
@@ -376,6 +381,7 @@ LOGGING = {
             "propagate": False,
         },
         "modoboa.admin": {"handlers": ["modoboa"], "level": "INFO", "propagate": False},
+        "modoboa.dns": {"handlers": ["syslog"], "level": "INFO", "propagate": False},
         "django.server": {
             "handlers": ["django.server"],
             "level": "INFO",

From 64d7a9125cc9aa57b351ce14c2e7d60a8301cd05 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sun, 14 Dec 2025 11:49:15 +0100
Subject: [PATCH 6/8] Try to disable rspamd tests

---
 .gitignore                            |   1 +
 docker-compose.yml                    |   2 +-
 modoboa/rspamd/tests.py               | 136 +++++++++++++-------------
 test_project/test_project/settings.py |   2 +-
 4 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/.gitignore b/.gitignore
index 750781646..4488700e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ node_modules
 
 # TOX stuff
 test_project/modoboa.db
+test_project/frontend
 
 /.project
 /.pydevproject
diff --git a/docker-compose.yml b/docker-compose.yml
index 65504da2f..738fa68e1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     profiles: [ldap]
 
   mariadb:
-    image: mariadb:10
+    image: mariadb:11
     restart: unless-stopped
     environment:
       MARIADB_ROOT_PASSWORD: Password1000
diff --git a/modoboa/rspamd/tests.py b/modoboa/rspamd/tests.py
index 5594fb1ba..d5dcf9323 100644
--- a/modoboa/rspamd/tests.py
+++ b/modoboa/rspamd/tests.py
@@ -1,84 +1,84 @@
-import os
-import shutil
+# import os
+# import shutil
 
-from django.core import management
-from django.test import modify_settings
-from django.urls import reverse
+# from django.core import management
+# from django.test import modify_settings
+# from django.urls import reverse
 
-from modoboa.admin import factories as admin_factories, models as admin_models
-from modoboa.lib.tests import ModoAPITestCase
+# from modoboa.admin import factories as admin_factories, models as admin_models
+# from modoboa.lib.tests import ModoAPITestCase
 
 
-@modify_settings(
-    INSTALLED_APPS={
-        "append": "modoboa.rspamd",
-    }
-)
-class ManagementCommandTestCase(ModoAPITestCase):
+# @modify_settings(
+#     INSTALLED_APPS={
+#         "append": "modoboa.rspamd",
+#     }
+# )
+# class ManagementCommandTestCase(ModoAPITestCase):
 
-    @classmethod
-    def setUpTestData(cls):
-        super().setUpTestData()
-        admin_factories.populate_database()
+#     @classmethod
+#     def setUpTestData(cls):
+#         super().setUpTestData()
+#         admin_factories.populate_database()
 
-    def tearDown(self):
-        """Reset test env."""
-        shutil.rmtree(self.workdir)
+#     def tearDown(self):
+#         """Reset test env."""
+#         shutil.rmtree(self.workdir)
 
-    def configure(self):
-        self.key_map_path = f"{self.workdir}/keys.map"
-        self.set_global_parameter("key_map_path", self.key_map_path)
-        self.selector_map_path = f"{self.workdir}/selectors.map"
-        self.set_global_parameter("selector_map_path", self.selector_map_path)
+#     def configure(self):
+#         self.key_map_path = f"{self.workdir}/keys.map"
+#         self.set_global_parameter("key_map_path", self.key_map_path)
+#         self.selector_map_path = f"{self.workdir}/selectors.map"
+#         self.set_global_parameter("selector_map_path", self.selector_map_path)
 
-    def unconfigure(self):
-        self.set_global_parameter("key_map_path", "")
-        self.set_global_parameter("selector_map_path", "")
+#     def unconfigure(self):
+#         self.set_global_parameter("key_map_path", "")
+#         self.set_global_parameter("selector_map_path", "")
 
-    def test_command(self):
-        self.unconfigure()
-        with self.assertRaises(management.CommandError):
-            management.call_command("manage_rspamd_maps")
+#     def test_command(self):
+#         self.unconfigure()
+#         with self.assertRaises(management.CommandError):
+#             management.call_command("manage_rspamd_maps")
 
-        self.configure()
-        management.call_command("manage_rspamd_maps")
-        self.assertFalse(os.path.exists(self.key_map_path))
-        self.assertFalse(os.path.exists(self.selector_map_path))
+#         self.configure()
+#         management.call_command("manage_rspamd_maps")
+#         self.assertFalse(os.path.exists(self.key_map_path))
+#         self.assertFalse(os.path.exists(self.selector_map_path))
 
-        domain = admin_models.Domain.objects.get(name="test.com")
-        domain.enable_dkim = True
-        domain.dkim_private_key_path = "xxx"
-        domain.save()
-        management.call_command("manage_rspamd_maps")
-        self.assertTrue(os.path.exists(self.key_map_path))
-        self.assertTrue(os.path.exists(self.selector_map_path))
+#         domain = admin_models.Domain.objects.get(name="test.com")
+#         domain.enable_dkim = True
+#         domain.dkim_private_key_path = "xxx"
+#         domain.save()
+#         management.call_command("manage_rspamd_maps")
+#         self.assertTrue(os.path.exists(self.key_map_path))
+#         self.assertTrue(os.path.exists(self.selector_map_path))
 
-        # Now, empty map files
-        domain.enable_dkim = False
-        domain.save()
-        management.call_command("manage_rspamd_maps")
-        with open(self.key_map_path) as fp:
-            content = fp.read()
-        self.assertNotIn(domain.name, content)
+#         # Now, empty map files
+#         domain.enable_dkim = False
+#         domain.save()
+#         management.call_command("manage_rspamd_maps")
+#         with open(self.key_map_path) as fp:
+#             content = fp.read()
+#         self.assertNotIn(domain.name, content)
 
-    def test_command_with_arg(self):
-        self.configure()
-        domain = admin_models.Domain.objects.get(name="test.com")
-        domain.enable_dkim = True
-        domain.save()
-        management.call_command("manage_rspamd_maps", "--domain", "test.com")
-        self.assertTrue(os.path.exists(self.key_map_path))
-        self.assertTrue(os.path.exists(self.selector_map_path))
+#     def test_command_with_arg(self):
+#         self.configure()
+#         domain = admin_models.Domain.objects.get(name="test.com")
+#         domain.enable_dkim = True
+#         domain.save()
+#         management.call_command("manage_rspamd_maps", "--domain", "test.com")
+#         self.assertTrue(os.path.exists(self.key_map_path))
+#         self.assertTrue(os.path.exists(self.selector_map_path))
 
 
-class ParametersAPITestCase(ModoAPITestCase):
+# class ParametersAPITestCase(ModoAPITestCase):
 
-    def test_update_settings(self):
-        url = reverse("v2:parameter-global-detail", args=["rspamd"])
-        data = {
-            "key_map_path": f"{self.workdir}/key.map",
-            "selector_map_path": f"{self.workdir}/selector.map",
-            "rspamd_dashboard_location": "/rspamd",
-        }
-        response = self.client.put(url, data, format="json")
-        self.assertEqual(response.status_code, 200)
+#     def test_update_settings(self):
+#         url = reverse("v2:parameter-global-detail", args=["rspamd"])
+#         data = {
+#             "key_map_path": f"{self.workdir}/key.map",
+#             "selector_map_path": f"{self.workdir}/selector.map",
+#             "rspamd_dashboard_location": "/rspamd",
+#         }
+#         response = self.client.put(url, data, format="json")
+#         self.assertEqual(response.status_code, 200)
diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py
index 0556ee3d1..70f45ea33 100644
--- a/test_project/test_project/settings.py
+++ b/test_project/test_project/settings.py
@@ -110,7 +110,7 @@ MODOBOA_APPS = (
     "modoboa.imap_migration",
     "modoboa.autoreply",
     "modoboa.sievefilters",
-    "modoboa.rspamd",
+    # "modoboa.rspamd",
     # Modoboa extensions here.
     "modoboa.contacts",
     "modoboa.calendars",

From 4ebd2e383f0c09f229fb700723e897b11d3c1fbe Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sun, 14 Dec 2025 18:41:08 +0100
Subject: [PATCH 7/8] Use SimplerWorker explicitely

---
 modoboa/contacts/tests.py |  12 +++-
 modoboa/rspamd/tests.py   | 136 +++++++++++++++++++-------------------
 2 files changed, 77 insertions(+), 71 deletions(-)

diff --git a/modoboa/contacts/tests.py b/modoboa/contacts/tests.py
index 89d2f967b..eb917b8a1 100644
--- a/modoboa/contacts/tests.py
+++ b/modoboa/contacts/tests.py
@@ -3,12 +3,13 @@
 import os
 
 import httmock
+from rq import SimpleWorker
 
 from django.core import management
 from django.urls import reverse
 from django.utils import timezone
 
-from django_rq import get_worker
+import django_rq
 
 from modoboa.admin import factories as admin_factories
 from modoboa.core import models as core_models
@@ -137,11 +138,16 @@ class AddressBookViewSetTestCase(TestDataMixin, ModoAPITestCase):
         self.enable_cdav_sync()
         last_sync = timezone.now()
         self.user.addressbook_set.update(last_sync=last_sync)
+        addressbook = self.user.addressbook_set.first()
+        self.assertEqual(addressbook.sync_token, "")
         with httmock.HTTMock(mocks.options_mock, mocks.report_mock, mocks.get_mock):
             response = self.client.get(reverse("api:addressbook-sync-from-cdav"))
-            get_worker("modoboa").work(burst=True)
+            queue = django_rq.get_queue("modoboa")
+            worker = SimpleWorker([queue], connection=queue.connection)
+            worker.work(burst=True)
         self.assertEqual(response.status_code, 200)
-        self.assertIsNot(self.user.addressbook_set.first().sync_token, None)
+        addressbook.refresh_from_db()
+        self.assertNotEqual(addressbook.sync_token, "")
 
 
 class CategoryViewSetTestCase(TestDataMixin, ModoAPITestCase):
diff --git a/modoboa/rspamd/tests.py b/modoboa/rspamd/tests.py
index d5dcf9323..5594fb1ba 100644
--- a/modoboa/rspamd/tests.py
+++ b/modoboa/rspamd/tests.py
@@ -1,84 +1,84 @@
-# import os
-# import shutil
+import os
+import shutil
 
-# from django.core import management
-# from django.test import modify_settings
-# from django.urls import reverse
+from django.core import management
+from django.test import modify_settings
+from django.urls import reverse
 
-# from modoboa.admin import factories as admin_factories, models as admin_models
-# from modoboa.lib.tests import ModoAPITestCase
+from modoboa.admin import factories as admin_factories, models as admin_models
+from modoboa.lib.tests import ModoAPITestCase
 
 
-# @modify_settings(
-#     INSTALLED_APPS={
-#         "append": "modoboa.rspamd",
-#     }
-# )
-# class ManagementCommandTestCase(ModoAPITestCase):
+@modify_settings(
+    INSTALLED_APPS={
+        "append": "modoboa.rspamd",
+    }
+)
+class ManagementCommandTestCase(ModoAPITestCase):
 
-#     @classmethod
-#     def setUpTestData(cls):
-#         super().setUpTestData()
-#         admin_factories.populate_database()
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        admin_factories.populate_database()
 
-#     def tearDown(self):
-#         """Reset test env."""
-#         shutil.rmtree(self.workdir)
+    def tearDown(self):
+        """Reset test env."""
+        shutil.rmtree(self.workdir)
 
-#     def configure(self):
-#         self.key_map_path = f"{self.workdir}/keys.map"
-#         self.set_global_parameter("key_map_path", self.key_map_path)
-#         self.selector_map_path = f"{self.workdir}/selectors.map"
-#         self.set_global_parameter("selector_map_path", self.selector_map_path)
+    def configure(self):
+        self.key_map_path = f"{self.workdir}/keys.map"
+        self.set_global_parameter("key_map_path", self.key_map_path)
+        self.selector_map_path = f"{self.workdir}/selectors.map"
+        self.set_global_parameter("selector_map_path", self.selector_map_path)
 
-#     def unconfigure(self):
-#         self.set_global_parameter("key_map_path", "")
-#         self.set_global_parameter("selector_map_path", "")
+    def unconfigure(self):
+        self.set_global_parameter("key_map_path", "")
+        self.set_global_parameter("selector_map_path", "")
 
-#     def test_command(self):
-#         self.unconfigure()
-#         with self.assertRaises(management.CommandError):
-#             management.call_command("manage_rspamd_maps")
+    def test_command(self):
+        self.unconfigure()
+        with self.assertRaises(management.CommandError):
+            management.call_command("manage_rspamd_maps")
 
-#         self.configure()
-#         management.call_command("manage_rspamd_maps")
-#         self.assertFalse(os.path.exists(self.key_map_path))
-#         self.assertFalse(os.path.exists(self.selector_map_path))
+        self.configure()
+        management.call_command("manage_rspamd_maps")
+        self.assertFalse(os.path.exists(self.key_map_path))
+        self.assertFalse(os.path.exists(self.selector_map_path))
 
-#         domain = admin_models.Domain.objects.get(name="test.com")
-#         domain.enable_dkim = True
-#         domain.dkim_private_key_path = "xxx"
-#         domain.save()
-#         management.call_command("manage_rspamd_maps")
-#         self.assertTrue(os.path.exists(self.key_map_path))
-#         self.assertTrue(os.path.exists(self.selector_map_path))
+        domain = admin_models.Domain.objects.get(name="test.com")
+        domain.enable_dkim = True
+        domain.dkim_private_key_path = "xxx"
+        domain.save()
+        management.call_command("manage_rspamd_maps")
+        self.assertTrue(os.path.exists(self.key_map_path))
+        self.assertTrue(os.path.exists(self.selector_map_path))
 
-#         # Now, empty map files
-#         domain.enable_dkim = False
-#         domain.save()
-#         management.call_command("manage_rspamd_maps")
-#         with open(self.key_map_path) as fp:
-#             content = fp.read()
-#         self.assertNotIn(domain.name, content)
+        # Now, empty map files
+        domain.enable_dkim = False
+        domain.save()
+        management.call_command("manage_rspamd_maps")
+        with open(self.key_map_path) as fp:
+            content = fp.read()
+        self.assertNotIn(domain.name, content)
 
-#     def test_command_with_arg(self):
-#         self.configure()
-#         domain = admin_models.Domain.objects.get(name="test.com")
-#         domain.enable_dkim = True
-#         domain.save()
-#         management.call_command("manage_rspamd_maps", "--domain", "test.com")
-#         self.assertTrue(os.path.exists(self.key_map_path))
-#         self.assertTrue(os.path.exists(self.selector_map_path))
+    def test_command_with_arg(self):
+        self.configure()
+        domain = admin_models.Domain.objects.get(name="test.com")
+        domain.enable_dkim = True
+        domain.save()
+        management.call_command("manage_rspamd_maps", "--domain", "test.com")
+        self.assertTrue(os.path.exists(self.key_map_path))
+        self.assertTrue(os.path.exists(self.selector_map_path))
 
 
-# class ParametersAPITestCase(ModoAPITestCase):
+class ParametersAPITestCase(ModoAPITestCase):
 
-#     def test_update_settings(self):
-#         url = reverse("v2:parameter-global-detail", args=["rspamd"])
-#         data = {
-#             "key_map_path": f"{self.workdir}/key.map",
-#             "selector_map_path": f"{self.workdir}/selector.map",
-#             "rspamd_dashboard_location": "/rspamd",
-#         }
-#         response = self.client.put(url, data, format="json")
-#         self.assertEqual(response.status_code, 200)
+    def test_update_settings(self):
+        url = reverse("v2:parameter-global-detail", args=["rspamd"])
+        data = {
+            "key_map_path": f"{self.workdir}/key.map",
+            "selector_map_path": f"{self.workdir}/selector.map",
+            "rspamd_dashboard_location": "/rspamd",
+        }
+        response = self.client.put(url, data, format="json")
+        self.assertEqual(response.status_code, 200)

From 7016768f2ecdd5cf3a76c188a79faae2ba1cfbe0 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sun, 14 Dec 2025 19:25:49 +0100
Subject: [PATCH 8/8] Updated tests

---
 modoboa/core/api/v2/tests.py       |  9 ---------
 modoboa/parameters/api/v2/tests.py |  2 +-
 modoboa/rspamd/tests.py            | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/modoboa/core/api/v2/tests.py b/modoboa/core/api/v2/tests.py
index 5305c64e1..cf963310a 100644
--- a/modoboa/core/api/v2/tests.py
+++ b/modoboa/core/api/v2/tests.py
@@ -596,15 +596,6 @@ class FIDOViewSetTestCase(ModoAPITestCase):
         self.assertIn("tokens", resp.json())
 
 
-class CapabilitiesAPITestCase(ModoAPITestCase):
-
-    def test_get(self):
-        url = reverse("v2:capabilities")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn("rspamd", response.json()["capabilities"])
-
-
 class ThemeAPITestCase(ModoAPITestCase):
 
     def test_get(self):
diff --git a/modoboa/parameters/api/v2/tests.py b/modoboa/parameters/api/v2/tests.py
index ba18b5c8a..e19c40e28 100644
--- a/modoboa/parameters/api/v2/tests.py
+++ b/modoboa/parameters/api/v2/tests.py
@@ -18,7 +18,7 @@ class GlobalParametersAPITestCase(ModoAPITestCase):
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
         # core, admin, limits, pdf credentials, ...
-        self.assertEqual(len(resp.json()), 13)
+        self.assertEqual(len(resp.json()), 12)
 
     def test_get_structure(self):
         url = reverse("v2:parameter-global-structure")
diff --git a/modoboa/rspamd/tests.py b/modoboa/rspamd/tests.py
index 5594fb1ba..714e69df5 100644
--- a/modoboa/rspamd/tests.py
+++ b/modoboa/rspamd/tests.py
@@ -82,3 +82,17 @@ class ParametersAPITestCase(ModoAPITestCase):
         }
         response = self.client.put(url, data, format="json")
         self.assertEqual(response.status_code, 200)
+
+
+@modify_settings(
+    MODOBOA_APPS={
+        "append": "modoboa.rspamd",
+    }
+)
+class CapabilitiesAPITestCase(ModoAPITestCase):
+
+    def test_get(self):
+        url = reverse("v2:capabilities")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertIn("rspamd", response.json()["capabilities"])