Compare commits
2 Commits
8a8d98b9a5
...
d08b90f90d
Author | SHA1 | Date | |
---|---|---|---|
d08b90f90d | |||
f5cbedce6a |
@@ -28,6 +28,7 @@ from pkg_resources import get_distribution
|
|||||||
from lxml.etree import fromstring, tostring
|
from lxml.etree import fromstring, tostring
|
||||||
from re import sub
|
from re import sub
|
||||||
from yaml import load as yload
|
from yaml import load as yload
|
||||||
|
from yaml import SafeLoader as SafeYAMLLoader
|
||||||
|
|
||||||
from pvc.cli.helpers import *
|
from pvc.cli.helpers import *
|
||||||
from pvc.cli.waiters import *
|
from pvc.cli.waiters import *
|
||||||
@@ -4511,7 +4512,7 @@ def cli_provisioner_userdata_add(name, filename):
|
|||||||
userdata = filename.read()
|
userdata = filename.read()
|
||||||
filename.close()
|
filename.close()
|
||||||
try:
|
try:
|
||||||
yload(userdata, Loader=yaml.SafeLoader)
|
yload(userdata, Loader=SafeYAMLLoader)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
echo("Error: Userdata document is malformed")
|
echo("Error: Userdata document is malformed")
|
||||||
cleanup(False, e)
|
cleanup(False, e)
|
||||||
@@ -4600,7 +4601,7 @@ def cli_provisioner_userdata_modify(name, filename, editor):
|
|||||||
filename.close()
|
filename.close()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
yload(userdata, Loader=yaml.SafeLoader)
|
yload(userdata, Loader=SafeYAMLLoader)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
echo("Error: Userdata document is malformed")
|
echo("Error: Userdata document is malformed")
|
||||||
cleanup(False, e)
|
cleanup(False, e)
|
||||||
|
Reference in New Issue
Block a user