[openstack-nova/f17] Updated patches from master-patches

[Russell Bryant]

commit 4e34c102b879167227a6669714b2614a4cb19f5d
Author: Russell Bryant <rbryant at redhat.com>
Date:   Thu Mar 29 13:44:18 2012 -0400

    Updated patches from master-patches

 ...d-validation-for-OSAPI-server-name-length.patch |   88 ++++++++++++++++++++
 openstack-nova.spec                                |    2 +
 2 files changed, 90 insertions(+), 0 deletions(-)
---
diff --git a/0004-Add-validation-for-OSAPI-server-name-length.patch b/0004-Add-validation-for-OSAPI-server-name-length.patch
new file mode 100644
index 0000000..e34f0e8
--- /dev/null
+++ b/0004-Add-validation-for-OSAPI-server-name-length.patch
@@ -0,0 +1,88 @@
+From d4a0a4c35ab5da866ec75404551793f0952f85d5 Mon Sep 17 00:00:00 2001
+From: Dan Prince <dprince at redhat.com>
+Date: Fri, 23 Mar 2012 15:03:19 -0400
+Subject: [PATCH] Add validation for OSAPI server name length.
+
+Fixes LP Bug #962515.
+
+Change-Id: Iee895604f8e9101a341a5909fc5ba2dd8e708b4b
+---
+ nova/api/openstack/compute/servers.py            |    4 ++
+ nova/tests/api/openstack/compute/test_servers.py |   42 ++++++++++++++++++++++
+ 2 files changed, 46 insertions(+), 0 deletions(-)
+
+diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
+index e6a8fdc..8ca49b6 100644
+--- a/nova/api/openstack/compute/servers.py
++++ b/nova/api/openstack/compute/servers.py
+@@ -505,6 +505,10 @@ class Controller(wsgi.Controller):
+             msg = _("Server name is an empty string")
+             raise exc.HTTPBadRequest(explanation=msg)
+ 
++        if not len(value) < 256:
++            msg = _("Server name must be less than 256 characters.")
++            raise exc.HTTPBadRequest(explanation=msg)
++
+     def _get_injected_files(self, personality):
+         """
+         Create a list of injected files from the personality attribute
+diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
+index 59d7c8a..238afa3 100644
+--- a/nova/tests/api/openstack/compute/test_servers.py
++++ b/nova/tests/api/openstack/compute/test_servers.py
+@@ -891,6 +891,17 @@ class ServersControllerTest(test.TestCase):
+         self.assertEqual(res_dict['server']['id'], FAKE_UUID)
+         self.assertEqual(res_dict['server']['name'], 'server_test')
+ 
++    def test_update_server_name_too_long(self):
++        self.stubs.Set(nova.db, 'instance_get',
++                fakes.fake_instance_get(name='server_test'))
++        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
++        req.method = 'PUT'
++        req.content_type = 'application/json'
++        body = {'server': {'name': 'x' * 256}}
++        req.body = json.dumps(body)
++        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
++                            req, FAKE_UUID, body)
++
+     def test_update_server_access_ipv4(self):
+         self.stubs.Set(nova.db, 'instance_get',
+                 fakes.fake_instance_get(access_ipv4='0.0.0.0'))
+@@ -1643,6 +1654,37 @@ class ServersControllerCreateTest(test.TestCase):
+         self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create,
+                             req, body)
+ 
++    def test_create_instance_name_too_long(self):
++        # proper local hrefs must start with 'http://localhost/v2/'
++        image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
++        image_href = 'http://localhost/v2/images/%s' % image_uuid
++        flavor_ref = 'http://localhost/123/flavors/3'
++        body = {
++            'server': {
++                'name': 'X' * 256,
++                'imageRef': image_href,
++                'flavorRef': flavor_ref,
++                'metadata': {
++                    'hello': 'world',
++                    'open': 'stack',
++                },
++                'personality': [
++                    {
++                        "path": "/etc/banner.txt",
++                        "contents": "MQ==",
++                    },
++
++                ],
++            },
++        }
++
++        req = fakes.HTTPRequest.blank('/v2/fake/servers')
++        req.method = 'POST'
++        req.body = json.dumps(body)
++        req.headers["content-type"] = "application/json"
++        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create,
++                            req, body)
++
+     def test_create_instance(self):
+         # proper local hrefs must start with 'http://localhost/v2/'
+         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 886536f..cc059f5 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -36,6 +36,7 @@ Source23:         openstack-nova-db-setup
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 Patch0002: 0002-fix-useexisting-deprecation-warnings.patch
 Patch0003: 0003-ensure-atomic-manipulation-of-libvirt-disk-images.patch
+Patch0004: 0004-Add-validation-for-OSAPI-server-name-length.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -174,6 +175,7 @@ This package contains documentation files for nova.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete