Merge lp:~jtv/maas/bug-1306335 into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Quote interface name in dhcpd.conf; required when the interface name contains dots (or perhaps other strange characters).

The unquoted version is treacherously accepted without complaints for “normal” names. To install, we can only assume, a false sense of security.

Jeroen

[Julian Edwards (julian-edwards)]

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~jtv/maas/bug-1306335 into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Ign http://security.ubuntu.com trusty-security/main Translation-en_US
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://security.ubuntu.com trusty-security/universe Translation-en_US
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en_US
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-netaddr python-netifaces python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-pip p...

[Jeroen T. Vermeulen (jtv)]

That failure looks like an unlucky choice of port for rabbit. Trying again.

=== modified file 'etc/maas/templates/dhcp/dhcpd.conf.template'
--- etc/maas/templates/dhcp/dhcpd.conf.template	2014-03-21 19:01:40 +0000
+++ etc/maas/templates/dhcp/dhcpd.conf.template	2014-04-11 03:23:27 +0000
@@ -9,7 +9,7 @@
 {{for dhcp_subnet in dhcp_subnets}}
 subnet {{dhcp_subnet['subnet']}} netmask {{dhcp_subnet['subnet_mask']}} {
        {{bootloader}}
-       interface {{dhcp_subnet['interface']}};
+       interface "{{dhcp_subnet['interface']}}";
        ignore-client-uids true;
        option subnet-mask {{dhcp_subnet['subnet_mask']}};
        option broadcast-address {{dhcp_subnet['broadcast_ip']}};
 
=== modified file 'src/provisioningserver/dhcp/tests/test_config.py'
--- src/provisioningserver/dhcp/tests/test_config.py	2014-04-01 13:28:39 +0000
+++ src/provisioningserver/dhcp/tests/test_config.py	2014-04-11 03:23:27 +0000
@@ -101,6 +101,15 @@
             template.substitute(params),
             config.get_config(**params))
 
+    def test_quotes_interface(self):
+        # The interface name doesn't normally need to be quoted, but the
+        # template does quote it, in case it contains dots or other weird
+        # but legal characters (bug 1306335).
+        params = make_sample_params()
+        self.assertIn(
+            'interface "%s";' % params['dhcp_subnets'][0]['interface'],
+            config.get_config(**params))
+
     def test_get_config_with_too_few_parameters(self):
         template = self.patch_template()
         params = make_sample_params()