Skip to content

[AFD WAF] Add defaultState and defaultAction to managed rule set definitions #7220

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
lirenhe merged 2 commits into from
Sep 19, 2019
Merged

[AFD WAF] Add defaultState and defaultAction to managed rule set definitions #7220

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
0a9801c
Add defaultState and defaultAction to managed rule set definitions
Sep 13, 2019
3fa8f35
Add read-only to defaultAction and defaultState fields
Sep 17, 2019
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
14 changes: 10 additions & 4 deletions ...resource-manager/Microsoft.Network/stable/2019-03-01/examples/WafListManagedRuleSets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,23 @@
"properties": {
"provisioningState": "Succeeded",
"ruleSetType": "DefaultRuleSet",
"ruleSetVersion": "preview-1.0",
"ruleSetVersion": "1.0",
"ruleGroups": [
{
"ruleGroupName": "Group1",
"description": "Description for rule group 1.",
"rules": [
{
"ruleId": "GROUP1-0001",
"description": "Generic managed web application firewall rule."
"description": "Generic managed web application firewall rule.",
"defaultState": "Enabled",
"defaultAction": "Block"
},
{
"ruleId": "GROUP1-0002",
"description": "Generic managed web application firewall rule."
"description": "Generic managed web application firewall rule.",
"defaultState": "Disabled",
"defaultAction": "Block"
}
]
},
Expand All @@ -36,7 +40,9 @@
"rules": [
{
"ruleId": "GROUP2-0001",
"description": "Generic managed web application firewall rule."
"description": "Generic managed web application firewall rule.",
"defaultState": "Enabled",
"defaultAction": "Allow"
}
]
}
Expand Down
32 changes: 23 additions & 9 deletions ...rontdoor/resource-manager/Microsoft.Network/stable/2019-03-01/webapplicationfirewall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,15 +619,7 @@
},
"enabledState": {
"description": "Describes if the managed rule is in enabled or disabled state. Defaults to Disabled if not specified.",
"type": "string",
"enum": [
"Disabled",
"Enabled"
],
"x-ms-enum": {
"name": "ManagedRuleEnabledState",
"modelAsString": true
}
"$ref": "#/definitions/ManagedRuleEnabledState"
},
"action": {
"description": "Describes the override action to be applied when rule matches.",
Expand Down Expand Up @@ -726,6 +718,16 @@
"readOnly": true,
"type": "string"
},
"defaultState": {
"description": "Describes the default state for the managed rule.",
"readOnly": true,
"$ref": "#/definitions/ManagedRuleEnabledState"
},
"defaultAction": {
"description": "Describes the default action to be applied when the managed rule matches.",
"readOnly": true,
"$ref": "#/definitions/ActionType"
},
"description": {
"description": "Describes the functionality of the managed rule.",
"readOnly": true,
Expand All @@ -747,6 +749,18 @@
"modelAsString": true
}
},
"ManagedRuleEnabledState": {
"description": "Describes if the managed rule is in enabled or disabled state.",
"type": "string",
"enum": [
"Disabled",
"Enabled"
],
"x-ms-enum": {
"name": "ManagedRuleEnabledState",
"modelAsString": true
}
},
"ErrorResponse": {
"description": "Error response indicates Front Door service is not able to process the incoming request. The reason is provided in the error message.",
"type": "object",
Expand Down