From 03509e5fb0ec0cab75fa44d328ca588a694ddad9 Mon Sep 17 00:00:00 2001 From: hoang Date: Fri, 13 Nov 2026 08:57:05 +0700 Subject: [PATCH 1/2] Require meaningful service or project matchers for Silence We have added a validation to SilenceSerializer to require meaningful "service" or "project" matchers when users create a new Silence or update an existing one. --- promgen/errors.py | 3 +++ promgen/serializers.py | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/promgen/errors.py b/promgen/errors.py index b307e2255..5466e2285 100644 --- a/promgen/errors.py +++ b/promgen/errors.py @@ -18,3 +18,6 @@ class SilenceError(ValidationErrorEnum): STARTENDMISMATCH = _("Start time and end time are mismatched.") NOMATCHER = _("Missing matchers for silence.") NOSERVICEORPROJECTMATCHER = _("Silence must include a service or project matcher.") + NO_MEANINGFUL_SERVICE_OR_PROJECT_MATCHER = _( + "Either meaningful service or project matchers are required." + ) diff --git a/promgen/serializers.py b/promgen/serializers.py index e86ea8ae1..f3e76a131 100644 --- a/promgen/serializers.py +++ b/promgen/serializers.py @@ -155,6 +155,17 @@ def validate(self, data): if not any(matcher["name"] in ["service", "project"] for matcher in data["matchers"]): raise errors.SilenceError.NOSERVICEORPROJECTMATCHER.error() + # Either meaningful service or project matchers are required + meaningful_service_matcher = False + meaningful_project_matcher = False + for matcher in data["matchers"]: + if matcher["name"] == "service" and matcher["value"] not in [".*", ".+", ""]: + meaningful_service_matcher = True + if matcher["name"] == "project" and matcher["value"] not in [".*", ".+", ""]: + meaningful_project_matcher = True + if not (meaningful_service_matcher or meaningful_project_matcher): + raise errors.SilenceError.NO_MEANINGFUL_SERVICE_OR_PROJECT_MATCHER.error() + if data.get("duration"): # No further validation is required if only duration is set return data From e0301f7154a82a111a915d996f948c568b15860a Mon Sep 17 00:00:00 2001 From: hoang Date: Fri, 13 Nov 2026 09:05:40 +0700 Subject: [PATCH 2/2] Not allow users to create ambiguous Silence We have added a validation step requiring that Silence created by regular users must affect at least one service or project on Promgen. --- promgen/proxy.py | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/promgen/proxy.py b/promgen/proxy.py index 2866d7db1..a9cf9b85e 100644 --- a/promgen/proxy.py +++ b/promgen/proxy.py @@ -385,9 +385,7 @@ def post(self, request): ) -def get_uneditable_obj_by_silence_matchers(matchers, user): - affected_projects, affected_services = get_affected_obj_by_matchers(matchers) - +def get_uneditable_for_user(affected_projects, affected_services, user): uneditable_projects = models.Project.objects.none() uneditable_services = models.Service.objects.none() @@ -429,8 +427,25 @@ def post(self, request, *args, **kwargs): # Check if the user has permission to silence the alert if not request.user.is_superuser: - uneditable_projects, uneditable_services = get_uneditable_obj_by_silence_matchers( - serializer.data["matchers"], request.user + affected_projects, affected_services = get_affected_obj_by_matchers( + serializer.data["matchers"] + ) + + if not affected_projects.exists() and not affected_services.exists(): + return JsonResponse( + { + "messages": [ + { + "class": "alert alert-warning", + "message": _("Silence affects no projects or services."), + } + ] + }, + status=HTTPStatus.FORBIDDEN, + ) + + uneditable_projects, uneditable_services = get_uneditable_for_user( + affected_projects, affected_services, request.user ) messages = [] for objs, label in [ @@ -501,8 +516,11 @@ def delete(self, request, silence_id): # Check if the user has permission to delete the silence if not request.user.is_superuser: silence = response.json() - uneditable_projects, uneditable_services = get_uneditable_obj_by_silence_matchers( - silence.get("matchers", []), request.user + affected_projects, affected_services = get_affected_obj_by_matchers( + silence.get("matchers", []) + ) + uneditable_projects, uneditable_services = get_uneditable_for_user( + affected_projects, affected_services, request.user ) messages = [] for objs, label in [