diff options
| author | Josh Kearney <josh@jk0.org> | 2012-05-21 12:55:49 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2012-05-21 15:16:30 -0500 |
| commit | e6b42d7bdf92c8dade030798436cb3e5ec652ee9 (patch) | |
| tree | ee997054c29230ed0d62564dc021563a8f00728d /nova/compute | |
| parent | 53583faac261f2272f81da2ee2efaff0e10bc400 (diff) | |
Only permit alpha-numerics and ._- for instance type names.
Fixes bug 977187.
Change-Id: I883204a508f39441c172f3c42c8be3d6598c35d8
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/instance_types.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py index 2bc470a41..c4a6f66f9 100644 --- a/nova/compute/instance_types.py +++ b/nova/compute/instance_types.py @@ -20,6 +20,8 @@ """Built-in instance properties.""" +import re + from nova import context from nova import db from nova import exception @@ -29,6 +31,8 @@ from nova import log as logging FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) +INVALID_NAME_REGEX = re.compile("[^\w\.\- ]") + def create(name, memory, vcpus, root_gb, ephemeral_gb, flavorid, swap=None, rxtx_factor=None): @@ -48,6 +52,12 @@ def create(name, memory, vcpus, root_gb, ephemeral_gb, flavorid, swap=None, '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 for option in kwargs: try: |