replace usage of FullLoader w/ safe_load

This commit is contained in:
Ryan Petrello
2019-08-15 11:25:47 -04:00
parent e08e70efb4
commit 39d0eb62e4
5 changed files with 9 additions and 10 deletions

View File

@@ -7,4 +7,4 @@ class HasVariables(object):
@property
def variables(self):
return PseudoNamespace(yaml.load(self.json.variables, Loader=yaml.FullLoader))
return PseudoNamespace(yaml.safe_load(self.json.variables))

View File

@@ -114,16 +114,16 @@ class UnifiedJob(HasStatus, base.Base):
"""
def attempt_yaml_load(arg):
try:
return yaml.load(arg, Loader=yaml.FullLoader)
return yaml.safe_load(arg)
except (yaml.parser.ParserError, yaml.scanner.ScannerError):
return str(arg)
args = []
if not self.json.job_args:
return ""
for arg in yaml.load(self.json.job_args, Loader=yaml.FullLoader):
for arg in yaml.safe_load(self.json.job_args):
try:
args.append(yaml.load(arg, Loader=yaml.FullLoader))
args.append(yaml.safe_load(arg))
except (yaml.parser.ParserError, yaml.scanner.ScannerError):
if arg[0] == '@': # extra var file reference
args.append(attempt_yaml_load(arg))