Skip to content

[pull] dev from KelvinTegelaar:dev #356

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
pull merged 2 commits into from
Jul 12, 2025
Merged

[pull] dev from KelvinTegelaar:dev #356

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
4397a3c
add disable Ca
KelvinTegelaar Jul 12, 2025
fb9819c
updates for ca disablement
KelvinTegelaar Jul 12, 2025
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
4 changes: 2 additions & 2 deletions Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-AddCAPolicy.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using namespace System.Net

Function Invoke-AddCAPolicy {
function Invoke-AddCAPolicy {
<#
.FUNCTIONALITY
Entrypoint
Expand All @@ -19,7 +19,7 @@ Function Invoke-AddCAPolicy {

$results = foreach ($Tenant in $tenants) {
try {
$CAPolicy = New-CIPPCAPolicy -replacePattern $Request.Body.replacename -Overwrite $request.Body.overwrite -TenantFilter $Tenant -state $Request.Body.NewState -RawJSON $Request.Body.RawJSON -APIName $APIName -Headers $Headers
$CAPolicy = New-CIPPCAPolicy -replacePattern $Request.Body.replacename -Overwrite $request.Body.overwrite -TenantFilter $Tenant -state $Request.Body.NewState -DisableSD $Request.Body.DisableSD -RawJSON $Request.Body.RawJSON -APIName $APIName -Headers $Headers
"$CAPolicy"
} catch {
"$($_.Exception.Message)"
Expand Down
71 changes: 35 additions & 36 deletions ...ic/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ListConditionalAccessPolicies.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ function Invoke-ListConditionalAccessPolicies {
$Locations
)
if ($id -eq 'All') {
return @{label = 'All'; value = 'All' }
return 'All'
}
$DisplayName = $Locations | Where-Object { $_.id -eq $ID } | Select-Object -ExpandProperty DisplayName
if (![string]::IsNullOrEmpty($displayName)) {
return @{label = $DisplayName; value = $ID }
if ([string]::IsNullOrEmpty($displayName)) {
return $ID
} else {
return $DisplayName
}
}

Expand All @@ -39,13 +41,13 @@ function Invoke-ListConditionalAccessPolicies {
$RoleDefinitions
)
if ($id -eq 'All') {
return @{label = 'All'; value = 'All' }
return 'All'
}
$DisplayName = $RoleDefinitions | Where-Object { $_.id -eq $ID } | Select-Object -ExpandProperty DisplayName
if ([string]::IsNullOrEmpty($displayName)) {
return @{label = $ID; value = $ID }
return $ID
} else {
return @{label = $DisplayName; value = $ID }
return $DisplayName
}
}

Expand All @@ -57,13 +59,13 @@ function Invoke-ListConditionalAccessPolicies {
$Users
)
if ($id -eq 'All') {
return @{label = 'All'; value = 'All' }
return 'All'
}
$DisplayName = $Users | Where-Object { $_.id -eq $ID } | Select-Object -ExpandProperty DisplayName
if ([string]::IsNullOrEmpty($displayName)) {
return @{label = $ID; value = $ID }
return $ID
} else {
return @{label = $DisplayName; value = $ID }
return $DisplayName
}
}

Expand All @@ -74,13 +76,13 @@ function Invoke-ListConditionalAccessPolicies {
$Groups
)
if ($id -eq 'All') {
return @{label = 'All'; value = 'All' }
return 'All'
}
$DisplayName = $Groups | Where-Object { $_.id -eq $ID } | Select-Object -ExpandProperty DisplayName
if ([string]::IsNullOrEmpty($displayName)) {
return @{label = 'No Data'; value = 'No Data' }
return 'No Data'
} else {
return @{label = $DisplayName; value = $ID }
return $DisplayName
}
}

Expand All @@ -93,7 +95,7 @@ function Invoke-ListConditionalAccessPolicies {
$ServicePrincipals
)
if ($id -eq 'All') {
return @{label = 'All'; value = 'All' }
return 'All'
}

$return = $ServicePrincipals | Where-Object { $_.appId -eq $ID } | Select-Object -ExpandProperty DisplayName
Expand All @@ -110,10 +112,7 @@ function Invoke-ListConditionalAccessPolicies {
$return = ''
}

if ($return) {
$return = @{label = $return; value = $ID }
return $return
}
return $return
}

# Interact with query parameters or the body of the request.
Expand Down Expand Up @@ -177,25 +176,25 @@ function Invoke-ListConditionalAccessPolicies {
createdDateTime = $(if (![string]::IsNullOrEmpty($cap.createdDateTime)) { [datetime]$cap.createdDateTime } else { '' })
modifiedDateTime = $(if (![string]::IsNullOrEmpty($cap.modifiedDateTime)) { [datetime]$cap.modifiedDateTime }else { '' })
state = $cap.state
clientAppTypes = @(if ($cap.conditions.clientAppTypes) { $cap.conditions.clientAppTypes | ForEach-Object { return @{label = $_; value = $_ } } } else { @() })
includePlatforms = @(if ($cap.conditions.platforms.includePlatforms) { $cap.conditions.platforms.includePlatforms | ForEach-Object { return @{label = $_; value = $_ } } } else { @() })
excludePlatforms = @(if ($cap.conditions.platforms.excludePlatforms) { $cap.conditions.platforms.excludePlatforms | ForEach-Object { return @{label = $_; value = $_ } } } else { @() })
includeLocations = @(Get-LocationNameFromId -Locations $AllNamedLocations -id $cap.conditions.locations.includeLocations)
excludeLocations = @(Get-LocationNameFromId -Locations $AllNamedLocations -id $cap.conditions.locations.excludeLocations)
includeApplications = @(Get-ApplicationNameFromId -Applications $AllApplications -ServicePrincipals $AllServicePrincipals -id $cap.conditions.applications.includeApplications)
excludeApplications = @(Get-ApplicationNameFromId -Applications $AllApplications -ServicePrincipals $AllServicePrincipals -id $cap.conditions.applications.excludeApplications)
includeUserActions = @($cap.conditions.applications.includeUserActions )
includeAuthenticationContextClassReferences = @($cap.conditions.applications.includeAuthenticationContextClassReferences )
includeUsers = @($cap.conditions.users.includeUsers | ForEach-Object { Get-UserNameFromId -Users $UserListOutput -id $_ })
excludeUsers = @($cap.conditions.users.excludeUsers | ForEach-Object { Get-UserNameFromId -Users $UserListOutput -id $_ })
includeGroups = @($cap.conditions.users.includeGroups | ForEach-Object { Get-GroupNameFromId -Groups $GroupListOutput -id $_ })
excludeGroups = @($cap.conditions.users.excludeGroups | ForEach-Object { Get-GroupNameFromId -Groups $GroupListOutput -id $_ })
includeRoles = @($cap.conditions.users.includeRoles | ForEach-Object { Get-RoleNameFromId -RoleDefinitions $AllRoleDefinitions -id $_ })
excludeRoles = @($cap.conditions.users.excludeRoles | ForEach-Object { Get-RoleNameFromId -RoleDefinitions $AllRoleDefinitions -id $_ })
grantControlsOperator = @(if ($cap.grantControls.operator) { $cap.grantControls.operator | ForEach-Object { return @{label = $_; value = $_ } } } else { @() })
builtInControls = @(if ($cap.grantControls.builtInControls) { $cap.grantControls.builtInControls | ForEach-Object { return @{label = $_; value = $_ } } } else { @() })
customAuthenticationFactors = @(if ($cap.grantControls.customAuthenticationFactors) { $cap.grantControls.customAuthenticationFactors | ForEach-Object { return @{label = $_; value = $_ } } } else { @() })
termsOfUse = @(if ($cap.grantControls.termsOfUse) { $cap.grantControls.termsOfUse | ForEach-Object { return @{label = $_; value = $_ } } } else { @() })
clientAppTypes = ($cap.conditions.clientAppTypes) -join ','
includePlatforms = ($cap.conditions.platforms.includePlatforms) -join ','
excludePlatforms = ($cap.conditions.platforms.excludePlatforms) -join ','
includeLocations = (Get-LocationNameFromId -Locations $AllNamedLocations -id $cap.conditions.locations.includeLocations) -join ','
excludeLocations = (Get-LocationNameFromId -Locations $AllNamedLocations -id $cap.conditions.locations.excludeLocations) -join ','
includeApplications = ($cap.conditions.applications.includeApplications | ForEach-Object { Get-ApplicationNameFromId -Applications $AllApplications -ServicePrincipals $AllServicePrincipals -id $_ }) -join ','
excludeApplications = ($cap.conditions.applications.excludeApplications | ForEach-Object { Get-ApplicationNameFromId -Applications $AllApplications -ServicePrincipals $AllServicePrincipals -id $_ }) -join ','
includeUserActions = ($cap.conditions.applications.includeUserActions | Out-String)
includeAuthenticationContextClassReferences = ($cap.conditions.applications.includeAuthenticationContextClassReferences | Out-String)
includeUsers = ($cap.conditions.users.includeUsers | ForEach-Object { Get-UserNameFromId -Users $UserListOutput -id $_ }) | Out-String
excludeUsers = ($cap.conditions.users.excludeUsers | ForEach-Object { Get-UserNameFromId -Users $UserListOutput -id $_ }) | Out-String
includeGroups = ($cap.conditions.users.includeGroups | ForEach-Object { Get-GroupNameFromId -Groups $GroupListOutput -id $_ }) | Out-String
excludeGroups = ($cap.conditions.users.excludeGroups | ForEach-Object { Get-GroupNameFromId -Groups $GroupListOutput -id $_ }) | Out-String
includeRoles = ($cap.conditions.users.includeRoles | ForEach-Object { Get-RoleNameFromId -RoleDefinitions $AllRoleDefinitions -id $_ }) | Out-String
excludeRoles = ($cap.conditions.users.excludeRoles | ForEach-Object { Get-RoleNameFromId -RoleDefinitions $AllRoleDefinitions -id $_ }) | Out-String
grantControlsOperator = ($cap.grantControls.operator) -join ','
builtInControls = ($cap.grantControls.builtInControls) -join ','
customAuthenticationFactors = ($cap.grantControls.customAuthenticationFactors) -join ','
termsOfUse = ($cap.grantControls.termsOfUse) -join ','
rawjson = ($cap | ConvertTo-Json -Depth 100)
}
$temp
Expand Down
9 changes: 8 additions & 1 deletion Modules/CIPPCore/Public/New-CIPPCAPolicy.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ function New-CIPPCAPolicy {
$State,
$Overwrite,
$ReplacePattern = 'none',
$DisableSD = $false,
$APIName = 'Create CA Policy',
$Headers
)
Expand Down Expand Up @@ -225,7 +226,13 @@ function New-CIPPCAPolicy {
}
}
}

if ($DisableSD -eq $true) {
#Send request to disable security defaults.
$body = '{ "isEnabled": false }'
$null = New-GraphPostRequest -tenantid $tenant -Uri 'https://graph.microsoft.com/beta/policies/identitySecurityDefaultsEnforcementPolicy' -Type patch -Body $body -ContentType 'application/json'
Write-LogMessage -Headers $User -API $APINAME -tenant $($Tenant) -message "Disabled Security Defaults for tenant $($TenantFilter)" -Sev 'Info'
Start-Sleep 3
}
$RawJSON = ConvertTo-Json -InputObject $JSONObj -Depth 10 -Compress
Write-Information $RawJSON
try {
Expand Down
2 changes: 1 addition & 1 deletion Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardConditionalAccessTemplate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function Invoke-CIPPStandardConditionalAccessTemplate {
$Table = Get-CippTable -tablename 'templates'
$Filter = "PartitionKey eq 'CATemplate' and RowKey eq '$($Setting.TemplateList.value)'"
$JSONObj = (Get-CippAzDataTableEntity @Table -Filter $Filter).JSON
$null = New-CIPPCAPolicy -replacePattern 'displayName' -TenantFilter $tenant -state $Setting.state -RawJSON $JSONObj -Overwrite $true -APIName $APIName -Headers $Request.Headers
$null = New-CIPPCAPolicy -replacePattern 'displayName' -TenantFilter $tenant -state $Setting.state -RawJSON $JSONObj -Overwrite $true -APIName $APIName -Headers $Request.Headers -DisableSD $Setting.DisableSD
} catch {
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to create or update conditional access rule $($JSONObj.displayName). Error: $ErrorMessage" -sev 'Error'
Expand Down