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

Jump to bottom

azuread_conditional_access_policy - Add disable_session_resilience property #1135

Merged
merged 1 commit into from
Jul 12, 2023
Merged

azuread_conditional_access_policy - Add disable_session_resilience property #1135

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: 2 additions & 0 deletions docs/resources/conditional_access_policy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ resource "azuread_conditional_access_policy" "example" {

session_controls {
application_enforced_restrictions_enabled = true
disable_resilience_defaults = false
sign_in_frequency = 10
sign_in_frequency_period = "hours"
cloud_app_security_policy = "monitorOnly"
Expand Down Expand Up @@ -157,6 +158,7 @@ The following arguments are supported:
-> Only Office 365, Exchange Online and Sharepoint Online support application enforced restrictions.

* `cloud_app_security_policy` - (Optional) Enables cloud app security and specifies the cloud app security policy to use. Possible values are: `blockDownloads`, `mcasConfigured`, `monitorOnly` or `unknownFutureValue`.
* `disable_resilience_defaults` - (Optional) Disables [resilience defaults](https://learn.microsoft.com/en-us/azure/active-directory/conditional-access/resilience-defaults). Defaults to `false`.
* `persistent_browser_mode` - (Optional) Session control to define whether to persist cookies or not. Possible values are: `always` or `never`.
* `sign_in_frequency` - (Optional) Number of days or hours to enforce sign-in frequency. Required when `sign_in_frequency_period` is specified. Due to an API issue, removing this property forces a new resource to be created.
* `sign_in_frequency_period` - (Optional) The time period to enforce sign-in frequency. Possible values are: `hours` or `days`. Required when `sign_in_frequency_period` is specified. Due to an API issue, removing this property forces a new resource to be created.
Expand Down
8 changes: 8 additions & 0 deletions internal/services/conditionalaccess/conditional_access_policy_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,11 @@ func conditionalAccessPolicyResource() *schema.Resource {
}, false),
},

"disable_resilience_defaults": {
Type: schema.TypeBool,
Optional: true,
},

"persistent_browser_mode": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -468,6 +473,9 @@ func conditionalAccessPolicyDiffSuppress(k, old, new string, d *schema.ResourceD
if v, ok := sessionControls["cloud_app_security_policy"]; ok && v.(string) != "" {
suppress = false
}
if v, ok := sessionControls["disable_resilience_defaults"]; ok && v.(bool) {
suppress = false
}
if v, ok := sessionControls["persistent_browser_mode"]; ok && v.(string) != "" {
suppress = false
}
Expand Down
2 changes: 2 additions & 0 deletions internal/services/conditionalaccess/conditional_access_policy_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ resource "azuread_conditional_access_policy" "test" {

session_controls {
application_enforced_restrictions_enabled = true
disable_resilience_defaults = true
cloud_app_security_policy = "monitorOnly"
persistent_browser_mode = "never"
sign_in_frequency = 10
Expand Down Expand Up @@ -553,6 +554,7 @@ resource "azuread_conditional_access_policy" "test" {

session_controls {
application_enforced_restrictions_enabled = true
disable_resilience_defaults = false
cloud_app_security_policy = "blockDownloads"
persistent_browser_mode = "always"
sign_in_frequency = 2
Expand Down
9 changes: 9 additions & 0 deletions internal/services/conditionalaccess/conditionalaccess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ func flattenConditionalAccessSessionControls(in *msgraph.ConditionalAccessSessio
cloudAppSecurity = *in.CloudAppSecurity.CloudAppSecurityType
}

disableResilienceDefaults := false
if in.DisableResilienceDefaults != nil {
disableResilienceDefaults = *in.DisableResilienceDefaults
}

signInFrequency := 0
signInFrequencyPeriod := ""
if in.SignInFrequency != nil && in.SignInFrequency.Value != nil && in.SignInFrequency.Type != nil {
Expand All @@ -143,6 +148,7 @@ func flattenConditionalAccessSessionControls(in *msgraph.ConditionalAccessSessio
map[string]interface{}{
"application_enforced_restrictions_enabled": applicationEnforceRestrictions,
"cloud_app_security_policy": cloudAppSecurity,
"disable_resilience_defaults": disableResilienceDefaults,
"persistent_browser_mode": persistentBrowserMode,
"sign_in_frequency": signInFrequency,
"sign_in_frequency_period": signInFrequencyPeriod,
Expand Down Expand Up @@ -382,6 +388,9 @@ func expandConditionalAccessSessionControls(in []interface{}) *msgraph.Condition
}
}

DisableResilienceDefaults := config["disable_resilience_defaults"]
result.DisableResilienceDefaults = utils.Bool(DisableResilienceDefaults.(bool))

if persistentBrowserMode := config["persistent_browser_mode"].(string); persistentBrowserMode != "" {
result.PersistentBrowser = &msgraph.PersistentBrowserSessionControl{
IsEnabled: utils.Bool(true),
Expand Down