From da2b53d91f5a1cdba62fe6fe079ce35fa1d35ac0 Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods@redhat.com>
Date: Thu, 30 Jun 2011 11:11:07 -0400
Subject: [PATCH] Fix x86 "root=..." quoting problem and add udev_escape()

udev_escape gets passed to the arch templates so they can properly
escape the root=live:CDLABEL=... argument.
---
 share/x86.tmpl             |  2 +-
 src/pylorax/treebuilder.py | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/share/x86.tmpl b/share/x86.tmpl
index eedc3f64..4453e061 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -62,7 +62,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
 
 ## CDLABEL matches the -V argument to mkisofs
 replace "append initrd=initrd.img" \
-        "append initrd=initrd.img root=live:CDLABEL='${product.name}'" \
+        "append initrd=initrd.img root=live:CDLABEL=${udev_escape(product.name)}" \
         ${BOOTDIR}/isolinux.cfg
 
 runcmd mkisofs -o ${outroot}/images/boot.iso \
diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py
index 1f361ec6..20501e06 100644
--- a/src/pylorax/treebuilder.py
+++ b/src/pylorax/treebuilder.py
@@ -84,6 +84,15 @@ def generate_module_info(moddir, outfile=None):
     for mod in sorted(modinfo, key=lambda m: m.get('name')):
         out.write('{name}\n\t{type}\n\t"{desc:.65}"\n'.format(**mod))
 
+# udev whitelist: 'a-zA-Z0-9#+.:=@_-' (see is_whitelisted in libudev-util.c)
+udev_blacklist=' !"$%&\'()*,/;<>?[\\]^`{|}~' # ASCII printable, minus whitelist
+udev_blacklist += ''.join(chr(i) for i in range(32)) # ASCII non-printable
+def udev_escape(label):
+    out = u''
+    for ch in label.decode('utf8'):
+        out += ch if ch not in udev_blacklist else u'\\x%02x' % ord(ch)
+    return out.encode('utf8')
+
 def brace_expand(s):
     if not ('{' in s and ',' in s and '}' in s):
         yield s
@@ -164,7 +173,8 @@ class TreeBuilder(object):
         # clobber some mako internal variables - hence "runtime_img".
         self.vars = DataHolder(arch=arch, product=product, runtime_img=runtime,
                                inroot=inroot, outroot=outroot,
-                               basearch=arch.basearch, libdir=arch.libdir)
+                               basearch=arch.basearch, libdir=arch.libdir,
+                               udev_escape=udev_escape)
         self._runner = LoraxTemplateRunner(inroot, outroot)
         self._runner.templatedir = templatedir
         self._runner.defaults = self.vars