From beee5fa838f336617f167c419510f9ba3a546dd0 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Wed, 24 Sep 2014 11:26:59 -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 | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/nova/compute/api.py b/nova/compute/api.py index 1efcfd7..e5746d9 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1760,6 +1760,10 @@ class API(base.Base): sort_key, sort_dir, limit=limit, marker=marker) + + if 'ip6' in filters or 'ip' in filters: + inst_models = self._ip_filter(inst_models, filters) + if want_objects: return inst_models @@ -1770,18 +1774,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): - 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'] return instance_obj.InstanceList.get_by_filters( -- 1.7.11.1