source: better error if source spec missing "source" keyword

Related ticket: #5141

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d0e7aef255bc84a95136a31560f2602379c1a69..b60d3d782574aa15f85d709c89eb21b3263bf779 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
   https://redmine.openinfosecfoundation.org/issues/3974
 - Allow spaces in custom HTTP headers. Redmine issue
   https://redmine.openinfosecfoundation.org/issues/4362
+- Better error message on invalid source specification:
+  https://redmine.openinfosecfoundation.org/issues/5141
 
 ## 1.2.5 - 2022-09-22
 - Update entrypoint search path when not installed with distutils. This is

diff --git a/suricata/update/sources.py b/suricata/update/sources.py
index 651a4d60d8125a701e5d1681425773a22bd074c7..a5bc6737ee6bd399b6c5c2d341827445e1641328 100644 (file)
--- a/suricata/update/sources.py
+++ b/suricata/update/sources.py
@@ -158,7 +158,14 @@ def get_enabled_sources():
         for filename in filenames:
             if filename.endswith(".yaml"):
                 path = os.path.join(dirpath, filename)
+                logger.debug("Loading source specification file {}".format(path))
                 source = yaml.safe_load(open(path, "rb"))
+
+                if not "source" in source:
+                    logger.error("Source specification file missing field \"source\": filename: {}".format(
+                        path))
+                    continue
+
                 sources[source["source"]] = source
 
                 if "params" in source: