parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 109 Wiki Activity

Validate provisioner userdata with SafeLoader 

Given the issues with FullLoader and its eventual deprecation, just use
SafeLoader instead. Any well-formatted Userdata document should conform.
This commit is contained in:
Joshua Boniface 2020-12-15 00:30:20 -05:00
parent 3705daff43
commit 37c3b4ef80
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client-cli/pvc.py
View File

@ -3320,7 +3320,7 @@ def provisioner_userdata_add(name, filename):
userdata = filename.read() userdata = filename.read()
filename.close() filename.close()
try: try:
yaml.load(userdata, Loader=yaml.FullLoader) yaml.load(userdata, Loader=yaml.SafeLoader)
except Exception as e: except Exception as e:
click.echo("Error: Userdata document is malformed") click.echo("Error: Userdata document is malformed")
cleanup(False, e) cleanup(False, e)
@ -3397,7 +3397,7 @@ def provisioner_userdata_modify(name, filename, editor):
filename.close() filename.close()
try: try:
yaml.load(userdata, Loader=yaml.FullLoader) yaml.load(userdata, Loader=yaml.SafeLoader)
except Exception as e: except Exception as e:
click.echo("Error: Userdata document is malformed") click.echo("Error: Userdata document is malformed")
cleanup(False, e) cleanup(False, e)