Merge pull request #129 from CriticalSolutionsNetwork/Formatting-QoL

Formatting qol EXO

CHANGELOG.md

@@ -4,6 +4,22 @@ The format is based on and uses the types of changes according to [Keep a Change
 
 ## [Unreleased]
 
+### Added
+
+- Added `Get-PhishPolicyDetail` and `Test-PhishPolicyCompliance` private functions to help test for phishing policy compliance.
+
+### Fixed
+
+- Fixed various EXO test to be more accurate and include more properties in the output.
+
+#### Changed
+
+- Changed main function parameter for Domain to `DomainName`.
+
+
+
+## [0.1.17] - 2024-06-28
+
 ### Fixed
 
 - Fixed `Get-ExceededLengthResultDetail` function paramter validation for Exported Tests to allow for Null.

help/Export-M365SecurityAuditTable.md

@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Export-M365SecurityAuditTable
@@ -15,25 +15,24 @@ Exports M365 security audit results to a CSV file or outputs a specific test res
 ### OutputObjectFromAuditResultsSingle
 ```
 Export-M365SecurityAuditTable [-AuditResults] <CISAuditResult[]> [-OutputTestNumber] <String>
- [-ProgressAction <ActionPreference>] [<CommonParameters>]
+ [<CommonParameters>]
 ```
 
 ### ExportAllResultsFromAuditResults
 ```
 Export-M365SecurityAuditTable [-AuditResults] <CISAuditResult[]> [-ExportAllTests] -ExportPath <String>
- [-ExportOriginalTests] [-ExportToExcel] [-ProgressAction <ActionPreference>] [<CommonParameters>]
+ [-ExportOriginalTests] [-ExportToExcel] [<CommonParameters>]
 ```
 
 ### OutputObjectFromCsvSingle
 ```
-Export-M365SecurityAuditTable [-CsvPath] <String> [-OutputTestNumber] <String>
+Export-M365SecurityAuditTable [-CsvPath] <String> [-OutputTestNumber] <String> [<CommonParameters>]
- [-ProgressAction <ActionPreference>] [<CommonParameters>]
 ```
 
 ### ExportAllResultsFromCsv
 ```
 Export-M365SecurityAuditTable [-CsvPath] <String> [-ExportAllTests] -ExportPath <String> [-ExportOriginalTests]
- [-ExportToExcel] [-ProgressAction <ActionPreference>] [<CommonParameters>]
+ [-ExportToExcel] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -110,6 +109,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -OutputTestNumber
+The test number to output as an object.
+Valid values are "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4".
+
+```yaml
+Type: String
+Parameter Sets: OutputObjectFromAuditResultsSingle, OutputObjectFromCsvSingle
+Aliases:
+
+Required: True
+Position: 2
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ExportAllTests
 Switch to export all test results.
 
@@ -118,23 +133,8 @@ Type: SwitchParameter
 Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
 Aliases:
 
-Required: True
-Position: 1
-Default value: False
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -ExportOriginalTests
-Switch to export the original audit results to a CSV file.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
-Aliases:
-
 Required: False
-Position: Named
+Position: 1
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -155,6 +155,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ExportOriginalTests
+Switch to export the original audit results to a CSV file.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
+Aliases:
+
+Required: True
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ExportToExcel
 Switch to export the results to an Excel file.
 
@@ -170,37 +185,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -OutputTestNumber
-The test number to output as an object.
-Valid values are "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4".
-
-```yaml
-Type: String
-Parameter Sets: OutputObjectFromAuditResultsSingle, OutputObjectFromCsvSingle
-Aliases:
-
-Required: True
-Position: 2
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -ProgressAction
-{{ Fill ProgressAction Description }}
-
-```yaml
-Type: ActionPreference
-Parameter Sets: (All)
-Aliases: proga
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 

help/Get-AdminRoleUserLicense.md

@@ -13,7 +13,7 @@ Retrieves user licenses and roles for administrative accounts from Microsoft 365
 ## SYNTAX
 
 ```
-Get-AdminRoleUserLicense [-SkipGraphConnection] [-ProgressAction <ActionPreference>] [<CommonParameters>]
+Get-AdminRoleUserLicense [-SkipGraphConnection] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -38,21 +38,6 @@ This example retrieves all administrative role users along with their licenses w
 
 ## PARAMETERS
 
-### -ProgressAction
-{{ Fill ProgressAction Description }}
-
-```yaml
-Type: ActionPreference
-Parameter Sets: (All)
-Aliases: proga
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -SkipGraphConnection
 A switch parameter that, when set, skips the connection to Microsoft Graph if already established.
 This is useful for batch processing or when used within scripts where multiple calls are made and the connection is managed externally.

help/Get-MFAStatus.md

@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-MFAStatus
@@ -13,8 +13,7 @@ Retrieves the MFA (Multi-Factor Authentication) status for Azure Active Director
 ## SYNTAX
 
 ```
-Get-MFAStatus [[-UserId] <String>] [-SkipMSOLConnectionChecks] [-ProgressAction <ActionPreference>]
+Get-MFAStatus [[-UserId] <String>] [-SkipMSOLConnectionChecks] [<CommonParameters>]
- [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -37,16 +36,17 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
 
 ## PARAMETERS
 
-### -ProgressAction
+### -UserId
-{{ Fill ProgressAction Description }}
+The User Principal Name (UPN) of a specific user to retrieve MFA status for.
+If not provided, the function retrieves MFA status for all users.
 
 ```yaml
-Type: ActionPreference
+Type: String
 Parameter Sets: (All)
-Aliases: proga
+Aliases:
 
 Required: False
-Position: Named
+Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -67,22 +67,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -UserId
-The User Principal Name (UPN) of a specific user to retrieve MFA status for.
-If not provided, the function retrieves MFA status for all users.
-
-```yaml
-Type: String
-Parameter Sets: (All)
-Aliases:
-
-Required: False
-Position: 1
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 

help/Grant-M365SecurityAuditConsent.md

@@ -14,8 +14,7 @@ Grants Microsoft Graph permissions for an auditor.
 
 ```
 Grant-M365SecurityAuditConsent [-UserPrincipalNameForConsent] <String> [-SkipGraphConnection]
- [-SkipModuleCheck] [-SuppressRevertOutput] [-DoNotDisconnect] [-ProgressAction <ActionPreference>] [-WhatIf]
+ [-SkipModuleCheck] [-SuppressRevertOutput] [-DoNotDisconnect] [-WhatIf] [-Confirm] [<CommonParameters>]
- [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -41,33 +40,18 @@ Grants Microsoft Graph permissions to user@example.com, skipping the connection
 
 ## PARAMETERS
 
-### -DoNotDisconnect
+### -UserPrincipalNameForConsent
-If specified, does not disconnect from Microsoft Graph after granting consent.
+Specify the UPN of the user to grant consent for.
 
 ```yaml
-Type: SwitchParameter
+Type: String
 Parameter Sets: (All)
 Aliases:
 
-Required: False
+Required: True
-Position: Named
+Position: 1
-Default value: False
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -ProgressAction
-{{ Fill ProgressAction Description }}
-
-```yaml
-Type: ActionPreference
-Parameter Sets: (All)
-Aliases: proga
-
-Required: False
-Position: Named
 Default value: None
-Accept pipeline input: False
+Accept pipeline input: True (ByPropertyName, ByValue)
 Accept wildcard characters: False
 ```
 
@@ -116,32 +100,17 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -UserPrincipalNameForConsent
+### -DoNotDisconnect
-Specify the UPN of the user to grant consent for.
+If specified, does not disconnect from Microsoft Graph after granting consent.
-
-```yaml
-Type: String
-Parameter Sets: (All)
-Aliases:
-
-Required: True
-Position: 1
-Default value: None
-Accept pipeline input: True (ByPropertyName, ByValue)
-Accept wildcard characters: False
-```
-
-### -Confirm
-Prompts you for confirmation before running the cmdlet.
 
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)
-Aliases: cf
+Aliases:
 
 Required: False
 Position: Named
-Default value: None
+Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -162,6 +131,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -Confirm
+Prompts you for confirmation before running the cmdlet.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: cf
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 

help/Invoke-M365SecurityAudit.md

@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit
@@ -14,51 +14,47 @@ Invokes a security audit for Microsoft 365 environments.
 
 ### Default (Default)
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>] [-DoNotConnect]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-DoNotConnect] [-DoNotDisconnect]
- [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-ProgressAction <ActionPreference>] [-WhatIf]
+ [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
- [-Confirm] [<CommonParameters>]
 ```
 
 ### ELevelFilter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>] -ELevel <String>
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -ELevel <String>
  -ProfileLevel <String> [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections]
- [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### IG1Filter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>] [-IncludeIG1]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG1] [-DoNotConnect]
- [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
- [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### IG2Filter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>] [-IncludeIG2]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG2] [-DoNotConnect]
- [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
- [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### IG3Filter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>] [-IncludeIG3]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG3] [-DoNotConnect]
- [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
- [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### RecFilter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -IncludeRecommendation <String[]>
- -IncludeRecommendation <String[]> [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck]
+ [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm]
- [-DoNotConfirmConnections] [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [<CommonParameters>]
 ```
 
 ### SkipRecFilter
 ```
-Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-M365DomainForPWPolicyTest <String>]
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -SkipRecommendation <String[]>
- -SkipRecommendation <String[]> [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections]
+ [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm]
- [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -164,47 +160,33 @@ What if: Performing the operation "Invoke-M365SecurityAudit" on target "Microsof
 
 ## PARAMETERS
 
-### -DoNotConfirmConnections
+### -TenantAdminUrl
-If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.
+The URL of the tenant admin.
+If not specified, none of the SharePoint Online tests will run.
 
 ```yaml
-Type: SwitchParameter
+Type: String
 Parameter Sets: (All)
 Aliases:
 
 Required: False
 Position: Named
-Default value: False
+Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -DoNotConnect
+### -DomainName
-If specified, the cmdlet will not establish a connection to Microsoft 365 services.
+The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.
 
 ```yaml
-Type: SwitchParameter
+Type: String
 Parameter Sets: (All)
 Aliases:
 
 Required: False
 Position: Named
-Default value: False
+Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -DoNotDisconnect
-If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-
-Required: False
-Position: Named
-Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -225,6 +207,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ProfileLevel
+Specifies the profile level (L1 or L2) for the audit.
+This parameter is optional and can be combined with the ELevel parameter.
+
+```yaml
+Type: String
+Parameter Sets: ELevelFilter
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -IncludeIG1
 If specified, includes tests where IG1 is true.
 
@@ -286,18 +284,48 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -M365DomainForPWPolicyTest
+### -SkipRecommendation
-The domain name of the Microsoft 365 environment to test.
+Specifies specific recommendations to exclude from the audit.
-This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.
+Accepts an array of recommendation numbers.
 
 ```yaml
-Type: String
+Type: String[]
+Parameter Sets: SkipRecFilter
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -DoNotConnect
+If specified, the cmdlet will not establish a connection to Microsoft 365 services.
+
+```yaml
+Type: SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
 Required: False
 Position: Named
-Default value: None
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -DoNotDisconnect
+If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -317,61 +345,29 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ProfileLevel
+### -DoNotConfirmConnections
-Specifies the profile level (L1 or L2) for the audit.
+If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.
-This parameter is optional and can be combined with the ELevel parameter.
 
 ```yaml
-Type: String
+Type: SwitchParameter
-Parameter Sets: ELevelFilter
-Aliases:
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -ProgressAction
-{{ Fill ProgressAction Description }}
-
-```yaml
-Type: ActionPreference
 Parameter Sets: (All)
-Aliases: proga
+Aliases:
 
 Required: False
 Position: Named
-Default value: None
+Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -SkipRecommendation
+### -WhatIf
-Specifies specific recommendations to exclude from the audit.
+Shows what would happen if the cmdlet runs.
-Accepts an array of recommendation numbers.
+The cmdlet is not run.
 
 ```yaml
-Type: String[]
+Type: SwitchParameter
-Parameter Sets: SkipRecFilter
-Aliases:
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -TenantAdminUrl
-The URL of the tenant admin.
-If not specified, none of the SharePoint Online tests will run.
-
-```yaml
-Type: String
 Parameter Sets: (All)
-Aliases:
+Aliases: wi
 
 Required: False
 Position: Named
@@ -395,22 +391,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -WhatIf
-Shows what would happen if the cmdlet runs.
-The cmdlet is not run.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases: wi
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 

help/M365FoundationsCISReport.md

@@ -1,4 +1,4 @@
----
+---
 Module Name: M365FoundationsCISReport
 Module Guid: 0d064bfb-d1ce-484b-a173-993b55984dc9
 Download Help Link: {{Please enter Link manually}}
@@ -20,6 +20,9 @@ Retrieves user licenses and roles for administrative accounts from Microsoft 365
 ### [Get-MFAStatus](Get-MFAStatus.md)
 Retrieves the MFA (Multi-Factor Authentication) status for Azure Active Directory users.
 
+### [Grant-M365SecurityAuditConsent](Grant-M365SecurityAuditConsent.md)
+Grants Microsoft Graph permissions for an auditor.
+
 ### [Invoke-M365SecurityAudit](Invoke-M365SecurityAudit.md)
 Invokes a security audit for Microsoft 365 environments.
 

help/Remove-RowsWithEmptyCSVStatus.md

@@ -13,8 +13,7 @@ Removes rows from an Excel worksheet where the 'CSV_Status' column is empty and
 ## SYNTAX
 
 ```
-Remove-RowsWithEmptyCSVStatus [-FilePath] <String> [-WorksheetName] <String>
+Remove-RowsWithEmptyCSVStatus [-FilePath] <String> [-WorksheetName] <String> [<CommonParameters>]
- [-ProgressAction <ActionPreference>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -46,21 +45,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ProgressAction
-{{ Fill ProgressAction Description }}
-
-```yaml
-Type: ActionPreference
-Parameter Sets: (All)
-Aliases: proga
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -WorksheetName
 The name of the worksheet within the Excel file to be processed.
 

help/Sync-CISExcelAndCsvData.md

@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Sync-CISExcelAndCsvData
@@ -14,7 +14,7 @@ Synchronizes and updates data in an Excel worksheet with new information from a
 
 ```
 Sync-CISExcelAndCsvData [[-ExcelPath] <String>] [[-CsvPath] <String>] [[-SheetName] <String>]
- [-ProgressAction <ActionPreference>] [<CommonParameters>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -32,22 +32,6 @@ Updates the 'AuditData' worksheet in 'excel.xlsx' with data from 'data.csv', add
 
 ## PARAMETERS
 
-### -CsvPath
-Specifies the path to the CSV file containing new data.
-This parameter is mandatory.
-
-```yaml
-Type: String
-Parameter Sets: (All)
-Aliases:
-
-Required: False
-Position: 2
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -ExcelPath
 Specifies the path to the Excel file to be updated.
 This parameter is mandatory.
@@ -64,16 +48,17 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ProgressAction
+### -CsvPath
-{{ Fill ProgressAction Description }}
+Specifies the path to the CSV file containing new data.
+This parameter is mandatory.
 
 ```yaml
-Type: ActionPreference
+Type: String
 Parameter Sets: (All)
-Aliases: proga
+Aliases:
 
 Required: False
-Position: Named
+Position: 2
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False

source/Private/Get-CISExoOutput.ps1

@@ -52,18 +52,105 @@ function Get-CISExoOutput {
                 # Test-BlockSharedMailboxSignIn.ps1
                 $MBX = Get-EXOMailbox -RecipientTypeDetails SharedMailbox
                 # [object[]]
-                return $MBX
+                # $MBX mock object:
+                <#
+                    $MBX = @(
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser1@domain.com"
+                            ExternalDirectoryObjectId = "123e4567-e89b-12d3-a456-426614174000"
+                        },
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser2@domain.com"
+                            ExternalDirectoryObjectId = "987e6543-21ba-12d3-a456-426614174000"
+                        },
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser3@domain.com"
+                            ExternalDirectoryObjectId = "abcddcba-98fe-76dc-a456-426614174000"
+                        }
+                    )
+                #>
+                return $MBX.ExternalDirectoryObjectId
             }
             '1.3.3' {
                 # Test-ExternalSharingCalendars.ps1
                 # Step: Retrieve sharing policies related to calendar sharing
+                # $sharingPolicies Mock Object
+                <#
+                    $sharingPolicies = [PSCustomObject]@{
+                        Name = "Default Sharing Policy"
+                        Domains = @("Anonymous:CalendarSharingFreeBusySimple")
+                        Enabled = $true
+                        Default = $true
+                    }
+                #>
                 $sharingPolicies = Get-SharingPolicy | Where-Object { $_.Domains -like '*CalendarSharing*' }
                 # [psobject[]]
                 return $sharingPolicies
             }
+            '1.3.3b' {
+                # $mailboxes Mock Object
+                <#
+                    $mailboxes = @(
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser1@domain.com"
+                            ExternalDirectoryObjectId = "123e4567-e89b-12d3-a456-426614174000"
+                            PrimarySmtpAddress = "SMBuser1@domain.com"
+                            PublishEnabled       = $False
+                            PublishedCalendarUrl = "https://example.com/calendar/smbuser1"
+                        },
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser2@domain.com"
+                            ExternalDirectoryObjectId = "987e6543-21ba-12d3-a456-426614174000"
+                            PrimarySmtpAddress = "SMBuser2@domain.com"
+                            PublishEnabled       = $False
+                            PublishedCalendarUrl = "https://example.com/calendar/smbuser2"
+                        },
+                        [PSCustomObject]@{
+                            UserPrincipalName = "SMBuser3@domain.com"
+                            ExternalDirectoryObjectId = "abcddcba-98fe-76dc-a456-426614174000"
+                            PrimarySmtpAddress = "SMBuser3@domain.com"
+                            PublishEnabled       = $False
+                            PublishedCalendarUrl = "https://example.com/calendar/smbuser3"
+                        }
+                    )
+                #>
+                $mailboxes = Get-Mailbox -ResultSize Unlimited
+                $results = foreach ($mailbox in $mailboxes) {
+                    # Get the name of the default calendar folder (depends on the mailbox's language)
+                    # Return single string Ex: return "Calendar" x 3 in array
+                    $calendarFolder = [string](Get-EXOMailboxFolderStatistics $mailbox.PrimarySmtpAddress -Folderscope Calendar | Where-Object { $_.FolderType -eq 'Calendar' }).Name
+                    Write-Verbose "Calendar folder for $($mailbox.PrimarySmtpAddress): $calendarFolder"
+                    # Get users calendar folder settings for their default Calendar folder
+                    # calendar has the format identity:\<calendar folder name>
+                    $calendar = Get-MailboxCalendarFolder -Identity "$($mailbox.PrimarySmtpAddress):\$calendarFolder"
+                    #Write-Host "Calendar object for $($mailbox.PrimarySmtpAddress): $calendar"
+                    Write-Verbose "Calendar publishing enabled: $($calendar.PublishEnabled)"
+                    # Check if calendar publishing is enabled and create a custom object
+                    if ($calendar.PublishEnabled) {
+                        [PSCustomObject]@{
+                            PrimarySmtpAddress   = $mailbox.PrimarySmtpAddress
+                            CalendarFolder       = $calendarFolder
+                            PublishEnabled       = $calendar.PublishEnabled
+                            PublishedCalendarUrl = $calendar.PublishedCalendarUrl
+                        }
+                    }
+                }
+                $calendarDetails = @()
+                foreach ($calendar in $results) {
+                    $calendarDetails += "Calendar: $($calendar.PrimarySmtpAddress); URL: $($calendar.PublishedCalendarUrl)"
+                }
+                return $calendarDetails
+            }
             '1.3.6' {
                 # Test-CustomerLockbox.ps1
                 # Step: Retrieve the organization configuration (Condition C: Pass/Fail)
+                # $orgConfig Mock Object:
+                <#
+                    # return $orgConfig
+                    $orgConfig = [PSCustomObject]@{
+                        CustomerLockBoxEnabled = $true
+                    }
+                #>
                 $orgConfig = Get-OrganizationConfig | Select-Object CustomerLockBoxEnabled
                 $customerLockboxEnabled = $orgConfig.CustomerLockBoxEnabled
                 # [bool]
@@ -74,12 +161,41 @@ function Get-CISExoOutput {
                 if (Get-Command Get-SafeLinksPolicy -ErrorAction SilentlyContinue) {
                     # 2.1.1 (L2) Ensure Safe Links for Office Applications is Enabled
                     # Retrieve all Safe Links policies
+                    # $policies Mock Object:
+                    <#
+                        $policies = @(
+                            [PSCustomObject]@{
+                                Name = "PolicyOne"
+                                EnableSafeLinksForEmail = $true
+                                EnableSafeLinksForTeams = $true
+                                EnableSafeLinksForOffice = $true
+                                TrackClicks = $true
+                                AllowClickThrough = $false
+                            },
+                            [PSCustomObject]@{
+                                Name = "PolicyTwo"
+                                EnableSafeLinksForEmail = $true
+                                EnableSafeLinksForTeams = $true
+                                EnableSafeLinksForOffice = $true
+                                TrackClicks = $true
+                                AllowClickThrough = $true
+                            },
+                            [PSCustomObject]@{
+                                Name = "PolicyThree"
+                                EnableSafeLinksForEmail = $true
+                                EnableSafeLinksForTeams = $true
+                                EnableSafeLinksForOffice = $true
+                                TrackClicks = $true
+                                AllowClickThrough = $false
+                            }
+                        )
+                    #>
                     $policies = Get-SafeLinksPolicy
                     # Initialize the details collection
                     $misconfiguredDetails = @()
                     foreach ($policy in $policies) {
                         # Get the detailed configuration of each policy
-                        $policyDetails = Get-SafeLinksPolicy -Identity $policy.Name
+                        $policyDetails = $policy #Get-SafeLinksPolicy -Identity $policy.Name
                         # Check each required property and record failures
                         # Condition A: Checking policy settings
                         $failures = @()
@@ -106,6 +222,12 @@ function Get-CISExoOutput {
                 # Condition A: The Common Attachment Types Filter is enabled in the Microsoft 365 Security & Compliance Center.
                 # Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `True`.
                 # Retrieve the attachment filter policy
+                # $attachmentFilter Mock Object
+                <#
+                    $attachmentFilter = [PSCustomObject]@{
+                        EnableFileFilter = $true
+                    }
+                #>
                 $attachmentFilter = Get-MalwareFilterPolicy -Identity Default | Select-Object EnableFileFilter
                 $result = $attachmentFilter.EnableFileFilter
                 # [bool]
@@ -115,6 +237,21 @@ function Get-CISExoOutput {
                 # Test-NotifyMalwareInternal.ps1
                 # 2.1.3 Ensure notifications for internal users sending malware is Enabled
                 # Retrieve all 'Custom' malware filter policies and check notification settings
+                # $malwareNotifications Mock Object
+                <#
+                    $malwareNotifications = @(
+                        [PSCustomObject]@{
+                            Identity = "Default"
+                            EnableInternalSenderAdminNotifications = $true
+                            RecommendedPolicyType = "Custom"
+                        },
+                        [PSCustomObject]@{
+                            Identity = "Anti-malware-Policy"
+                            EnableInternalSenderAdminNotifications = $true
+                            RecommendedPolicyType = "Custom"
+                        }
+                    )
+                #>
                 $malwareNotifications = Get-MalwareFilterPolicy | Where-Object { $_.RecommendedPolicyType -eq 'Custom' }
                 # [object[]]
                 return $malwareNotifications
@@ -124,6 +261,18 @@ function Get-CISExoOutput {
                 if (Get-Command Get-SafeAttachmentPolicy -ErrorAction SilentlyContinue) {
                     # Retrieve all Safe Attachment policies where Enable is set to True
                     # Check if ErrorAction needed below
+                    # $safeAttachmentPolicies Mock Object:
+                    <#
+                        $safeAttachmentPolicies = @(
+                            [PSCustomObject]@{
+                                Policy        = "Strict Preset Security Policy"
+                                Action        = "Block"
+                                QuarantineTag = "AdminOnlyAccessPolicy"
+                                Redirect      = $false
+                                Enabled       = $true
+                            }
+                        )
+                    #>
                     $safeAttachmentPolicies = Get-SafeAttachmentPolicy -ErrorAction SilentlyContinue | Where-Object { $_.Enable -eq $true }
                     # [object[]]
                     return $safeAttachmentPolicies
@@ -139,6 +288,17 @@ function Get-CISExoOutput {
                     # Retrieve the ATP policies for Office 365 and check Safe Attachments settings
                     $atpPolicies = Get-AtpPolicyForO365
                     # Check if the required ATP policies are enabled
+                    # $atpPolicyResult Mock Object:
+                    <#
+                        $atpPolicyResult = @(
+                            [PSCustomObject]@{
+                                Name                   = "Default"
+                                EnableATPForSPOTeamsODB = $true
+                                EnableSafeDocs         = $true
+                                AllowSafeDocsOpen      = $false
+                            }
+                        )
+                    #>
                     $atpPolicyResult = $atpPolicies | Where-Object {
                         $_.EnableATPForSPOTeamsODB -eq $true -and
                         $_.EnableSafeDocs -eq $true -and
@@ -153,13 +313,82 @@ function Get-CISExoOutput {
             }
             '2.1.6' {
                 # Test-SpamPolicyAdminNotify.ps1
-                # Retrieve the default hosted outbound spam filter policy
+                # Retrieve the hosted outbound spam filter policies
-                $hostedOutboundSpamFilterPolicy = Get-HostedOutboundSpamFilterPolicy | Where-Object { $_.IsDefault -eq $true }
+                # $spamPolicies Mock Object:
-                return $hostedOutboundSpamFilterPolicy
+                <#
+                    # Mock data representing multiple spam filter policies
+                    $spamPolicies = @(
+                        [PSCustomObject]@{
+                            Name                                       = "Default"
+                            IsDefault                                  = $true
+                            NotifyOutboundSpam                         = $true
+                            BccSuspiciousOutboundMail                  = $true
+                            NotifyOutboundSpamRecipients               = "admin@example.com"
+                            BccSuspiciousOutboundAdditionalRecipients  = "bccadmin@example.com"
+                        },
+                        [PSCustomObject]@{
+                            Name                                       = "Custom Policy 1"
+                            IsDefault                                  = $false
+                            NotifyOutboundSpam                         = $false
+                            BccSuspiciousOutboundMail                  = $true
+                            NotifyOutboundSpamRecipients               = ""
+                            BccSuspiciousOutboundAdditionalRecipients  = ""
+                        },
+                        [PSCustomObject]@{
+                            Name                                       = "Custom Policy 2"
+                            IsDefault                                  = $false
+                            NotifyOutboundSpam                         = $true
+                            BccSuspiciousOutboundMail                  = $false
+                            NotifyOutboundSpamRecipients               = "notify@example.com"
+                            BccSuspiciousOutboundAdditionalRecipients  = "bccnotify@example.com"
+                        }
+                    )
+                #>
+                $spamPolicies = Get-HostedOutboundSpamFilterPolicy
+                return $spamPolicies
             }
             '2.1.7' {
                 # Test-AntiPhishingPolicy.ps1
-                # Condition A: Ensure that an anti-phishing policy has been created
+                <#
+                    $antiPhishPolicies = @(
+                        [PSCustomObject]@{
+                            Identity = "Strict Preset Security Policy"
+                            Enabled = $true
+                            PhishThresholdLevel = 4
+                            EnableMailboxIntelligenceProtection = $true
+                            EnableMailboxIntelligence = $true
+                            EnableSpoofIntelligence = $true
+                            TargetedUsersToProtect = "John Doe;jdoe@contoso.net, Jane Does;janedoe@contoso.net"
+                        },
+                        [PSCustomObject]@{
+                            Identity = "Office365 AntiPhish Default"
+                            Enabled = $true
+                            PhishThresholdLevel = 2
+                            EnableMailboxIntelligenceProtection = $true
+                            EnableMailboxIntelligence = $true
+                            EnableSpoofIntelligence = $true
+                            TargetedUsersToProtect = $null  # Assuming it targets all users as it's the default
+                        },
+                        [PSCustomObject]@{
+                            Identity = "Admin"
+                            Enabled = $true
+                            PhishThresholdLevel = 2
+                            EnableMailboxIntelligenceProtection = $true
+                            EnableMailboxIntelligence = $true
+                            EnableSpoofIntelligence = $true
+                            TargetedUsersToProtect = $null  # Assuming it targets all users
+                        },
+                        [PSCustomObject]@{
+                            Identity = "Standard Preset Security Policy"
+                            Enabled = $true
+                            PhishThresholdLevel = 3
+                            EnableMailboxIntelligenceProtection = $true
+                            EnableMailboxIntelligence = $true
+                            EnableSpoofIntelligence = $true
+                            TargetedUsersToProtect = $null  # Assuming it targets all users
+                        }
+                    )
+                #>
                 $antiPhishPolicies = Get-AntiPhishPolicy
                 return $antiPhishPolicies
             }
@@ -284,7 +513,7 @@ function Get-CISExoOutput {
                 # Retrieve the necessary settings for Teams and Exchange Online
                 # Condition B: Verify that 'Monitor reported messages in Microsoft Teams' is checked in the Microsoft 365 Defender portal.
                 # Condition C: Ensure the 'Send reported messages to' setting in the Microsoft 365 Defender portal is set to 'My reporting mailbox only' with the correct report email addresses.
-                $ReportSubmissionPolicy = Get-ReportSubmissionPolicy | Select-Object -Property ReportJunkToCustomizedAddress, ReportNotJunkToCustomizedAddress, ReportPhishToCustomizedAddress,ReportJunkAddresses,ReportNotJunkAddresses,ReportPhishAddresses,ReportChatMessageEnabled,ReportChatMessageToCustomizedAddressEnabled
+                $ReportSubmissionPolicy = Get-ReportSubmissionPolicy | Select-Object -Property ReportJunkToCustomizedAddress, ReportNotJunkToCustomizedAddress, ReportPhishToCustomizedAddress, ReportJunkAddresses, ReportNotJunkAddresses, ReportPhishAddresses, ReportChatMessageEnabled, ReportChatMessageToCustomizedAddressEnabled
                 return $ReportSubmissionPolicy
             }
             default { throw "No match found for test: $Rec" }

source/Private/Get-PhishPolicyDetail.ps1

@@ -0,0 +1,18 @@
+function Get-PhishPolicyDetail {
+    param (
+        [Parameter(Mandatory = $true)]
+        [pscustomobject]$policy,
+
+        [Parameter(Mandatory = $true)]
+        [bool]$isCompliant
+    )
+
+    return "Policy: $($policy.Identity)`n" +
+    "Enabled: $($policy.Enabled)`n" +
+    "PhishThresholdLevel: $($policy.PhishThresholdLevel)`n" +
+    "MailboxIntelligenceProtection: $($policy.EnableMailboxIntelligenceProtection)`n" +
+    "MailboxIntelligence: $($policy.EnableMailboxIntelligence)`n" +
+    "SpoofIntelligence: $($policy.EnableSpoofIntelligence)`n" +
+    "TargetedUsersToProtect: $($policy.TargetedUsersToProtect -join ', ')`n" +
+    "IsCompliant: $isCompliant"
+}

source/Private/Test-PhishPolicyCompliance.ps1

@@ -0,0 +1,8 @@
+function Test-PhishPolicyCompliance {
+    param ($policy)
+    return ($policy.Enabled -eq $true -and
+        $policy.PhishThresholdLevel -ge 2 -and
+        $policy.EnableMailboxIntelligenceProtection -eq $true -and
+        $policy.EnableMailboxIntelligence -eq $true -and
+        $policy.EnableSpoofIntelligence -eq $true)
+}

source/Public/Export-M365SecurityAuditTable.ps1

@@ -69,8 +69,8 @@ function Export-M365SecurityAuditTable {
         [Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromCsv")]
         [string]$ExportPath,
 
-        [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromAuditResults")]
+        [Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromAuditResults")]
-        [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromCsv")]
+        [Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromCsv")]
         [switch]$ExportOriginalTests,
 
         [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromAuditResults")]

source/Public/Invoke-M365SecurityAudit.ps1

@@ -5,7 +5,7 @@
         The Invoke-M365SecurityAudit cmdlet performs a comprehensive security audit based on the specified parameters. It allows auditing of various configurations and settings within a Microsoft 365 environment, such as compliance with CIS benchmarks.
     .PARAMETER TenantAdminUrl
         The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.
-    .PARAMETER M365DomainForPWPolicyTest
+    .PARAMETER DomainName
         The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.
     .PARAMETER ELevel
         Specifies the E-Level (E3 or E5) for the audit. This parameter is optional and can be combined with the ProfileLevel parameter.
@@ -46,7 +46,7 @@
                         user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
         FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -ELevel "E5" -ProfileLevel "L1"
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -ELevel "E5" -ProfileLevel "L1"
 
         Performs a security audit for the E5 level and L1 profile in the specified Microsoft 365 environment.
         Output:
@@ -62,7 +62,7 @@
                         user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
         FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -IncludeIG1
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -IncludeIG1
 
         Performs an audit including all tests where IG1 is true.
         Output:
@@ -78,7 +78,7 @@
                         user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
         FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -SkipRecommendation '1.1.3', '2.1.1'
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -SkipRecommendation '1.1.3', '2.1.1'
         Performs an audit while excluding specific recommendations 1.1.3 and 2.1.1.
         Output:
         Status      : Fail
@@ -93,7 +93,7 @@
                         user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
         FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-        PS> $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com"
+        PS> $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com"
         PS> $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation
 
         Captures the audit results into a variable and exports them to a CSV file.
@@ -131,7 +131,7 @@ function Invoke-M365SecurityAudit {
 
         [Parameter(Mandatory = $false, HelpMessage = "Specify this to test only the default domain for password expiration policy when '1.3.1' is included in the tests to be run. The domain name of your organization, e.g., 'example.com'.")]
         [ValidatePattern('^[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$')]
-        [string]$M365DomainForPWPolicyTest,
+        [string]$DomainName,
 
         # E-Level with optional ProfileLevel selection
         [Parameter(Mandatory = $true, ParameterSetName = 'ELevelFilter')]
@@ -286,7 +286,7 @@ function Invoke-M365SecurityAudit {
                 Write-Progress -Activity "Executing Tests" -Status "Executing $($currentTestIndex) of $($totalTests): $($testFunction.Name)" -PercentComplete (($currentTestIndex / $totalTests) * 100)
                 $functionName = $testFunction.BaseName
                 if ($PSCmdlet.ShouldProcess($functionName, "Execute test")) {
-                    $auditResult = Invoke-TestFunction -FunctionFile $testFunction -DomainName $M365DomainForPWPolicyTest
+                    $auditResult = Invoke-TestFunction -FunctionFile $testFunction -DomainName $DomainName
                     # Add the result to the collection
                     [void]$allAuditResults.Add($auditResult)
                 }

source/tests/Test-AntiPhishingPolicy.ps1

@@ -1,104 +1,227 @@
 function Test-AntiPhishingPolicy {
     [CmdletBinding()]
     [OutputType([CISAuditResult])]
-    param (
+    param ()
-        # Aligned
-        # Parameters can be added if needed
-    )
-
     begin {
-        # Dot source the class script if necessary
-        #. .\source\Classes\CISAuditResult.ps1
-        # Initialization code, if needed
-        #$auditResults = @()
         $recnum = "2.1.7"
-
+        Write-Verbose "Running Test-AntiPhishingPolicy for $recnum..."
+        #. .\source\Classes\CISAuditResult.ps1
         <#
-        Conditions for 2.1.7 (L1) Ensure that an anti-phishing policy has been created
+        Conditions for 2.1.7 (L1) Ensure robust anti-phishing policies are enforced
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        - Specific conditions to check:
+        - Ensure the policies are checked in the following order of precedence: Strict, Standard, Custom, and Default.
-          - Condition A: Verify that an anti-phishing policy exists in the Microsoft 365 Security Center.
+            - Specific conditions to check:
-          - Condition B: Using PowerShell, ensure the anti-phishing policy is configured with appropriate settings such as enabling impersonation protection and spoof intelligence.
+                - Condition A: At least one policy (preferably Strict or Standard) should cover all users or be marked as default.
-
+                - Condition B: The policy must have enabled settings including PhishThresholdLevel at least 2, EnableMailboxIntelligenceProtection, EnableMailboxIntelligence, and EnableSpoofIntelligence.
         Validate test for a fail:
-        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+        - Identify any policy misconfigurations or absence of comprehensive coverage.
-        - Specific conditions to check:
+            - Specific conditions to check:
-          - Condition A: No anti-phishing policy exists in the Microsoft 365 Security Center.
+                - Condition A: No policy comprehensively covers all users or meets specified security criteria.
-          - Condition B: Using PowerShell, the anti-phishing policy is not configured with the required settings.
+                - Condition B: Critical security features like Spoof Intelligence or Mailbox Intelligence are disabled in the relevant policies.
         #>
     }
-
     process {
-
         try {
-            # Condition A: Ensure that an anti-phishing policy has been created
+            # Step 1: Retrieve all anti-phishing policies
+            #$VerbosePreference = "Continue"
+            Write-Verbose "Retrieving all anti-phishing policies..."
             $antiPhishPolicies = Get-CISExoOutput -Rec $recnum
-
+            # Step 2: Initialize variables to track compliance and details
-            # Condition B: Verify the anti-phishing policy settings using PowerShell
+            $compliantPolicy = $null
-            $validatedPolicies = $antiPhishPolicies | Where-Object {
+            $details = @()
-                $_.Enabled -eq $true -and
+            $failureReasons = @()
-                $_.PhishThresholdLevel -ge 2 -and
+            $hasFullCoveragePolicy = $false
-                $_.EnableMailboxIntelligenceProtection -eq $true -and
+            $policiesEvaluated = @()
-                $_.EnableMailboxIntelligence -eq $true -and
+            $PassedTests = @()
-                $_.EnableSpoofIntelligence -eq $true
+            $FailedTests = @()
+            Write-Verbose "Evaluating each policy for compliance..."
+            # Separate policies based on type
+            $strictPolicy = $antiPhishPolicies | Where-Object { $_.Identity -match "Strict Preset Security Policy" }
+            $standardPolicy = $antiPhishPolicies | Where-Object { $_.Identity -match "Standard Preset Security Policy" }
+            $customPolicies = $antiPhishPolicies | Where-Object { -not ($_.Identity -match "Strict Preset Security Policy" -or $_.Identity -match "Standard Preset Security Policy" -or $_.IsDefault) }
+            $defaultPolicy = $antiPhishPolicies | Where-Object { $_.IsDefault }
+            # Step 3: Check for Strict Preset Security Policy
+            if ($null -ne $strictPolicy) {
+                Write-Verbose "Evaluating policy: $($strictPolicy.Identity)"
+                $policiesEvaluated += $strictPolicy.Identity
+                # Check if policy is compliant
+                $isCompliant = Test-PhishPolicyCompliance -policy $strictPolicy
+                # Log failure reasons for non-compliant policies
+                if (-not $isCompliant) {
+                    $failureReasons += "Policy $($strictPolicy.Identity) does not meet compliance criteria."
+                    Write-Verbose "Policy $($strictPolicy.Identity) fails to meet one or more required conditions."
+                    $FailedTests += $strictPolicy.Identity
+                }
+                # Compile details of each policy using the new function
+                $details += Get-PhishPolicyDetail -policy $strictPolicy -isCompliant $isCompliant
+                # Check if policy is Strict and covers all users
+                if ($isCompliant) {
+                    $PassedTests += $strictPolicy.Identity
+                    Write-Verbose "Policy $($strictPolicy.Identity) is compliant."
+                    $strictUsersToProtect = $strictPolicy.TargetedUsersToProtect
+                    if ($strictUsersToProtect.count -eq 0) {
+                        $hasFullCoveragePolicy = $true
+                        $compliantPolicy = $strictPolicy
+                        $details += "Is Full Coverage Policy: $hasFullCoveragePolicy`n`n"
+                        Write-Verbose "$($strictPolicy.Identity) is compliant and covers all users. Stopping further evaluation."
+                    }
+                    else {
+                        $details += "Is Full Coverage Policy: $($false)`n`n"
+                    }
+                }
             }
-
+            # Step 4: Check for Standard Preset Security Policy if no full coverage from Strict
-            # Check if there is at least one policy that meets the requirements
+            if ($null -ne $standardPolicy -and $hasFullCoveragePolicy -ne $true) {
-            $nonCompliantItems = $antiPhishPolicies | Where-Object {
+                Write-Verbose "Evaluating policy: $($standardPolicy.Identity)"
-                $_.Enabled -ne $true -or
+                $policiesEvaluated += $standardPolicy.Identity
-                $_.PhishThresholdLevel -lt 2 -or
+                # Check if policy is compliant
-                $_.EnableMailboxIntelligenceProtection -ne $true -or
+                $isCompliant = Test-PhishPolicyCompliance -policy $standardPolicy
-                $_.EnableMailboxIntelligence -ne $true -or
+                # Log failure reasons for non-compliant policies
-                $_.EnableSpoofIntelligence -ne $true
+                if (-not $isCompliant) {
+                    $failureReasons += "$($standardPolicy.Identity) does not meet compliance criteria."
+                    Write-Verbose "$($standardPolicy.Identity) fails to meet one or more required conditions."
+                    $FailedTests += $standardPolicy.Identity
+                }
+                # Compile details of each policy using the new function
+                $details += Get-PhishPolicyDetail -policy $standardPolicy -isCompliant $isCompliant
+                # Check if policy is Strict and covers all users
+                if ($isCompliant) {
+                    Write-Verbose "$($standardPolicy.Identity) is compliant."
+                    $PassedTests += $standardPolicy.Identity
+                    $standardUsersToProtect = $standardPolicy.TargetedUsersToProtect
+                    if ($standardUsersToProtect.count -eq 0) {
+                        $hasFullCoveragePolicy = $true
+                        $compliantPolicy = $standardPolicy
+                        $details += "Is Full Coverage Policy: $hasFullCoveragePolicy`n`n"
+                        Write-Verbose "$($standardPolicy.Identity) is compliant and covers all users. Stopping further evaluation."
+                    }
+                    else {
+                        $details += "Is Full Coverage Policy: $($false)`n`n"
+                    }
+                }
             }
-            $compliantItems = $validatedPolicies
+            elseif ($null -ne $standardPolicy) {
-            $isCompliant = $compliantItems.Count -gt 0
+                Write-Verbose "$($standardPolicy.Identity) was not evaluated."
-
+                $isCompliant = Test-PhishPolicyCompliance -policy $standardPolicy
-            # Prepare failure reasons for non-compliant items
+                $details += Get-PhishPolicyDetail -policy $standardPolicy -isCompliant $isCompliant
-            $nonCompliantNames = $nonCompliantItems | ForEach-Object { $_.Name }
+                $details += "Is Full Coverage Policy: $($false)`n`n"
-            $failureReasons = if ($nonCompliantNames.Count -gt 0) {
+            }
-                "Reason: Does not meet one or more compliance criteria.`nNon-compliant Policies:`n" + ($nonCompliantNames -join "`n")
+            # Step 5: Check Custom Policies if no full coverage from Strict or Standard
+            if ($null -ne $customPolicies -and $hasFullCoveragePolicy -ne $true) {
+                foreach ($policy in $customPolicies) {
+                    if (-not $compliantPolicy) {
+                        Write-Verbose "Evaluating policy: $($policy.Identity)"
+                        $policiesEvaluated += $policy.Identity
+                        # Check if policy is compliant
+                        $isCompliant = Test-PhishPolicyCompliance -policy $policy
+                        # Log failure reasons for non-compliant policies
+                        if (-not $isCompliant) {
+                            $failureReasons += "$($policy.Identity) Policy does not meet compliance criteria."
+                            Write-Verbose "$($policy.Identity) Policy fails to meet one or more required conditions."
+                            $FailedTests += $policy.Identity
+                        }
+                        # Compile details of each policy using the new function
+                        $details += Get-PhishPolicyDetail -policy $policy -isCompliant $isCompliant
+                        # Check if policy is Custom and covers all users
+                        if ($isCompliant) {
+                            Write-Verbose "$($policy.Identity) is compliant."
+                            $PassedTests += $policy.Identity
+                            $custompolicyUsersToProtect = $policy.TargetedUsersToProtect
+                            if ($custompolicyUsersToProtect.count -eq 0) {
+                                $hasFullCoveragePolicy = $true
+                                $compliantPolicy = $policy
+                                $details += "Is Full Coverage Policy: $hasFullCoveragePolicy`n"
+                                Write-Verbose "$($policy.Identity) is compliant and covers all users. Stopping further evaluation."
+                            }
+                            else {
+                                $details += "Is Full Coverage Policy: $($false)`n`n"
+                            }
+                        }
+                    }
+                    elseif ($compliantPolicy) {
+                        Write-Verbose "$($policy.Identity) was not evaluated."
+                        $isCompliant = Test-PhishPolicyCompliance -policy $policy
+                        $details += Get-PhishPolicyDetail -policy $policy -isCompliant $isCompliant
+                        $details += "Is Full Coverage Policy: $($false)`n`n"
+                    }
+                }
+            }
+            elseif ($null -ne $customPolicies ) {
+                foreach ($policy in $customPolicies) {
+                    Write-Verbose "$($policy.Identity) was not evaluated."
+                    $isCompliant = Test-PhishPolicyCompliance -policy $policy
+                    $details += Get-PhishPolicyDetail -policy $policy -isCompliant $isCompliant
+                    $details += "Is Full Coverage Policy: $($false)`n`n"
+                }
+            }
+            # Step 6: Check Default Policy if no full coverage from Strict, Standard, or Custom
+            if ($null -ne $defaultPolicy -and $hasFullCoveragePolicy -ne $true) {
+                Write-Verbose "Evaluating policy: $($defaultPolicy.Identity)"
+                $policiesEvaluated += $defaultPolicy.Identity
+                # Check if policy is compliant
+                $isCompliant = Test-PhishPolicyCompliance -policy $defaultPolicy
+                # Log failure reasons for non-compliant policies
+                if (-not $isCompliant) {
+                    $failureReasons += "$($defaultPolicy.Identity) Policy does not meet compliance criteria."
+                    Write-Verbose "$($defaultPolicy.Identity) Policy fails to meet one or more required conditions."
+                    $FailedTests += $defaultPolicy.Identity
+                }
+                # Compile details of each policy using the new function
+                $details += Get-PhishPolicyDetail -policy $defaultPolicy -isCompliant $isCompliant
+                # Check if policy is Default and covers all users
+                if ($isCompliant) {
+                    Write-Verbose "$($defaultPolicy.Identity) is compliant."
+                    $PassedTests += $defaultPolicy.Identity
+                    $defaultUsersToProtect = $defaultPolicy.TargetedUsersToProtect
+                    if ($defaultUsersToProtect.count -eq 0) {
+                        $hasFullCoveragePolicy = $true
+                        $compliantPolicy = $defaultPolicy
+                        $details += "Is Full Coverage Policy: $hasFullCoveragePolicy`n"
+                        Write-Verbose "$($defaultPolicy.Identity) is compliant and covers all users. Stopping further evaluation."
+                    }
+                    else {
+                        $details += "Is Full Coverage Policy: $($false)`n`n"
+                    }
+                }
+            }
+            elseif ($null -ne $defaultPolicy) {
+                Write-Verbose "$($defaultPolicy.Identity) was not evaluated."
+                $isCompliant = Test-PhishPolicyCompliance -policy $defaultPolicy
+                $details += Get-PhishPolicyDetail -policy $defaultPolicy -isCompliant $isCompliant
+                $details += "Is Full Coverage Policy: $($false)`n`n"
+            }
+            # Determine overall compliance based on the evaluations
+            $isOverallCompliant = $hasFullCoveragePolicy -and $null -ne $compliantPolicy
+            # Prepare result details
+            $resultDetails = if ($isOverallCompliant) {
+                "Compliant Policy: $($compliantPolicy.Identity)`nDetails:`n" + ($details -join "`n")
             }
             else {
-                "N/A"
+                "Non-Compliant or No Policy Fully Covers All Users.`nDetails:`n" + ($details -join "`n")
             }
-
+            # Verbose output for the overall compliance
-            # Prepare details for non-compliant items
+            Write-Verbose "Overall Compliance: $isOverallCompliant"
-            $nonCompliantDetails = $nonCompliantItems | ForEach-Object {
+            #$VerbosePreference = "SilentlyContinue"
-                "Policy: $($_.Name)"
+            # Prepare the parameters for the audit result
-            }
-            $nonCompliantDetails = $nonCompliantDetails -join "`n"
-
-            # Prepare details based on compliance
-            $details = if ($nonCompliantItems) {
-                "Non-Compliant Items: $($nonCompliantItems.Count)`nDetails:`n$nonCompliantDetails"
-            }
-            else {
-                "Compliant Items: $($compliantItems.Count)"
-            }
-
-            # Parameter splat for Initialize-CISAuditResult function
             $params = @{
                 Rec           = $recnum
-                Result        = $nonCompliantItems.Count -eq 0
+                Result        = $isOverallCompliant
-                Status        = if ($isCompliant) { "Pass" } else { "Fail" }
+                Status        = if ($isOverallCompliant) { "Pass" } else { "Fail" }
-                Details       = $details
+                Details       = $resultDetails
-                FailureReason = $failureReasons
+                FailureReason = if (-not $isOverallCompliant) { $failureReasons -join "`n" } else { "None: All settings are correct based on the highest precedence policy that applies to all users." }
             }
-
+            # Initialize the audit result
-            # Create and populate the CISAuditResult object
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            $LastError = $_
+            Write-Error "An error occurred during the test: $_"
-            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
+            $auditResult = Get-TestError -LastError $_ -recnum $recnum
         }
     }
-
     end {
-        # Return auditResult
         return $auditResult
     }
 }
+
+

source/tests/Test-AuditDisabledFalse.ps1

@@ -5,11 +5,9 @@ function Test-AuditDisabledFalse {
     param (
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Conditions for 6.1.1 (L1) Ensure 'AuditDisabled' organizationally is set to 'False'
         #
         # Validate test for a pass:
@@ -25,18 +23,15 @@ function Test-AuditDisabledFalse {
         #   - Condition A: The `AuditDisabled` organizational setting is set to `True` in the Microsoft 365 admin center.
         #   - Condition B: Using PowerShell, the `AuditDisabled` property in the organization's configuration is set to `True`.
         #   - Condition C: Mailbox auditing is not enabled by default at the organizational level.
-
         # Initialization code, if needed
         $recnum = "6.1.1"
+        Write-Verbose "Running Test-AuditDisabledFalse for $recnum..."
     }
-
     process {
         try {
             # 6.1.1 (L1) Ensure 'AuditDisabled' organizationally is set to 'False'
-
             # Retrieve the AuditDisabled configuration (Condition B)
             $auditNotDisabled = Get-CISExoOutput -Rec $recnum
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $auditNotDisabled) {
                 "AuditDisabled is set to True"  # Condition A Fail
@@ -44,14 +39,12 @@ function Test-AuditDisabledFalse {
             else {
                 "N/A"
             }
-
             $details = if ($auditNotDisabled) {
                 "Audit is not disabled organizationally"  # Condition C Pass
             }
             else {
                 "Audit is disabled organizationally"  # Condition C Fail
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -67,7 +60,6 @@ function Test-AuditDisabledFalse {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-AuditLogSearch.ps1

@@ -5,23 +5,20 @@ function Test-AuditLogSearch {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "3.1.1"
-
+        Write-Verbose "Running Test-AuditLogSearch for $recnum..."
         <#
         Conditions for 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
             - Condition A: Audit log search is enabled in the Microsoft Purview compliance portal.
             - Condition B: The audit log retains user and admin activity for 90 days.
             - Condition C: Audit log search capabilities are functional (search results are displayed for activities within the past 30 days).
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -30,14 +27,10 @@ function Test-AuditLogSearch {
             - Condition C: Audit log search capabilities are non-functional (no search results are displayed for activities within the past 30 days).
         #>
     }
-
     process {
-
         try {
             # 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled
-
             $auditLogResult = Get-CISExoOutput -Rec $recnum
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $auditLogResult) {
                 # Condition A (Fail): Audit log search is not enabled in the Microsoft Purview compliance portal
@@ -46,7 +39,6 @@ function Test-AuditLogSearch {
             else {
                 "N/A"
             }
-
             $details = if ($auditLogResult) {
                 # Condition A (Pass): Audit log search is enabled in the Microsoft Purview compliance portal
                 "UnifiedAuditLogIngestionEnabled: True"
@@ -54,7 +46,6 @@ function Test-AuditLogSearch {
             else {
                 "UnifiedAuditLogIngestionEnabled: False"
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -70,7 +61,6 @@ function Test-AuditLogSearch {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-BlockMailForwarding.ps1

@@ -4,23 +4,20 @@ function Test-BlockMailForwarding {
     param (
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "6.2.1"
-
+        Write-Verbose "Running Test-BlockMailForwarding for $recnum..."
         <#
         Conditions for 6.2.1 (L1) Ensure all forms of mail forwarding are blocked and/or disabled
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
           - Condition A: Transport rules do not forward email to external domains.
           - Condition B: Anti-spam outbound policy is configured to disable automatic email forwarding to external domains.
           - Condition C: No exceptions to the forwarding rules unless explicitly defined by organizational policy.
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -29,26 +26,20 @@ function Test-BlockMailForwarding {
           - Condition C: Unapproved exceptions to the forwarding rules are present.
         #>
     }
-
     process {
         try {
             # 6.2.1 (L1) Ensure all forms of mail forwarding are blocked and/or disabled
-
             # Step 1: Retrieve the transport rules that redirect messages
             $transportRules,$nonCompliantSpamPolicies = Get-CISExoOutput -Rec $recnum
             $transportForwardingBlocked = $transportRules.Count -eq 0
-
             # Step 2: Check all anti-spam outbound policies
             $nonCompliantSpamPoliciesArray = @($nonCompliantSpamPolicies)
             $spamForwardingBlocked = $nonCompliantSpamPoliciesArray.Count -eq 0
-
             # Determine overall compliance
             $forwardingBlocked = $transportForwardingBlocked -and $spamForwardingBlocked
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = @()
             $details = @()
-
             if ($transportRules -ne 1) {
                 # Fail Condition A
                 $failureReasons += "Mail forwarding rules found: $($transportRules.Name -join ', ')"
@@ -58,7 +49,6 @@ function Test-BlockMailForwarding {
                 }
                 $details += "`n"
             }
-
             if ($nonCompliantSpamPoliciesArray.Count -gt 0) {
                 # Fail Condition B
                 $failureReasons += "Outbound spam policies allowing automatic forwarding found."
@@ -67,7 +57,6 @@ function Test-BlockMailForwarding {
                     "$($_.Name)|$($_.AutoForwardingMode)"
                 }
             }
-
             if ($failureReasons.Count -eq 0) {
                 $failureReasons = "N/A"
                 $details = "Both transport rules and outbound spam policies are configured correctly to block forwarding."
@@ -76,7 +65,6 @@ function Test-BlockMailForwarding {
                 $failureReasons = $failureReasons -join " | "
                 $details = $details -join "`n"
             }
-
             # Populate the audit result
             $params = @{
                 Rec           = $recnum
@@ -92,7 +80,6 @@ function Test-BlockMailForwarding {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-BlockSharedMailboxSignIn.ps1

@@ -8,10 +8,9 @@ function Test-BlockSharedMailboxSignIn {
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "1.2.2"
-
+        Write-Verbose "Running Test-BlockSharedMailboxSignIn for $recnum..."
         # Conditions for 1.2.2 (L1) Ensure sign-in to shared mailboxes is blocked
         #
         # Validate test for a pass:
@@ -26,36 +25,59 @@ function Test-BlockSharedMailboxSignIn {
         #   - Condition A: One or more shared mailboxes have the "Sign-in blocked" option enabled in the properties pane on the Microsoft 365 admin center.
         #   - Condition B: Using PowerShell, the `AccountEnabled` property for one or more shared mailboxes is set to `True`.
     }
-
     process {
         try {
             # Step: Retrieve shared mailbox details
-            $MBX = Get-CISExoOutput -Rec $recnum
+            # $objectids Mock Object
-            $objectids = $MBX.ExternalDirectoryObjectId
+            <#
+                $objectids = @(
+                    "123e4567-e89b-12d3-a456-426614174000",
+                    "987e6543-21ba-12d3-a456-426614174000",
+                    "abcddcba-98fe-76dc-a456-426614174000"
+                )
+            #>
+            $objectids = Get-CISExoOutput -Rec $recnum
+            # Step: Retrieve user details from Azure AD
+            # $users Mock Object
+            <#
+                $accountDetails = @(
+                    [PSCustomObject]@{
+                        ObjectId = "123e4567-e89b-12d3-a456-426614174000"
+                        DisplayName = "SMBuser1"
+                        AccountEnabled = $true
+                    },
+                    [PSCustomObject]@{
+                        ObjectId = "987e6543-21ba-12d3-a456-426614174000"
+                        DisplayName = "SMBuser2"
+                        AccountEnabled = $true
+                    },
+                    [PSCustomObject]@{
+                        ObjectId = "abcddcba-98fe-76dc-a456-426614174000"
+                        DisplayName = "SMBuser3"
+                        AccountEnabled = $true
+                    }
+                )
+            #>
             $users = Get-CISAadOutput -Rec $recnum
             # Step: Retrieve details of shared mailboxes from Azure AD (Condition B: Pass/Fail)
             $sharedMailboxDetails = $users | Where-Object {$_.objectid -in $objectids}
-
             # Step: Identify enabled mailboxes (Condition B: Pass/Fail)
             $enabledMailboxes = $sharedMailboxDetails | Where-Object { $_.AccountEnabled } | ForEach-Object { $_.DisplayName }
             $allBlocked = $enabledMailboxes.Count -eq 0
-
             # Step: Determine failure reasons based on enabled mailboxes (Condition A & B: Fail)
             $failureReasons = if (-not $allBlocked) {
-                "Some mailboxes have sign-in enabled: $($enabledMailboxes -join ', ')"
+                "Some mailboxes have sign-in enabled (AccountEnabled:True):`n$($enabledMailboxes -join ', ')"
             }
             else {
                 "N/A"
             }
-
             # Step: Prepare details for the audit result (Condition A & B: Pass/Fail)
             $details = if ($allBlocked) {
                 "All shared mailboxes have sign-in blocked."
             }
             else {
-                "Enabled Mailboxes: $($enabledMailboxes -join ', ')"
+                "AccountEnabled set to True Mailboxes: $($enabledMailboxes -join ', ')"
             }
-
             # Step: Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -71,7 +93,6 @@ function Test-BlockSharedMailboxSignIn {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-CommonAttachmentFilter.ps1

@@ -5,41 +5,37 @@ function Test-CommonAttachmentFilter {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         <#
-        Conditions for 2.1.2 (L1) Ensure the Common Attachment Types Filter is enabled
+            Conditions for 2.1.2 (L1) Ensure the Common Attachment Types Filter is enabled
-
+            Validate test for a pass:
-        Validate test for a pass:
+            - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+            - Specific conditions to check:
-        - Specific conditions to check:
+                - Condition A: The Common Attachment Types Filter is enabled in the Microsoft 365 Security & Compliance Center.
-          - Condition A: The Common Attachment Types Filter is enabled in the Microsoft 365 Security & Compliance Center.
+                - Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `True`.
-          - Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `True`.
+                - Condition C: Ensure that the setting is enabled in the highest priority policy listed if custom policies exist.
-          - Condition C: Ensure that the setting is enabled in the highest priority policy listed if custom policies exist.
+            Validate test for a fail:
-
+            - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
-        Validate test for a fail:
+            - Specific conditions to check:
-        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+                - Condition A: The Common Attachment Types Filter is not enabled in the Microsoft 365 Security & Compliance Center.
-        - Specific conditions to check:
+                - Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `False`.
-          - Condition A: The Common Attachment Types Filter is not enabled in the Microsoft 365 Security & Compliance Center.
+                - Condition C: Ensure that the setting is not enabled in the highest priority policy listed if custom policies exist.
-          - Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `False`.
-          - Condition C: Ensure that the setting is not enabled in the highest priority policy listed if custom policies exist.
         #>
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "2.1.2"
+        Write-Verbose "Running Test-CommonAttachmentFilter for $recnum..."
     }
-
     process {
         try {
             # 2.1.2 (L1) Ensure the Common Attachment Types Filter is enabled
             # Condition A: The Common Attachment Types Filter is enabled in the Microsoft 365 Security & Compliance Center.
             # Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `True`.
-
             # Retrieve the attachment filter policy
+            # $result Mock Object
+            # $result = $true
             $result = Get-CISExoOutput -Rec $recnum
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $result) {
                 # Condition A: The Common Attachment Types Filter is not enabled in the Microsoft 365 Security & Compliance Center.
@@ -49,14 +45,12 @@ function Test-CommonAttachmentFilter {
             else {
                 "N/A"
             }
-
             $details = if ($result) {
                 "File Filter Enabled: True"
             }
             else {
                 "File Filter Enabled: False"
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -72,7 +66,6 @@ function Test-CommonAttachmentFilter {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-CustomerLockbox.ps1

@@ -12,7 +12,7 @@ function Test-CustomerLockbox {
 
         # Initialization code, if needed
         $recnum = "1.3.6"
-
+        Write-Verbose "Running Test-CustomerLockbox for $recnum..."
         # Conditions for 1.3.6 (L2) Ensure the customer lockbox feature is enabled (Automated)
         #
         # Validate test for a pass:
@@ -29,12 +29,12 @@ function Test-CustomerLockbox {
         #   - Condition B: Using the SecureScore portal, the Customer Lockbox feature is not enabled.
         #   - Condition C: Using PowerShell, the Customer Lockbox feature is not set to `True`.
     }
-
     process {
         try {
             # Step: Retrieve the organization configuration (Condition C: Pass/Fail)
+            # $customerLockboxEnabled Mock Object
+            # $customerLockboxEnabled = $true
             $customerLockboxEnabled = Get-CISExoOutput -Rec $recnum
-
             # Step: Prepare failure reasons and details based on compliance (Condition A, B, & C: Fail)
             $failureReasons = if (-not $customerLockboxEnabled) {
                 "Customer lockbox feature is not enabled."
@@ -42,7 +42,6 @@ function Test-CustomerLockbox {
             else {
                 "N/A"
             }
-
             # Step: Prepare details for the audit result (Condition A, B, & C: Pass/Fail)
             $details = if ($customerLockboxEnabled) {
                 "Customer Lockbox Enabled: True"
@@ -50,7 +49,6 @@ function Test-CustomerLockbox {
             else {
                 "Customer Lockbox Enabled: False"
             }
-
             # Step: Create and populate the CISAuditResult object
             $params = @{
                 Rec            = $recnum
@@ -66,7 +64,6 @@ function Test-CustomerLockbox {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-EnableDKIM.ps1

@@ -4,24 +4,21 @@ function Test-EnableDKIM {
     param (
         # Aligned
         # Parameters can be added if needed
+        [string]$DomainName
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "2.1.9"
-
+        Write-Verbose "Running Test-EnableDKIM for $recnum..."
         <#
         Conditions for 2.1.9 (L1) Ensure DKIM is enabled for all Exchange Online Domains (Automated)
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
           - Condition A: DKIM is enabled for all Exchange Online domains in the Microsoft 365 security center.
           - Condition B: Using the Exchange Online PowerShell Module, the `CnameConfiguration.Enabled` property for each domain is set to `True`.
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -29,17 +26,21 @@ function Test-EnableDKIM {
           - Condition B: Using the Exchange Online PowerShell Module, the `CnameConfiguration.Enabled` property for one or more domains is set to `False`.
         #>
     }
-
     process {
-
         try {
             # 2.1.9 (L1) Ensure DKIM is enabled for all Exchange Online Domains
-
             # Retrieve DKIM configuration for all domains
             $dkimConfig = Get-CISExoOutput -Rec $recnum
-            $dkimResult = ($dkimConfig | ForEach-Object { $_.Enabled }) -notcontains $false
+            if (-not $DomainName) {
-            $dkimFailedDomains = $dkimConfig | Where-Object { -not $_.Enabled } | ForEach-Object { $_.Domain }
+                $dkimResult = ($dkimConfig | ForEach-Object { $_.Enabled }) -notcontains $false
-
+                $dkimFailedDomains = $dkimConfig | Where-Object { -not $_.Enabled } | ForEach-Object { $_.Domain }
+            }
+            else {
+                $dkimResult = ($dkimConfig | Where-Object { $_.Domain -eq $DomainName }).Enabled
+                if ($dkimResult -eq $false) {
+                    $dkimFailedDomains = $dkimConfig | Where-Object { $_.Domain -eq $DomainName } | ForEach-Object { $_.Domain }
+                }
+            }
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $dkimResult) {
                 "DKIM is not enabled for some domains"  # Condition A fail
@@ -47,21 +48,25 @@ function Test-EnableDKIM {
             else {
                 "N/A"
             }
-
+            $basedetails = "All domains have DKIM enabled"
             $details = if ($dkimResult) {
-                "All domains have DKIM enabled"  # Condition A pass
+                if ($DomainName) {
+                    "Domain: $DomainName; $basedetails"
+                }
+                else {
+                    $basedetails
+                }  # Condition A pass
             }
             else {
                 "DKIM not enabled for: $($dkimFailedDomains -join ', ')"  # Condition B fail
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
-                Rec            = $recnum
+                Rec           = $recnum
-                Result         = $dkimResult
+                Result        = $dkimResult
-                Status         = if ($dkimResult) { "Pass" } else { "Fail" }
+                Status        = if ($dkimResult) { "Pass" } else { "Fail" }
-                Details        = $details
+                Details       = $details
-                FailureReason  = $failureReasons
+                FailureReason = $failureReasons
             }
             $auditResult = Initialize-CISAuditResult @params
         }
@@ -70,7 +75,6 @@ function Test-EnableDKIM {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-ExternalSharingCalendars.ps1

@@ -5,14 +5,12 @@ function Test-ExternalSharingCalendars {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "1.3.3"
-
+        Write-Verbose "Running Test-ExternalSharingCalendars for $recnum..."
         # Conditions for 1.3.3 (L2) Ensure 'External sharing' of calendars is not available (Automated)
         #
         # Validate test for a pass:
@@ -27,12 +25,19 @@ function Test-ExternalSharingCalendars {
         #   - Condition A: In the Microsoft 365 admin center, external calendar sharing is enabled.
         #   - Condition B: Using the Exchange Online PowerShell Module, the `OrganizationConfig` property `ExternalSharingEnabled` is set to `True`.
     }
-
     process {
         try {
             # Step: Retrieve sharing policies related to calendar sharing
+            # $sharingPolicies Mock Object
+            <#
+                $sharingPolicies = [PSCustomObject]@{
+                    Name = "Default Sharing Policy"
+                    Domains = @("Anonymous:CalendarSharingFreeBusySimple")
+                    Enabled = $true
+                    Default = $true
+                }
+            #>
             $sharingPolicies = Get-CISExoOutput -Rec $recnum
-
             # Step (Condition A & B: Pass/Fail): Check if calendar sharing is disabled in all applicable policies
             $isExternalSharingDisabled = $true
             $sharingPolicyDetails = @()
@@ -42,23 +47,43 @@ function Test-ExternalSharingCalendars {
                     $sharingPolicyDetails += "$($policy.Name): Enabled"
                 }
             }
-
+            # Retrieve calendars with publishing enabled (from 1.3.3b)
-            # Step: Prepare failure reasons and details based on compliance (Condition A & B: Fail)
+            # $calendarDetails Mock Object
+            <#
+                $calendarDetails = @(
+                    [PSCustomObject]@{
+                        Calendar = "SMBuser1@domain.com"
+                        URL = "https://example.com/calendar/smbuser1"
+                    },
+                    [PSCustomObject]@{
+                        Calendar = "SMBuser2@domain.com"
+                        URL = "https://example.com/calendar/smbuser2"
+                    },
+                    [PSCustomObject]@{
+                        Calendar = "SMBuser4@domain.com"
+                        URL = "https://example.com/calendar/smbuser3"
+                    }
+                )
+            #>
+            $calendarDetails = Get-CISExoOutput -Rec "$("$recnum" + "b")"
+            # Build the failure reason string
             $failureReasons = if (-not $isExternalSharingDisabled) {
-                "Calendar sharing with external users is enabled in one or more policies."
+                $baseMessage = "Calendar sharing with external users is enabled in one or more policies."
+                if ($calendarDetails.Count -gt 0) {
+                    $baseMessage += "`nPrior to remediating, check the following mailboxes that have calendar publishing enabled: `n$($calendarDetails -join '`n')"
+                }
+                $baseMessage
             }
             else {
                 "N/A"
             }
-
             # Step: Prepare details for the audit result (Condition A & B: Pass/Fail)
             $details = if ($isExternalSharingDisabled) {
                 "Calendar sharing with external users is disabled."
             }
             else {
-                "Enabled Sharing Policies: $($sharingPolicyDetails -join ', ')"
+                "Enabled Sharing Policies:`n$($sharingPolicyDetails -join ', ')"
             }
-
             # Step: Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -74,7 +99,6 @@ function Test-ExternalSharingCalendars {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-IdentifyExternalEmail.ps1

@@ -9,10 +9,9 @@ function Test-IdentifyExternalEmail {
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "6.2.3"
-
+        Write-Verbose "Running Test-IdentifyExternalEmail for $recnum..."
         # Conditions for 6.2.3 (L1) Ensure email from external senders is identified
         #
         # Validate test for a pass:
@@ -29,16 +28,12 @@ function Test-IdentifyExternalEmail {
         #   - Condition B: The BypassAllowList contains unauthorized email addresses.
         #   - Condition C: External sender tag does not appear in email messages received from external sources.
     }
-
     process {
-
         try {
             # 6.2.3 (L1) Ensure email from external senders is identified
-
             # Retrieve external sender tagging configuration
             $externalInOutlook = Get-CISExoOutput -Rec $recnum
             $externalTaggingEnabled = ($externalInOutlook | ForEach-Object { $_.Enabled }) -contains $true
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $externalTaggingEnabled) {
                 # Condition A: External tagging is not enabled using PowerShell for all identities.
@@ -47,10 +42,8 @@ function Test-IdentifyExternalEmail {
             else {
                 "N/A"
             }
-
             # Details for external tagging configuration
             $details = "Enabled: $($externalTaggingEnabled); AllowList: $($externalInOutlook.AllowList)"
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -66,7 +59,6 @@ function Test-IdentifyExternalEmail {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-MailTipsEnabled.ps1

@@ -5,15 +5,12 @@ function Test-MailTipsEnabled {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
-
-        $auditResult = [CISAuditResult]::new()
         $recnum = "6.5.2"
-
+        Write-Verbose "Running Test-MailTipsEnabled for $recnum..."
         # Conditions for 6.5.2 (L2) Ensure MailTips are enabled for end users
         #
         # Validate test for a pass:
@@ -32,18 +29,14 @@ function Test-MailTipsEnabled {
         #   - Condition C: MailTipsGroupMetricsEnabled is not set to True.
         #   - Condition D: MailTipsLargeAudienceThreshold is not set to an acceptable value (default is 25).
     }
-
     process {
         try {
             # 6.5.2 (L2) Ensure MailTips are enabled for end users
-
             # Retrieve organization configuration for MailTips settings
             $orgConfig = Get-CISExoOutput -Rec $recnum
-
             # Check the MailTips settings (Conditions A, B, C, D)
             $allTipsEnabled = $orgConfig.MailTipsAllTipsEnabled -and $orgConfig.MailTipsGroupMetricsEnabled -and $orgConfig.MailTipsLargeAudienceThreshold -eq 25
             $externalRecipientsTipsEnabled = $orgConfig.MailTipsExternalRecipientsTipsEnabled
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not ($allTipsEnabled -and $externalRecipientsTipsEnabled)) {
                 "One or more MailTips settings are not configured as required."
@@ -51,14 +44,12 @@ function Test-MailTipsEnabled {
             else {
                 "N/A"
             }
-
             $details = if ($allTipsEnabled -and $externalRecipientsTipsEnabled) {
                 "MailTipsAllTipsEnabled: $($orgConfig.MailTipsAllTipsEnabled); MailTipsExternalRecipientsTipsEnabled: $($orgConfig.MailTipsExternalRecipientsTipsEnabled); MailTipsGroupMetricsEnabled: $($orgConfig.MailTipsGroupMetricsEnabled); MailTipsLargeAudienceThreshold: $($orgConfig.MailTipsLargeAudienceThreshold)"
             }
             else {
                 "One or more MailTips settings are not configured as required."
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -74,7 +65,6 @@ function Test-MailTipsEnabled {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-MailboxAuditingE3.ps1

@@ -4,11 +4,9 @@ function Test-MailboxAuditingE3 {
     param (
         # Parameters can be added if needed
     )
-
     begin {
         <#
         Conditions for 6.1.2 (L1) Ensure mailbox auditing for E3 users is Enabled
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
@@ -16,7 +14,6 @@ function Test-MailboxAuditingE3 {
           - Condition B: The `AuditAdmin` actions include `ApplyRecord`, `Create`, `HardDelete`, `MoveToDeletedItems`, `SendAs`, `SendOnBehalf`, `SoftDelete`, `Update`, `UpdateCalendarDelegation`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
           - Condition C: The `AuditDelegate` actions include `ApplyRecord`, `Create`, `HardDelete`, `MoveToDeletedItems`, `SendAs`, `SendOnBehalf`, `SoftDelete`, `Update`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
           - Condition D: The `AuditOwner` actions include `ApplyRecord`, `HardDelete`, `MoveToDeletedItems`, `SoftDelete`, `Update`, `UpdateCalendarDelegation`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -25,24 +22,19 @@ function Test-MailboxAuditingE3 {
           - Condition C: The `AuditDelegate` actions do not include `ApplyRecord`, `Create`, `HardDelete`, `MoveToDeletedItems`, `SendAs`, `SendOnBehalf`, `SoftDelete`, `Update`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
           - Condition D: The `AuditOwner` actions do not include `ApplyRecord`, `HardDelete`, `MoveToDeletedItems`, `SoftDelete`, `Update`, `UpdateCalendarDelegation`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
         #>
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
-
         $actionDictionaries = Get-Action -Dictionaries
         # E3 specific actions
         $AdminActions = $actionDictionaries.AdminActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }
         $DelegateActions = $actionDictionaries.DelegateActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed") }
         $OwnerActions = $actionDictionaries.OwnerActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }
-
         $allFailures = @()
         $recnum = "6.1.2"
+        Write-Verbose "Running Test-MailboxAuditingE3 for $recnum..."
         $allUsers = Get-CISMgOutput -Rec $recnum
         $processedUsers = @{}  # Dictionary to track processed users
-
     }
-
     process {
         if ($null -ne $allUsers) {
             $mailboxes = Get-CISExoOutput -Rec $recnum
@@ -52,14 +44,11 @@ function Test-MailboxAuditingE3 {
                         Write-Verbose "Skipping already processed user: $($user.UserPrincipalName)"
                         continue
                     }
-
                     $userUPN = $user.UserPrincipalName
                     $mailbox = $mailboxes | Where-Object { $_.UserPrincipalName -eq $user.UserPrincipalName }
-
                     $missingAdminActions = @()
                     $missingDelegateActions = @()
                     $missingOwnerActions = @()
-
                     if ($mailbox.AuditEnabled) {
                         foreach ($action in $AdminActions) {
                             if ($mailbox.AuditAdmin -notcontains $action) {
@@ -76,7 +65,6 @@ function Test-MailboxAuditingE3 {
                                 $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner")
                             }
                         }
-
                         if ($missingAdminActions.Count -gt 0 -or $missingDelegateActions.Count -gt 0 -or $missingOwnerActions.Count -gt 0) {
                             $allFailures += "$userUPN|True|$($missingAdminActions -join ',')|$($missingDelegateActions -join ',')|$($missingOwnerActions -join ',')"
                         }
@@ -84,11 +72,9 @@ function Test-MailboxAuditingE3 {
                     else {
                         $allFailures += "$userUPN|False|||" # Condition A for fail
                     }
-
                     # Mark the user as processed
                     $processedUsers[$user.UserPrincipalName] = $true
                 }
-
                 # Prepare failure reasons and details based on compliance
                 if ($allFailures.Count -eq 0) {
                     $failureReasons = "N/A"
@@ -102,7 +88,6 @@ function Test-MailboxAuditingE3 {
                 else {
                     "UserPrincipalName|AuditEnabled|AdminActionsMissing|DelegateActionsMissing|OwnerActionsMissing`n" + ($allFailures -join "`n")
                 }
-
                 # Populate the audit result
                 $params = @{
                     Rec           = $recnum
@@ -115,13 +100,10 @@ function Test-MailboxAuditingE3 {
             }
             catch {
                 Write-Error "An error occurred during the test: $_"
-
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
                 $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
                 # Call Initialize-CISAuditResult with error parameters
                 $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
@@ -137,15 +119,12 @@ function Test-MailboxAuditingE3 {
             $auditResult = Initialize-CISAuditResult @params
         }
     }
-
     end {
         $detailsLength = $details.Length
         Write-Verbose "Character count of the details: $detailsLength"
-
         if ($detailsLength -gt 32767) {
             Write-Verbose "Warning: The character count exceeds the limit for Excel cells."
         }
-
         return $auditResult
     }
 }

source/tests/Test-MailboxAuditingE5.ps1

@@ -4,11 +4,9 @@ function Test-MailboxAuditingE5 {
     param (
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Conditions for 6.1.3 (L1) Ensure mailbox auditing for E5 users is Enabled
         #
         # Validate test for a pass:
@@ -26,18 +24,16 @@ function Test-MailboxAuditingE5 {
         #   - Condition B: AuditAdmin actions do not include all of the following: ApplyRecord, Create, HardDelete, MailItemsAccessed, MoveToDeletedItems, Send, SendAs, SendOnBehalf, SoftDelete, Update, UpdateCalendarDelegation, UpdateFolderPermissions, UpdateInboxRules.
         #   - Condition C: AuditDelegate actions do not include all of the following: ApplyRecord, Create, HardDelete, MailItemsAccessed, MoveToDeletedItems, SendAs, SendOnBehalf, SoftDelete, Update, UpdateFolderPermissions, UpdateInboxRules.
         #   - Condition D: AuditOwner actions do not include all of the following: ApplyRecord, HardDelete, MailItemsAccessed, MoveToDeletedItems, Send, SoftDelete, Update, UpdateCalendarDelegation, UpdateFolderPermissions, UpdateInboxRules.
-
         $actionDictionaries = Get-Action -Dictionaries
         $AdminActions = $actionDictionaries.AdminActions.Keys
         $DelegateActions = $actionDictionaries.DelegateActions.Keys
         $OwnerActions = $actionDictionaries.OwnerActions.Keys
-
         $allFailures = @()
         $processedUsers = @{}
         $recnum = "6.1.3"
+        Write-Verbose "Running Test-MailboxAuditingE5 for $recnum..."
         $allUsers = Get-CISMgOutput -Rec $recnum
     }
-
     process {
         if ($null -ne $allUsers) {
             $mailboxes = Get-CISExoOutput -Rec $recnum
@@ -47,14 +43,11 @@ function Test-MailboxAuditingE5 {
                         Write-Verbose "Skipping already processed user: $($user.UserPrincipalName)"
                         continue
                     }
-
                     $mailbox = $mailboxes | Where-Object { $_.UserPrincipalName -eq $user.UserPrincipalName }
                     $userUPN = $user.UserPrincipalName
-
                     $missingAdminActions = @()
                     $missingDelegateActions = @()
                     $missingOwnerActions = @()
-
                     if ($mailbox.AuditEnabled) {
                         # Validate Admin actions
                         foreach ($action in $AdminActions) {
@@ -74,7 +67,6 @@ function Test-MailboxAuditingE5 {
                                 $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner") # Condition D
                             }
                         }
-
                         if ($missingAdminActions.Count -gt 0 -or $missingDelegateActions.Count -gt 0 -or $missingOwnerActions.Count -gt 0) {
                             $allFailures += "$userUPN|True|$($missingAdminActions -join ',')|$($missingDelegateActions -join ',')|$($missingOwnerActions -join ',')"
                         }
@@ -82,11 +74,9 @@ function Test-MailboxAuditingE5 {
                     else {
                         $allFailures += "$userUPN|False|||" # Condition A for fail
                     }
-
                     # Mark the user as processed
                     $processedUsers[$user.UserPrincipalName] = $true
                 }
-
                 # Prepare failure reasons and details based on compliance
                 if ($allFailures.Count -eq 0) {
                     $failureReasons = "N/A"
@@ -113,13 +103,10 @@ function Test-MailboxAuditingE5 {
             }
             catch {
                 Write-Error "An error occurred during the test: $_"
-
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
                 $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
                 # Call Initialize-CISAuditResult with error parameters
                 $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
@@ -135,15 +122,12 @@ function Test-MailboxAuditingE5 {
             $auditResult = Initialize-CISAuditResult @params
         }
     }
-
     end {
         $detailsLength = $details.Length
         Write-Verbose "Character count of the details: $detailsLength"
-
         if ($detailsLength -gt 32767) {
             Write-Verbose "Warning: The character count exceeds the limit for Excel cells."
         }
-
         return $auditResult
     }
 }

source/tests/Test-ModernAuthExchangeOnline.ps1

@@ -5,11 +5,9 @@ function Test-ModernAuthExchangeOnline {
         # Aligned
         # Define your parameters here
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Conditions for 6.5.1 (L1) Ensure modern authentication for Exchange Online is enabled
         #
         # Validate test for a pass:
@@ -25,17 +23,14 @@ function Test-ModernAuthExchangeOnline {
         #   - Condition A: Modern authentication for Exchange Online is not enabled.
         #   - Condition B: Exchange Online clients do not use modern authentication to log in to Microsoft 365 mailboxes.
         #   - Condition C: Users of older email clients, such as Outlook 2013 and Outlook 2016, are still able to authenticate to Exchange using Basic Authentication.
-
         $recnum = "6.5.1"
+        Write-Verbose "Running Test-ModernAuthExchangeOnline for $recnum..."
     }
-
     process {
         try {
             # 6.5.1 (L1) Ensure modern authentication for Exchange Online is enabled
-
             # Check modern authentication setting in Exchange Online configuration (Condition A and B)
             $orgConfig = Get-CISExoOutput -Rec $recnum
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $orgConfig.OAuth2ClientProfileEnabled) {
                 "Modern authentication is disabled"
@@ -43,10 +38,8 @@ function Test-ModernAuthExchangeOnline {
             else {
                 "N/A"
             }
-
             # Details include the current setting (Condition A and B)
             $details = "OAuth2ClientProfileEnabled: $($orgConfig.OAuth2ClientProfileEnabled) for Organization: $($orgConfig.Name)"
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -56,15 +49,12 @@ function Test-ModernAuthExchangeOnline {
                 FailureReason = $failureReasons
             }
             $auditResult = Initialize-CISAuditResult @params
-
         }
         catch {
             $LastError = $_
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-NoWhitelistDomains.ps1

@@ -5,24 +5,20 @@ function Test-NoWhitelistDomains {
         # Aligned
         # Define your parameters here
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "6.2.2"
-
+        Write-Verbose "Running Test-NoWhitelistDomains for $recnum..."
         <#
         Conditions for 6.2.2 (L1) Ensure mail transport rules do not whitelist specific domains (Automated)
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
           - Condition A: No mail transport rules whitelist any specific domains.
           - Condition B: Verification of mail transport rules using PowerShell shows no domains are whitelisted.
           - Condition C: Manual review in Exchange Online admin center confirms no whitelisted domains in transport rules.
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -31,11 +27,9 @@ function Test-NoWhitelistDomains {
           - Condition C: Manual review in Exchange Online admin center shows whitelisted domains in transport rules.
         #>
     }
-
     process {
         try {
             # 6.2.2 (L1) Ensure mail transport rules do not whitelist specific domains
-
             # Retrieve transport rules that whitelist specific domains
             # Condition A: Checking for transport rules that whitelist specific domains
             $whitelistedRules = Get-CISExoOutput -Rec $recnum
@@ -47,7 +41,6 @@ function Test-NoWhitelistDomains {
             else {
                 "N/A"
             }
-
             # Condition C: Prepare details about the whitelisted rules if found
             $details = if ($whitelistedRules) {
                 $ruleDetails = $whitelistedRules | ForEach-Object { "{0}: {1}" -f $_.Name, ($_.SenderDomainIs -join ', ') }
@@ -56,7 +49,6 @@ function Test-NoWhitelistDomains {
             else {
                 "No transport rules whitelisting specific domains found."
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -72,7 +64,6 @@ function Test-NoWhitelistDomains {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return auditResult
         return $auditResult

source/tests/Test-NotifyMalwareInternal.ps1

@@ -5,7 +5,6 @@ function Test-NotifyMalwareInternal {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         <#
         # Conditions for 2.1.3 (L1) Ensure notifications for internal users sending malware is Enabled
@@ -22,20 +21,33 @@ function Test-NotifyMalwareInternal {
         #   - Condition A: Notifications for internal users sending malware are not enabled in the Microsoft 365 Security & Compliance Center.
         #   - Condition B: Using PowerShell, the `NotifyInternal` property in the anti-malware policy is set to `False` or does not include any valid email addresses for notifications.
         #>
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "2.1.3"
+        Write-Verbose "Running Test-NotifyMalwareInternal for $recnum..."
     }
-
     process {
         try {
             # 2.1.3 Ensure notifications for internal users sending malware is Enabled
 
             # Retrieve all 'Custom' malware filter policies and check notification settings
+            # $malwareNotifications Mock Object
+            <#
+                $malwareNotifications = @(
+                    [PSCustomObject]@{
+                        Identity = "Default"
+                        EnableInternalSenderAdminNotifications = $true
+                        RecommendedPolicyType = "Custom"
+                    },
+                    [PSCustomObject]@{
+                        Identity = "Anti-malware-Policy"
+                        EnableInternalSenderAdminNotifications = $true
+                        RecommendedPolicyType = "Custom"
+                    }
+                )
+            #>
             $malwareNotifications = Get-CISExoOutput -Rec $recnum
-
             # Condition B: Using PowerShell, the `NotifyInternal` property in the anti-malware policy is set to `True` and includes at least one valid email address for notifications.
             $policiesToReport = @()
             foreach ($policy in $malwareNotifications) {
@@ -43,10 +55,8 @@ function Test-NotifyMalwareInternal {
                     $policiesToReport += "$($policy.Identity): Notifications Disabled"
                 }
             }
-
             # Determine the result based on the presence of custom policies without notifications
             $result = $policiesToReport.Count -eq 0
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if ($result) {
                 "N/A"
@@ -55,14 +65,12 @@ function Test-NotifyMalwareInternal {
                 # Condition A: Notifications for internal users sending malware are not enabled in the Microsoft 365 Security & Compliance Center.
                 "Some custom policies do not have notifications for internal users sending malware enabled."
             }
-
             $details = if ($result) {
                 "All custom malware policies have notifications enabled."
             }
             else {
-                "Misconfigured Policies: $($policiesToReport -join ', ')"
+                "Misconfigured Policies: $($policiesToReport -join '`n')"
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -78,7 +86,6 @@ function Test-NotifyMalwareInternal {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-ReportSecurityInTeams.ps1

@@ -5,20 +5,17 @@ function Test-ReportSecurityInTeams {
         # Aligned
         # Parameters can be defined here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "8.6.1"
+        Write-Verbose "Running Test-ReportSecurityInTeams for $recnum..."
     }
-
     process {
         try {
             # Test-ReportSecurityInTeams.ps1
             # 8.6.1 (L1) Ensure users can report security concerns in Teams
-
             # Retrieve the necessary settings for Teams and Exchange Online
             # Condition A: Ensure the 'Report a security concern' setting in the Teams admin center is set to 'On'.
             $CsTeamsMessagingPolicy = Get-CISMSTeamsOutput -Rec $recnum
@@ -35,7 +32,6 @@ function Test-ReportSecurityInTeams {
             $null -ne $ReportSubmissionPolicy.ReportPhishAddresses -and
             $ReportSubmissionPolicy.ReportChatMessageToCustomizedAddressEnabled -and
             -not $ReportSubmissionPolicy.ReportChatMessageEnabled
-
             $detailsString = @"
 The following settings are required for users to report security concerns in Teams:
 
@@ -75,7 +71,6 @@ ReportChatMessageToCustomizedAddressEnabled: True
             else {
                 $faildetailstring
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -91,7 +86,6 @@ ReportChatMessageToCustomizedAddressEnabled: True
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-RestrictOutlookAddins.ps1

@@ -5,16 +5,14 @@ function Test-RestrictOutlookAddins {
         # Aligned
         # Parameters could include credentials or other necessary data
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code
         $defaultPolicyFailureDetails = @()
         $relevantRoles = @('My Custom Apps', 'My Marketplace Apps', 'My ReadWriteMailbox Apps')
         $recnum = "6.3.1"
-
+        Write-Verbose "Running Test-RestrictOutlookAddins for $recnum..."
         # Conditions for 6.3.1 (L2) Ensure users installing Outlook add-ins is not allowed
         #
         # Validate test for a pass:
@@ -29,21 +27,17 @@ function Test-RestrictOutlookAddins {
         #   - Condition A: One or more of the roles MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are checked under Other roles.
         #   - Condition B: Using PowerShell, verify that MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are assigned to users.
     }
-
     process {
         try {
             # 6.3.1 (L2) Ensure users installing Outlook add-ins is not allowed
-
             # Check all mailboxes for custom policies with unallowed add-ins
             # Check Default Role Assignment Policy
             $customPolicyFailures, $defaultPolicy = Get-CISExoOutput -Rec $recnum
             $defaultPolicyRoles = $defaultPolicy.AssignedRoles | Where-Object { $_ -in $relevantRoles }
-
             # Condition A: Verify that the roles MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are unchecked under Other roles.
             if ($defaultPolicyRoles) {
                 $defaultPolicyFailureDetails = $defaultPolicyRoles
             }
-
             # Prepare result details string
             $detailsString = ""
             if ($customPolicyFailures) {
@@ -53,7 +47,6 @@ function Test-RestrictOutlookAddins {
             else {
                 $detailsString += "Custom Policy Failures: None | "
             }
-
             $detailsString += "Default Role Assignment Policy: "
             if ($defaultPolicyFailureDetails) {
                 $detailsString += ($defaultPolicyFailureDetails -join ', ')
@@ -61,10 +54,8 @@ function Test-RestrictOutlookAddins {
             else {
                 $detailsString += "Compliant"
             }
-
             # Determine result based on findings
             $isCompliant = -not ($customPolicyFailures -or $defaultPolicyFailureDetails)
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -80,7 +71,6 @@ function Test-RestrictOutlookAddins {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-RestrictStorageProvidersOutlook.ps1

@@ -5,7 +5,6 @@ function Test-RestrictStorageProvidersOutlook {
         # Aligned
         # Parameters can be added here if needed
     )
-
     begin {
         <#
         # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
@@ -22,25 +21,21 @@ function Test-RestrictStorageProvidersOutlook {
         #   - Condition A: Using PowerShell, verify that `AdditionalStorageProvidersAvailable` is not set to `False` in the OwaMailboxPolicy.
         #   - Condition B: Ensure that the command `Get-OwaMailboxPolicy | Format-Table Name, AdditionalStorageProvidersAvailable` does not return `False`.
         #>
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "6.5.3"
+        Write-Verbose "Running Test-RestrictStorageProvidersOutlook for $recnum..."
     }
-
     process {
         try {
             # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
-
             # Retrieve all OwaMailbox policies
             $owaPolicies = Get-CISExoOutput -Rec $recnum
             # Condition A: Check if AdditionalStorageProvidersAvailable is set to False
             $nonCompliantPolicies = $owaPolicies | Where-Object { $_.AdditionalStorageProvidersAvailable }
-
             # Determine compliance
             $allPoliciesRestricted = $nonCompliantPolicies.Count -eq 0
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if ($allPoliciesRestricted) {
                 "N/A"
@@ -48,14 +43,12 @@ function Test-RestrictStorageProvidersOutlook {
             else {
                 "One or more OwaMailbox policies allow AdditionalStorageProvidersAvailable."
             }
-
             $details = if ($allPoliciesRestricted) {
                 "All OwaMailbox policies restrict AdditionalStorageProvidersAvailable"
             }
             else {
                 "Non-compliant OwaMailbox policies: $($nonCompliantPolicies.Name -join ', ')"
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -71,7 +64,6 @@ function Test-RestrictStorageProvidersOutlook {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-SafeAttachmentsPolicy.ps1

@@ -2,76 +2,68 @@ function Test-SafeAttachmentsPolicy {
     [CmdletBinding()]
     [OutputType([CISAuditResult])]
     param ()
-
     begin {
         $recnum = "2.1.4"
-
+        Write-Verbose "Running Test-SafeAttachmentsPolicy for $recnum..."
         <#
-        Conditions for 2.1.4 (L2) Ensure Safe Attachments policy is enabled
+            Conditions for 2.1.4 (L2) Ensure Safe Attachments policy is enabled:
-
+            Validate test for a pass:
-        Validate test for a pass:
+                - Ensure the highest priority Safe Attachments policy is enabled.
-        - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+                - Check if the policy's action is set to 'Block'.
-        - Specific conditions to check:
+                - Confirm the QuarantineTag is set to 'AdminOnlyAccessPolicy'.
-          - Condition A: The Safe Attachments policy is enabled in the Microsoft 365 Defender portal.
+                - Verify that the Redirect setting is disabled.
-          - Condition B: The policy covers all recipients within the organization.
+            Validate test for a fail:
-          - Condition C: The policy action is set to "Dynamic Delivery" or "Quarantine".
+                - If the highest priority Safe Attachments policy's action is not set to 'Block'.
-          - Condition D: The policy is not disabled.
+                - If the QuarantineTag is not set to 'AdminOnlyAccessPolicy'.
-
+                - If the Redirect setting is enabled.
-        Validate test for a fail:
+                - If no enabled Safe Attachments policies are found.
-        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
-        - Specific conditions to check:
-          - Condition A: The Safe Attachments policy is not enabled in the Microsoft 365 Defender portal.
-          - Condition B: The policy does not cover all recipients within the organization.
-          - Condition C: The policy action is not set to "Dynamic Delivery" or "Quarantine".
-          - Condition D: The policy is disabled.
         #>
     }
-
     process {
+        # 2.1.4 (L2) Ensure Safe Attachments policy is enabled
+        # $safeAttachmentPolicies Mock Object
+        <#
+            $safeAttachmentPolicies = @(
+                [PSCustomObject]@{
+                    Policy        = "Strict Preset Security Policy"
+                    Action        = "Block"
+                    QuarantineTag = "AdminOnlyAccessPolicy"
+                    Redirect      = $false
+                    Enabled       = $true
+                }
+            )
+        #>
         $safeAttachmentPolicies = Get-CISExoOutput -Rec $recnum
         if ($safeAttachmentPolicies -ne 1) {
             try {
-                # Check if any Safe Attachments policy is enabled (Condition A)
+                $highestPriorityPolicy = $safeAttachmentPolicies | Select-Object -First 1
-                $result = $null -ne $safeAttachmentPolicies -and $safeAttachmentPolicies.Count -gt 0
-
                 # Initialize details and failure reasons
                 $details = @()
                 $failureReasons = @()
-
+                # Check policy specifics as per CIS benchmark requirements
-                foreach ($policy in $safeAttachmentPolicies) {
+                if ($highestPriorityPolicy.Action -ne 'Block') {
-                    # Initialize policy detail and failed status
+                    $failureReasons += "Policy action is not set to 'Block'."
-                    $failed = $false
+                }
-
+                if ($highestPriorityPolicy.QuarantineTag -ne 'AdminOnlyAccessPolicy') {
-                    # Check if the policy action is set to "Dynamic Delivery" or "Quarantine" (Condition C)
+                    $failureReasons += "Quarantine policy is not set to 'AdminOnlyAccessPolicy'."
-                    if ($policy.Action -notin @("DynamicDelivery", "Quarantine")) {
+                }
-                        $failureReasons += "Policy '$($policy.Name)' action is not set to 'Dynamic Delivery' or 'Quarantine'."
+                if ($highestPriorityPolicy.Redirect -ne $false) {
-                        $failed = $true
+                    $failureReasons += "Redirect is not disabled."
-                    }
-
-                    # Check if the policy is not disabled (Condition D)
-                    if (-not $policy.Enable) {
-                        $failureReasons += "Policy '$($policy.Name)' is disabled."
-                        $failed = $true
-                    }
-
-                    # Add policy details to the details array
-                    $details += [PSCustomObject]@{
-                        Policy  = $policy.Name
-                        Enabled = $policy.Enable
-                        Action  = $policy.Action
-                        Failed  = $failed
-                    }
                 }
-
                 # The result is a pass if there are no failure reasons
                 $result = $failureReasons.Count -eq 0
-
+                $details = [PSCustomObject]@{
+                    Policy        = $highestPriorityPolicy.Identity
+                    Action        = $highestPriorityPolicy.Action
+                    QuarantineTag = $highestPriorityPolicy.QuarantineTag
+                    Redirect      = $highestPriorityPolicy.Redirect
+                    Enabled       = $highestPriorityPolicy.Enable
+                }
                 # Format details for output manually
-                $detailsString = "Policy|Enabled|Action|Failed`n" + ($details |
+                $detailsString = "Policy|Action|QuarantineTag|Redirect|Enabled`n" + ($details |
-                    ForEach-Object {"$($_.Policy)|$($_.Enabled)|$($_.Action)|$($_.Failed)`n"}
+                    ForEach-Object { "$($_.Policy)|$($_.Action)|$($_.QuarantineTag)|$($_.Redirect)|$($_.Enabled)`n" }
                 )
-                $failureReasonsString = ($failureReasons | ForEach-Object { $_ }) -join ' '
+                $failureReasonsString = ($failureReasons -join "`n")
-
                 # Create and populate the CISAuditResult object
                 $params = @{
                     Rec           = $recnum
@@ -84,13 +76,10 @@ function Test-SafeAttachmentsPolicy {
             }
             catch {
                 Write-Error "An error occurred during the test: $_"
-
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
                 $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
                 # Call Initialize-CISAuditResult with error parameters
                 $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
@@ -106,7 +95,6 @@ function Test-SafeAttachmentsPolicy {
             $auditResult = Initialize-CISAuditResult @params
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-SafeAttachmentsTeams.ps1

@@ -5,11 +5,9 @@ function Test-SafeAttachmentsTeams {
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Conditions for 2.1.5 (L2) Ensure Safe Attachments for SharePoint, OneDrive, and Microsoft Teams is Enabled
         #
         # Validate test for a pass:
@@ -25,35 +23,60 @@ function Test-SafeAttachmentsTeams {
         #   - Condition A: Safe Attachments for SharePoint is not enabled.
         #   - Condition B: Safe Attachments for OneDrive is not enabled.
         #   - Condition C: Safe Attachments for Microsoft Teams is not enabled.
-
         # Initialization code, if needed
         $recnum = "2.1.5"
+        Write-Verbose "Running Test-SafeAttachmentsTeams for $recnum..."
     }
-
     process {
+        # $atpPolicyResult Mock Object
+        <#
+            $atpPolicyResult = @(
+                [PSCustomObject]@{
+                    Name                   = "Default"
+                    EnableATPForSPOTeamsODB = $true
+                    EnableSafeDocs         = $true
+                    AllowSafeDocsOpen      = $false
+                }
+            )
+        #>
         $atpPolicyResult = Get-CISExoOutput -Rec $recnum
         if ($atpPolicyResult -ne 1) {
             try {
                 # Condition A: Check Safe Attachments for SharePoint
                 # Condition B: Check Safe Attachments for OneDrive
                 # Condition C: Check Safe Attachments for Microsoft Teams
-
                 # Determine the result based on the ATP policy settings
                 $result = $null -ne $atpPolicyResult
+                #$atpPolicyResult | Where-Object { $_.Identity -eq "Default" }
+                if ($result) {
+                    $detailpass = [PSCustomObject]@{
+                        Name                    = $atpPolicyResult.Name
+                        EnableATPForSPOTeamsODB = $atpPolicyResult.EnableATPForSPOTeamsODB
+                        EnableSafeDocs          = $atpPolicyResult.EnableSafeDocs
+                        AllowSafeDocsOpen       = $atpPolicyResult.AllowSafeDocsOpen
+                    }
+                    $detailsString = $detailpass | ForEach-Object {
+                        @"
+Name: $($_.Name)
+EnableATPForSPOTeamsODB: $($_.EnableATPForSPOTeamsODB)
+EnableSafeDocs: $($_.EnableSafeDocs)
+AllowSafeDocsOpen: $($_.AllowSafeDocsOpen)
+`n
+"@
+                    }
+                }
                 $details = if ($result) {
-                    "ATP for SharePoint, OneDrive, and Teams is enabled with correct settings."
+                    $detailsString
                 }
                 else {
                     "ATP for SharePoint, OneDrive, and Teams is not enabled with correct settings."
                 }
-
                 $failureReasons = if ($result) {
                     "N/A"
                 }
                 else {
                     "ATP policy for SharePoint, OneDrive, and Microsoft Teams is not correctly configured."
                 }
-
                 # Create and populate the CISAuditResult object
                 $params = @{
                     Rec           = $recnum
@@ -66,13 +89,10 @@ function Test-SafeAttachmentsTeams {
             }
             catch {
                 Write-Error "An error occurred during the test: $_"
-
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
                 $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
                 # Call Initialize-CISAuditResult with error parameters
                 $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
@@ -88,7 +108,6 @@ function Test-SafeAttachmentsTeams {
             $auditResult = Initialize-CISAuditResult @params
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-SafeLinksOfficeApps.ps1

@@ -5,16 +5,14 @@ function Test-SafeLinksOfficeApps {
         # Aligned
         # Define your parameters here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "2.1.1"
-
+        Write-Verbose "Running Test-SafeLinksOfficeApps for $recnum..."
         <#
         Conditions for 2.1.1 (L2) Ensure Safe Links for Office Applications is Enabled
-
         Validate test for a pass:
         - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
         - Specific conditions to check:
@@ -25,7 +23,6 @@ function Test-SafeLinksOfficeApps {
             - Click protection settings: On
             - Do not track when users click safe links: Off
           - Condition B: Using the Exchange Online PowerShell Module, Safe Links policies are retrieved, and the relevant policy shows Safe Links for Office applications is enabled.
-
         Validate test for a fail:
         - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         - Specific conditions to check:
@@ -38,7 +35,6 @@ function Test-SafeLinksOfficeApps {
           - Condition B: Using the Exchange Online PowerShell Module, Safe Links policies are retrieved, and the relevant policy shows Safe Links for Office applications is not enabled.
         #>
     }
-
     process {
         # 2.1.1 (L2) Ensure Safe Links for Office Applications is Enabled
         # Retrieve all Safe Links policies
@@ -49,9 +45,8 @@ function Test-SafeLinksOfficeApps {
                 # Prepare the final result
                 # Condition B: Ensuring no misconfigurations
                 $result = $misconfiguredDetails.Count -eq 0
-                $details = if ($result) { "All Safe Links policies are correctly configured." } else { $misconfiguredDetails -join ' | ' }
+                $details = if ($result) { "All Safe Links policies are correctly configured." } else { $misconfiguredDetails -join '`n' }
                 $failureReasons = if ($result) { "N/A" } else { "The following Safe Links policies settings do not meet the recommended configuration: $($misconfiguredDetails -join ' | ')" }
-
                 # Create and populate the CISAuditResult object
                 $params = @{
                     Rec           = $recnum
@@ -64,13 +59,10 @@ function Test-SafeLinksOfficeApps {
             }
             catch {
                 Write-Error "An error occurred during the test: $_"
-
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
                 $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
                 # Call Initialize-CISAuditResult with error parameters
                 $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
@@ -86,7 +78,6 @@ function Test-SafeLinksOfficeApps {
             $auditResult = Initialize-CISAuditResult @params
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-SpamPolicyAdminNotify.ps1

@@ -1,78 +1,119 @@
 function Test-SpamPolicyAdminNotify {
     [CmdletBinding()]
     [OutputType([CISAuditResult])]
-    param (
+    param ()
-        # Aligned
-        # Parameters can be added if needed
-    )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
-
-        $recnum = "2.1.6"
-
         <#
-        Conditions for 2.1.6 (L1) Ensure Exchange Online Spam Policies are set to notify administrators
+            Conditions for 2.1.6 (L1) Ensure Exchange Online Spam Policies are set to notify administrators:
-
+            Description:
-        Validate recommendation details:
+                - This test ensures that Exchange Online Spam Policies are configured to notify administrators when a sender in the organization has been blocked for sending spam. It checks for the proper setup of both Bcc and Notify properties and the inclusion of valid email addresses.
-        - Confirm that the recommendation details are accurate and complete as per the CIS benchmark.
+            Validate test for a pass:
-
+                - Checks that the 'BccSuspiciousOutboundMail' and 'NotifyOutboundSpam' properties are enabled for the default policy.
-        Validate test for a pass:
+                - Ensures that valid email addresses are provided for 'NotifyOutboundSpamRecipients' and 'BccSuspiciousOutboundAdditionalRecipients'.
-        - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+            Validate test for a fail:
-        - Specific conditions to check:
+            - If the default policy is not found, this is flagged as a critical compliance issue.
-          - Condition A: In the Microsoft 365 Security & Compliance Center, the Exchange Online Spam Policies are set to notify administrators when a sender in the organization has been blocked for sending spam emails.
+            - The test fails if any of the following settings are incorrect:
-          - Condition B: Using PowerShell, the `NotifyOutboundSpam` and `NotifyOutboundSpamContact` properties are correctly set in all relevant spam filter policies.
+                - 'BccSuspiciousOutboundMail' is not enabled.
-
+                - 'NotifyOutboundSpam' is not enabled.
-        Validate test for a fail:
+                - 'NotifyOutboundSpamRecipients' does not contain at least one valid email address.
-        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+                - 'BccSuspiciousOutboundAdditionalRecipients' does not contain at least one valid email address.
-        - Specific conditions to check:
+            Note:
-          - Condition A: In the Microsoft 365 Security & Compliance Center, the Exchange Online Spam Policies are not set to notify administrators when a sender in the organization has been blocked for sending spam emails.
+            - While the primary focus is on the default policy, the function also retrieves and displays settings from additional policies that are not default, providing comprehensive insight into the organization's configuration. These additional policies are not used to determine the test's pass/fail status but are included in the details for informational purposes.
-          - Condition B: Using PowerShell, the `NotifyOutboundSpam` and `NotifyOutboundSpamContact` properties are not correctly set in all relevant spam filter policies.
         #>
+        $recnum = "2.1.6"
+        Write-Verbose "Running Test-SpamPolicyAdminNotify for $recnum..."
     }
-
     process {
         try {
-            # 2.1.6 Ensure Exchange Online Spam Policies are set to notify administrators
+            # Mock data representing multiple spam filter policies
-
+            <#
-            # Retrieve the default hosted outbound spam filter policy
+                $spamPolicies = @(
-            $hostedOutboundSpamFilterPolicy = Get-CISExoOutput -Rec $recnum
+                    [PSCustomObject]@{
-
+                        Name                                       = "Default"
-            # Check if both settings are enabled (Condition A and Condition B for pass)
+                        IsDefault                                  = $true
-            $bccSuspiciousOutboundMailEnabled = $hostedOutboundSpamFilterPolicy.BccSuspiciousOutboundMail
+                        NotifyOutboundSpam                         = $false
-            $notifyOutboundSpamEnabled = $hostedOutboundSpamFilterPolicy.NotifyOutboundSpam
+                        BccSuspiciousOutboundMail                  = $true
-            $areSettingsEnabled = $bccSuspiciousOutboundMailEnabled -and $notifyOutboundSpamEnabled
+                        NotifyOutboundSpamRecipients               = "admin@example.com"
-
+                        BccSuspiciousOutboundAdditionalRecipients  = "bccadmin@example.com"
-            # Prepare failure details if any setting is not enabled (Condition A and Condition B for fail)
+                    },
-            $failureDetails = @()
+                    [PSCustomObject]@{
-            if (-not $bccSuspiciousOutboundMailEnabled) {
+                        Name                                       = "Custom Policy 1"
-                $failureDetails += "BccSuspiciousOutboundMail is not enabled."
+                        IsDefault                                  = $false
+                        NotifyOutboundSpam                         = $false
+                        BccSuspiciousOutboundMail                  = $true
+                        NotifyOutboundSpamRecipients               = ""
+                        BccSuspiciousOutboundAdditionalRecipients  = ""
+                    },
+                    [PSCustomObject]@{
+                        Name                                       = "Custom Policy 2"
+                        IsDefault                                  = $false
+                        NotifyOutboundSpam                         = $true
+                        BccSuspiciousOutboundMail                  = $false
+                        NotifyOutboundSpamRecipients               = "notify@example.com"
+                        BccSuspiciousOutboundAdditionalRecipients  = "bccnotify@example.com"
+                    }
+                )
+            #>
+            $spamPolicies = Get-CISExoOutput -Rec $recnum
+            $defaultPolicy = $spamPolicies | Where-Object { $_.IsDefault -eq $true }
+            $additionalPolicies = $spamPolicies | Where-Object { $_.IsDefault -eq $false }
+            $details = @()
+            $failureReasons = @()
+            # Check the default policy settings and format details
+            # Build the details string for the default policy
+            if ($defaultPolicy) {
+                $details += "Default Policy: $($defaultPolicy.Name)`n`n" +
+                "Bcc Suspicious Outbound Mail: $($defaultPolicy.BccSuspiciousOutboundMail)`n" +
+                "Notify Outbound Spam: $($defaultPolicy.NotifyOutboundSpam)`n" +
+                "Notify Emails: $($defaultPolicy.NotifyOutboundSpamRecipients -join ', ')`n" +
+                "Bcc Emails: $($defaultPolicy.BccSuspiciousOutboundAdditionalRecipients -join ', ')"
+                if (-not $defaultPolicy.BccSuspiciousOutboundMail) {
+                    $failureReasons += "BccSuspiciousOutboundMail should be enabled."
+                }
+                if (-not $defaultPolicy.NotifyOutboundSpam) {
+                    $failureReasons += "NotifyOutboundSpam should be enabled."
+                }
+                if (-not $defaultPolicy.NotifyOutboundSpamRecipients) {
+                    $failureReasons += "NotifyOutboundSpamRecipients should have at least one valid email."
+                }
+                if (-not $defaultPolicy.BccSuspiciousOutboundAdditionalRecipients) {
+                    $failureReasons += "BccSuspiciousOutboundAdditionalRecipients should have at least one valid email."
+                }
             }
-            if (-not $notifyOutboundSpamEnabled) {
+            else {
-                $failureDetails += "NotifyOutboundSpam is not enabled."
+                $failureReasons += "No default policy found. This is critical for compliance."
             }
-
+            # Format additional policy details
-            # Create an instance of CISAuditResult and populate it
+            foreach ($policy in $additionalPolicies) {
+                $details += "`n`nAdditional Policy: $($policy.Name)`n`n" +
+                "Bcc Suspicious Outbound Mail: $($policy.BccSuspiciousOutboundMail)`n" +
+                "Notify Outbound Spam: $($policy.NotifyOutboundSpam)`n" +
+                "Notify Emails: $($policy.NotifyOutboundSpamRecipients -join ', ')`n" +
+                "Bcc Emails: $($policy.BccSuspiciousOutboundAdditionalRecipients -join ', ')"
+            }
+            $result = $failureReasons.Count -eq 0
+            $detailsString = $details -join "`n"
+            $failureReasonsString = $failureReasons -join "`n"
+            # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
-                Result        = $areSettingsEnabled
+                Result        = $result
-                Status        = if ($areSettingsEnabled) { "Pass" } else { "Fail" }
+                Status        = if ($result) { "Pass" } else { "Fail" }
-                Details       = if ($areSettingsEnabled) { "Both BccSuspiciousOutboundMail and NotifyOutboundSpam are enabled." } else { $failureDetails -join ' ' }
+                Details       = $detailsString
-                FailureReason = if (-not $areSettingsEnabled) { "One or both spam policies are not set to notify administrators." } else { "N/A" }
+                FailureReason = if (-not $result) { $failureReasonsString } else { "All settings are correct based on the default policy." }
             }
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            $LastError = $_
+            Write-Error "An error occurred during the test: $_"
-            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
+            $auditResult = Get-TestError -LastError $_ -recnum $recnum
         }
     }
-
     end {
-        # Return auditResult
+        # Return the audit result
         return $auditResult
     }
 }
-

tests/Unit/Private/Get-PhishPolicyDetail.tests.ps1

@@ -0,0 +1,27 @@
+$ProjectPath = "$PSScriptRoot\..\..\.." | Convert-Path
+$ProjectName = ((Get-ChildItem -Path $ProjectPath\*\*.psd1).Where{
+        ($_.Directory.Name -match 'source|src' -or $_.Directory.Name -eq $_.BaseName) -and
+        $(try { Test-ModuleManifest $_.FullName -ErrorAction Stop } catch { $false } )
+    }).BaseName
+
+
+Import-Module $ProjectName
+
+InModuleScope $ProjectName {
+    Describe Get-PrivateFunction {
+        Context 'Default' {
+            BeforeEach {
+                $return = Get-PrivateFunction -PrivateData 'string'
+            }
+
+            It 'Returns a single object' {
+                ($return | Measure-Object).Count | Should -Be 1
+            }
+
+            It 'Returns a string based on the parameter PrivateData' {
+                $return | Should -Be 'string'
+            }
+        }
+    }
+}
+

tests/Unit/Private/Test-PhishPolicyCompliance.tests.ps1

@@ -0,0 +1,27 @@
+$ProjectPath = "$PSScriptRoot\..\..\.." | Convert-Path
+$ProjectName = ((Get-ChildItem -Path $ProjectPath\*\*.psd1).Where{
+        ($_.Directory.Name -match 'source|src' -or $_.Directory.Name -eq $_.BaseName) -and
+        $(try { Test-ModuleManifest $_.FullName -ErrorAction Stop } catch { $false } )
+    }).BaseName
+
+
+Import-Module $ProjectName
+
+InModuleScope $ProjectName {
+    Describe Get-PrivateFunction {
+        Context 'Default' {
+            BeforeEach {
+                $return = Get-PrivateFunction -PrivateData 'string'
+            }
+
+            It 'Returns a single object' {
+                ($return | Measure-Object).Count | Should -Be 1
+            }
+
+            It 'Returns a string based on the parameter PrivateData' {
+                $return | Should -Be 'string'
+            }
+        }
+    }
+}
+