Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adding error checking on cidrs

Browse Source
This commit is contained in:
kevgliss 2016-01-15 12:57:43 -08:00
parent 6bc4a8b38a
commit 093a64c1c8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moto/ec2/models.py
View File

@ -1240,7 +1240,6 @@ class SecurityGroupBackend(object):
def get_security_group_from_id(self, group_id): def get_security_group_from_id(self, group_id):
# 2 levels of chaining necessary since it's a complex structure # 2 levels of chaining necessary since it's a complex structure
all_groups = itertools.chain.from_iterable([x.values() for x in self.groups.values()]) all_groups = itertools.chain.from_iterable([x.values() for x in self.groups.values()])
for group in all_groups: for group in all_groups:
if group.id == group_id: if group.id == group_id:
return group return group
@ -1267,7 +1266,6 @@ class SecurityGroupBackend(object):
source_group_ids=None, source_group_ids=None,
vpc_id=None): vpc_id=None):
group = self.get_security_group_by_name_or_id(group_name_or_id, vpc_id) group = self.get_security_group_by_name_or_id(group_name_or_id, vpc_id)
if ip_ranges and not isinstance(ip_ranges, list): if ip_ranges and not isinstance(ip_ranges, list):
ip_ranges = [ip_ranges] ip_ranges = [ip_ranges]
if ip_ranges: if ip_ranges:
@ -1335,8 +1333,10 @@ class SecurityGroupBackend(object):
group = self.get_security_group_by_name_or_id(group_name_or_id, vpc_id) group = self.get_security_group_by_name_or_id(group_name_or_id, vpc_id)
if ip_ranges and not isinstance(ip_ranges, list): if ip_ranges:
ip_ranges = [ip_ranges] for cidr in ip_ranges:
if not is_valid_cidr(cidr):
raise InvalidCIDRSubnetError(cidr=cidr)
# for VPCs # for VPCs
source_groups = [] source_groups = []