Skip to content

[Network] az network application-gateway waf-policy managed-rule rule-set add: support Microsoft_BotManagerRuleSet #12518

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

Merged
mmyyrroonn merged 1 commit into from
Mar 11, 2020
Merged

[Network] az network application-gateway waf-policy managed-rule rule-set add: support Microsoft_BotManagerRuleSet #12518

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
8 changes: 6 additions & 2 deletions src/azure-cli/azure/cli/command_modules/network/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,10 +469,14 @@ def load_arguments(self, _):

with self.argument_context('network application-gateway waf-policy managed-rule rule-set',
min_api='2019-09-01') as c:
c.argument('rule_set_type', options_list='--type', help='The type of the web application firewall rule set.')
c.argument('rule_set_type', options_list='--type',
arg_type=get_enum_type(['Microsoft_BotManagerRuleSet', 'OWASP']),
help='The type of the web application firewall rule set.')
c.argument('rule_set_version',
options_list='--version',
help='The version of the web application firewall rule set type.')
arg_type=get_enum_type(['0.1', '2.2.9', '3.0', '3.1']),
help='The version of the web application firewall rule set type. '
'0.1 is used for Microsoft_BotManagerRuleSet')
c.argument('rule_group_name',
options_list='--group-name',
help='The name of the web application firewall rule set group.')
Expand Down
16 changes: 11 additions & 5 deletions src/azure-cli/azure/cli/command_modules/network/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,8 @@ def remove_waf_custom_rule_match_cond(cmd, client, resource_group_name, policy_n

# region ApplicationGatewayWAFPolicy ManagedRule ManagedRuleSet
def add_waf_managed_rule_set(cmd, client, resource_group_name, policy_name,
rule_set_type, rule_set_version, rule_group_name, rules):
rule_set_type, rule_set_version,
rule_group_name=None, rules=None):
"""
Add managed rule set to the WAF policy managed rules.
Visit: https://docs.microsoft.com/en-us/azure/web-application-firewall/ag/application-gateway-crs-rulegroups-rules
Expand All @@ -1243,11 +1244,15 @@ def add_waf_managed_rule_set(cmd, client, resource_group_name, policy_name,

waf_policy = client.get(resource_group_name, policy_name)

managed_rule_overrides = [ManagedRuleOverride(rule_id=r) for r in rules]
rule_group_override = ManagedRuleGroupOverride(rule_group_name=rule_group_name, rules=managed_rule_overrides)
managed_rule_overrides = [ManagedRuleOverride(rule_id=r) for r in rules] if rules is not None else []

rule_group_override = None
if rule_group_name is not None:
rule_group_override = ManagedRuleGroupOverride(rule_group_name=rule_group_name,
rules=managed_rule_overrides)
new_managed_rule_set = ManagedRuleSet(rule_set_type=rule_set_type,
rule_set_version=rule_set_version,
rule_group_overrides=[rule_group_override])
rule_group_overrides=[rule_group_override] if rule_group_override is not None else []) # pylint: disable=line-too-long

for rule_set in waf_policy.managed_rules.managed_rule_sets:
if rule_set.rule_set_type == rule_set_type:
Expand All @@ -1256,7 +1261,8 @@ def add_waf_managed_rule_set(cmd, client, resource_group_name, policy_name,
rule_override.rules.extend(managed_rule_overrides)
break
else:
rule_set.rule_group_overrides.append(rule_group_override)
if rule_group_override is not None:
rule_set.rule_group_overrides.append(rule_group_override)
break
else:
waf_policy.managed_rules.managed_rule_sets.append(new_managed_rule_set)
Expand Down
Loading