Skip to content

[Storage] ip addresses with host bits set should be validated #31371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
eric-therond wants to merge 1 commit into from
Closed

[Storage] ip addresses with host bits set should be validated #31371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/storage/_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2341,7 +2341,7 @@ def validate_ip_address(namespace):
if not ip_address:
return

ip_address_networks = [ip_network(ip) for ip in ip_address]
ip_address_networks = [ip_network(ip, False) for ip in ip_address]
for idx, ip_address_network in enumerate(ip_address_networks):
for idx2, ip_address_network2 in enumerate(ip_address_networks):
if idx == idx2:
Expand Down
8 changes: 4 additions & 4 deletions src/azure-cli/azure/cli/command_modules/storage/operations/account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,8 +709,8 @@ def add_network_rule(cmd, client, resource_group_name, account_name, action='All
for ip in ip_address:
to_modify = True
for x in rules.ip_rules:
existing_ip_network = ip_network(x.ip_address_or_range)
new_ip_network = ip_network(ip)
existing_ip_network = ip_network(x.ip_address_or_range, False)
new_ip_network = ip_network(ip, False)
if new_ip_network.overlaps(existing_ip_network):
logger.warning("IP/CIDR %s overlaps with %s, which exists already. Not adding duplicates.",
ip, x.ip_address_or_range)
Expand Down Expand Up @@ -739,8 +739,8 @@ def remove_network_rule(cmd, client, resource_group_name, account_name, ip_addre
rules.virtual_network_rules = [x for x in rules.virtual_network_rules
if not x.virtual_network_resource_id.endswith(subnet)]
if ip_address:
to_remove = [ip_network(x) for x in ip_address]
rules.ip_rules = list(filter(lambda x: all(ip_network(x.ip_address_or_range) != i for i in to_remove),
to_remove = [ip_network(x, False) for x in ip_address]
rules.ip_rules = list(filter(lambda x: all(ip_network(x.ip_address_or_range, False) != i for i in to_remove),
rules.ip_rules))

if resource_id:
Expand Down
Loading