diff --git a/CHANGELOG.md b/CHANGELOG.md index 742aa3c..0dbf301 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,8 @@ The format is based on and uses the types of changes according to [Keep a Change ### Added - Link to App Authentication documentation in `New-M365SecurityAuditAuthObject` help file. -- TestDefinitions.csv file to the helper folder for version choices. +- TestDefinitions-v4.0.0.csv file to the helper folder for version choices. +- Test Definition Placeholders ## [0.1.26] - 2024-08-04 diff --git a/source/Private/Get-CISExoOutput.ps1 b/source/Private/Get-CISExoOutput.ps1 index 4d7df94..d35ab1f 100644 --- a/source/Private/Get-CISExoOutput.ps1 +++ b/source/Private/Get-CISExoOutput.ps1 @@ -340,6 +340,9 @@ function Get-CISExoOutput { $antiPhishPolicies = Get-AntiPhishPolicy return $antiPhishPolicies } + '2.1.7-v4' { + # Placeholder Test-AntiPhishingPolicy.ps1 + } '2.1.9' { # Test-EnableDKIM.ps1 # 2.1.9 (L1) Ensure DKIM is enabled for all Exchange Online Domains @@ -348,6 +351,18 @@ function Get-CISExoOutput { # [object[]] return $dkimConfig } + '2.1.11' { + # Placeholder - Test-AttachmentFiltering + } + '2.1.12' { + # Placeholder - Test-ConnectionFilterIPAllowList + } + '2.1.13' { + # Placeholder - Test-ConnectionFilterSafeList + } + '2.1.14' { + # Placeholder - Test-InboundAntiSpamPolicies + } '3.1.1' { # Test-AuditLogSearch.ps1 # 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled @@ -379,6 +394,9 @@ function Get-CISExoOutput { # [object[]] return $mailboxes } + '6.1.4' { + # Placeholder - Test-AuditBypassEnabled + } '6.2.1' { # Test-BlockMailForwarding.ps1 # 6.2.1 (L1) Ensure all forms of mail forwarding are blocked and/or disabled diff --git a/source/Private/Get-CISMgOutput.ps1 b/source/Private/Get-CISMgOutput.ps1 index 7413e35..67f220f 100644 --- a/source/Private/Get-CISMgOutput.ps1 +++ b/source/Private/Get-CISMgOutput.ps1 @@ -2,13 +2,10 @@ function Get-CISMgOutput { <# .SYNOPSIS This is a sample Private function only visible within the module. - .DESCRIPTION This sample function is not exported to the module and only return the data passed as parameter. - .EXAMPLE $null = Get-CISMgOutput -PrivateData 'NOTHING TO SEE HERE' - .PARAMETER PrivateData The PrivateData parameter is what will be returned without transformation. @@ -20,7 +17,6 @@ function Get-CISMgOutput { [Parameter(Mandatory = $false)] [String]$DomainName ) - begin { # Begin Block # # Tests @@ -34,19 +30,27 @@ function Get-CISMgOutput { 6.1.2 6.1.3 # Test number array - $testNumbers = @('1.1.1', '1.1.3', '1.2.1', '1.3.1', '5.1.2.3', '5.1.8.1', '6.1.2', '6.1.3') + $testNumbers = @('1.1.1', '1.1.1-v4', '1.1.3', '1.2.1', '1.3.1', '5.1.2.3', '5.1.8.1', '6.1.2', '6.1.3', '1.1.4') #> } process { try { - Write-Verbose "Get-CISMgOutput: Retuning data for Rec: $Rec" + Write-Verbose "Get-CISMgOutput: Returning data for Rec: $Rec" switch ($rec) { '1.1.1' { - # 1.1.1 + # 1.1.1 - MicrosoftGraphPlaceholder # Test-AdministrativeAccountCompliance $AdminRoleAssignmentsAndUsers = Get-AdminRoleUserAndAssignment return $AdminRoleAssignmentsAndUsers } + '1.1.1-v4' { + # 1.1.1-v4 - MicrosoftGraphPlaceholder + # Placeholder for the new v4 logic for Test-AdministrativeAccountCompliance + } + '1.1.4' { + # 1.1.4 - MicrosoftGraphPlaceholder + # Placeholder for Test-AdminAccountLicenses + } '1.1.3' { # Test-GlobalAdminsCount # Step: Retrieve global admin role @@ -121,7 +125,6 @@ function Get-CISMgOutput { } } end { - Write-Verbose "Retuning data for Rec: $Rec" + Write-Verbose "Returning data for Rec: $Rec" } -} # end function Get-CISMgOutput - +} # end function Get-CISMgOutput \ No newline at end of file