Skip to content

Commit

Permalink
Merge branch 'Dev' into DefenderDeviceAuthenticatedScanDefinition
Browse files Browse the repository at this point in the history
  • Loading branch information
NikCharlebois authored Nov 5, 2024
2 parents ae1dba1 + 360b686 commit 72b2cad
Show file tree
Hide file tree
Showing 117 changed files with 8,447 additions and 1,915 deletions.
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@
* Initial release.
* AADConditionalAccessPolicy
* FIXES [#5282](https://github.com/microsoft/Microsoft365DSC/issues/5282)
* Added support for InsiderRiskLevels.
* AADCustomSecurityAttributeDefinition
* Fixed missing permissions in settings.json
* AADEnrichedAuditLogs
* Initial release.
* AADFederationConfiguration
* Initial release.
* AADFilteringPolicy
* Initial release.
* AADFilteringPolicyRule
Expand Down Expand Up @@ -46,12 +49,16 @@
* Initial release.
* AADNetworkAccessSettingCrossTenantAccess
* Initial release.
* AADOnPremisesPublishingProfilesSettings
* Initial release.
* AADOrganizationCertificateBasedAuthConfiguration
* Initial release.
* AADRemoteNetwork
* Initial release.
* AADRoleManagementPolicyRule
* Initial release.
* AADServicePrincipal
* Added the notes field.
* AADSocialIdentityProvider
* Fixed missing permissions in settings.json
* AADVerifiedIdAuthority
Expand All @@ -66,21 +73,30 @@
* Initial release.
* AzureDiagnosticSettingsCustomSecurityAttribute
* Initial release.
* AzureSubscription
* Renamed parameters and added logic flow to create new subscriptions.
* AzureVerifiedIdFaceCheck
* Initial release.
* DefenderDeviceAuthenticatedScanDefinition
* Initial release.
* EXOActiveSyncMailboxPolicy
* Initial release.
* EXOArcConfig
* Fixed `Test-TargetResource` to correctly check property `ArcTrustedSealers`
when it has an array
* AADUserFlowAttribute
* Initial Release
* EXOMailboxAuditBypassAssociation
* Initial release.
* EXOMailboxSettings
* Added support for AddressBookPolicy, RetentionPolicy, RoleAssignmentPolicy
and SharingPolicy.
* EXOServicePrincipal
* Initial release.
* EXOTenantAllowBlockListItems
* Fixed `Test-TargetResource` to correctly mark when this resource is removed
* EXOTenantAllowBlockListSpoofItems
* Initial release.
* IntuneAppAndBrowserIsolationPolicyWindows10ConfigMgr
* Initial release.
* IntuneAppCategory
Expand All @@ -102,13 +118,28 @@
* Initial release.
* IntuneSecurityBaselineDefenderForEndpoint
* Initial release.
* IntuneSettingCatalogCustomPolicyWindows10
* Fixes an issue with limited results when more than 25 results are present.
* Intune workload
* Fixed missing permissions in settings.json
* M365DSCRuleEvaluation
* Changed the name of the Key property from ResourceName to ResourceTypeName.
While this is considered a breaking change, the old property name was
breaking the DSCParser process. The impact of this breaking the parsing
process is important enough to justify an out-of-band breaking change of
this resource.
* SCInsiderRiskPolicy
* Added support for property MDATPTriageStatus.
* Added support for GPUUtilizationLimit and CPUUtilizationLimit.
* SCPolicyConfig
* Initial release.
* SCSensitivityLabel
* Fixed issue with setting label priority
FIXES [#5266](https://github.com/microsoft/Microsoft365DSC/issues/5266)
* PPPowerAppsEnvironment
* FIXES [#5207](https://github.com/microsoft/Microsoft365DSC/issues/5207)
* PPTenantSettings
* Updated to support latest settings.
* SentinelAlertRule
* Initial release.
* SentinelThreatIntelligenceIndicator
Expand All @@ -128,6 +159,18 @@
* M365DSCDRGUtil
* Fixes an issue where non-unique properties were not combined
properly with their respective parent setting.
* MISC
* Fixed references to graph.microsoft.com with dynamic domain name based on target cloud.
Impacted AADAdminConsentRequestPolicy, AADApplication, AADConditionalAccessPolicy, AADGroup,
AADNamedLocationPolicy, AADServiePrincipal, IntuneASRRulesPolicyWindows10,
IntuneAccountProtectionLocalUsersGroupMembershipPolicy, IntuneAccountProtectionPolicy,
IntuneAppProtectionPolicyiOS,IntuneDeviceConfigurationAdministrativeTemplatePolicyWindows10,
IntuneDeviceConfigurationSCEPCertificatePolicyWindows10, IntuneDeviceConfigurationWiredNetworkPolicyWindows10,
IntuneDeviceEnrollmentStatusPageWindows10, IntuneDiskEncryptionMacOS, IntunePolicySets,
IntuneSettingCatalogCustomPolicyWindows10, M365DSCRGUtil
* Exponential performance improvements by reducing complexity and roundtrips.
* Changed the logic that appends GUID in the resource name when primary key is not found during an
export. We will only append a GUID if the IsSingleInstance property is not found on the resource.
* DEPENDENCIES
* Updated Microsoft.Graph to version 2.24.0.
* Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.199.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,9 @@ function Set-TargetResource

$updateJSON = ConvertTo-Json $updateParameters
Write-Verbose -Message "Updating the Entra Id Admin Consent Request Policy with values: $updateJSON"
$Uri = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + 'beta/policies/adminConsentRequestPolicy'
Invoke-MgGraphRequest -Method 'PUT' `
-Uri 'https://graph.microsoft.com/beta/policies/adminConsentRequestPolicy' `
-Uri $Uri `
-Body $updateJSON | Out-Null
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,9 @@ function Get-TargetResource

try
{
$Uri = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/applications/$($AADBetaApp.Id)/onPremisesPublishing"
$oppInfo = Invoke-MgGraphRequest -Method GET `
-Uri "https://graph.microsoft.com/beta/applications/$($AADBetaApp.Id)/onPremisesPublishing" `
-Uri $Uri `
-ErrorAction SilentlyContinue
}
catch
Expand Down Expand Up @@ -1135,8 +1136,10 @@ function Set-TargetResource
$onPremisesPublishingValue.Add('singleSignOnSettings', $singleSignOnValues)
$onPremisesPayload = ConvertTo-Json $onPremisesPublishingValue -Depth 10 -Compress
Write-Verbose -Message "Updating the OnPremisesPublishing settings for application {$($currentAADApp.DisplayName)} with payload: $onPremisesPayload"

$Uri = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/applications/$($currentAADApp.Id)/onPremisesPublishing"
Invoke-MgGraphRequest -Method 'PATCH' `
-Uri "https://graph.microsoft.com/beta/applications/$($currentAADApp.Id)/onPremisesPublishing" `
-Uri $Uri `
-Body $onPremisesPayload
}
#endregion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,10 @@ function Get-TargetResource
[System.String]
$TransferMethods,

[Parameter()]
[System.String]
$InsiderRiskLevels,

#generic
[Parameter()]
[ValidateSet('Present', 'Absent')]
Expand Down Expand Up @@ -709,6 +713,7 @@ function Get-TargetResource
TransferMethods = [System.String]$Policy.Conditions.AuthenticationFlows.TransferMethods
#Standard part
TermsOfUse = $termOfUseName
InsiderRiskLevels = $Policy.Conditions.InsiderRiskLevels
Ensure = 'Present'
Credential = $Credential
ApplicationSecret = $ApplicationSecret
Expand Down Expand Up @@ -943,6 +948,10 @@ function Set-TargetResource
[System.String]
$TransferMethods,

[Parameter()]
[System.String]
$InsiderRiskLevels,

#generic
[Parameter()]
[ValidateSet('Present', 'Absent')]
Expand Down Expand Up @@ -1577,6 +1586,11 @@ function Set-TargetResource
}
}

if ($null -ne $InsiderRiskLevels)
{
$conditions.Add("insiderRiskLevels", $InsiderRiskLevels)
}

Write-Verbose -Message 'Set-Targetresource: process risk levels and app types'
Write-Verbose -Message "Set-Targetresource: UserRiskLevels: $UserRiskLevels"
If ($currentParameters.ContainsKey('UserRiskLevels'))
Expand Down Expand Up @@ -1753,7 +1767,9 @@ function Set-TargetResource
try
{
Write-Verbose -Message "Updating existing policy with values: $(Convert-M365DscHashtableToString -Hashtable $NewParameters)"
Invoke-MgGraphRequest -Method PATCH -Uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($currentPolicy.Id)" -Body $NewParameters

$Uri = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/identity/conditionalAccess/policies/$($currentPolicy.Id)"
Invoke-MgGraphRequest -Method PATCH -Uri $Uri -Body $NewParameters
}
catch
{
Expand All @@ -1776,7 +1792,8 @@ function Set-TargetResource
{
try
{
Invoke-MgGraphRequest -Method POST -Uri 'https://graph.microsoft.com/beta/identity/conditionalAccess/policies' -Body $NewParameters
$Uri = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/identity/conditionalAccess/policies"
Invoke-MgGraphRequest -Method POST -Uri $Uri -Body $NewParameters
}
catch
{
Expand Down Expand Up @@ -2041,6 +2058,10 @@ function Test-TargetResource
[System.String]
$TransferMethods,

[Parameter()]
[System.String]
$InsiderRiskLevels,

#generic
[Parameter()]
[ValidateSet('Present', 'Absent')]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class MSFT_AADConditionalAccessPolicy : OMI_BaseResource
[Write, Description("Name of the associated authentication strength policy.")] String AuthenticationStrength;
[Write, Description("Names of the associated authentication flow transfer methods. Possible values are '', 'deviceCodeFlow', 'authenticationTransfer', or 'deviceCodeFlow,authenticationTransfer'.")] String TransferMethods;
[Write, Description("Authentication context class references.")] String AuthenticationContexts[];
[Write, Description("Insider risk levels conditions.")] String InsiderRiskLevels;
[Write, Description("Specify if the Azure AD CA Policy should exist or not."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
[Write, Description("Credentials for the Microsoft Graph delegated permissions."), EmbeddedInstance("MSFT_Credential")] string Credential;
[Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId;
Expand Down
Loading

0 comments on commit 72b2cad

Please sign in to comment.