Add xml_escape util function, apply where needed.

Author: crobinso

virtinst/DistroManager.py

@@ -27,6 +27,7 @@
 import re
 import struct
 import tempfile
+import util
 import Guest
 from virtinst import _virtinst as _
 
@@ -219,9 +220,9 @@ def _get_osblob(self, install, hvm, arch = None, loader = None):
                 osblob += "    <type>%s</type>\n" % type
 
             if install and self.install["kernel"]:
-                osblob += "    <kernel>%s</kernel>\n"   % self.install["kernel"]
-                osblob += "    <initrd>%s</initrd>\n"   % self.install["initrd"]
-                osblob += "    <cmdline>%s</cmdline>\n" % self.install["extraargs"]
+                osblob += "    <kernel>%s</kernel>\n"   % util.xml_escape(self.install["kernel"])
+                osblob += "    <initrd>%s</initrd>\n"   % util.xml_escape(self.install["initrd"])
+                osblob += "    <cmdline>%s</cmdline>\n" % util.xml_escape(self.install["extraargs"])
             else:
                 if loader:
                     osblob += "    <loader>%s</loader>\n" % loader

virtinst/Guest.py

@@ -180,8 +180,7 @@ def get_xml_config(self, disknode):
             else:
                 ret += "      <driver name='%(name)s' type='%(type)s'/>\n" % { "name": self.driver_name, "type": self.driver_type }
         if self.path is not None:
-            path = self.path.replace("&", "&amp;")
-            path = path.replace("'", "&apos;")
+            path = util.xml_escape(self.path)
             ret += "      <source %(typeattr)s='%(disk)s'/>\n" % { "typeattr": typeattr, "disk": path }
         if self.target is not None:
             disknode = self.target

virtinst/ImageManager.py

@@ -108,9 +108,9 @@ def _get_osblob(self, install, hvm, arch = None, loader = None):
             osblob += "    <type>%s</type>\n" % type
 
         if self.boot.kernel:
-            osblob += "    <kernel>%s</kernel>\n"   % self._abspath(self.boot.kernel)
-            osblob += "    <initrd>%s</initrd>\n"   % self._abspath(self.boot.initrd)
-            osblob += "    <cmdline>%s</cmdline>\n" % self.boot.cmdline
+            osblob += "    <kernel>%s</kernel>\n"   % util.xml_escape(self._abspath(self.boot.kernel))
+            osblob += "    <initrd>%s</initrd>\n"   % util.xml_escape(self._abspath(self.boot.initrd))
+            osblob += "    <cmdline>%s</cmdline>\n" % util.xml_escape(self.boot.cmdline)
             osblob += "  </os>"
         elif hvm:
             if loader:

virtinst/util.py

@@ -207,3 +207,12 @@ def get_phy_cpus(conn):
     hostinfo = conn.getInfo()
     pcpus = hostinfo[4] * hostinfo[5] * hostinfo[6] * hostinfo[7]
     return pcpus
+
+def xml_escape(str):
+    """Replaces chars ' " < > & with xml safe counterparts"""
+    str.replace("&", "&amp;")
+    str.replace("'", "&apos;")
+    str.replace("\"", "&quot;")
+    str.replace("<", "&lt;")
+    str.replace(">", "&gt;")
+    return str