events: add task to expire seen notifications
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
parent
eb4dce91c3
commit
4de2ac3248
|
@ -34,9 +34,9 @@ def clean_expired_models(self: MonitoredTask):
|
||||||
objects = (
|
objects = (
|
||||||
cls.objects.all().exclude(expiring=False).exclude(expiring=True, expires__gt=now())
|
cls.objects.all().exclude(expiring=False).exclude(expiring=True, expires__gt=now())
|
||||||
)
|
)
|
||||||
|
amount = objects.count()
|
||||||
for obj in objects:
|
for obj in objects:
|
||||||
obj.expire_action()
|
obj.expire_action()
|
||||||
amount = objects.count()
|
|
||||||
LOGGER.debug("Expired models", model=cls, amount=amount)
|
LOGGER.debug("Expired models", model=cls, amount=amount)
|
||||||
messages.append(f"Expired {amount} {cls._meta.verbose_name_plural}")
|
messages.append(f"Expired {amount} {cls._meta.verbose_name_plural}")
|
||||||
# Special case
|
# Special case
|
||||||
|
|
12
authentik/events/settings.py
Normal file
12
authentik/events/settings.py
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
"""Event Settings"""
|
||||||
|
from celery.schedules import crontab
|
||||||
|
|
||||||
|
from authentik.lib.utils.time import fqdn_rand
|
||||||
|
|
||||||
|
CELERY_BEAT_SCHEDULE = {
|
||||||
|
"events_notification_cleanup": {
|
||||||
|
"task": "authentik.events.tasks.notification_cleanup",
|
||||||
|
"schedule": crontab(minute=fqdn_rand("notification_cleanup"), hour="*/8"),
|
||||||
|
"options": {"queue": "authentik_scheduled"},
|
||||||
|
},
|
||||||
|
}
|
|
@ -1,4 +1,5 @@
|
||||||
"""Event notification tasks"""
|
"""Event notification tasks"""
|
||||||
|
from django.db.models.query_utils import Q
|
||||||
from guardian.shortcuts import get_anonymous_user
|
from guardian.shortcuts import get_anonymous_user
|
||||||
from structlog.stdlib import get_logger
|
from structlog.stdlib import get_logger
|
||||||
|
|
||||||
|
@ -10,7 +11,12 @@ from authentik.events.models import (
|
||||||
NotificationTransport,
|
NotificationTransport,
|
||||||
NotificationTransportError,
|
NotificationTransportError,
|
||||||
)
|
)
|
||||||
from authentik.events.monitored_tasks import MonitoredTask, TaskResult, TaskResultStatus
|
from authentik.events.monitored_tasks import (
|
||||||
|
MonitoredTask,
|
||||||
|
TaskResult,
|
||||||
|
TaskResultStatus,
|
||||||
|
prefill_task,
|
||||||
|
)
|
||||||
from authentik.policies.engine import PolicyEngine
|
from authentik.policies.engine import PolicyEngine
|
||||||
from authentik.policies.models import PolicyBinding, PolicyEngineMode
|
from authentik.policies.models import PolicyBinding, PolicyEngineMode
|
||||||
from authentik.root.celery import CELERY_APP
|
from authentik.root.celery import CELERY_APP
|
||||||
|
@ -114,3 +120,15 @@ def gdpr_cleanup(user_pk: int):
|
||||||
events = Event.objects.filter(user__pk=user_pk)
|
events = Event.objects.filter(user__pk=user_pk)
|
||||||
LOGGER.debug("GDPR cleanup, removing events from user", events=events.count())
|
LOGGER.debug("GDPR cleanup, removing events from user", events=events.count())
|
||||||
events.delete()
|
events.delete()
|
||||||
|
|
||||||
|
|
||||||
|
@CELERY_APP.task(bind=True, base=MonitoredTask)
|
||||||
|
@prefill_task
|
||||||
|
def notification_cleanup(self: MonitoredTask):
|
||||||
|
"""Cleanup seen notifications and notifications whose event expired."""
|
||||||
|
notifications = Notification.objects.filter(Q(event=None) | Q(seen=True))
|
||||||
|
amount = notifications.count()
|
||||||
|
for notification in notifications:
|
||||||
|
notification.delete()
|
||||||
|
LOGGER.debug("Expired notifications", amount=amount)
|
||||||
|
self.set_status(TaskResult(TaskResultStatus.SUCCESSFUL, [f"Expired {amount} Notifications"]))
|
||||||
|
|
Reference in a new issue