Improved YAML loading and exception message printing.

Author: mgeeky

lib/ipLookupHelper.py

@@ -600,8 +600,8 @@ def main(argv):
         with open(conf) as f:
             try:
                 config = yaml.load(f, Loader=yaml.FullLoader)
-            except:
-                config = yaml.load(f)
+            except Exception as e:
+                self.logger.fatal(f'Could not parse {f} YAML file:\n\n{e}\n\n')
 
         deter = IPGeolocationDeterminant(logger, config['ip_geolocation_requirements'])
         out = deter.determine(result)

lib/optionsparser.py

@@ -239,8 +239,8 @@ def parseParametersFromConfigFile(_params):
         with open(outparams['config']) as f:
             try:
                 config = yaml.load(f, Loader=yaml.FullLoader)
-            except:
-                config = yaml.load(f)
+            except Exception as e:
+                self.logger.fatal(f'Could not parse {f} YAML file:\n\n{e}\n\n')
 
         outparams.update(config)
 

plugins/malleable_redirector.py

@@ -506,8 +506,10 @@ def help(self, parser):
             try:
                 if not self.proxyOptions['config'] and self.proxyOptions['redir_config'] != '':
                     with open(self.proxyOptions['redir_config']) as f:
-                        #redirectorConfig = yaml.load(f, Loader=yaml.FullLoader)
-                        redirectorConfig = yaml.load(f)
+                        try:
+                            redirectorConfig = yaml.load(f, Loader=yaml.FullLoader)
+                        except Exception as e:
+                            self.logger.fatal(f'Could not parse redirector {f} YAML file:\n\n{e}\n\n')
 
                     self.proxyOptions.update(redirectorConfig)