openstack/nova
Code Issues Proposed changes

Only permit alpha-numerics and ._- for instance type names.

Browse Source 
Fixes bug 977187.

Change-Id: I883204a508f39441c172f3c42c8be3d6598c35d8
This commit is contained in:
Josh Kearney 2012-05-21 12:55:49 -05:00
parent 53583faac2
commit e6b42d7bdf
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/compute/instance_types.py
View File

@ -20,6 +20,8 @@
"""Built-in instance properties.""" """Built-in instance properties."""
import re
from nova import context from nova import context
from nova import db from nova import db
from nova import exception from nova import exception
@ -29,6 +31,8 @@ from nova import log as logging
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
INVALID_NAME_REGEX = re.compile("[^\w\.\- ]")
def create(name, memory, vcpus, root_gb, ephemeral_gb, flavorid, swap=None, def create(name, memory, vcpus, root_gb, ephemeral_gb, flavorid, swap=None,
rxtx_factor=None): rxtx_factor=None):
@ -48,6 +52,12 @@ def create(name, memory, vcpus, root_gb, ephemeral_gb, flavorid, swap=None,
'rxtx_factor': rxtx_factor, 'rxtx_factor': rxtx_factor,
} }
# ensure name does not contain any special characters
invalid_name = INVALID_NAME_REGEX.search(name)
if invalid_name:
msg = _("names can only contain [a-zA-Z0-9_.- ]")
raise exception.InvalidInput(reason=msg)
# ensure some attributes are integers and greater than or equal to 0 # ensure some attributes are integers and greater than or equal to 0
for option in kwargs: for option in kwargs:
try: try:

7
nova/tests/test_instance_types.py
View File

@ -88,6 +88,13 @@ class InstanceTypeTestCase(test.TestCase):
new_list = instance_types.get_all_types() new_list = instance_types.get_all_types()
self.assertEqual(original_list, new_list) self.assertEqual(original_list, new_list)
def test_instance_type_create_with_special_characters(self):
"""Ensure instance types raises InvalidInput for invalid characters"""
name = "foo.bar!@#$%^-test_name"
flavorid = "flavor1"
self.assertRaises(exception.InvalidInput, instance_types.create,
name, 256, 1, 120, 100, flavorid)
def test_get_all_instance_types(self): def test_get_all_instance_types(self):
"""Ensures that all instance types can be retrieved""" """Ensures that all instance types can be retrieved"""
session = sql_session.get_session() session = sql_session.get_session()