From 2ad5bd283dfa56f0ab3f520896eb897a8c14eb3f Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Fri, 24 Feb 2023 12:33:55 +0100
Subject: [PATCH 1/9] reworked alarms, added alarm on dkim issue

---
 frontend/src/App.vue                          | 30 ++++++-
 frontend/src/api/alarms.js                    |  6 ++
 frontend/src/components/alarms/AlarmList.vue  | 79 ++++++++++++++++++-
 frontend/src/views/Login.vue                  |  2 +
 frontend/vue.config.js                        |  2 +-
 modoboa/admin/api/v2/serializers.py           | 15 ++++
 modoboa/admin/api/v2/viewsets.py              | 40 +++++++++-
 modoboa/admin/constants.py                    |  2 +
 .../commands/subcommands/_manage_dkim_keys.py | 21 +++++
 modoboa/admin/models/alarm.py                 |  6 ++
 10 files changed, 196 insertions(+), 7 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 640da0f5f..9d2d7bdda 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -35,6 +35,7 @@
 
 <script>
 import { mapGetters } from 'vuex'
+import alarms from '@/api/alarms'
 import { bus } from '@/main'
 import Navbar from '@/components/layout/Navbar'
 
@@ -51,12 +52,21 @@ export default {
   created () {
     // this.$store.dispatch('auth/initialize')
     bus.$on('notification', this.showNotification)
+    bus.$on('logged', this.checkAlarms)
+  },
+  mounted () {
+    this.checkAlarms()
+  },
+  beforeDestroy () {
+    clearInterval(this.alarmChecker)
   },
   data: () => ({
     snackbar: false,
     notification: '',
     notificationColor: 'success',
-    notificationTimeout: 2000
+    notificationTimeout: 2000,
+    alarmNotified: [],
+    alarmChecker: null
   }),
   methods: {
     showNotification (options) {
@@ -65,6 +75,24 @@ export default {
         this.notificationColor = (options.type) ? options.type : 'success'
         this.snackbar = true
       }
+    },
+    checkAlarms () {
+      if (this.isAuthenticated) {
+        this.alarmChecker = window.setInterval(() => {
+          alarms.getAll({}).then(resp => {
+            let count = 0
+            for (const alarm of resp.data) {
+              if (alarm.status === 1 && !this.alarmNotified.includes(alarm.id)) {
+                count++
+                this.alarmNotified.push(alarm.id)
+              }
+            }
+            if (count !== 0) {
+              bus.$emit('notification', { msg: this.$gettext('You have one or more opened alarms'), type: 'error' })
+            }
+          })
+        }, 10000)
+      }
     }
   }
 }
diff --git a/frontend/src/api/alarms.js b/frontend/src/api/alarms.js
index aa655bc31..be141dd3c 100644
--- a/frontend/src/api/alarms.js
+++ b/frontend/src/api/alarms.js
@@ -5,5 +5,11 @@ const resource = 'alarms'
 export default {
   getAll (params) {
     return repository.get(`${resource}/`, { params })
+  },
+  switchStatus (alarmId, data) {
+    return repository.patch(`${resource}/${alarmId}/switch/`, data)
+  },
+  delete (alarmId) {
+    return repository.delete(`${resource}/${alarmId}/`)
   }
 }
diff --git a/frontend/src/components/alarms/AlarmList.vue b/frontend/src/components/alarms/AlarmList.vue
index b7c6891b2..5b79ed678 100644
--- a/frontend/src/components/alarms/AlarmList.vue
+++ b/frontend/src/components/alarms/AlarmList.vue
@@ -8,6 +8,7 @@
         </v-btn>
       </template>
       <v-list dense>
+        <menu-items :items="getActionMenuItems()"/>
       </v-list>
     </v-menu>
     <v-spacer></v-spacer>
@@ -26,7 +27,7 @@
     :headers="headers"
     :items="alarms"
     :search="search"
-    item-key="pk"
+    item-key="id"
     :options.sync="options"
     :server-items-length="totalAlarms"
     :loading="loading"
@@ -53,18 +54,39 @@
       <template v-if="item.mailbox">
         {{ item.mailbox.address }}@{{ item.domain.name }}
       </template>
+      <template v-else>
+        /
+      </template>
     </template>
     <template v-slot:item.created="{ item }">
       {{ item.created|date }}
     </template>
+    <template v-slot:item.actions="{ item }">
+      <div class="text-right">
+        <v-menu offset-y>
+          <template v-slot:activator="{ on, attrs }">
+            <v-btn icon v-bind="attrs" v-on="on">
+              <v-icon>mdi-dots-horizontal</v-icon>
+            </v-btn>
+          </template>
+          <menu-items :items="getMenuItems(item)" :object="item" />
+        </v-menu>
+      </div>
+    </template>
   </v-data-table>
 </v-card>
 </template>
 
 <script>
+import { bus } from '@/main'
 import alarms from '@/api/alarms'
 import debounce from 'debounce'
+import MenuItems from '@/components/tools/MenuItems'
+
 export default {
+  components: {
+    MenuItems
+  },
   data () {
     return {
       alarms: [],
@@ -73,7 +95,8 @@ export default {
         { text: this.$gettext('Status'), value: 'status' },
         { text: this.$gettext('Domain'), value: 'domain.name', sortable: false },
         { text: this.$gettext('Mailbox'), value: 'mailbox', sortable: false },
-        { text: this.$gettext('Message'), value: 'title' }
+        { text: this.$gettext('Message'), value: 'title' },
+        { text: this.$gettext('Actions'), value: 'actions', sortable: false, align: 'right' }
       ],
       loading: true,
       options: {},
@@ -83,6 +106,9 @@ export default {
     }
   },
   methods: {
+    sleep (milliseconds) {
+      return new Promise((resolve) => setTimeout(resolve, milliseconds))
+    },
     fetchAlarms () {
       const params = {
         page: this.options.page
@@ -95,10 +121,57 @@ export default {
       }
       this.loading = true
       alarms.getAll(params).then(resp => {
-        this.alarms = resp.data.results
+        this.alarms = resp.data
         this.totalAlarms = resp.data.count
         this.loading = false
       })
+    },
+    async deleteAlarm (alarm, single = true) {
+      alarms.delete(alarm.id).then(() => {
+        if (single) {
+          bus.$emit('notification', { msg: this.$gettext('Alarm deleted') })
+          this.fetchAlarms()
+        }
+      })
+    },
+    async closeAlarm (alarm) {
+      alarms.switchStatus(alarm.id, { status: 2 }).then(() => {
+        bus.$emit('notification', { msg: this.$gettext('Alarm closed') })
+        this.fetchAlarms()
+      })
+    },
+    async openAlarm (alarm) {
+      alarms.switchStatus(alarm.id, { status: 1 }).then(() => {
+        bus.$emit('notification', { msg: this.$gettext('Alarm re-opened') })
+        this.fetchAlarms()
+      })
+    },
+    async deleteAlarms () {
+      for (const alarm of this.selected) {
+        this.deleteAlarm(alarm, false)
+        await this.sleep(100)
+      }
+      bus.$emit('notification', { msg: this.$gettext('Alarms deleted') })
+      this.selected = []
+      this.fetchAlarms()
+    },
+    getMenuItems (item) {
+      const result = []
+      result.push({ label: this.$gettext('Delete'), icon: 'mdi-delete-outline', onClick: this.deleteAlarm, color: 'red' })
+      if (item.status === 1) {
+        result.push({ label: this.$gettext('Close alarm'), icon: 'mdi-check', onClick: this.closeAlarm, color: 'green' })
+      } else {
+        result.push({ label: this.$gettext('Reopen alarm'), icon: 'mdi-alert-circle-outline', onClick: this.openAlarm, color: 'orange' })
+      }
+      return result
+    },
+    getActionMenuItems () {
+      const result = []
+      if (this.selected.length > 0) {
+        result.push({ label: this.$gettext('Delete'), icon: 'mdi-delete-outline', onClick: this.deleteAlarms, color: 'red' })
+      }
+      result.push({ label: 'Reload', icon: 'mdi-reload', onClick: this.fetchAlarms })
+      return result
     }
   },
   mounted () {
diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue
index 4141c18eb..1fc8b31a3 100644
--- a/frontend/src/views/Login.vue
+++ b/frontend/src/views/Login.vue
@@ -58,6 +58,7 @@
 </template>
 
 <script>
+import { bus } from '@/main'
 import Cookies from 'js-cookie'
 import auth from '@/api/auth'
 
@@ -86,6 +87,7 @@ export default {
         Cookies.set('token', resp.data.access, { sameSite: 'strict' })
         Cookies.set('refreshToken', resp.data.refresh, { sameSite: 'strict' })
         this.$store.dispatch('auth/initialize').then(() => {
+          bus.$emit('logged')
           this.$router.push({ name: 'DomainList' })
         })
       }).catch(err => {
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index 3ceebaec0..c0e75e1bc 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -5,7 +5,7 @@ module.exports = {
         target:
           process.env.DOCKER == "yes"
             ? "http://api:8000/"
-            : "http://localhost:8000",
+            : "http://127.0.0.1:8000",
       },
     },
   },
diff --git a/modoboa/admin/api/v2/serializers.py b/modoboa/admin/api/v2/serializers.py
index 84bccec49..1f4205535 100644
--- a/modoboa/admin/api/v2/serializers.py
+++ b/modoboa/admin/api/v2/serializers.py
@@ -225,6 +225,10 @@ class AdminGlobalParametersSerializer(serializers.Serializer):
                 raise serializers.ValidationError(
                     _("Directory not found.")
                 )
+            if not os.access(value, os.W_OK):
+                raise serializers.ValidationError(
+                    _("Directory non-writable")
+                )
             code, output = exec_cmd("which openssl")
             if code:
                 raise serializers.ValidationError(
@@ -588,3 +592,14 @@ class AlarmSerializer(serializers.ModelSerializer):
         depth = 1
         fields = "__all__"
         model = models.Alarm
+
+
+class AlarmSwitchStatusSerializer(serializers.Serializer):
+    """Serializer to switch the status of an Alarm."""
+
+    status = serializers.IntegerField()
+
+    def validate(self, data):
+        if data["status"] not in [constants.ALARM_OPENED, constants.ALARM_CLOSED]:
+            raise ValidationError(_("Unknown status"))
+        return data
diff --git a/modoboa/admin/api/v2/viewsets.py b/modoboa/admin/api/v2/viewsets.py
index f21348c84..e6ee407ab 100644
--- a/modoboa/admin/api/v2/viewsets.py
+++ b/modoboa/admin/api/v2/viewsets.py
@@ -10,7 +10,7 @@ from rest_framework import (
     filters, mixins, parsers, pagination, permissions, response, status, viewsets
 )
 from rest_framework.decorators import action
-from rest_framework.exceptions import PermissionDenied
+from rest_framework.exceptions import PermissionDenied, ValidationError
 
 from modoboa.admin.api.v1 import viewsets as v1_viewsets
 from modoboa.core import models as core_models
@@ -20,6 +20,7 @@ from modoboa.lib.throttle import GetThrottleViewsetMixin
 
 from ... import lib
 from ... import models
+from ... import constants
 from . import serializers
 
 
@@ -325,7 +326,10 @@ class UserAccountViewSet(GetThrottleViewsetMixin, viewsets.ViewSet):
         return response.Response(serializer.validated_data)
 
 
-class AlarmViewSet(GetThrottleViewsetMixin, viewsets.ReadOnlyModelViewSet):
+class AlarmViewSet(GetThrottleViewsetMixin,
+                   mixins.ListModelMixin,
+                   mixins.RetrieveModelMixin,
+                   viewsets.GenericViewSet):
     """Viewset for Alarm."""
 
     filter_backends = (filters.OrderingFilter, filters.SearchFilter, )
@@ -342,3 +346,35 @@ class AlarmViewSet(GetThrottleViewsetMixin, viewsets.ReadOnlyModelViewSet):
             domain__in=models.Domain.objects.get_for_admin(
                 self.request.user)
         ).order_by("-created")
+
+    @action(methods=["delete"], detail=True)
+    def delete(self, request, **kwargs):
+        """Custom delete method that accepts body arguments."""
+        alarm = self.get_object()
+        domain = models.Domain.objects.filter(pk=alarm.domain.pk)
+        if not domain.exists():
+            alarm.delete()
+        if not request.user.can_access(domain):
+            raise PermissionDenied(_("You don't have access to this domain"))
+        else:
+            alarm.delete()
+        return response.Response(status=status.HTTP_204_NO_CONTENT)
+
+    @action(methods=['patch'], detail=True)
+    def switch(self, request, **kwargs):
+        """Custom update method that switch status of an alarm."""
+        alarm = self.get_object()
+        serializer = serializers.AlarmSwitchStatusSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        domain = models.Domain.objects.filter(pk=alarm.domain.pk)
+        if not domain.exists():
+            alarm.delete()
+            raise ValidationError(_("No alarm found"))
+        if not request.user.can_access(domain):
+            raise PermissionDenied(_("You don't have access to this domain"))
+        else:
+            if serializer.data["status"] == constants.ALARM_CLOSED:
+                alarm.close()
+            else:
+                alarm.reopen()
+        return response.Response(status=status.HTTP_204_NO_CONTENT)
diff --git a/modoboa/admin/constants.py b/modoboa/admin/constants.py
index 18480ab29..c1272c052 100644
--- a/modoboa/admin/constants.py
+++ b/modoboa/admin/constants.py
@@ -35,6 +35,8 @@ DKIM_KEY_LENGTHS = [
     (4096, "4096"),
 ]
 
+DKIM_WRITE_ERROR = "DKIM path error"
+
 ALARM_OPENED = 1
 ALARM_CLOSED = 2
 
diff --git a/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py b/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py
index 0bc9e6f4e..bd810bd09 100644
--- a/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py
+++ b/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py
@@ -4,12 +4,14 @@ import os
 
 from django.core.management.base import BaseCommand
 from django.utils.encoding import smart_text
+from django.utils.translation import ugettext as _
 
 from modoboa.lib import sysutils
 from modoboa.parameters import tools as param_tools
 
 from .... import models
 from .... import signals
+from ....constants import DKIM_WRITE_ERROR, ALARM_OPENED
 
 
 class ManageDKIMKeys(BaseCommand):
@@ -19,6 +21,25 @@ class ManageDKIMKeys(BaseCommand):
         """Create a new DKIM key."""
         storage_dir = param_tools.get_global_parameter("dkim_keys_storage_dir")
         pkey_path = os.path.join(storage_dir, "{}.pem".format(domain.name))
+        alarm_qset = models.alarm.Alarm.objects.filter(
+                        domain=domain.pk,
+                        internal_name=DKIM_WRITE_ERROR)
+        if not os.access(storage_dir, os.W_OK):
+            if not alarm_qset:
+                alarm = models.alarm.Alarm.objects.create(
+                    domain=domain,
+                    title=_("DKIM path non-writable"),
+                    internal_name=DKIM_WRITE_ERROR
+                    )
+                alarm.save()
+            else:
+                alarm = alarm_qset.first()
+                if alarm.status != ALARM_OPENED:
+                    alarm.status = ALARM_OPENED
+                    alarm.save()
+            return
+        elif alarm_qset:
+            alarm_qset.first().close()
         key_size = (
             domain.dkim_key_length if domain.dkim_key_length
             else self.default_key_length)
diff --git a/modoboa/admin/models/alarm.py b/modoboa/admin/models/alarm.py
index 8168fe51d..03509f32a 100644
--- a/modoboa/admin/models/alarm.py
+++ b/modoboa/admin/models/alarm.py
@@ -51,5 +51,11 @@ class Alarm(models.Model):
         self.closed = timezone.now()
         self.save()
 
+    def reopen(self):
+        """Reopen this alarm."""
+        self.status = constants.ALARM_OPENED
+        self.closed = None
+        self.save()
+
 
 reversion.register(Alarm)

From 2ebe8fea439d4b0c22c4dddf198f2fd45db918a4 Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Fri, 24 Feb 2023 14:47:51 +0100
Subject: [PATCH 2/9] Added tests

---
 modoboa/admin/api/v2/tests.py      | 29 +++++++++++++++++++++++++++++
 modoboa/admin/api/v2/viewsets.py   |  7 +------
 modoboa/admin/tests/test_alarms.py | 26 ++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 modoboa/admin/tests/test_alarms.py

diff --git a/modoboa/admin/api/v2/tests.py b/modoboa/admin/api/v2/tests.py
index b4235ad95..65cefe0fd 100644
--- a/modoboa/admin/api/v2/tests.py
+++ b/modoboa/admin/api/v2/tests.py
@@ -485,3 +485,32 @@ class AlarmViewSetTestCase(ModoAPITestCase):
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(len(resp.json()), 1)
+
+    def test_update_alarm(self):
+        """Try updating alarm status and delete it afterward."""
+
+        domain = models.Domain.objects.filter(name="test.com")
+        alarm = models.Alarm.objects.create(
+            domain=domain.first(), mailbox=None, title="Test alarm 2")
+        alarm.save()
+
+        # Switch status of the alarm to close
+        url = reverse("v2:alarm-switch", args=[alarm.pk])
+        resp = self.client.patch(url, {"status": 2})
+        self.assertEqual(resp.status_code, 204)
+
+        # Check actual status
+        url = reverse("v2:alarm-detail", args=[alarm.pk])
+        resp = self.client.get(url)
+        self.assertEqual(resp.json()["status"], 2)
+
+        # Try to set an non-existant status
+        url = reverse("v2:alarm-switch", args=[alarm.pk])
+        resp = self.client.patch(url, {"status": 10})
+        self.assertEqual(resp.status_code, 400)
+
+        # Delete the alarm
+        url = reverse("v2:alarm-delete", args=[alarm.pk])
+        resp = self.client.delete(url)
+        self.assertEqual(resp.status_code, 204)
+
diff --git a/modoboa/admin/api/v2/viewsets.py b/modoboa/admin/api/v2/viewsets.py
index e6ee407ab..01525a1e4 100644
--- a/modoboa/admin/api/v2/viewsets.py
+++ b/modoboa/admin/api/v2/viewsets.py
@@ -10,7 +10,7 @@ from rest_framework import (
     filters, mixins, parsers, pagination, permissions, response, status, viewsets
 )
 from rest_framework.decorators import action
-from rest_framework.exceptions import PermissionDenied, ValidationError
+from rest_framework.exceptions import PermissionDenied
 
 from modoboa.admin.api.v1 import viewsets as v1_viewsets
 from modoboa.core import models as core_models
@@ -352,8 +352,6 @@ class AlarmViewSet(GetThrottleViewsetMixin,
         """Custom delete method that accepts body arguments."""
         alarm = self.get_object()
         domain = models.Domain.objects.filter(pk=alarm.domain.pk)
-        if not domain.exists():
-            alarm.delete()
         if not request.user.can_access(domain):
             raise PermissionDenied(_("You don't have access to this domain"))
         else:
@@ -367,9 +365,6 @@ class AlarmViewSet(GetThrottleViewsetMixin,
         serializer = serializers.AlarmSwitchStatusSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         domain = models.Domain.objects.filter(pk=alarm.domain.pk)
-        if not domain.exists():
-            alarm.delete()
-            raise ValidationError(_("No alarm found"))
         if not request.user.can_access(domain):
             raise PermissionDenied(_("You don't have access to this domain"))
         else:
diff --git a/modoboa/admin/tests/test_alarms.py b/modoboa/admin/tests/test_alarms.py
new file mode 100644
index 000000000..560dde817
--- /dev/null
+++ b/modoboa/admin/tests/test_alarms.py
@@ -0,0 +1,26 @@
+"""Alarm related tests."""
+
+from django.urls import reverse
+
+from modoboa.lib.tests import ModoTestCase
+from ..factories import populate_database
+from ..models import Alarm, Domain
+
+
+class AlarmsTestCase(ModoTestCase):
+    """Alarm open/close test cases."""
+
+    def setUp(self):
+        super().setUp()
+        populate_database()
+
+    def test_set_forward(self):
+        domain = Domain.objects.all().first()
+        alarm = Alarm.objects.create(
+            domain=domain, mailbox=None, title="Test alarm 3")
+        alarm.save()
+        self.assertEqual(alarm.status, 1)
+        alarm.close()
+        self.assertEqual(alarm.status, 2)
+        alarm.reopen()
+        self.assertEqual(alarm.status, 1)

From e7257e20f2ff518a613efa999cec5f2b0a831223 Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Fri, 24 Feb 2023 15:49:07 +0100
Subject: [PATCH 3/9] Added tests

---
 .../commands/subcommands/_manage_dkim_keys.py |  3 +--
 modoboa/admin/tests/test_domain.py            | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py b/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py
index bd810bd09..d929d01a9 100644
--- a/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py
+++ b/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py
@@ -35,8 +35,7 @@ class ManageDKIMKeys(BaseCommand):
             else:
                 alarm = alarm_qset.first()
                 if alarm.status != ALARM_OPENED:
-                    alarm.status = ALARM_OPENED
-                    alarm.save()
+                    alarm.reopen()
             return
         elif alarm_qset:
             alarm_qset.first().close()
diff --git a/modoboa/admin/tests/test_domain.py b/modoboa/admin/tests/test_domain.py
index 4b3793b0c..97c1e97a0 100644
--- a/modoboa/admin/tests/test_domain.py
+++ b/modoboa/admin/tests/test_domain.py
@@ -20,9 +20,10 @@ from modoboa.core.tests.test_views import SETTINGS_SAMPLE
 from modoboa.lib.tests import ModoTestCase
 from modoboa.maillog import factories as ml_factories
 
+from ..import constants
 from . import utils
 from .. import factories
-from ..models import Alias, Domain
+from ..models import Alarm, Alias, Domain
 
 
 class DomainTestCase(ModoTestCase):
@@ -445,10 +446,24 @@ class DKIMTestCase(ModoTestCase):
         values["dkim_key_selector"] = "default"
         self.ajax_post(reverse("admin:domain_add"), values)
 
+        # Try generating a key to a protected directory
+        self.set_global_parameter("dkim_keys_storage_dir", "/I_DONT_EXIST")
         call_command("modo", "manage_dkim_keys")
+        domain = Domain.objects.filter(name=values["name"])
+        alarm = Alarm.objects.get(domain__in=domain,
+                                  internal_name=constants.DKIM_WRITE_ERROR)
+
+        # Closing the alarm and retry generating dkim keys
+        alarm.close()
+        call_command("modo", "manage_dkim_keys")
+        self.assertEqual(alarm.status, constants.ALARM_OPENED)
+
+        # Generate normally
+        self.set_global_parameter("dkim_keys_storage_dir", self.workdir)
+        call_command("modo", "manage_dkim_keys")
+        self.assertEqual(alarm.status, constants.ALARM_CLOSED)
         key_path = os.path.join(self.workdir, "{}.pem".format(values["name"]))
         self.assertTrue(os.path.exists(key_path))
-
         domain = Domain.objects.get(name=values["name"])
         url = reverse("admin:domain_detail", args=[domain.pk])
         response = self.client.get(url)

From 329ea62aac85c68bb358e8f4098f7e7544d7fbee Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Fri, 24 Feb 2023 16:09:34 +0100
Subject: [PATCH 4/9] Updated test

---
 modoboa/admin/tests/test_domain.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/modoboa/admin/tests/test_domain.py b/modoboa/admin/tests/test_domain.py
index 97c1e97a0..81db43495 100644
--- a/modoboa/admin/tests/test_domain.py
+++ b/modoboa/admin/tests/test_domain.py
@@ -450,18 +450,24 @@ class DKIMTestCase(ModoTestCase):
         self.set_global_parameter("dkim_keys_storage_dir", "/I_DONT_EXIST")
         call_command("modo", "manage_dkim_keys")
         domain = Domain.objects.filter(name=values["name"])
-        alarm = Alarm.objects.get(domain__in=domain,
-                                  internal_name=constants.DKIM_WRITE_ERROR)
 
         # Closing the alarm and retry generating dkim keys
-        alarm.close()
+        Alarm.objects.get(domain__in=domain,
+                          internal_name=constants.DKIM_WRITE_ERROR
+                          ).close()
         call_command("modo", "manage_dkim_keys")
-        self.assertEqual(alarm.status, constants.ALARM_OPENED)
+        self.assertEqual(
+            Alarm.objects.get(domain__in=domain,
+                              internal_name=constants.DKIM_WRITE_ERROR).status,
+            constants.ALARM_OPENED)
 
         # Generate normally
         self.set_global_parameter("dkim_keys_storage_dir", self.workdir)
         call_command("modo", "manage_dkim_keys")
-        self.assertEqual(alarm.status, constants.ALARM_CLOSED)
+        self.assertEqual(
+            Alarm.objects.get(domain__in=domain,
+                              internal_name=constants.DKIM_WRITE_ERROR).status,
+            constants.ALARM_CLOSED)
         key_path = os.path.join(self.workdir, "{}.pem".format(values["name"]))
         self.assertTrue(os.path.exists(key_path))
         domain = Domain.objects.get(name=values["name"])

From 5ab5c9092710367ffcad0fb185c58db181eb76a3 Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Fri, 24 Feb 2023 16:37:52 +0100
Subject: [PATCH 5/9] Last tests

---
 modoboa/admin/api/v2/tests.py      | 24 ++++++++++++++++++++++--
 modoboa/admin/api/v2/viewsets.py   |  4 ++--
 modoboa/admin/tests/test_domain.py |  8 ++++----
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/modoboa/admin/api/v2/tests.py b/modoboa/admin/api/v2/tests.py
index 65cefe0fd..92b9c5e3f 100644
--- a/modoboa/admin/api/v2/tests.py
+++ b/modoboa/admin/api/v2/tests.py
@@ -479,6 +479,8 @@ class AlarmViewSetTestCase(ModoAPITestCase):
         factories.populate_database()
         factories.AlarmFactory(
             domain__name="test.com", mailbox=None, title="Test alarm")
+        cls.da_token = Token.objects.create(
+            user=core_models.User.objects.get(username="admin@test.com"))
 
     def test_list(self):
         url = reverse("v2:alarm-list")
@@ -489,11 +491,28 @@ class AlarmViewSetTestCase(ModoAPITestCase):
     def test_update_alarm(self):
         """Try updating alarm status and delete it afterward."""
 
-        domain = models.Domain.objects.filter(name="test.com")
+        domain = models.Domain.objects.get(name="test.com")
         alarm = models.Alarm.objects.create(
-            domain=domain.first(), mailbox=None, title="Test alarm 2")
+            domain=domain, mailbox=None, title="Test alarm 2")
         alarm.save()
 
+        # Try performing action on restricted domains
+        self.client.credentials(
+            HTTP_AUTHORIZATION="Token " + self.da_token.key)
+        domain = models.Domain.objects.get(name="test2.com")
+        alarm_restricted = models.Alarm.objects.create(
+            domain=domain, mailbox=None, title="Test alarm 3")
+        alarm_restricted.save()
+        url = reverse("v2:alarm-switch", args=[alarm_restricted.pk])
+        resp = self.client.post(url)
+        self.assertEqual(resp.status_code, 405)
+        url = reverse("v2:alarm-delete", args=[alarm_restricted.pk])
+        resp = self.client.delete(url)
+        self.assertEqual(resp.status_code, 404)
+
+        # Perform actions as SuperAdmin
+        self.client.credentials(HTTP_AUTHORIZATION="Token " + self.token.key)
+
         # Switch status of the alarm to close
         url = reverse("v2:alarm-switch", args=[alarm.pk])
         resp = self.client.patch(url, {"status": 2})
@@ -514,3 +533,4 @@ class AlarmViewSetTestCase(ModoAPITestCase):
         resp = self.client.delete(url)
         self.assertEqual(resp.status_code, 204)
 
+
diff --git a/modoboa/admin/api/v2/viewsets.py b/modoboa/admin/api/v2/viewsets.py
index 01525a1e4..0876e93c8 100644
--- a/modoboa/admin/api/v2/viewsets.py
+++ b/modoboa/admin/api/v2/viewsets.py
@@ -351,7 +351,7 @@ class AlarmViewSet(GetThrottleViewsetMixin,
     def delete(self, request, **kwargs):
         """Custom delete method that accepts body arguments."""
         alarm = self.get_object()
-        domain = models.Domain.objects.filter(pk=alarm.domain.pk)
+        domain = models.Domain.objects.get(pk=alarm.domain.pk)
         if not request.user.can_access(domain):
             raise PermissionDenied(_("You don't have access to this domain"))
         else:
@@ -364,7 +364,7 @@ class AlarmViewSet(GetThrottleViewsetMixin,
         alarm = self.get_object()
         serializer = serializers.AlarmSwitchStatusSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        domain = models.Domain.objects.filter(pk=alarm.domain.pk)
+        domain = models.Domain.objects.get(pk=alarm.domain.pk)
         if not request.user.can_access(domain):
             raise PermissionDenied(_("You don't have access to this domain"))
         else:
diff --git a/modoboa/admin/tests/test_domain.py b/modoboa/admin/tests/test_domain.py
index 81db43495..6fd4a8b7a 100644
--- a/modoboa/admin/tests/test_domain.py
+++ b/modoboa/admin/tests/test_domain.py
@@ -449,15 +449,15 @@ class DKIMTestCase(ModoTestCase):
         # Try generating a key to a protected directory
         self.set_global_parameter("dkim_keys_storage_dir", "/I_DONT_EXIST")
         call_command("modo", "manage_dkim_keys")
-        domain = Domain.objects.filter(name=values["name"])
+        domain = Domain.objects.get(name=values["name"])
 
         # Closing the alarm and retry generating dkim keys
-        Alarm.objects.get(domain__in=domain,
+        Alarm.objects.get(domain=domain,
                           internal_name=constants.DKIM_WRITE_ERROR
                           ).close()
         call_command("modo", "manage_dkim_keys")
         self.assertEqual(
-            Alarm.objects.get(domain__in=domain,
+            Alarm.objects.get(domain=domain,
                               internal_name=constants.DKIM_WRITE_ERROR).status,
             constants.ALARM_OPENED)
 
@@ -465,7 +465,7 @@ class DKIMTestCase(ModoTestCase):
         self.set_global_parameter("dkim_keys_storage_dir", self.workdir)
         call_command("modo", "manage_dkim_keys")
         self.assertEqual(
-            Alarm.objects.get(domain__in=domain,
+            Alarm.objects.get(domain=domain,
                               internal_name=constants.DKIM_WRITE_ERROR).status,
             constants.ALARM_CLOSED)
         key_path = os.path.join(self.workdir, "{}.pem".format(values["name"]))

From 800cdad11b7c371de439b308c270c4e0b7a9b67b Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Fri, 24 Feb 2023 17:52:52 +0100
Subject: [PATCH 6/9] Even better tests

---
 modoboa/admin/api/v2/tests.py      | 25 ++++++++++++++++++-------
 modoboa/admin/api/v2/viewsets.py   | 14 ++++----------
 modoboa/parameters/api/v2/tests.py | 12 ++++++++++++
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/modoboa/admin/api/v2/tests.py b/modoboa/admin/api/v2/tests.py
index 92b9c5e3f..b58a31199 100644
--- a/modoboa/admin/api/v2/tests.py
+++ b/modoboa/admin/api/v2/tests.py
@@ -6,7 +6,7 @@ from django.utils.encoding import force_text
 
 from rest_framework.authtoken.models import Token
 
-from modoboa.admin import factories, models
+from modoboa.admin import factories, models, constants
 from modoboa.core import models as core_models
 from modoboa.lib.tests import ModoAPITestCase
 
@@ -492,16 +492,13 @@ class AlarmViewSetTestCase(ModoAPITestCase):
         """Try updating alarm status and delete it afterward."""
 
         domain = models.Domain.objects.get(name="test.com")
-        alarm = models.Alarm.objects.create(
-            domain=domain, mailbox=None, title="Test alarm 2")
-        alarm.save()
 
         # Try performing action on restricted domains
         self.client.credentials(
             HTTP_AUTHORIZATION="Token " + self.da_token.key)
         domain = models.Domain.objects.get(name="test2.com")
         alarm_restricted = models.Alarm.objects.create(
-            domain=domain, mailbox=None, title="Test alarm 3")
+            domain=domain, mailbox=None, title="Test alarm 2")
         alarm_restricted.save()
         url = reverse("v2:alarm-switch", args=[alarm_restricted.pk])
         resp = self.client.post(url)
@@ -513,15 +510,29 @@ class AlarmViewSetTestCase(ModoAPITestCase):
         # Perform actions as SuperAdmin
         self.client.credentials(HTTP_AUTHORIZATION="Token " + self.token.key)
 
+        alarm = models.Alarm.objects.create(
+            domain=domain, mailbox=None, title="Test alarm 3")
+        alarm.save()
+
         # Switch status of the alarm to close
         url = reverse("v2:alarm-switch", args=[alarm.pk])
-        resp = self.client.patch(url, {"status": 2})
+        resp = self.client.patch(url, {"status": constants.ALARM_CLOSED})
         self.assertEqual(resp.status_code, 204)
 
         # Check actual status
         url = reverse("v2:alarm-detail", args=[alarm.pk])
         resp = self.client.get(url)
-        self.assertEqual(resp.json()["status"], 2)
+        self.assertEqual(resp.json()["status"], constants.ALARM_CLOSED)
+
+        # Switch status back to open
+        url = reverse("v2:alarm-switch", args=[alarm.pk])
+        resp = self.client.patch(url, {"status": constants.ALARM_OPENED})
+        self.assertEqual(resp.status_code, 204)
+
+        # Check actual status
+        url = reverse("v2:alarm-detail", args=[alarm.pk])
+        resp = self.client.get(url)
+        self.assertEqual(resp.json()["status"], constants.ALARM_OPENED)
 
         # Try to set an non-existant status
         url = reverse("v2:alarm-switch", args=[alarm.pk])
diff --git a/modoboa/admin/api/v2/viewsets.py b/modoboa/admin/api/v2/viewsets.py
index 0876e93c8..5c3da0f08 100644
--- a/modoboa/admin/api/v2/viewsets.py
+++ b/modoboa/admin/api/v2/viewsets.py
@@ -352,10 +352,7 @@ class AlarmViewSet(GetThrottleViewsetMixin,
         """Custom delete method that accepts body arguments."""
         alarm = self.get_object()
         domain = models.Domain.objects.get(pk=alarm.domain.pk)
-        if not request.user.can_access(domain):
-            raise PermissionDenied(_("You don't have access to this domain"))
-        else:
-            alarm.delete()
+        alarm.delete()
         return response.Response(status=status.HTTP_204_NO_CONTENT)
 
     @action(methods=['patch'], detail=True)
@@ -365,11 +362,8 @@ class AlarmViewSet(GetThrottleViewsetMixin,
         serializer = serializers.AlarmSwitchStatusSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         domain = models.Domain.objects.get(pk=alarm.domain.pk)
-        if not request.user.can_access(domain):
-            raise PermissionDenied(_("You don't have access to this domain"))
+        if serializer.data["status"] == constants.ALARM_CLOSED:
+            alarm.close()
         else:
-            if serializer.data["status"] == constants.ALARM_CLOSED:
-                alarm.close()
-            else:
-                alarm.reopen()
+            alarm.reopen()
         return response.Response(status=status.HTTP_204_NO_CONTENT)
diff --git a/modoboa/parameters/api/v2/tests.py b/modoboa/parameters/api/v2/tests.py
index 0803b650d..dc5e21c59 100644
--- a/modoboa/parameters/api/v2/tests.py
+++ b/modoboa/parameters/api/v2/tests.py
@@ -75,6 +75,18 @@ class ParametersAPITestCase(ModoAPITestCase):
             errors["dkim_keys_storage_dir"], ["Directory not found."]
         )
 
+        # Try to set dkim storage dir to a non-writable directory.
+        data = {
+            "dkim_keys_storage_dir": "/root"
+        }
+        url = reverse("v2:parameter-detail", args=["admin"])
+        resp = self.client.put(url, data, format="json")
+        self.assertEqual(resp.status_code, 400)
+        errors = resp.json()
+        self.assertEqual(
+            errors["dkim_keys_storage_dir"], ["Directory non-writable"]
+        )
+
         data = {
             "enable_mx_checks": True,
             "domains_must_have_authorized_mx": True,

From 8807fcd94b91f41599525f9b09228e675d6ce5d8 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 27 Feb 2023 11:35:04 +0100
Subject: [PATCH 7/9] Endpoint result is paginated.

---
 frontend/src/components/alarms/AlarmList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/alarms/AlarmList.vue b/frontend/src/components/alarms/AlarmList.vue
index 5b79ed678..04cf2be73 100644
--- a/frontend/src/components/alarms/AlarmList.vue
+++ b/frontend/src/components/alarms/AlarmList.vue
@@ -121,7 +121,7 @@ export default {
       }
       this.loading = true
       alarms.getAll(params).then(resp => {
-        this.alarms = resp.data
+        this.alarms = resp.data.results
         this.totalAlarms = resp.data.count
         this.loading = false
       })

From 5558dfba30492e2f282584511bbf1004fa295666 Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Fri, 3 Mar 2023 11:24:47 +0100
Subject: [PATCH 8/9] Fix review

Co-Authored-By: Antoine Nguyen <tonio@ngyn.org>
---
 frontend/src/App.vue                          | 19 ++++++++++++----
 frontend/src/components/alarms/AlarmList.vue  |  7 +++---
 frontend/src/constants.json                   |  1 +
 frontend/src/views/Login.vue                  |  2 +-
 modoboa/admin/api/v2/viewsets.py              | 22 +++++++++++++++----
 .../commands/subcommands/_manage_dkim_keys.py | 15 +++++--------
 6 files changed, 44 insertions(+), 22 deletions(-)
 create mode 100644 frontend/src/constants.json

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 9d2d7bdda..a2603c62b 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -52,7 +52,7 @@ export default {
   created () {
     // this.$store.dispatch('auth/initialize')
     bus.$on('notification', this.showNotification)
-    bus.$on('logged', this.checkAlarms)
+    bus.$on('loggedIn', this.checkAlarms)
   },
   mounted () {
     this.checkAlarms()
@@ -66,7 +66,9 @@ export default {
     notificationColor: 'success',
     notificationTimeout: 2000,
     alarmNotified: [],
-    alarmChecker: null
+    alarmChecker: null,
+    lastAlarmDate: '',
+    alarmSleepTime: 10000
   }),
   methods: {
     showNotification (options) {
@@ -79,10 +81,19 @@ export default {
     checkAlarms () {
       if (this.isAuthenticated) {
         this.alarmChecker = window.setInterval(() => {
-          alarms.getAll({}).then(resp => {
+          const params = {}
+          if (this.lastAlarmDate instanceof Date) {
+            params.min_date = this.lastAlarmDate
+          }
+          alarms.getAll(params).then(resp => {
             let count = 0
             for (const alarm of resp.data) {
               if (alarm.status === 1 && !this.alarmNotified.includes(alarm.id)) {
+                if (this.lastAlarmDate instanceof Date && new Date(alarm.created) > this.lastAlarmDate) {
+                  this.lastAlarmDate = new Date(alarm.created)
+                } else if (!(this.lastAlarmDate instanceof Date)) {
+                  this.lastAlarmDate = new Date(alarm.created)
+                }
                 count++
                 this.alarmNotified.push(alarm.id)
               }
@@ -91,7 +102,7 @@ export default {
               bus.$emit('notification', { msg: this.$gettext('You have one or more opened alarms'), type: 'error' })
             }
           })
-        }, 10000)
+        }, this.alarmSleepTime)
       }
     }
   }
diff --git a/frontend/src/components/alarms/AlarmList.vue b/frontend/src/components/alarms/AlarmList.vue
index 04cf2be73..dfda1b339 100644
--- a/frontend/src/components/alarms/AlarmList.vue
+++ b/frontend/src/components/alarms/AlarmList.vue
@@ -82,6 +82,7 @@ import { bus } from '@/main'
 import alarms from '@/api/alarms'
 import debounce from 'debounce'
 import MenuItems from '@/components/tools/MenuItems'
+import constants from '@/constants.json'
 
 export default {
   components: {
@@ -121,7 +122,7 @@ export default {
       }
       this.loading = true
       alarms.getAll(params).then(resp => {
-        this.alarms = resp.data.results
+        this.alarms = resp.data
         this.totalAlarms = resp.data.count
         this.loading = false
       })
@@ -135,13 +136,13 @@ export default {
       })
     },
     async closeAlarm (alarm) {
-      alarms.switchStatus(alarm.id, { status: 2 }).then(() => {
+      alarms.switchStatus(alarm.id, { status: constants.ALARM_CLOSED }).then(() => {
         bus.$emit('notification', { msg: this.$gettext('Alarm closed') })
         this.fetchAlarms()
       })
     },
     async openAlarm (alarm) {
-      alarms.switchStatus(alarm.id, { status: 1 }).then(() => {
+      alarms.switchStatus(alarm.id, { status: constants.ALARM_OPENED }).then(() => {
         bus.$emit('notification', { msg: this.$gettext('Alarm re-opened') })
         this.fetchAlarms()
       })
diff --git a/frontend/src/constants.json b/frontend/src/constants.json
new file mode 100644
index 000000000..7f66341bd
--- /dev/null
+++ b/frontend/src/constants.json
@@ -0,0 +1 @@
+{"ALARM_OPENED":1, "ALARM_CLOSED":2}
diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue
index 1fc8b31a3..77a927dc0 100644
--- a/frontend/src/views/Login.vue
+++ b/frontend/src/views/Login.vue
@@ -87,7 +87,7 @@ export default {
         Cookies.set('token', resp.data.access, { sameSite: 'strict' })
         Cookies.set('refreshToken', resp.data.refresh, { sameSite: 'strict' })
         this.$store.dispatch('auth/initialize').then(() => {
-          bus.$emit('logged')
+          bus.$emit('loggedIn')
           this.$router.push({ name: 'DomainList' })
         })
       }).catch(err => {
diff --git a/modoboa/admin/api/v2/viewsets.py b/modoboa/admin/api/v2/viewsets.py
index 5c3da0f08..d3d5e4c04 100644
--- a/modoboa/admin/api/v2/viewsets.py
+++ b/modoboa/admin/api/v2/viewsets.py
@@ -326,13 +326,29 @@ class UserAccountViewSet(GetThrottleViewsetMixin, viewsets.ViewSet):
         return response.Response(serializer.validated_data)
 
 
+class AlarmFilterSet(dj_filters.FilterSet):
+    """Custom FilterSet for Alarms."""
+
+    min_date = dj_filters.DateTimeFilter(method="filter_date")
+
+    class Meta:
+        model = models.Alarm
+        fields = ["created"]
+
+    def filter_date(self, queryset, name, value):
+        return queryset.filter(created__gt=value)
+
+
 class AlarmViewSet(GetThrottleViewsetMixin,
                    mixins.ListModelMixin,
                    mixins.RetrieveModelMixin,
                    viewsets.GenericViewSet):
     """Viewset for Alarm."""
 
-    filter_backends = (filters.OrderingFilter, filters.SearchFilter, )
+    filter_backends = (filters.OrderingFilter,
+                       filters.SearchFilter,
+                       dj_filters.DjangoFilterBackend)
+    filterset_class = AlarmFilterSet
     ordering_fields = ["created", "status", "title"]
     pagination_class = pagination.PageNumberPagination
     permission_classes = (
@@ -349,9 +365,8 @@ class AlarmViewSet(GetThrottleViewsetMixin,
 
     @action(methods=["delete"], detail=True)
     def delete(self, request, **kwargs):
-        """Custom delete method that accepts body arguments."""
+        """Allow admins to delete alarms."""
         alarm = self.get_object()
-        domain = models.Domain.objects.get(pk=alarm.domain.pk)
         alarm.delete()
         return response.Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -361,7 +376,6 @@ class AlarmViewSet(GetThrottleViewsetMixin,
         alarm = self.get_object()
         serializer = serializers.AlarmSwitchStatusSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        domain = models.Domain.objects.get(pk=alarm.domain.pk)
         if serializer.data["status"] == constants.ALARM_CLOSED:
             alarm.close()
         else:
diff --git a/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py b/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py
index d929d01a9..1d125ed43 100644
--- a/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py
+++ b/modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py
@@ -21,23 +21,18 @@ class ManageDKIMKeys(BaseCommand):
         """Create a new DKIM key."""
         storage_dir = param_tools.get_global_parameter("dkim_keys_storage_dir")
         pkey_path = os.path.join(storage_dir, "{}.pem".format(domain.name))
-        alarm_qset = models.alarm.Alarm.objects.filter(
-                        domain=domain.pk,
-                        internal_name=DKIM_WRITE_ERROR)
+        alarm_qset = domain.alarms.filter(internal_name=DKIM_WRITE_ERROR)
         if not os.access(storage_dir, os.W_OK):
-            if not alarm_qset:
-                alarm = models.alarm.Alarm.objects.create(
-                    domain=domain,
+            if not alarm_qset.exists():
+                domain.alarms.create(
                     title=_("DKIM path non-writable"),
-                    internal_name=DKIM_WRITE_ERROR
-                    )
-                alarm.save()
+                    internal_name=DKIM_WRITE_ERROR)
             else:
                 alarm = alarm_qset.first()
                 if alarm.status != ALARM_OPENED:
                     alarm.reopen()
             return
-        elif alarm_qset:
+        elif alarm_qset.exists():
             alarm_qset.first().close()
         key_size = (
             domain.dkim_key_length if domain.dkim_key_length

From 29609e3adbe23d0fc338606d631e1fa567b3e86e Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 6 Mar 2023 18:12:16 +0100
Subject: [PATCH 9/9] Added bulk delete endpoint for alarms

---
 frontend/src/api/alarms.js                   |  3 ++
 frontend/src/components/alarms/AlarmList.vue | 36 +++++++++++++-------
 frontend/src/constants.json                  |  5 ++-
 modoboa/admin/api/v2/tests.py                | 21 ++++++++++--
 modoboa/admin/api/v2/viewsets.py             | 22 ++++++++----
 modoboa/admin/models/mxrecord.py             |  2 +-
 6 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/frontend/src/api/alarms.js b/frontend/src/api/alarms.js
index be141dd3c..535b7cb34 100644
--- a/frontend/src/api/alarms.js
+++ b/frontend/src/api/alarms.js
@@ -11,5 +11,8 @@ export default {
   },
   delete (alarmId) {
     return repository.delete(`${resource}/${alarmId}/`)
+  },
+  bulkDelete (alarmsIds) {
+    return repository.delete(`${resource}/bulk_delete/`, { params: { ids: alarmsIds } })
   }
 }
diff --git a/frontend/src/components/alarms/AlarmList.vue b/frontend/src/components/alarms/AlarmList.vue
index dfda1b339..eaabeff12 100644
--- a/frontend/src/components/alarms/AlarmList.vue
+++ b/frontend/src/components/alarms/AlarmList.vue
@@ -107,9 +107,6 @@ export default {
     }
   },
   methods: {
-    sleep (milliseconds) {
-      return new Promise((resolve) => setTimeout(resolve, milliseconds))
-    },
     fetchAlarms () {
       const params = {
         page: this.options.page
@@ -122,7 +119,7 @@ export default {
       }
       this.loading = true
       alarms.getAll(params).then(resp => {
-        this.alarms = resp.data
+        this.alarms = resp.data.results
         this.totalAlarms = resp.data.count
         this.loading = false
       })
@@ -148,21 +145,34 @@ export default {
       })
     },
     async deleteAlarms () {
-      for (const alarm of this.selected) {
-        this.deleteAlarm(alarm, false)
-        await this.sleep(100)
-      }
+      await alarms.bulkDelete(this.selected.map(alarm => alarm.id))
       bus.$emit('notification', { msg: this.$gettext('Alarms deleted') })
       this.selected = []
       this.fetchAlarms()
     },
     getMenuItems (item) {
       const result = []
-      result.push({ label: this.$gettext('Delete'), icon: 'mdi-delete-outline', onClick: this.deleteAlarm, color: 'red' })
-      if (item.status === 1) {
-        result.push({ label: this.$gettext('Close alarm'), icon: 'mdi-check', onClick: this.closeAlarm, color: 'green' })
+      result.push({
+        label: this.$gettext('Delete'),
+        icon: 'mdi-delete-outline',
+        onClick: this.deleteAlarm,
+        color: 'red'
+      })
+      if (item.status === constants.ALARM_OPENED) {
+        result.push({
+          label: this.$gettext('Close alarm'),
+          icon: 'mdi-check',
+          onClick: this.closeAlarm,
+          color: 'green'
+        })
       } else {
-        result.push({ label: this.$gettext('Reopen alarm'), icon: 'mdi-alert-circle-outline', onClick: this.openAlarm, color: 'orange' })
+        result.push({
+          label: this.$gettext('Reopen alarm'),
+          icon: 'mdi-alert-circle-outline',
+          onClick:
+          this.openAlarm,
+          color: 'orange'
+        })
       }
       return result
     },
@@ -171,7 +181,7 @@ export default {
       if (this.selected.length > 0) {
         result.push({ label: this.$gettext('Delete'), icon: 'mdi-delete-outline', onClick: this.deleteAlarms, color: 'red' })
       }
-      result.push({ label: 'Reload', icon: 'mdi-reload', onClick: this.fetchAlarms })
+      result.push({ label: this.$gettext('Reload'), icon: 'mdi-reload', onClick: this.fetchAlarms })
       return result
     }
   },
diff --git a/frontend/src/constants.json b/frontend/src/constants.json
index 7f66341bd..b67288602 100644
--- a/frontend/src/constants.json
+++ b/frontend/src/constants.json
@@ -1 +1,4 @@
-{"ALARM_OPENED":1, "ALARM_CLOSED":2}
+{
+    "ALARM_OPENED": 1,
+    "ALARM_CLOSED": 2
+}
diff --git a/modoboa/admin/api/v2/tests.py b/modoboa/admin/api/v2/tests.py
index b58a31199..347d4be99 100644
--- a/modoboa/admin/api/v2/tests.py
+++ b/modoboa/admin/api/v2/tests.py
@@ -503,7 +503,7 @@ class AlarmViewSetTestCase(ModoAPITestCase):
         url = reverse("v2:alarm-switch", args=[alarm_restricted.pk])
         resp = self.client.post(url)
         self.assertEqual(resp.status_code, 405)
-        url = reverse("v2:alarm-delete", args=[alarm_restricted.pk])
+        url = reverse("v2:alarm-detail", args=[alarm_restricted.pk])
         resp = self.client.delete(url)
         self.assertEqual(resp.status_code, 404)
 
@@ -540,8 +540,23 @@ class AlarmViewSetTestCase(ModoAPITestCase):
         self.assertEqual(resp.status_code, 400)
 
         # Delete the alarm
-        url = reverse("v2:alarm-delete", args=[alarm.pk])
+        url = reverse("v2:alarm-detail", args=[alarm.pk])
         resp = self.client.delete(url)
         self.assertEqual(resp.status_code, 204)
 
-
+    def test_bulk_delete(self):
+        url = reverse("v2:alarm-bulk-delete")
+        resp = self.client.delete(url)
+        self.assertEqual(resp.status_code, 400)
+        resp = self.client.delete(f"{url}?ids[]=toto")
+        self.assertEqual(resp.status_code, 400)
+        alarm1 = factories.AlarmFactory(
+            domain__name="test.com", mailbox=None, title="Test alarm")
+        alarm2 = factories.AlarmFactory(
+            domain__name="test.com", mailbox=None, title="Test alarm")
+        resp = self.client.delete(f"{url}?ids[]={alarm1.pk}&ids[]={alarm2.pk}")
+        self.assertEqual(resp.status_code, 204)
+        with self.assertRaises(models.Alarm.DoesNotExist):
+            alarm1.refresh_from_db()
+        with self.assertRaises(models.Alarm.DoesNotExist):
+            alarm2.refresh_from_db()
diff --git a/modoboa/admin/api/v2/viewsets.py b/modoboa/admin/api/v2/viewsets.py
index d3d5e4c04..54d42b3f2 100644
--- a/modoboa/admin/api/v2/viewsets.py
+++ b/modoboa/admin/api/v2/viewsets.py
@@ -340,6 +340,7 @@ class AlarmFilterSet(dj_filters.FilterSet):
 
 
 class AlarmViewSet(GetThrottleViewsetMixin,
+                   mixins.DestroyModelMixin,
                    mixins.ListModelMixin,
                    mixins.RetrieveModelMixin,
                    viewsets.GenericViewSet):
@@ -363,13 +364,6 @@ class AlarmViewSet(GetThrottleViewsetMixin,
                 self.request.user)
         ).order_by("-created")
 
-    @action(methods=["delete"], detail=True)
-    def delete(self, request, **kwargs):
-        """Allow admins to delete alarms."""
-        alarm = self.get_object()
-        alarm.delete()
-        return response.Response(status=status.HTTP_204_NO_CONTENT)
-
     @action(methods=['patch'], detail=True)
     def switch(self, request, **kwargs):
         """Custom update method that switch status of an alarm."""
@@ -381,3 +375,17 @@ class AlarmViewSet(GetThrottleViewsetMixin,
         else:
             alarm.reopen()
         return response.Response(status=status.HTTP_204_NO_CONTENT)
+
+    @action(methods=['delete'], detail=False)
+    def bulk_delete(self, request, **kwargs):
+        """Delete multiple alarms at the same time."""
+        ids = request.query_params.getlist("ids[]")
+        if not ids:
+            return response.Response(_("No alarm ID provided"), status=400)
+        try:
+            ids = [int(alarm_id) for alarm_id in ids]
+        except ValueError:
+            return response.Response(
+                _("Received invalid alarm id(s)"), status=400)
+        models.Alarm.objects.filter(pk__in=ids).delete()
+        return response.Response(status=204)
diff --git a/modoboa/admin/models/mxrecord.py b/modoboa/admin/models/mxrecord.py
index c03ae3e4f..c0653ffbe 100644
--- a/modoboa/admin/models/mxrecord.py
+++ b/modoboa/admin/models/mxrecord.py
@@ -60,7 +60,7 @@ class MXRecord(models.Model):
     managed = models.BooleanField(default=False)
     updated = models.DateTimeField()
 
-    objects = MXRecordManager.from_queryset(MXRecordQuerySet)()
+    objects: MXRecordManager = MXRecordManager.from_queryset(MXRecordQuerySet)()
 
     def is_managed(self):
         if not param_tools.get_global_parameter("enable_mx_checks"):