Make the list of banned users configurable

fedora-infra · Dec 9, 2024 · 0a7f114 · 0a7f114
1 parent 771b7b3
commit 0a7f114
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 35 deletions.
diff --git a/devel/ansible/roles/dev/files/config.toml b/devel/ansible/roles/dev/files/config.toml
@@ -50,6 +50,37 @@ distgit_hostname = "src.tinystage.test"
 id_provider_hostname = "id.tinystage.test"
 fasjson_base_url = "https://fasjson.tinystage.test/fasjson"
 
+# Users skipped when awarding badges
+skip_users = [
+    "bodhi",
+    "oscar",
+    "apache",
+    "koji",
+    "bodhi",
+    "taskotron",
+    "pagure",
+    "packit",
+    "packit-stg",
+    "koschei",
+    "distrobuildsync-eln/jenkins-continuous-infra.apps.ci.centos.org",
+    "root",
+    "zodbot",
+    "bodhidev-bot",
+    "eclipse-bluechi-bot",
+    "githubbotargparsemanpage",
+    "imagebuilder-bot",
+    "knet-ci-bot",
+    "l10nbot",
+    "noobdevbot",
+    "notifs-bot",
+    "notifs-stg-bot",
+    "osbuild-automation-bot",
+    "releng-bot",
+    "sambabot",
+    "sourcegraph-bot",
+    "theforeman-bot",
+    "rhcontainerbot",
+]
 
 # Cache configuation
 [consumer_config.cache]

diff --git a/fedbadges.toml.example b/fedbadges.toml.example
@@ -53,6 +53,38 @@ fasjson_base_url = "https://fasjson.fedoraproject.org"
 # Check for new rules every these many minutes
 rules_reload_interval = 15
 
+# Users skipped when awarding badges
+skip_users = [
+    "bodhi",
+    "oscar",
+    "apache",
+    "koji",
+    "bodhi",
+    "taskotron",
+    "pagure",
+    "packit",
+    "packit-stg",
+    "koschei",
+    "distrobuildsync-eln/jenkins-continuous-infra.apps.ci.centos.org",
+    "root",
+    "zodbot",
+    "bodhidev-bot",
+    "eclipse-bluechi-bot",
+    "githubbotargparsemanpage",
+    "imagebuilder-bot",
+    "knet-ci-bot",
+    "l10nbot",
+    "noobdevbot",
+    "notifs-bot",
+    "notifs-stg-bot",
+    "osbuild-automation-bot",
+    "releng-bot",
+    "sambabot",
+    "sourcegraph-bot",
+    "theforeman-bot",
+    "rhcontainerbot",
+]
+
 # Cache configuation
 [consumer_config.cache]
 backend = "dogpile.cache.memory"

diff --git a/fedbadges/rules.py b/fedbadges/rules.py
@@ -93,39 +93,6 @@ class BadgeRule:
         ]
     )
 
-    banned_usernames = frozenset(
-        [
-            "bodhi",
-            "oscar",
-            "apache",
-            "koji",
-            "bodhi",
-            "taskotron",
-            "pagure",
-            "packit",
-            "packit-stg",
-            "koschei",
-            "distrobuildsync-eln/jenkins-continuous-infra.apps.ci.centos.org",
-            "root",
-            "zodbot",
-            "bodhidev-bot",
-            "eclipse-bluechi-bot",
-            "githubbotargparsemanpage",
-            "imagebuilder-bot",
-            "knet-ci-bot",
-            "l10nbot",
-            "noobdevbot",
-            "notifs-bot",
-            "notifs-stg-bot",
-            "osbuild-automation-bot",
-            "releng-bot",
-            "sambabot",
-            "sourcegraph-bot",
-            "theforeman-bot",
-            "rhcontainerbot",
-        ]
-    )
-
     def __init__(self, badge_dict, issuer_id, config, fasjson):
         try:
             validate_fields(self.required, self.possible, badge_dict)
@@ -222,8 +189,8 @@ def _get_candidates(self, msg: Message, tahrir: TahrirDatabase):
         # Remove None
         candidates = frozenset([e for e in candidates if e is not None])
 
-        # Exclude banned usernames
-        candidates = candidates.difference(self.banned_usernames)
+        # Skipped usernames
+        candidates = candidates.difference(frozenset(self.config.get("skip_users", [])))
 
         # Strip anyone who is an IP address
         candidates = frozenset(