From 39b709dff8d111982680b267219e2c300ae001a5 Mon Sep 17 00:00:00 2001
From: BharatDeva <278575558+BharatDeva@users.noreply.github.com>
Date: Sat, 9 May 2026 20:56:22 -0500
Subject: [PATCH] Add default domain suffix database path

DomainSuffixExpertBot had no default suffix_file even though its update-database command can create and refresh the public suffix list file.

Use a stable state-file path by default and let update_database fall back to it when runtime parameters omit suffix_file. Add a regression test covering that default update path.

Signed-off-by: BharatDeva <278575558+BharatDeva@users.noreply.github.com>
---
 intelmq/bots/experts/domain_suffix/expert.py  | 10 +++---
 .../bots/experts/domain_suffix/test_expert.py | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/intelmq/bots/experts/domain_suffix/expert.py b/intelmq/bots/experts/domain_suffix/expert.py
index 24b98adf7b..36780c7154 100644
--- a/intelmq/bots/experts/domain_suffix/expert.py
+++ b/intelmq/bots/experts/domain_suffix/expert.py
@@ -14,6 +14,7 @@
 
 import requests.exceptions
 
+from intelmq import VAR_STATE_PATH
 from intelmq.lib.bot import ExpertBot
 from intelmq.lib.exceptions import InvalidArgument
 from intelmq.lib.utils import get_bots_settings, create_request_session
@@ -31,7 +32,7 @@
 class DomainSuffixExpertBot(ExpertBot):
     """Extract the domain suffix from a domain and save it in the the domain_suffix field. Requires a local file with valid domain suffixes"""
     field: str = None
-    suffix_file: str = None  # TODO: should be pathlib.Path
+    suffix_file: str = f'{VAR_STATE_PATH}domain_suffix/public_suffix_list.dat'  # TODO: should be pathlib.Path
     autoupdate_cached_database: bool = True  # Activate/deactivate update-database functionality
 
     def init(self):
@@ -53,10 +54,11 @@ def process(self):
 
     @staticmethod
     def check(parameters):
-        if not os.path.exists(parameters.get('suffix_file', '')):
+        suffix_file = parameters.get('suffix_file', DomainSuffixExpertBot.suffix_file)
+        if not os.path.exists(suffix_file):
             return [["error", "File given as parameter 'suffix_file' does not exist."]]
         try:
-            with codecs.open(parameters['suffix_file'], encoding='UTF-8') as database:
+            with codecs.open(suffix_file, encoding='UTF-8') as database:
                 PublicSuffixList(source=database, only_icann=True)
         except Exception as exc:
             return [["error", "Error reading database: %r." % exc]]
@@ -86,7 +88,7 @@ def update_database(cls, verbose=False):
         try:
             for bot in runtime_conf:
                 if runtime_conf[bot]["module"] == __name__ and runtime_conf[bot]['parameters'].get('autoupdate_cached_database', True):
-                    bots[bot] = runtime_conf[bot]["parameters"]["suffix_file"]
+                    bots[bot] = runtime_conf[bot]["parameters"].get("suffix_file", cls.suffix_file)
 
         except KeyError as e:
             sys.exit(f"Database update failed. Your configuration of {bot} is missing key {e}.")
diff --git a/intelmq/tests/bots/experts/domain_suffix/test_expert.py b/intelmq/tests/bots/experts/domain_suffix/test_expert.py
index 24745550ff..a2769f4063 100644
--- a/intelmq/tests/bots/experts/domain_suffix/test_expert.py
+++ b/intelmq/tests/bots/experts/domain_suffix/test_expert.py
@@ -4,9 +4,14 @@
 
 # -*- coding: utf-8 -*-
 import os.path
+import tempfile
 import unittest
+from pathlib import Path
+from types import SimpleNamespace
+from unittest import mock
 
 import intelmq.lib.test as test
+from intelmq.bots.experts.domain_suffix import expert as domain_suffix_expert
 from intelmq.bots.experts.domain_suffix.expert import DomainSuffixExpertBot
 
 
@@ -93,5 +98,31 @@ def test_wildcard(self):
         self.assertMessageEqual(0, WILDCARD_OUTPUT)
 
 
+class TestDomainSuffixDatabaseUpdate(unittest.TestCase):
+    def test_update_database_uses_default_suffix_file(self):
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            suffix_file = Path(tmp_dir) / "domain_suffix" / "public_suffix_list.dat"
+            session = SimpleNamespace(get=mock.Mock(return_value=SimpleNamespace(
+                content=b"// public suffix list\ncom\n",
+                ok=True,
+                status_code=200,
+                url="https://publicsuffix.org/list/public_suffix_list.dat",
+            )))
+
+            with mock.patch.object(DomainSuffixExpertBot, "suffix_file", str(suffix_file)), \
+                    mock.patch.object(domain_suffix_expert, "get_bots_settings", return_value={
+                        "domain-suffix": {
+                            "module": "intelmq.bots.experts.domain_suffix.expert",
+                            "parameters": {},
+                        }
+                    }), \
+                    mock.patch.object(domain_suffix_expert, "create_request_session", return_value=session), \
+                    mock.patch.object(domain_suffix_expert, "IntelMQController") as controller:
+                DomainSuffixExpertBot.update_database()
+
+            self.assertEqual(suffix_file.read_bytes(), b"// public suffix list\ncom\n")
+            controller.return_value.bot_reload.assert_called_once_with("domain-suffix")
+
+
 if __name__ == '__main__':  # pragma: no cover
     unittest.main()