Merge "Return 400 in get_console_output for bad length."

2 files changed, 31 insertions, 3 deletions

diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py
index 7a16daec3..c29177a07 100644
--- a/nova/api/openstack/compute/contrib/console_output.py
+++ b/nova/api/openstack/compute/contrib/console_output.py
@@ -49,14 +49,22 @@ class ConsoleOutputController(wsgi.Controller):
         try:
             length = body['os-getConsoleOutput'].get('length')
         except (TypeError, KeyError):
-            raise webob.exc.HTTPBadRequest(_('Malformed request body'))
+            raise webob.exc.HTTPBadRequest(_('os-getConsoleOutput malformed or '
+                                             'missing from request body'))
+
+        if length is not None:
+            try:
+                int(length)
+            except ValueError:
+                raise webob.exc.HTTPBadRequest(_('Length in request body must '
+                                                 'be an integer value'))
 
         try:
             output = self.compute_api.get_console_output(context,
                                                          instance,
                                                          length)
         except exception.NotFound:
-            raise webob.exc.HTTPNotFound(_('Instance not found'))
+            raise webob.exc.HTTPNotFound(_('Unable to get console'))
 
         # XML output is not correctly escaped, so remove invalid characters
         remove_re = re.compile('[\x00-\x08\x0B-\x0C\x0E-\x1F]')
@@ -64,7 +72,6 @@ class ConsoleOutputController(wsgi.Controller):
 
         return {'output': output}
 
-
 class Console_output(extensions.ExtensionDescriptor):
     """Console log output support, with tailing ability."""
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_console_output.py b/nova/tests/api/openstack/compute/contrib/test_console_output.py
index ab0fe35b9..aa722ee8a 100644
--- a/nova/tests/api/openstack/compute/contrib/test_console_output.py
+++ b/nova/tests/api/openstack/compute/contrib/test_console_output.py
@@ -74,6 +74,27 @@ class ConsoleOutputExtensionTest(test.TestCase):
         self.assertEqual(res.status_int, 200)
         self.assertEqual(output, {'output': '2\n3\n4'})
 
+    def test_get_console_output_with_length_as_str(self):
+        body = {'os-getConsoleOutput': {'length': '3'}}
+        req = webob.Request.blank('/v2/fake/servers/1/action')
+        req.method = "POST"
+        req.body = jsonutils.dumps(body)
+        req.headers["content-type"] = "application/json"
+        res = req.get_response(fakes.wsgi_app())
+        output = jsonutils.loads(res.body)
+        self.assertEqual(res.status_int, 200)
+        self.assertEqual(output, {'output': '2\n3\n4'})
+
+    def test_get_console_output_with_non_integer_length(self):
+        body = {'os-getConsoleOutput': {'length': 'NaN'}}
+        req = webob.Request.blank('/v2/fake/servers/1/action')
+        req.method = "POST"
+        req.body = jsonutils.dumps(body)
+        req.headers["content-type"] = "application/json"
+        res = req.get_response(fakes.wsgi_app())
+        output = jsonutils.loads(res.body)
+        self.assertEqual(res.status_int, 400)
+
     def test_get_text_console_no_instance(self):
         self.stubs.Set(compute.API, 'get', fake_get_not_found)
         body = {'os-getConsoleOutput': {}}