Merge lp:~allenap/maas/no-string-in-mime into lp:maas/trunk

[Gavin Panella]

Check the body being dispatched by parsing it with Django's multipart parser.

Previously the check was along the lines of "needle in multipart/form-data haystack", but now the haystack is mostly base64 encoded this does not work.

[Jeroen T. Vermeulen (jtv)]

Thanks! One tiny thing: the comment conveys your frustration very nicely, but the technical details may puzzle some readers. A few more words about what goes on perhaps?

review: Approve

[lp:~allenap/maas/no-string-in-mime]

1073. By Gavin Panella on 2012-09-25

Expand on why Django is annoying.

=== modified file 'src/provisioningserver/tests/test_start_cluster_controller.py'
--- src/provisioningserver/tests/test_start_cluster_controller.py	2012-09-25 10:42:00 +0000
+++ src/provisioningserver/tests/test_start_cluster_controller.py	2012-09-25 14:19:20 +0000
@@ -23,6 +23,8 @@
     )
 
 from apiclient.maas_client import MAASDispatcher
+from apiclient.testing.django import parse_headers_and_body_with_django
+from fixtures import EnvironmentVariableFixture
 from maastesting.factory import factory
 from provisioningserver import start_cluster_controller
 from provisioningserver.testing.testcase import PservTestCase
@@ -162,7 +164,16 @@
         (args, kwargs) = MAASDispatcher.dispatch_query.call_args
         self.assertEqual(url + 'api/1.0/nodegroups', args[0])
         self.assertEqual('POST', kwargs['method'])
-        self.assertIn('refresh_workers', kwargs['data'])
+
+        # Make Django STFU; just using Django's multipart code causes it to
+        # pull in a settings module, and it will throw up if it can't.
+        self.useFixture(
+            EnvironmentVariableFixture(
+                "DJANGO_SETTINGS_MODULE", __name__))
+
+        headers, body = kwargs["headers"], kwargs["data"]
+        post, files = parse_headers_and_body_with_django(headers, body)
+        self.assertEqual("refresh_workers", post["op"])
 
     def test_start_up_ignores_failure_on_refresh_secrets(self):
         self.patch(start_cluster_controller, 'Popen')