Skip to content
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

[Firewall] create a Firewall Policy Network Rule with FQDNs #3685

Merged
merged 2 commits into from
Jul 26, 2021
Merged

[Firewall] create a Firewall Policy Network Rule with FQDNs #3685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
314fa7e
support fqdns parameters for 'az network firewall policy rule-collect…
kairu-ms Jul 21, 2021
ca38210
add tests for fqdns update
kairu-ms Jul 22, 2021
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
6 changes: 6 additions & 0 deletions src/azure-firewall/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
Release History
===============

0.12.0
++++++
* `az network firewall policy rule-collection-group collection add-filter-collection`: Add parameter `--destination-fqdns`
* `az network firewall policy rule-collection-group collection rule add`: Add parameters `--destination-fqdns` and `--translated-fqdn`
* `az network firewall policy rule-collection-group collection rule update`: Add parameters `--destination-fqdns` and `--translated-fqdn`

0.11.0
++++++
* Fix issue: `create_or_update` not found
Expand Down
1 change: 1 addition & 0 deletions src/azure-firewall/azext_firewall/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ def load_arguments(self, _):
with self.argument_context('network firewall policy rule-collection-group collection', arg_group='Network Rule') as c:
c.argument('destination_ip_groups', options_list=['--destination-ip-groups', '--dest-ipg'], nargs='+', validator=validate_ip_groups,
help='Space-separated list of name or resource id of destination IpGroups')
c.argument('destination_fqdns')

with self.argument_context('network firewall policy rule-collection-group collection add-filter-collection') as c:
c.argument('filter_action', options_list=['--action'], arg_type=get_enum_type(['Allow', 'Deny']), help='The action type of a rule collection.')
Expand Down
22 changes: 14 additions & 8 deletions src/azure-firewall/azext_firewall/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,7 @@ def add_azure_firewall_policy_filter_rule_collection(cmd, resource_group_name, f
destination_ports=None,
protocols=None, fqdn_tags=None, target_fqdns=None,
source_ip_groups=None, destination_ip_groups=None,
destination_fqdns=None,
target_urls=None, enable_tls_inspection=False, web_categories=None):
NetworkRule, FirewallPolicyRuleApplicationProtocol,\
ApplicationRule, FirewallPolicyFilterRuleCollectionAction, FirewallPolicyFilterRuleCollection =\
Expand All @@ -828,7 +829,8 @@ def add_azure_firewall_policy_filter_rule_collection(cmd, resource_group_name, f
destination_addresses=destination_addresses,
destination_ports=destination_ports,
source_ip_groups=source_ip_groups,
destination_ip_groups=destination_ip_groups)
destination_ip_groups=destination_ip_groups,
destination_fqdns=destination_fqdns)
else:
def map_application_rule_protocol(item):
return FirewallPolicyRuleApplicationProtocol(protocol_type=item['protocol_type'],
Expand Down Expand Up @@ -883,8 +885,8 @@ def add_azure_firewall_policy_filter_rule(cmd, resource_group_name, firewall_pol
description=None, ip_protocols=None, source_addresses=None,
destination_addresses=None, destination_ports=None,
protocols=None, fqdn_tags=None, target_fqdns=None,
source_ip_groups=None, destination_ip_groups=None,
translated_address=None, translated_port=None,
source_ip_groups=None, destination_ip_groups=None, destination_fqdns=None,
translated_address=None, translated_port=None, translated_fqdn=None,
target_urls=None, enable_tls_inspection=False, web_categories=None):
(NetworkRule,
FirewallPolicyRuleApplicationProtocol,
Expand Down Expand Up @@ -918,7 +920,8 @@ def add_azure_firewall_policy_filter_rule(cmd, resource_group_name, firewall_pol
destination_addresses=destination_addresses,
destination_ports=destination_ports,
source_ip_groups=source_ip_groups,
destination_ip_groups=destination_ip_groups)
destination_ip_groups=destination_ip_groups,
destination_fqdns=destination_fqdns)
elif rule_type == 'ApplicationRule':
def map_application_rule_protocol(item):
return FirewallPolicyRuleApplicationProtocol(protocol_type=item['protocol_type'],
Expand Down Expand Up @@ -947,7 +950,8 @@ def map_application_rule_protocol(item):
destination_ports=destination_ports,
translated_address=translated_address,
translated_port=translated_port,
source_ip_groups=source_ip_groups)
source_ip_groups=source_ip_groups,
translated_fqdn=translated_fqdn)
target_rule_collection.rules.append(rule)
return client.begin_create_or_update(resource_group_name, firewall_policy_name,
rule_collection_group_name, rule_collection_group)
Expand Down Expand Up @@ -979,8 +983,8 @@ def update_azure_firewall_policy_filter_rule(cmd, instance, rule_collection_name
description=None, ip_protocols=None, source_addresses=None,
destination_addresses=None, destination_ports=None,
protocols=None, fqdn_tags=None, target_fqdns=None,
source_ip_groups=None, destination_ip_groups=None,
translated_address=None, translated_port=None,
source_ip_groups=None, destination_ip_groups=None, destination_fqdns=None,
translated_address=None, translated_port=None, translated_fqdn=None,
target_urls=None, enable_tls_inspection=None, web_categories=None):
(NetworkRule,
FirewallPolicyRuleApplicationProtocol,
Expand Down Expand Up @@ -1008,7 +1012,8 @@ def update_azure_firewall_policy_filter_rule(cmd, instance, rule_collection_name
destination_addresses=(destination_addresses or rule.destination_addresses),
destination_ports=(destination_ports or rule.destination_ports),
source_ip_groups=(source_ip_groups or rule.source_ip_groups),
destination_ip_groups=(destination_ip_groups or rule.destination_ip_groups))
destination_ip_groups=(destination_ip_groups or rule.destination_ip_groups),
destination_fqdns=(destination_fqdns or rule.destination_fqdns))
elif rule.rule_type == 'ApplicationRule':
def map_application_rule_protocol(item):
return FirewallPolicyRuleApplicationProtocol(protocol_type=item['protocol_type'],
Expand Down Expand Up @@ -1037,6 +1042,7 @@ def map_application_rule_protocol(item):
destination_ports=(destination_ports or rule.destination_ports),
translated_address=(translated_address or rule.translated_address),
translated_port=(translated_port or rule.translated_port),
translated_fqdn=(translated_fqdn or rule.translated_fqdn),
source_ip_groups=(source_ip_groups or rule.source_ip_groups))
if new_rule:
target_rule_collection.rules[i] = copy.deepcopy(new_rule)
Expand Down
Loading