From 02afd125e9fb65379c449346bfeda12584b9e83c Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Mon, 22 Sep 2014 23:31:07 -0700 Subject: [PATCH] Fixes DOS issue in instance list ip filter Converts the ip filtering to filter the list locally based on the network info cache instead of making an extremely expensive call over to nova network where it attempts to retrieve a list of every instance in the system. Change-Id: I455f6ab4acdecacc5152b11a183027f933dc4475 Closes-bug: #1358583 (cherry picked from commit d16f7ef57b34a23f9d9411cb895df064edccdc27) --- nova/compute/api.py | 30 ++++++++++++++++++++++-------- nova/tests/compute/test_compute.py | 30 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/nova/compute/api.py b/nova/compute/api.py index d013184..349bbbf 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1886,6 +1886,9 @@ class API(base.Base): sort_key, sort_dir, limit=limit, marker=marker, expected_attrs=expected_attrs) + if 'ip6' in filters or 'ip' in filters: + inst_models = self._ip_filter(inst_models, filters) + if want_objects: return inst_models @@ -1896,18 +1899,29 @@ class API(base.Base): return instances + @staticmethod + def _ip_filter(inst_models, filters): + ipv4_f = re.compile(str(filters.get('ip'))) + ipv6_f = re.compile(str(filters.get('ip6'))) + result_objs = [] + for instance in inst_models: + nw_info = compute_utils.get_nw_info_for_instance(instance) + for vif in nw_info: + for fixed_ip in vif.fixed_ips(): + address = fixed_ip.get('address') + if not address: + continue + version = fixed_ip.get('version') + if ((version == 4 and ipv4_f.match(address)) or + (version == 6 and ipv6_f.match(address))): + result_objs.append(instance) + continue + return instance_obj.InstanceList(objects=result_objs) + def _get_instances_by_filters(self, context, filters, sort_key, sort_dir, limit=None, marker=None, expected_attrs=None): - if 'ip6' in filters or 'ip' in filters: - res = self.network_api.get_instance_uuids_by_ip_filter(context, - filters) - # NOTE(jkoelker) It is possible that we will get the same - # instance uuid twice (one for ipv4 and ipv6) - uuids = set([r['instance_uuid'] for r in res]) - filters['uuid'] = uuids - fields = ['metadata', 'system_metadata', 'info_cache', 'security_groups'] if expected_attrs: diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index ee1d7b3..3bb059d 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -57,6 +57,7 @@ from nova.network.security_group import openstack_driver from nova.objects import base as obj_base from nova.objects import block_device as block_device_obj from nova.objects import instance as instance_obj +from nova.objects import instance_info_cache as cache_obj from nova.objects import instance_group as instance_group_obj from nova.objects import migration as migration_obj from nova.objects import quotas as quotas_obj @@ -6720,6 +6721,35 @@ class ComputeAPITestCase(BaseTestCase): self.assertIsNone(instance['task_state']) return instance, instance_uuid + def test_ip_filtering(self): + info = [{ + 'address': 'aa:bb:cc:dd:ee:ff', + 'id': 1, + 'network': { + 'bridge': 'br0', + 'id': 1, + 'label': 'private', + 'subnets': [{ + 'cidr': '192.168.0.0/24', + 'ips': [{ + 'address': '192.168.0.10', + 'type': 'fixed', + }] + }] + } + }] + + info1 = cache_obj.InstanceInfoCache(network_info=jsonutils.dumps(info)) + inst1 = instance_obj.Instance(id=1, info_cache=info1) + info[0]['network']['subnets'][0]['ips'][0]['address'] = '192.168.0.20' + info2 = cache_obj.InstanceInfoCache(network_info=jsonutils.dumps(info)) + inst2 = instance_obj.Instance(id=2, info_cache=info2) + instances = instance_obj.InstanceList(objects=[inst1, inst2]) + + instances = self.compute_api._ip_filter(instances, {'ip': '.*10'}) + self.assertEqual(len(instances), 1) + self.assertEqual(instances[0].id, 1) + def test_create_with_too_little_ram(self): # Test an instance type with too little memory. -- 1.7.11.1