summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Plugins/SSLCA.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-05-15 09:43:28 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-05-15 09:43:28 -0400
commit14ff0892f13ad45c99043fd9c90b6b1b7829b268 (patch)
tree53f795b75c7e996c277381a3da20f3a52fce1df5 /src/lib/Server/Plugins/SSLCA.py
parentdfd79c78df9351c1c4c337f94881bba878c3c549 (diff)
downloadbcfg2-14ff0892f13ad45c99043fd9c90b6b1b7829b268.tar.gz
bcfg2-14ff0892f13ad45c99043fd9c90b6b1b7829b268.tar.bz2
bcfg2-14ff0892f13ad45c99043fd9c90b6b1b7829b268.zip
use XML parser that strips whitespace to avoid xml concatenation pretty_print issue
Diffstat (limited to 'src/lib/Server/Plugins/SSLCA.py')
-rw-r--r--src/lib/Server/Plugins/SSLCA.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/SSLCA.py b/src/lib/Server/Plugins/SSLCA.py
index 7b4a08ae1..e5bc38fba 100644
--- a/src/lib/Server/Plugins/SSLCA.py
+++ b/src/lib/Server/Plugins/SSLCA.py
@@ -43,14 +43,16 @@ class SSLCA(Bcfg2.Server.Plugin.GroupSpool):
if event.filename.endswith('.xml'):
if action in ['exists', 'created', 'changed']:
if event.filename.endswith('key.xml'):
- key_spec = dict(list(lxml.etree.parse(epath).find('Key').items()))
+ key_spec = dict(list(lxml.etree.parse(epath,
+ parser=Bcfg2.Server.XMLParser).find('Key').items()))
self.key_specs[ident] = {
'bits': key_spec.get('bits', 2048),
'type': key_spec.get('type', 'rsa')
}
self.Entries['Path'][ident] = self.get_key
elif event.filename.endswith('cert.xml'):
- cert_spec = dict(list(lxml.etree.parse(epath).find('Cert').items()))
+ cert_spec = dict(list(lxml.etree.parse(epath,
+ parser=Bcfg2.Server.XMLParser).find('Cert').items()))
ca = cert_spec.get('ca', 'default')
self.cert_specs[ident] = {
'ca': ca,