git - Merge pull request #236 from DinoTools/improve_config_parsing

Improve config parsing
DinoTools · Sep 13, 2018 · 4159025 · 4159025
2 parents 90b8467 + 8ea553e
commit 4159025
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/modules/python/dionaea/__init__.py b/modules/python/dionaea/__init__.py
@@ -70,7 +70,26 @@ def load_config_from_files(filename_patterns):
     for filename_pattern in filename_patterns:
         for filename in glob.glob(filename_pattern):
             fp = open(filename)
-            file_configs = yaml.load(fp)
+            try:
+                file_configs = yaml.safe_load(fp)
+            except yaml.YAMLError as e:
+                if hasattr(e, 'problem_mark'):
+                    mark = e.problem_mark
+                    logger.error(
+                        "Error while parsing config file '%s' at line: %d column: %d message: '%s'",
+                        filename,
+                        mark.line + 1,
+                        mark.column + 1,
+                        e.problem
+                    )
+                    if e.context is not None:
+                        logger.debug("Parser(context): %s" % e.context)
+                else:
+                    logger.error("Unknown error while parsing config file '%s'", filename)
+
+                # Skip processing
+                continue
+
             if isinstance(file_configs, (tuple, list)):
                 configs += file_configs
     return configs