x/gantt
Code Issues Proposed changes

Merge "Sanitize xenstore keys for metadata injection"

Browse Source
This commit is contained in:
Jenkins
2012-07-27 18:21:05 +00:00
committed by Gerrit Code Review
parent efc413c25e 35ab6edd00
commit 4d25cc7fb4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nova/tests/test_xenapi.py
View File

@@ -2256,7 +2256,10 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase):
# to xenstore # to xenstore
instance = dict(metadata=[FakeMetaItem("a", 1), instance = dict(metadata=[FakeMetaItem("a", 1),
FakeMetaItem("b", 2), FakeMetaItem("b", 2),
FakeMetaItem("c", 3)], FakeMetaItem("c", 3),
# Check xenstore key sanitizing
FakeMetaItem("hi.there", 4),
FakeMetaItem("hi!t.e/e", 5)],
system_metadata=[FakeMetaItem("sys_a", 1), system_metadata=[FakeMetaItem("sys_a", 1),
FakeMetaItem("sys_b", 2), FakeMetaItem("sys_b", 2),
FakeMetaItem("sys_c", 3)]) FakeMetaItem("sys_c", 3)])
@@ -2267,12 +2270,15 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase):
'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/a': '1',
'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/b': '2',
'vm-data/user-metadata/c': '3', 'vm-data/user-metadata/c': '3',
'vm-data/user-metadata/hi_there': '4',
'vm-data/user-metadata/hi_t_e_e': '5',
}, },
'ephem': {}, 'ephem': {},
}) })
def test_change_instance_metadata_add(self): def test_change_instance_metadata_add(self):
diff = dict(d=['+', 4]) # Test XenStore key sanitizing here, too.
diff = {'test.key': ['+', 4]}
self.xenstore = { self.xenstore = {
'persist': { 'persist': {
'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/a': '1',
@@ -2293,13 +2299,13 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase):
'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/a': '1',
'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/b': '2',
'vm-data/user-metadata/c': '3', 'vm-data/user-metadata/c': '3',
'vm-data/user-metadata/d': '4', 'vm-data/user-metadata/test_key': '4',
}, },
'ephem': { 'ephem': {
'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/a': '1',
'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/b': '2',
'vm-data/user-metadata/c': '3', 'vm-data/user-metadata/c': '3',
'vm-data/user-metadata/d': '4', 'vm-data/user-metadata/test_key': '4',
}, },
}) })