Merge pull request #156 from CriticalSolutionsNetwork/Bugfix--Fix-SPO-output-for-Get-SPOSite

fix: Fix SPO output for Get-SPOSite

.gitignore

@@ -16,4 +16,5 @@ markdownissues.txt
 node_modules
 package-lock.json
 Aligned.xlsx
-test-gh1.ps1
+test-gh1.ps1
+ModdedModules/*

CHANGELOG.md

@@ -6,6 +6,82 @@ The format is based on and uses the types of changes according to [Keep a Change
 
 ### Fixed
 
+- Get-SPOSite command to return all but voided output for no code runs (Ex: PowerAutomate)
+
+## [0.1.27] - 2025-01-13
+
+### Added
+
+- Added additional error handling to connect function to identify problematic steps when they occur.
+- Added new method of verifying spo tenant for Connect-SPOService branch of connect function.
+- Added method to avoid "assembly already loaded" error in PNP Powershell function on first run, subsequent runs in the same session will still throw the error.
+
+## [0.1.26] - 2024-08-04
+
+### Added
+
+- Added `New-M365SecurityAuditAuthObject` function to create a new authentication object for the security audit for app-based authentication.
+
+### Changed
+
+- Changed authentication options to include parameter for authenticating with a certificate.
+- Changed verbose output to ensure methods for suppressing all forms of output are available.
+
+## [0.1.25] - 2024-07-23
+
+### Fixed
+
+- Fixed test 1.3.1 as notification window for password expiration is no longer required.
+
+## [0.1.24] - 2024-07-07
+
+### Added
+
+- New private function `Get-AuditMailboxDetail` for 6.1.2 and 6.1.3 tests to get the action details for the test.
+
+### Changed
+
+- Changed `Get-Action` function to include both dictionaries.
+
+### Fixed
+
+- Fixed Test 1.3.3 to be the simpler version of the test while including output to check for current users sharing calendars.
+- Safe Attachments logic and added `$DomainName` as input to 2.1.4 to test main policy.
+
+### Docs
+
+- Updated `about_M365FoundationsCISReport` help file with new functions and changes.
+- Updated `Invoke-M365SecurityAudit` help file with examples.
+- Updated `Export-M365SecurityAudit` help file with examples.
+
+## [0.1.23] - 2024-07-02
+
+# Fixed
+
+- SPO tests formatting and output.
+
+## [0.1.22] - 2024-07-01
+
+### Added
+
+- Added hash and compress steps to `Export-M365SecurityAuditTable` function.
+
+## [0.1.21] - 2024-07-01
+
+### Fixed
+
+- SPO tests formatting and output.
+
+## [0.1.22] - 2024-07-01
+
+### Added
+
+- Added hash and compress steps to `Export-M365SecurityAuditTable` function.
+
+## [0.1.21] - 2024-07-01
+
+### Fixed
+
 - Formatting for MgGraph tests.
 
 ## [0.1.20] - 2024-06-30

README copy.md

@@ -1,5 +1,6 @@
 # M365FoundationsCISReport Module
-
+[![PSScriptAnalyzer](https://github.com/CriticalSolutionsNetwork/M365FoundationsCISReport/actions/workflows/powershell.yml/badge.svg)](https://github.com/CriticalSolutionsNetwork/M365FoundationsCISReport/actions/workflows/powershell.yml)
+[![pages-build-deployment](https://github.com/CriticalSolutionsNetwork/M365FoundationsCISReport/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/CriticalSolutionsNetwork/M365FoundationsCISReport/actions/workflows/pages/pages-build-deployment)
 ## License
 
 This PowerShell module is based on CIS benchmarks and is distributed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. This means:
@@ -11,83 +12,87 @@ This PowerShell module is based on CIS benchmarks and is distributed under the C
 For full license details, please visit [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en).
 
 [Register for and download CIS Benchmarks](https://www.cisecurity.org/cis-benchmarks)
+# Table of Contents
+1. [Invoke-M365SecurityAudit](#Invoke-M365SecurityAudit)
+2. [Export-M365SecurityAuditTable](#Export-M365SecurityAuditTable)
+3. [Get-AdminRoleUserLicense](#Get-AdminRoleUserLicense)
+4. [Get-MFAStatus](#Get-MFAStatus)
+5. [Grant-M365SecurityAuditConsent](#Grant-M365SecurityAuditConsent)
+6. [New-M365SecurityAuditAuthObject](#New-M365SecurityAuditAuthObject)
+7. [Remove-RowsWithEmptyCSVStatus](#Remove-RowsWithEmptyCSVStatus)
+8. [Sync-CISExcelAndCsvData](#Sync-CISExcelAndCsvData)
+
+## Module Dependencies
+
+The `M365FoundationsCISReport` module relies on several other PowerShell modules to perform its operations. The default run ensures these modules are installed with the specified versions. Use -NoModuleCheck to skip this step if you have installed the required modules previously and would like to suppress any output for automated runs.
+
+### Required Modules for Audit Functions
+
+Default modules used for audit functions:
+
+- **ExchangeOnlineManagement**
+  - Required Version: `3.3.0`
+
+- **Microsoft.Graph**
+  - Required Version: `2.4.0`
+
+- **PnP.PowerShell** (Optional, if PnP App authentication is used for SharePoint Online)
+  - Required Version: `2.5.0`
+
+- **Microsoft.Online.SharePoint.PowerShell** (If PnP authentication is not used (Default) )
+  - Required Version: `16.0.24009.12000`
+
+- **MicrosoftTeams**
+  - Required Version: `5.5.0`
+
+- **ImportExcel** (If importing or exporting Excel files)
+  - Required Version: `7.8.9`
+
+# EXAMPLES
 
-## Invoke-M365SecurityAudit
-### Synopsis
-Invokes a security audit for Microsoft 365 environments.
-### Syntax
 ```powershell
+# Example 1: Performing a security audit based on CIS benchmarks
+$auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com"
+$auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -ApprovedCloudStorageProviders "DropBox" -ApprovedFederatedDomains "northwind.com"
+# Suppressed output for automated runs
+$auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -NoModuleCheck -NoModuleCheck -DoNotConfirmConnections -Confirm:$false
 
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
+# Example 2: Exporting a security audit and it's nested tables to zipped CSV files
+Export-M365SecurityAuditTable -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests -ExportNestedTables
+    # Output Ex: 2024.07.07_14.55.55_M365FoundationsAudit_368B2E2F.zip
 
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-ELevel <String>] [-ProfileLevel <String>] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
+# Example 3: Retrieving licenses for users in administrative roles
+Get-AdminRoleUserLicense
 
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-IncludeIG1] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
-
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-IncludeIG2] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
-
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-IncludeIG3] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
-
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-IncludeRecommendation <String[]>] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
-
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-SkipRecommendation <String[]>] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
+# Example 4: Getting MFA status of users
+Get-MFAStatus -UserId "user@domain.com"
 
+# Example 5: Removing rows with empty status values from a CSV file
+Remove-RowsWithEmptyCSVStatus -FilePath "C:\Reports\Report.xlsx" -WorksheetName "Sheet1"
 
+# Example 6: Synchronizing CIS benchmark data with audit results
+Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -CsvPath "path\to\data.csv" -SheetName "Combined Profiles"
 
+# Example 7: Granting Microsoft Graph permissions to the auditor
+Grant-M365SecurityAuditConsent -UserPrincipalNameForConsent 'user@example.com'
 
+# Example 8: (PowerShell 7.x Only) Creating a new authentication object for the security audit for app-based authentication.
+$authParams = New-M365SecurityAuditAuthObject `
+  -ClientCertThumbPrint "ABCDEF1234567890ABCDEF1234567890ABCDEF12" `
+  -ClientId "12345678-1234-1234-1234-123456789012" `
+  -TenantId "12345678-1234-1234-1234-123456789012" `
+  -OnMicrosoftUrl "yourcompany.onmicrosoft.com" `
+  -SpAdminUrl "https://yourcompany-admin.sharepoint.com"
+Invoke-M365SecurityAudit -AuthParams $authParams -TenantAdminUrl "https://yourcompany-admin.sharepoint.com"
 ```
-### Parameters
-| Name  | Alias  | Description | Required? | Pipeline Input | Default Value |
-| - | - | - | - | - | - |
-| <nobr>TenantAdminUrl</nobr> |  | The URL of the tenant admin. This parameter is mandatory. | true | false |  |
-| <nobr>DomainName</nobr> |  | The domain name of the Microsoft 365 environment. This parameter is mandatory. | true | false |  |
-| <nobr>ELevel</nobr> |  | Specifies the E-Level \(E3 or E5\) for the audit. This parameter is optional and can be combined with the ProfileLevel parameter. | false | false |  |
-| <nobr>ProfileLevel</nobr> |  | Specifies the profile level \(L1 or L2\) for the audit. This parameter is optional and can be combined with the ELevel parameter. | false | false |  |
-| <nobr>IncludeIG1</nobr> |  | If specified, includes tests where IG1 is true. | false | false | False |
-| <nobr>IncludeIG2</nobr> |  | If specified, includes tests where IG2 is true. | false | false | False |
-| <nobr>IncludeIG3</nobr> |  | If specified, includes tests where IG3 is true. | false | false | False |
-| <nobr>IncludeRecommendation</nobr> |  | Specifies specific recommendations to include in the audit. Accepts an array of recommendation numbers. | false | false |  |
-| <nobr>SkipRecommendation</nobr> |  | Specifies specific recommendations to exclude from the audit. Accepts an array of recommendation numbers. | false | false |  |
-| <nobr>DoNotConnect</nobr> |  | If specified, the cmdlet will not establish a connection to Microsoft 365 services. | false | false | False |
-| <nobr>DoNotDisconnect</nobr> |  | If specified, the cmdlet will not disconnect from Microsoft 365 services after execution. | false | false | False |
-| <nobr>NoModuleCheck</nobr> |  | If specified, the cmdlet will not check for the presence of required modules. | false | false | False |
-| <nobr>WhatIf</nobr> | wi |  | false | false |  |
-| <nobr>Confirm</nobr> | cf |  | false | false |  |
-### Inputs
- - None. You cannot pipe objects to Invoke-M365SecurityAudit.
 
-### Outputs
- - CISAuditResult\\[\] The cmdlet returns an array of CISAuditResult objects representing the results of the security audit.
+# NOTE
+Ensure that you have the necessary permissions and administrative roles in your Microsoft 365 environment to run these cmdlets. Proper configuration and setup are required for accurate audit results.
 
-### Note
-This module is based on CIS benchmarks and is governed by the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. For more details, visit: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en
+# TROUBLESHOOTING NOTE
+If you encounter any issues while using the cmdlets, ensure that your environment meets the module prerequisites. Check for any updates or patches that may address known bugs. For issues related to specific cmdlets, refer to the individual help files for troubleshooting tips.
 
-### Examples
-**EXAMPLE 1**
-```powershell
-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.
-
-**EXAMPLE 2**
-```powershell
-Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -IncludeIG1
-```
-Performs an audit including all tests where IG1 is true.
-
-**EXAMPLE 3**
-```powershell
-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.
-
-**EXAMPLE 4**
-```powershell
-$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.
-
-### Links
-
- - [Online Version: [GitHub Repository URL]](#Online Version: [GitHub Repository URL])
+# SEE ALSO
+- [CIS Benchmarks](https://www.cisecurity.org/cis-benchmarks/)
+- [Microsoft 365 Security Documentation](https://docs.microsoft.com/en-us/microsoft-365/security/)
+- [PowerShell Documentation](https://docs.microsoft.com/en-us/powershell/)

help/Export-M365SecurityAuditTable.md

@@ -15,24 +15,27 @@ Exports M365 security audit results to a CSV file or outputs a specific test res
 ### OutputObjectFromAuditResultsSingle
 ```
 Export-M365SecurityAuditTable [-AuditResults] <CISAuditResult[]> [-OutputTestNumber] <String>
- [<CommonParameters>]
+ [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ExportAllResultsFromAuditResults
 ```
-Export-M365SecurityAuditTable [-AuditResults] <CISAuditResult[]> [-ExportAllTests] -ExportPath <String>
- [-ExportOriginalTests] [-ExportToExcel] [<CommonParameters>]
+Export-M365SecurityAuditTable [-AuditResults] <CISAuditResult[]> [-ExportNestedTables] -ExportPath <String>
+ [-ExportOriginalTests] [-ExportToExcel] [-Prefix <String>] [-ProgressAction <ActionPreference>] [-WhatIf]
+ [-Confirm] [<CommonParameters>]
 ```
 
 ### OutputObjectFromCsvSingle
 ```
-Export-M365SecurityAuditTable [-CsvPath] <String> [-OutputTestNumber] <String> [<CommonParameters>]
+Export-M365SecurityAuditTable [-CsvPath] <String> [-OutputTestNumber] <String>
+ [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ExportAllResultsFromCsv
 ```
-Export-M365SecurityAuditTable [-CsvPath] <String> [-ExportAllTests] -ExportPath <String> [-ExportOriginalTests]
- [-ExportToExcel] [<CommonParameters>]
+Export-M365SecurityAuditTable [-CsvPath] <String> [-ExportNestedTables] -ExportPath <String>
+ [-ExportOriginalTests] [-ExportToExcel] [-Prefix <String>] [-ProgressAction <ActionPreference>] [-WhatIf]
+ [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -125,8 +128,8 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ExportAllTests
-Switch to export all test results.
+### -ExportNestedTables
+Switch to export all test results. When specified, all test results are exported to the specified path.
 
 ```yaml
 Type: SwitchParameter
@@ -163,7 +166,7 @@ Type: SwitchParameter
 Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: False
 Accept pipeline input: False
@@ -185,15 +188,77 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -Prefix
+Add Prefix to filename after date when outputting to excel or csv.
+Validate that the count of letters in the prefix is less than 5.
+
+```yaml
+Type: String
+Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
+Aliases:
+
+Required: False
+Position: Named
+Default value: Corp
+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
+```
+
+### -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
+```
+
+### -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).
 
 ## INPUTS
 
-### [CISAuditResult[]], [string]
+### [CISAuditResult[]] - An array of CISAuditResult objects.
+### [string] - A path to a CSV file.
 ## OUTPUTS
 
-### [PSCustomObject]
+### [PSCustomObject] - A custom object containing the path to the zip file and its hash.
 ## NOTES
 
 ## RELATED LINKS

help/Get-AdminRoleUserLicense.md

@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-AdminRoleUserLicense
@@ -13,7 +13,7 @@ Retrieves user licenses and roles for administrative accounts from Microsoft 365
 ## SYNTAX
 
 ```
-Get-AdminRoleUserLicense [-SkipGraphConnection] [<CommonParameters>]
+Get-AdminRoleUserLicense [-SkipGraphConnection] [-ProgressAction <ActionPreference>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -54,6 +54,21 @@ 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-MFAStatus.md

@@ -13,7 +13,8 @@ Retrieves the MFA (Multi-Factor Authentication) status for Azure Active Director
 ## SYNTAX
 
 ```
-Get-MFAStatus [[-UserId] <String>] [-SkipMSOLConnectionChecks] [<CommonParameters>]
+Get-MFAStatus [[-UserId] <String>] [-SkipMSOLConnectionChecks] [-ProgressAction <ActionPreference>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -67,6 +68,21 @@ 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/Grant-M365SecurityAuditConsent.md

@@ -14,7 +14,8 @@ Grants Microsoft Graph permissions for an auditor.
 
 ```
 Grant-M365SecurityAuditConsent [-UserPrincipalNameForConsent] <String> [-SkipGraphConnection]
- [-SkipModuleCheck] [-SuppressRevertOutput] [-DoNotDisconnect] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-SkipModuleCheck] [-SuppressRevertOutput] [-DoNotDisconnect] [-ProgressAction <ActionPreference>] [-WhatIf]
+ [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -146,6 +147,21 @@ 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/Invoke-M365SecurityAudit.md

@@ -16,14 +16,16 @@ Invokes a security audit for Microsoft 365 environments.
 ```
 Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>]
  [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
- [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-AuthParams <CISAuthenticationParameters>]
+ [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ELevelFilter
 ```
 Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -ELevel <String>
  -ProfileLevel <String> [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>]
- [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm]
+ [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections]
+ [-AuthParams <CISAuthenticationParameters>] [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
 
@@ -31,35 +33,40 @@ Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -ELev
 ```
 Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG1]
  [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
- [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-AuthParams <CISAuthenticationParameters>]
+ [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### IG2Filter
 ```
 Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG2]
  [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
- [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-AuthParams <CISAuthenticationParameters>]
+ [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### IG3Filter
 ```
 Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG3]
  [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
- [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-AuthParams <CISAuthenticationParameters>]
+ [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### RecFilter
 ```
 Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -IncludeRecommendation <String[]>
  [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
- [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-AuthParams <CISAuthenticationParameters>]
+ [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### SkipRecFilter
 ```
 Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -SkipRecommendation <String[]>
  [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
- [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-AuthParams <CISAuthenticationParameters>]
+ [-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -395,6 +402,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AuthParams
+Specifies an authentication object containing parameters for application-based authentication. If provided, this will be used for connecting to services.
+
+```yaml
+Type: CISAuthenticationParameters
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -WhatIf
 Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
@@ -426,6 +448,21 @@ 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/M365FoundationsCISReport.md

@@ -26,6 +26,9 @@ Grants Microsoft Graph permissions for an auditor.
 ### [Invoke-M365SecurityAudit](Invoke-M365SecurityAudit)
 Invokes a security audit for Microsoft 365 environments.
 
+### [New-M365SecurityAuditAuthObject](New-M365SecurityAuditAuthObject)
+Creates a new CISAuthenticationParameters object for Microsoft 365 authentication.
+
 ### [Remove-RowsWithEmptyCSVStatus](Remove-RowsWithEmptyCSVStatus)
 Removes rows from an Excel worksheet where the 'CSV_Status' column is empty and saves the result to a new file.
 

help/New-M365SecurityAuditAuthObject.md

@@ -0,0 +1,149 @@
+---
+external help file: M365FoundationsCISReport-help.xml
+Module Name: M365FoundationsCISReport
+online version:
+schema: 2.0.0
+---
+
+# New-M365SecurityAuditAuthObject
+
+## SYNOPSIS
+Creates a new CISAuthenticationParameters object for Microsoft 365 authentication.
+
+## SYNTAX
+
+```
+New-M365SecurityAuditAuthObject [-ClientCertThumbPrint] <String> [-ClientId] <String> [-TenantId] <String>
+ [-OnMicrosoftUrl] <String> [-SpAdminUrl] <String> [-ProgressAction <ActionPreference>] [<CommonParameters>]
+```
+
+## DESCRIPTION
+The New-M365SecurityAuditAuthObject function constructs a new CISAuthenticationParameters object
+containing the necessary credentials and URLs for authenticating to various Microsoft 365 services.
+It validates input parameters to ensure they conform to expected formats and length requirements.
+An app registration in Azure AD with the required permissions to EXO, SPO, MSTeams and MgGraph is needed.
+
+## EXAMPLES
+
+### EXAMPLE 1
+```
+$authParams = New-M365SecurityAuditAuthObject -ClientCertThumbPrint "ABCDEF1234567890ABCDEF1234567890ABCDEF12" `
+                                                    -ClientId "12345678-1234-1234-1234-123456789012" `
+                                                    -TenantId "12345678-1234-1234-1234-123456789012" `
+                                                    -OnMicrosoftUrl "yourcompany.onmicrosoft.com" `
+                                                    -SpAdminUrl "https://yourcompany-admin.sharepoint.com"
+Creates a new CISAuthenticationParameters object with the specified credentials and URLs, validating each parameter's format and length.
+```
+
+## PARAMETERS
+
+### -ClientCertThumbPrint
+The thumbprint of the client certificate used for authentication.
+It must be a 40-character hexadecimal string.
+This certificate is used to authenticate the application in Azure AD.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: 1
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ClientId
+The Client ID (Application ID) of the Azure AD application.
+It must be a valid GUID format.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: 2
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -TenantId
+The Tenant ID of the Azure AD directory.
+It must be a valid GUID format representing your Microsoft 365 tenant.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: 3
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -OnMicrosoftUrl
+The URL of your onmicrosoft.com domain.
+It should be in the format 'example.onmicrosoft.com'.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: 4
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -SpAdminUrl
+The SharePoint admin URL, which should end with '-admin.sharepoint.com'.
+This URL is used for connecting to SharePoint Online.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: 5
+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).
+
+## INPUTS
+
+### None. You cannot pipe objects to this function.
+## OUTPUTS
+
+### CISAuthenticationParameters
+### The function returns an instance of the CISAuthenticationParameters class containing the authentication details.
+## NOTES
+Requires PowerShell 7.0 or later.
+
+## RELATED LINKS

help/Remove-RowsWithEmptyCSVStatus.md

@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version:
@@ -13,7 +13,8 @@ Removes rows from an Excel worksheet where the 'CSV_Status' column is empty and
 ## SYNTAX
 
 ```
-Remove-RowsWithEmptyCSVStatus [-FilePath] <String> [-WorksheetName] <String> [<CommonParameters>]
+Remove-RowsWithEmptyCSVStatus [-FilePath] <String> [-WorksheetName] <String>
+ [-ProgressAction <ActionPreference>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -60,6 +61,21 @@ 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/Sync-CISExcelAndCsvData.md

@@ -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>]
- [<CommonParameters>]
+ [-ProgressAction <ActionPreference>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -80,6 +80,21 @@ 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/about_M365FoundationsCISReport.md

@@ -18,9 +18,11 @@ The module includes functionality to synchronize audit results with CIS benchmar
 ```powershell
 # Example 1: Performing a security audit based on CIS benchmarks
 $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com"
+$auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -ApprovedCloudStorageProviders "DropBox" -ApprovedFederatedDomains "northwind.com"
 
-# Example 2: Exporting a security audit table to a CSV file
-Export-M365SecurityAuditTable -ExportAllTests -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests
+# Example 2: Exporting a security audit and it's nested tables to zipped CSV files
+Export-M365SecurityAuditTable -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests -ExportAllTests
+    # Output Ex: 2024.07.07_14.55.55_M365FoundationsAudit_368B2E2F.zip
 
 # Example 3: Retrieving licenses for users in administrative roles
 Get-AdminRoleUserLicense
@@ -36,6 +38,14 @@ Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -CsvPath "path\to\data.c
 
 # Example 7: Granting Microsoft Graph permissions to the auditor
 Grant-M365SecurityAuditConsent -UserPrincipalNameForConsent 'user@example.com'
+
+# Example 8: (PowerShell 7.x Only) Creating a new authentication object for the security audit for app-based authentication.
+$authParams = New-M365SecurityAuditAuthObject -ClientCertThumbPrint "ABCDEF1234567890ABCDEF1234567890ABCDEF12" `
+                                                            -ClientId "12345678-1234-1234-1234-123456789012" `
+                                                            -TenantId "12345678-1234-1234-1234-123456789012" `
+                                                            -OnMicrosoftUrl "yourcompany.onmicrosoft.com" `
+                                                            -SpAdminUrl "https://yourcompany-admin.sharepoint.com"
+Invoke-M365SecurityAudit -AuthParams $authParams -TenantAdminUrl "https://yourcompany-admin.sharepoint.com"
 ```
 
 # NOTE

helpers/Build-Help.ps1

@@ -1,13 +1,14 @@
 Import-Module .\output\module\M365FoundationsCISReport\*\*.psd1
+. .\source\Classes\CISAuditResult.ps1
 .\helpers\psDoc-master\src\psDoc.ps1 -moduleName M365FoundationsCISReport -outputDir docs -template ".\helpers\psDoc-master\src\out-html-template.ps1"
 .\helpers\psDoc-master\src\psDoc.ps1 -moduleName M365FoundationsCISReport -outputDir ".\" -template ".\helpers\psDoc-master\src\out-markdown-template.ps1" -fileName ".\README.md"
 
 
 <#
-    $ver = "v0.1.18"
+    $ver = "v0.1.28"
     git checkout main
     git pull origin main
-    git tag -a $ver -m "Release version $ver refactor Update"
+    git tag -a $ver -m "Release version $ver bugfix Update"
     git push origin $ver
     "Fix: PR #37"
     git push origin $ver
@@ -52,13 +53,12 @@ Register-SecretVault -Name ModuleBuildCreds -ModuleName `
 "SecretManagement.JustinGrote.CredMan" -ErrorAction Stop
 
 
-Set-Secret -Name "GalleryApiToken" -Vault ModuleBuildCreds
-Set-Secret -Name "GitHubToken" -Vault ModuleBuildCreds
+#Set-Secret -Name "GalleryApiToken" -Vault ModuleBuildCreds
+#Set-Secret -Name "GitHubToken" -Vault ModuleBuildCreds
 
 
 $GalleryApiToken = Get-Secret -Name "GalleryApiToken" -Vault ModuleBuildCreds -AsPlainText
 $GitHubToken = Get-Secret -Name "GitHubToken" -Vault ModuleBuildCreds -AsPlainText
 
-
 $GalleryApiToken
-$GitHubToken
+$GitHubToken

source/Classes/CISAuthenticationParameters.ps1

@@ -0,0 +1,43 @@
+class CISAuthenticationParameters {
+    [string]$ClientCertThumbPrint
+    [string]$ClientId
+    [string]$TenantId
+    [string]$OnMicrosoftUrl
+    [string]$SpAdminUrl
+
+    # Constructor with validation
+    CISAuthenticationParameters(
+        [string]$ClientCertThumbPrint,
+        [string]$ClientId,
+        [string]$TenantId,
+        [string]$OnMicrosoftUrl,
+        [string]$SpAdminUrl
+    ) {
+        # Validate ClientCertThumbPrint
+        if (-not $ClientCertThumbPrint -or $ClientCertThumbPrint.Length -ne 40 -or $ClientCertThumbPrint -notmatch '^[0-9a-fA-F]{40}$') {
+            throw [ArgumentException]::new("ClientCertThumbPrint must be a 40-character hexadecimal string.")
+        }
+        # Validate ClientId
+        if (-not $ClientId -or $ClientId -notmatch '^[0-9a-fA-F\-]{36}$') {
+            throw [ArgumentException]::new("ClientId must be a valid GUID in the format 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX'.")
+        }
+        # Validate TenantId
+        if (-not $TenantId -or $TenantId -notmatch '^[0-9a-fA-F\-]{36}$') {
+            throw [ArgumentException]::new("TenantId must be a valid GUID in the format 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX'.")
+        }
+        # Validate OnMicrosoftUrl
+        if (-not $OnMicrosoftUrl -or $OnMicrosoftUrl -notmatch '^[a-zA-Z0-9]+\.onmicrosoft\.com$') {
+            throw [ArgumentException]::new("OnMicrosoftUrl must be in the format 'example.onmicrosoft.com'.")
+        }
+        # Validate SpAdminUrl
+        if (-not $SpAdminUrl -or $SpAdminUrl -notmatch '^https:\/\/[a-zA-Z0-9\-]+\-admin\.sharepoint\.com$') {
+            throw [ArgumentException]::new("SpAdminUrl must be in the format 'https://[name]-admin.sharepoint.com'.")
+        }
+        # Assign validated properties
+        $this.ClientCertThumbPrint = $ClientCertThumbPrint
+        $this.ClientId = $ClientId
+        $this.TenantId = $TenantId
+        $this.OnMicrosoftUrl = $OnMicrosoftUrl
+        $this.SpAdminUrl = $SpAdminUrl
+    }
+}

source/M365FoundationsCISReport.psd1

@@ -33,7 +33,7 @@ Copyright = '(c) 2024 Douglas S. Rios (DrIOSx). All rights reserved.'
 Description = 'Automated assessment of 50 CIS 365 Foundations v3.0.0 benchmark.'
 
 # Minimum version of the Windows PowerShell engine required by this module
-PowerShellVersion = '5.0'
+# PowerShellVersion = '5.1'
 
 # Name of the Windows PowerShell host required by this module
 # PowerShellHostName = ''
@@ -51,7 +51,7 @@ PowerShellVersion = '5.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @()
+# RequiredModules = @()
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

source/Private/Assert-ModuleAvailability.ps1

@@ -1,37 +1,49 @@
 function Assert-ModuleAvailability {
+    [CmdletBinding()]
     [OutputType([void]) ]
     param(
         [string]$ModuleName,
         [string]$RequiredVersion,
         [string[]]$SubModules = @()
     )
-
-    try {
-        $module = Get-Module -ListAvailable -Name $ModuleName | Where-Object { $_.Version -ge [version]$RequiredVersion }
-
-        if ($null -eq $module) {
-            Write-Host "Installing $ModuleName module..." -ForegroundColor Yellow
-            Install-Module -Name $ModuleName -RequiredVersion $RequiredVersion -Force -AllowClobber -Scope CurrentUser | Out-Null
+    process {
+        try {
+                $module = Get-Module -ListAvailable -Name $ModuleName | Where-Object { $_.Version -ge [version]$RequiredVersion }
+                if ($null -eq $module) {
+                    Write-Verbose "Installing $ModuleName module..."
+                    Install-Module -Name $ModuleName -RequiredVersion $RequiredVersion -Force -AllowClobber -Scope CurrentUser | Out-Null
+                }
+                elseif ($module.Version -lt [version]$RequiredVersion) {
+                    Write-Verbose "Updating $ModuleName module to required version..."
+                    Update-Module -Name $ModuleName -RequiredVersion $RequiredVersion -Force | Out-Null
+                }
+                else {
+                    Write-Verbose "$ModuleName module is already at required version or newer."
+                }
+                if ($ModuleName -eq "Microsoft.Graph") {
+                    # "Preloading Microsoft.Graph assembly to prevent type-loading issues..."
+                    Write-Verbose "Preloading Microsoft.Graph assembly to prevent type-loading issues..."
+                    try {
+                        # Run a harmless cmdlet to preload the assembly
+                        Get-MgGroup -Top 1 -ErrorAction SilentlyContinue | Out-Null
+                    }
+                    catch {
+                        Write-Verbose "Could not preload Microsoft.Graph assembly. Error: $_"
+                    }
+                }
+                if ($SubModules.Count -gt 0) {
+                    foreach ($subModule in $SubModules) {
+                        Write-Verbose "Importing submodule $ModuleName.$subModule..."
+                        Get-Module "$ModuleName.$subModule" | Import-Module -RequiredVersion $RequiredVersion -ErrorAction Stop | Out-Null
+                    }
+                }
+                else {
+                    Write-Verbose "Importing module $ModuleName..."
+                    Import-Module -Name $ModuleName -RequiredVersion $RequiredVersion -ErrorAction Stop -WarningAction SilentlyContinue | Out-Null
+                }
         }
-        elseif ($module.Version -lt [version]$RequiredVersion) {
-            Write-Host "Updating $ModuleName module to required version..." -ForegroundColor Yellow
-            Update-Module -Name $ModuleName -RequiredVersion $RequiredVersion -Force | Out-Null
-        }
-        else {
-            Write-Host "$ModuleName module is already at required version or newer." -ForegroundColor Gray
-        }
-
-        if ($SubModules.Count -gt 0) {
-            foreach ($subModule in $SubModules) {
-                Write-Host "Importing submodule $ModuleName.$subModule..." -ForegroundColor DarkGray
-                Import-Module -Name "$ModuleName.$subModule" -RequiredVersion $RequiredVersion -ErrorAction Stop | Out-Null
-            }
-        } else {
-            Write-Host "Importing module $ModuleName..." -ForegroundColor DarkGray
-            Import-Module -Name $ModuleName -RequiredVersion $RequiredVersion -ErrorAction Stop -WarningAction SilentlyContinue | Out-Null
+        catch {
+            throw "Assert-ModuleAvailability:`n$_"
         }
     }
-    catch {
-        Write-Warning "An error occurred with module $ModuleName`: $_"
-    }
-}
+}

source/Private/Connect-M365Suite.ps1

@@ -5,6 +5,9 @@ function Connect-M365Suite {
         [Parameter(Mandatory = $false)]
         [string]$TenantAdminUrl,
 
+        [Parameter(Mandatory = $false)]
+        [CISAuthenticationParameters]$AuthParams,
+
         [Parameter(Mandatory)]
         [string[]]$RequiredConnections,
 
@@ -12,111 +15,131 @@ function Connect-M365Suite {
         [switch]$SkipConfirmation
     )
 
-    $VerbosePreference = "SilentlyContinue"
+    $VerbosePreference = if ($SkipConfirmation) { 'SilentlyContinue' } else { 'Continue' }
     $tenantInfo = @()
     $connectedServices = @()
 
     try {
-        if ($RequiredConnections -contains "AzureAD" -or $RequiredConnections -contains "AzureAD | EXO" -or $RequiredConnections -contains "AzureAD | EXO | Microsoft Graph") {
-            Write-Host "Connecting to Azure Active Directory..." -ForegroundColor Yellow
-            Connect-AzureAD -WarningAction SilentlyContinue | Out-Null
-            $tenantDetails = Get-AzureADTenantDetail -WarningAction SilentlyContinue
-            $tenantInfo += [PSCustomObject]@{
-                Service = "Azure Active Directory"
-                TenantName = $tenantDetails.DisplayName
-                TenantID = $tenantDetails.ObjectId
-            }
-            $connectedServices += "AzureAD"
-            Write-Host "Successfully connected to Azure Active Directory." -ForegroundColor Green
-        }
-
-        if ($RequiredConnections -contains "Microsoft Graph" -or $RequiredConnections -contains "EXO | Microsoft Graph") {
-            Write-Host "Connecting to Microsoft Graph with scopes: Directory.Read.All, Domain.Read.All, Policy.Read.All, Organization.Read.All" -ForegroundColor Yellow
+        if ($RequiredConnections -contains 'Microsoft Graph' -or $RequiredConnections -contains 'EXO | Microsoft Graph') {
             try {
-                Connect-MgGraph -Scopes "Directory.Read.All", "Domain.Read.All", "Policy.Read.All", "Organization.Read.All" -NoWelcome | Out-Null
+                Write-Verbose 'Connecting to Microsoft Graph...'
+                if ($AuthParams) {
+                    Connect-MgGraph -CertificateThumbprint $AuthParams.ClientCertThumbPrint -AppId $AuthParams.ClientId -TenantId $AuthParams.TenantId -NoWelcome | Out-Null
+                }
+                else {
+                    Connect-MgGraph -Scopes 'Directory.Read.All', 'Domain.Read.All', 'Policy.Read.All', 'Organization.Read.All' -NoWelcome | Out-Null
+                }
                 $graphOrgDetails = Get-MgOrganization
                 $tenantInfo += [PSCustomObject]@{
-                    Service = "Microsoft Graph"
+                    Service    = 'Microsoft Graph'
                     TenantName = $graphOrgDetails.DisplayName
-                    TenantID = $graphOrgDetails.Id
+                    TenantID   = $graphOrgDetails.Id
                 }
-                $connectedServices += "Microsoft Graph"
-                Write-Host "Successfully connected to Microsoft Graph with specified scopes." -ForegroundColor Green
+                $connectedServices += 'Microsoft Graph'
+                Write-Verbose 'Successfully connected to Microsoft Graph.'
             }
             catch {
-                Write-Host "Failed to connect to MgGraph, attempting device auth." -ForegroundColor Yellow
-                Connect-MgGraph -Scopes "Directory.Read.All", "Domain.Read.All", "Policy.Read.All", "Organization.Read.All" -UseDeviceCode -NoWelcome | Out-Null
-                $graphOrgDetails = Get-MgOrganization
-                $tenantInfo += [PSCustomObject]@{
-                    Service = "Microsoft Graph"
-                    TenantName = $graphOrgDetails.DisplayName
-                    TenantID = $graphOrgDetails.Id
+                throw "Failed to connect to Microsoft Graph: $($_.Exception.Message)"
+            }
+        }
+
+        if ($RequiredConnections -contains 'EXO' -or $RequiredConnections -contains 'AzureAD | EXO' -or $RequiredConnections -contains 'Microsoft Teams | EXO' -or $RequiredConnections -contains 'EXO | Microsoft Graph') {
+            try {
+                Write-Verbose 'Connecting to Exchange Online...'
+                if ($AuthParams) {
+                    Connect-ExchangeOnline -AppId $AuthParams.ClientId -CertificateThumbprint $AuthParams.ClientCertThumbPrint -Organization $AuthParams.OnMicrosoftUrl -ShowBanner:$false | Out-Null
                 }
-                $connectedServices += "Microsoft Graph"
-                Write-Host "Successfully connected to Microsoft Graph with specified scopes." -ForegroundColor Green
+                else {
+                    Connect-ExchangeOnline -ShowBanner:$false | Out-Null
+                }
+                $exoTenant = (Get-OrganizationConfig).Identity
+                $tenantInfo += [PSCustomObject]@{
+                    Service    = 'Exchange Online'
+                    TenantName = $exoTenant
+                    TenantID   = 'N/A'
+                }
+                $connectedServices += 'EXO'
+                Write-Verbose 'Successfully connected to Exchange Online.'
+            }
+            catch {
+                throw "Failed to connect to Exchange Online: $($_.Exception.Message)"
             }
         }
 
-        if ($RequiredConnections -contains "EXO" -or $RequiredConnections -contains "AzureAD | EXO" -or $RequiredConnections -contains "Microsoft Teams | EXO" -or $RequiredConnections -contains "EXO | Microsoft Graph") {
-            Write-Host "Connecting to Exchange Online..." -ForegroundColor Yellow
-            Connect-ExchangeOnline -ShowBanner:$false | Out-Null
-            $exoTenant = (Get-OrganizationConfig).Identity
-            $tenantInfo += [PSCustomObject]@{
-                Service = "Exchange Online"
-                TenantName = $exoTenant
-                TenantID = "N/A"
+        if ($RequiredConnections -contains 'SPO') {
+            try {
+                Write-Verbose 'Connecting to SharePoint Online...'
+                if ($AuthParams) {
+                    Connect-PnPOnline -Url $AuthParams.SpAdminUrl -ClientId $AuthParams.ClientId -Tenant $AuthParams.OnMicrosoftUrl -Thumbprint $AuthParams.ClientCertThumbPrint | Out-Null
+                }
+                else {
+                    Connect-SPOService -Url $TenantAdminUrl | Out-Null
+                }
+                $tenantName = if ($AuthParams) {
+                    (Get-PnPSite).Url
+                }
+                else {
+                    # Supress output from Get-SPOSite for powerautomate to avoid errors
+                    [void]($sites =  Get-SPOSite -Limit All)
+                    # Get the URL from the first site collection
+                    $url = $sites[0].Url
+                    # Use regex to extract the base URL up to the .com portion
+                    $baseUrl = [regex]::Match($url, 'https://[^/]+.com').Value
+                    # Output the base URL
+                    $baseUrl
+                }
+                $tenantInfo += [PSCustomObject]@{
+                    Service    = 'SharePoint Online'
+                    TenantName = $tenantName
+                }
+                $connectedServices += 'SPO'
+                Write-Verbose 'Successfully connected to SharePoint Online.'
+            }
+            catch {
+                throw "Failed to connect to SharePoint Online: $($_.Exception.Message)"
             }
-            $connectedServices += "EXO"
-            Write-Host "Successfully connected to Exchange Online." -ForegroundColor Green
         }
 
-        if ($RequiredConnections -contains "SPO") {
-            Write-Host "Connecting to SharePoint Online..." -ForegroundColor Yellow
-            Connect-SPOService -Url $TenantAdminUrl | Out-Null
-            $spoContext = Get-SPOCrossTenantHostUrl
-            $tenantName = Get-UrlLine -Output $spoContext
-            $tenantInfo += [PSCustomObject]@{
-                Service = "SharePoint Online"
-                TenantName = $tenantName
+        if ($RequiredConnections -contains 'Microsoft Teams' -or $RequiredConnections -contains 'Microsoft Teams | EXO') {
+            try {
+                Write-Verbose 'Connecting to Microsoft Teams...'
+                if ($AuthParams) {
+                    Connect-MicrosoftTeams -TenantId $AuthParams.TenantId -CertificateThumbprint $AuthParams.ClientCertThumbPrint -ApplicationId $AuthParams.ClientId | Out-Null
+                }
+                else {
+                    Connect-MicrosoftTeams | Out-Null
+                }
+                $teamsTenantDetails = Get-CsTenant
+                $tenantInfo += [PSCustomObject]@{
+                    Service    = 'Microsoft Teams'
+                    TenantName = $teamsTenantDetails.DisplayName
+                    TenantID   = $teamsTenantDetails.TenantId
+                }
+                $connectedServices += 'Microsoft Teams'
+                Write-Verbose 'Successfully connected to Microsoft Teams.'
+            }
+            catch {
+                throw "Failed to connect to Microsoft Teams: $($_.Exception.Message)"
             }
-            $connectedServices += "SPO"
-            Write-Host "Successfully connected to SharePoint Online." -ForegroundColor Green
         }
 
-        if ($RequiredConnections -contains "Microsoft Teams" -or $RequiredConnections -contains "Microsoft Teams | EXO") {
-            Write-Host "Connecting to Microsoft Teams..." -ForegroundColor Yellow
-            Connect-MicrosoftTeams | Out-Null
-            $teamsTenantDetails = Get-CsTenant
-            $tenantInfo += [PSCustomObject]@{
-                Service = "Microsoft Teams"
-                TenantName = $teamsTenantDetails.DisplayName
-                TenantID = $teamsTenantDetails.TenantId
-            }
-            $connectedServices += "Microsoft Teams"
-            Write-Host "Successfully connected to Microsoft Teams." -ForegroundColor Green
-        }
-
-        # Display tenant information and confirm with the user
         if (-not $SkipConfirmation) {
-            Write-Host "Connected to the following tenants:" -ForegroundColor Yellow
+            Write-Verbose 'Connected to the following tenants:'
             foreach ($tenant in $tenantInfo) {
-                Write-Host "Service: $($tenant.Service)" -ForegroundColor Cyan
-                Write-Host "Tenant Context: $($tenant.TenantName)`n" -ForegroundColor Green
-                #Write-Host "Tenant ID: $($tenant.TenantID)"
+                Write-Verbose "Service: $($tenant.Service) | Tenant: $($tenant.TenantName)"
             }
-            $confirmation = Read-Host "Do you want to proceed with these connections? (Y/N)"
+            $confirmation = Read-Host 'Do you want to proceed with these connections? (Y/N)'
             if ($confirmation -notlike 'Y') {
-                Write-Host "Connection setup aborted by user." -ForegroundColor Red
                 Disconnect-M365Suite -RequiredConnections $connectedServices
-                throw "User aborted connection setup."
+                throw 'User aborted connection setup.'
             }
         }
     }
     catch {
-        $VerbosePreference = "Continue"
-        Write-Host "There was an error establishing one or more connections: $_" -ForegroundColor Red
-        throw $_
+        $VerbosePreference = 'Continue'
+        throw "Connection failed: $($_.Exception.Message)"
     }
-
-    $VerbosePreference = "Continue"
-}
+    finally {
+        $VerbosePreference = 'Continue'
+    }
+}

source/Private/Disconnect-M365Suite.ps1

@@ -8,7 +8,7 @@ function Disconnect-M365Suite {
     # Clean up sessions
     try {
         if ($RequiredConnections -contains "EXO" -or $RequiredConnections -contains "AzureAD | EXO" -or $RequiredConnections -contains "Microsoft Teams | EXO") {
-            Write-Host "Disconnecting from Exchange Online..." -ForegroundColor Green
+            Write-Verbose "Disconnecting from Exchange Online..."
             Disconnect-ExchangeOnline -Confirm:$false | Out-Null
         }
     }
@@ -18,7 +18,7 @@ function Disconnect-M365Suite {
 
     try {
         if ($RequiredConnections -contains "AzureAD" -or $RequiredConnections -contains "AzureAD | EXO") {
-            Write-Host "Disconnecting from Azure AD..." -ForegroundColor Green
+            Write-Verbose "Disconnecting from Azure AD..."
             Disconnect-AzureAD | Out-Null
         }
     }
@@ -28,7 +28,7 @@ function Disconnect-M365Suite {
 
     try {
         if ($RequiredConnections -contains "Microsoft Graph") {
-            Write-Host "Disconnecting from Microsoft Graph..." -ForegroundColor Green
+            Write-Verbose "Disconnecting from Microsoft Graph..."
             Disconnect-MgGraph | Out-Null
         }
     }
@@ -38,8 +38,14 @@ function Disconnect-M365Suite {
 
     try {
         if ($RequiredConnections -contains "SPO") {
-            Write-Host "Disconnecting from SharePoint Online..." -ForegroundColor Green
-            Disconnect-SPOService | Out-Null
+            if (($script:PnpAuth)) {
+                Write-Verbose "Disconnecting from PnPOnline..."
+                Disconnect-PnPOnline | Out-Null
+            }
+            else {
+                Write-Verbose "Disconnecting from SharePoint Online..."
+                Disconnect-SPOService | Out-Null
+            }
         }
     }
     catch {
@@ -48,13 +54,12 @@ function Disconnect-M365Suite {
 
     try {
         if ($RequiredConnections -contains "Microsoft Teams" -or $RequiredConnections -contains "Microsoft Teams | EXO") {
-            Write-Host "Disconnecting from Microsoft Teams..." -ForegroundColor Green
+            Write-Verbose "Disconnecting from Microsoft Teams..."
             Disconnect-MicrosoftTeams | Out-Null
         }
     }
     catch {
         Write-Warning "Failed to disconnect from Microsoft Teams: $_"
     }
-
-    Write-Host "All necessary sessions have been disconnected." -ForegroundColor Green
+    Write-Verbose "All necessary sessions have been disconnected."
 }

source/Private/Get-Action.ps1

@@ -11,6 +11,12 @@ function Get-Action {
         [ValidateSet("Admin", "Delegate", "Owner")]
         [string]$ActionType,
 
+        [Parameter(Position = 2, Mandatory = $true, ParameterSetName = "ConvertActions")]
+        [Parameter(Position = 2, Mandatory = $true, ParameterSetName = "ReverseActions")]
+        [Parameter(Position = 1, Mandatory = $true, ParameterSetName = "GetDictionaries")]
+        [ValidateSet("6.1.2", "6.1.3")]
+        [string]$Version = "6.1.2",
+
         [Parameter(Position = 0, ParameterSetName = "ReverseActions")]
         [string[]]$AbbreviatedActions,
 
@@ -20,94 +26,152 @@ function Get-Action {
     )
 
     $Dictionary = @{
-        AdminActions = @{
-            ApplyRecord              = 'AR'
-            Copy                     = 'CP'
-            Create                   = 'CR'
-            FolderBind               = 'FB'
-            HardDelete               = 'HD'
-            MailItemsAccessed        = 'MIA'
-            Move                     = 'MV'
-            MoveToDeletedItems       = 'MTDI'
-            SendAs                   = 'SA'
-            SendOnBehalf             = 'SOB'
-            Send                     = 'SD'
-            SoftDelete               = 'SD'
-            Update                   = 'UP'
-            UpdateCalendarDelegation = 'UCD'
-            UpdateFolderPermissions  = 'UFP'
-            UpdateInboxRules         = 'UIR'
+        "6.1.2" = @{
+            AdminActions = @{
+                ApplyRecord              = 'AR'
+                Copy                     = 'CP'
+                Create                   = 'CR'
+                FolderBind               = 'FB'
+                HardDelete               = 'HD'
+                Move                     = 'MV'
+                MoveToDeletedItems       = 'MTDI'
+                SendAs                   = 'SA'
+                SendOnBehalf             = 'SOB'
+                SoftDelete               = 'SD'
+                Update                   = 'UP'
+                UpdateCalendarDelegation = 'UCD'
+                UpdateFolderPermissions  = 'UFP'
+                UpdateInboxRules         = 'UIR'
+            }
+            DelegateActions = @{
+                ApplyRecord             = 'AR'
+                Create                  = 'CR'
+                FolderBind              = 'FB'
+                HardDelete              = 'HD'
+                Move                    = 'MV'
+                MoveToDeletedItems      = 'MTDI'
+                SendAs                  = 'SA'
+                SendOnBehalf            = 'SOB'
+                SoftDelete              = 'SD'
+                Update                  = 'UP'
+                UpdateFolderPermissions = 'UFP'
+                UpdateInboxRules        = 'UIR'
+            }
+            OwnerActions = @{
+                ApplyRecord              = 'AR'
+                Create                   = 'CR'
+                HardDelete               = 'HD'
+                MailboxLogin             = 'ML'
+                Move                     = 'MV'
+                MoveToDeletedItems       = 'MTDI'
+                SoftDelete               = 'SD'
+                Update                   = 'UP'
+                UpdateCalendarDelegation = 'UCD'
+                UpdateFolderPermissions  = 'UFP'
+                UpdateInboxRules         = 'UIR'
+            }
         }
-        DelegateActions = @{
-            ApplyRecord             = 'AR'
-            Create                  = 'CR'
-            FolderBind              = 'FB'
-            HardDelete              = 'HD'
-            MailItemsAccessed       = 'MIA'
-            Move                    = 'MV'
-            MoveToDeletedItems      = 'MTDI'
-            SendAs                  = 'SA'
-            SendOnBehalf            = 'SOB'
-            SoftDelete              = 'SD'
-            Update                  = 'UP'
-            UpdateFolderPermissions = 'UFP'
-            UpdateInboxRules        = 'UIR'
-        }
-        OwnerActions = @{
-            ApplyRecord              = 'AR'
-            Create                   = 'CR'
-            HardDelete               = 'HD'
-            MailboxLogin             = 'ML'
-            MailItemsAccessed        = 'MIA'
-            Move                     = 'MV'
-            MoveToDeletedItems       = 'MTDI'
-            Send                     = 'SD'
-            SoftDelete               = 'SD'
-            Update                   = 'UP'
-            UpdateCalendarDelegation = 'UCD'
-            UpdateFolderPermissions  = 'UFP'
-            UpdateInboxRules         = 'UIR'
+        "6.1.3" = @{
+            AdminActions = @{
+                ApplyRecord              = 'AR'
+                Copy                     = 'CP'
+                Create                   = 'CR'
+                FolderBind               = 'FB'
+                HardDelete               = 'HD'
+                MailItemsAccessed        = 'MIA'
+                Move                     = 'MV'
+                MoveToDeletedItems       = 'MTDI'
+                SendAs                   = 'SA'
+                SendOnBehalf             = 'SOB'
+                Send                     = 'SD'
+                SoftDelete               = 'SD'
+                Update                   = 'UP'
+                UpdateCalendarDelegation = 'UCD'
+                UpdateFolderPermissions  = 'UFP'
+                UpdateInboxRules         = 'UIR'
+            }
+            DelegateActions = @{
+                ApplyRecord             = 'AR'
+                Create                  = 'CR'
+                FolderBind              = 'FB'
+                HardDelete              = 'HD'
+                MailItemsAccessed       = 'MIA'
+                Move                    = 'MV'
+                MoveToDeletedItems      = 'MTDI'
+                SendAs                  = 'SA'
+                SendOnBehalf            = 'SOB'
+                SoftDelete              = 'SD'
+                Update                  = 'UP'
+                UpdateFolderPermissions = 'UFP'
+                UpdateInboxRules        = 'UIR'
+            }
+            OwnerActions = @{
+                ApplyRecord              = 'AR'
+                Create                   = 'CR'
+                HardDelete               = 'HD'
+                MailboxLogin             = 'ML'
+                MailItemsAccessed        = 'MIA'
+                Move                     = 'MV'
+                MoveToDeletedItems       = 'MTDI'
+                Send                     = 'SD'
+                SoftDelete               = 'SD'
+                Update                   = 'UP'
+                UpdateCalendarDelegation = 'UCD'
+                UpdateFolderPermissions  = 'UFP'
+                UpdateInboxRules         = 'UIR'
+            }
         }
     }
 
     switch ($PSCmdlet.ParameterSetName) {
         "GetDictionaries" {
-            return $Dictionary
+            return $Dictionary[$Version]
         }
         "ConvertActions" {
-            $actionDictionary = switch ($ActionType) {
-                "Admin"    { $Dictionary.AdminActions }
-                "Delegate" { $Dictionary.DelegateActions }
-                "Owner"    { $Dictionary.OwnerActions }
+            try {
+                $Dictionary = $Dictionary[$Version]
+                $actionDictionary = switch ($ActionType) {
+                    "Admin"    { $Dictionary.AdminActions }
+                    "Delegate" { $Dictionary.DelegateActions }
+                    "Owner"    { $Dictionary.OwnerActions }
+                }
+
+                $abbreviatedActions = @()
+                foreach ($action in $Actions) {
+                    if ($actionDictionary.ContainsKey($action)) {
+                        $abbreviatedActions += $actionDictionary[$action]
+                    }
+                }
+                return $abbreviatedActions
+            }
+            catch {
+                throw $_
             }
 
-            $abbreviatedActions = @()
-            foreach ($action in $Actions) {
-                if ($actionDictionary.ContainsKey($action)) {
-                    $abbreviatedActions += $actionDictionary[$action]
-                }
-            }
-            return $abbreviatedActions
         }
         "ReverseActions" {
-            $reverseDictionary = @{}
-            $originalDictionary = switch ($ReverseActionType) {
-                "Admin"    { $Dictionary.AdminActions }
-                "Delegate" { $Dictionary.DelegateActions }
-                "Owner"    { $Dictionary.OwnerActions }
-            }
-
-            foreach ($key in $originalDictionary.Keys) {
-                $reverseDictionary[$originalDictionary[$key]] = $key
-            }
-
-            $fullNames = @()
-            foreach ($abbrAction in $AbbreviatedActions) {
-                if ($reverseDictionary.ContainsKey($abbrAction)) {
-                    $fullNames += $reverseDictionary[$abbrAction]
+            try {
+                $Dictionary = $Dictionary[$Version]
+                $reverseDictionary = @{}
+                $originalDictionary = switch ($ReverseActionType) {
+                    "Admin"    { $Dictionary.AdminActions }
+                    "Delegate" { $Dictionary.DelegateActions }
+                    "Owner"    { $Dictionary.OwnerActions }
                 }
+                foreach ($key in $originalDictionary.Keys) {
+                    $reverseDictionary[$originalDictionary[$key]] = $key
+                }
+                $fullNames = @()
+                foreach ($abbrAction in $AbbreviatedActions) {
+                    if ($reverseDictionary.ContainsKey($abbrAction)) {
+                        $fullNames += $reverseDictionary[$abbrAction]
+                    }
+                }
+                return $fullNames
+            }
+            catch {
+                throw $_
             }
-            return $fullNames
         }
     }
-}
+}

source/Private/Get-AuditMailboxDetail.ps1

@@ -0,0 +1,33 @@
+function Get-AuditMailboxDetail {
+    [cmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)]
+        [String]$Details,
+        [Parameter(Mandatory = $true)]
+        [String]$Version
+    )
+    process {
+        switch ($Version) {
+            "6.1.2" { [string]$VersionText = "No M365 E3 licenses found."}
+            "6.1.3" { [string]$VersionText = "No M365 E5 licenses found."}
+        }
+        if ($details -ne $VersionText ) {
+            $csv = $details | ConvertFrom-Csv -Delimiter '|'
+        }
+        else {
+            $csv = $null
+        }
+        if ($null -ne $csv) {
+            foreach ($row in $csv) {
+                $row.AdminActionsMissing = (Get-Action -AbbreviatedActions $row.AdminActionsMissing.Split(',') -ReverseActionType Admin -Version $Version) -join ','
+                $row.DelegateActionsMissing = (Get-Action -AbbreviatedActions $row.DelegateActionsMissing.Split(',') -ReverseActionType Delegate -Version $Version ) -join ','
+                $row.OwnerActionsMissing = (Get-Action -AbbreviatedActions $row.OwnerActionsMissing.Split(',') -ReverseActionType Owner -Version $Version ) -join ','
+            }
+            $newObjectDetails = $csv
+        }
+        else {
+            $newObjectDetails = $details
+        }
+        return $newObjectDetails
+    }
+}

source/Private/Get-CISExoOutput.ps1

@@ -46,490 +46,442 @@ function Get-CISExoOutput {
     #>
     }
     process {
-        Write-Verbose "Get-CISExoOutput: Retuning data for Rec: $Rec"
-        switch ($Rec) {
-            '1.2.2' {
-                # Test-BlockSharedMailboxSignIn.ps1
-                $MBX = Get-EXOMailbox -RecipientTypeDetails SharedMailbox
-                # [object[]]
-                # $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]
-                return $customerLockboxEnabled
-            }
-            '2.1.1' {
-                # Test-SafeLinksOfficeApps.ps1
-                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:
+        try {
+            Write-Verbose "Get-CISExoOutput: Retuning data for Rec: $Rec"
+            switch ($Rec) {
+                '1.2.2' {
+                    # Test-BlockSharedMailboxSignIn.ps1
+                    $MBX = Get-EXOMailbox -RecipientTypeDetails SharedMailbox
+                    # [object[]]
+                    # $MBX mock object:
                     <#
-                        $policies = @(
+                        $MBX = @(
                             [PSCustomObject]@{
-                                Name = "PolicyOne"
-                                EnableSafeLinksForEmail = $true
-                                EnableSafeLinksForTeams = $true
-                                EnableSafeLinksForOffice = $true
-                                TrackClicks = $true
-                                AllowClickThrough = $false
+                                UserPrincipalName = "SMBuser1@domain.com"
+                                ExternalDirectoryObjectId = "123e4567-e89b-12d3-a456-426614174000"
                             },
                             [PSCustomObject]@{
-                                Name = "PolicyTwo"
-                                EnableSafeLinksForEmail = $true
-                                EnableSafeLinksForTeams = $true
-                                EnableSafeLinksForOffice = $true
-                                TrackClicks = $true
-                                AllowClickThrough = $true
+                                UserPrincipalName = "SMBuser2@domain.com"
+                                ExternalDirectoryObjectId = "987e6543-21ba-12d3-a456-426614174000"
                             },
                             [PSCustomObject]@{
-                                Name = "PolicyThree"
-                                EnableSafeLinksForEmail = $true
-                                EnableSafeLinksForTeams = $true
-                                EnableSafeLinksForOffice = $true
-                                TrackClicks = $true
-                                AllowClickThrough = $false
+                                UserPrincipalName = "SMBuser3@domain.com"
+                                ExternalDirectoryObjectId = "abcddcba-98fe-76dc-a456-426614174000"
                             }
                         )
                     #>
-                    $policies = Get-SafeLinksPolicy
-                    # Initialize the details collection
-                    $misconfiguredDetails = @()
-                    foreach ($policy in $policies) {
-                        # Get the detailed configuration of each policy
-                        $policyDetails = $policy #Get-SafeLinksPolicy -Identity $policy.Name
-                        # Check each required property and record failures
-                        # Condition A: Checking policy settings
-                        $failures = @()
-                        if ($policyDetails.EnableSafeLinksForEmail -ne $true) { $failures += "EnableSafeLinksForEmail: False" } # Email: On
-                        if ($policyDetails.EnableSafeLinksForTeams -ne $true) { $failures += "EnableSafeLinksForTeams: False" } # Teams: On
-                        if ($policyDetails.EnableSafeLinksForOffice -ne $true) { $failures += "EnableSafeLinksForOffice: False" } # Office 365 Apps: On
-                        if ($policyDetails.TrackClicks -ne $true) { $failures += "TrackClicks: False" } # Click protection settings: On
-                        if ($policyDetails.AllowClickThrough -ne $false) { $failures += "AllowClickThrough: True" } # Do not track when users click safe links: Off
-                        # Only add details for policies that have misconfigurations
-                        if ($failures.Count -gt 0) {
-                            $misconfiguredDetails += "Policy: $($policy.Name); Failures: $($failures -join ', ')"
-                        }
-                    }
-                    # [object[]]
-                    return $misconfiguredDetails
+                    return $MBX.ExternalDirectoryObjectId
                 }
-                else {
-                    return 1
-                }
-            }
-            '2.1.2' {
-                # Test-CommonAttachmentFilter.ps1
-                # 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
-                # $attachmentFilter Mock Object
-                <#
-                    $attachmentFilter = [PSCustomObject]@{
-                        EnableFileFilter = $true
-                    }
-                #>
-                $attachmentFilter = Get-MalwareFilterPolicy -Identity Default | Select-Object EnableFileFilter
-                $result = $attachmentFilter.EnableFileFilter
-                # [bool]
-                return $result
-            }
-            '2.1.3' {
-                # 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
-            }
-            '2.1.4' {
-                # Test-SafeAttachmentsPolicy.ps1
-                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:
+                '1.3.3' {
+                    # Test-ExternalSharingCalendars.ps1
+                    # Step: Retrieve sharing policies related to calendar sharing
+                    # $sharingPolicies Mock Object
                     <#
-                        $safeAttachmentPolicies = @(
-                            [PSCustomObject]@{
-                                Policy        = "Strict Preset Security Policy"
-                                Action        = "Block"
-                                QuarantineTag = "AdminOnlyAccessPolicy"
-                                Redirect      = $false
-                                Enabled       = $true
-                            }
-                        )
+                        $sharingPolicies = [PSCustomObject]@{
+                            Name = "Default Sharing Policy"
+                            Domains = @("Anonymous:CalendarSharingFreeBusySimple")
+                            Enabled = $true
+                            Default = $true
+                        }
                     #>
-                    $safeAttachmentPolicies = Get-SafeAttachmentPolicy -ErrorAction SilentlyContinue | Where-Object { $_.Enable -eq $true }
-                    # [object[]]
-                    return $safeAttachmentPolicies
+                    $sharingPolicies = Get-SharingPolicy | Where-Object { $_.Domains -like '*CalendarSharing*' }
+                    # [psobject[]]
+                    return $sharingPolicies
+                }
+                '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]
+                    return $customerLockboxEnabled
+                }
+                '2.1.1' {
+                    # Test-SafeLinksOfficeApps.ps1
+                    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 = $policy #Get-SafeLinksPolicy -Identity $policy.Name
+                            # Check each required property and record failures
+                            # Condition A: Checking policy settings
+                            $failures = @()
+                            if ($policyDetails.EnableSafeLinksForEmail -ne $true) { $failures += "EnableSafeLinksForEmail: False" } # Email: On
+                            if ($policyDetails.EnableSafeLinksForTeams -ne $true) { $failures += "EnableSafeLinksForTeams: False" } # Teams: On
+                            if ($policyDetails.EnableSafeLinksForOffice -ne $true) { $failures += "EnableSafeLinksForOffice: False" } # Office 365 Apps: On
+                            if ($policyDetails.TrackClicks -ne $true) { $failures += "TrackClicks: False" } # Click protection settings: On
+                            if ($policyDetails.AllowClickThrough -ne $false) { $failures += "AllowClickThrough: True" } # Do not track when users click safe links: Off
+                            # Only add details for policies that have misconfigurations
+                            if ($failures.Count -gt 0) {
+                                $misconfiguredDetails += "Policy: $($policy.Name); Failures: $($failures -join ', ')"
+                            }
+                        }
+                        # [object[]]
+                        return $misconfiguredDetails
+                    }
                     else {
                         return 1
                     }
                 }
-            }
-            '2.1.5' {
-                # Test-SafeAttachmentsTeams.ps1
-                if (Get-Command Get-AtpPolicyForO365 -ErrorAction SilentlyContinue) {
-                    # 2.1.5 (L2) Ensure Safe Attachments for SharePoint, OneDrive, and Microsoft Teams is Enabled
-                    # 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:
+                '2.1.2' {
+                    # Test-CommonAttachmentFilter.ps1
+                    # 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
+                    # $attachmentFilter Mock Object
                     <#
-                        $atpPolicyResult = @(
+                        $attachmentFilter = [PSCustomObject]@{
+                            EnableFileFilter = $true
+                        }
+                    #>
+                    $attachmentFilter = Get-MalwareFilterPolicy -Identity Default | Select-Object EnableFileFilter
+                    $result = $attachmentFilter.EnableFileFilter
+                    # [bool]
+                    return $result
+                }
+                '2.1.3' {
+                    # 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]@{
-                                Name                   = "Default"
-                                EnableATPForSPOTeamsODB = $true
-                                EnableSafeDocs         = $true
-                                AllowSafeDocsOpen      = $false
+                                Identity = "Default"
+                                EnableInternalSenderAdminNotifications = $true
+                                RecommendedPolicyType = "Custom"
+                            },
+                            [PSCustomObject]@{
+                                Identity = "Anti-malware-Policy"
+                                EnableInternalSenderAdminNotifications = $true
+                                RecommendedPolicyType = "Custom"
                             }
                         )
                     #>
-                    $atpPolicyResult = $atpPolicies | Where-Object {
-                        $_.EnableATPForSPOTeamsODB -eq $true -and
-                        $_.EnableSafeDocs -eq $true -and
-                        $_.AllowSafeDocsOpen -eq $false
+                    $malwareNotifications = Get-MalwareFilterPolicy | Where-Object { $_.RecommendedPolicyType -eq 'Custom' }
+                    # [object[]]
+                    return $malwareNotifications
+                }
+                '2.1.4' {
+                    # Test-SafeAttachmentsPolicy.ps1
+                    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 }
+                        $safeAttachmentRules = Get-SafeAttachmentRule
+                        # [object[]]
+                        return $safeAttachmentPolicies, $safeAttachmentRules
+                        else {
+                            return 1,1
+                        }
                     }
-                    # [psobject[]]
-                    return $atpPolicyResult
                 }
-                else {
-                    return 1
-                }
-            }
-            '2.1.6' {
-                # Test-SpamPolicyAdminNotify.ps1
-                # Retrieve the hosted outbound spam filter policies
-                # $spamPolicies Mock Object:
-                <#
-                    # 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"
+                '2.1.5' {
+                    # Test-SafeAttachmentsTeams.ps1
+                    if (Get-Command Get-AtpPolicyForO365 -ErrorAction SilentlyContinue) {
+                        # 2.1.5 (L2) Ensure Safe Attachments for SharePoint, OneDrive, and Microsoft Teams is Enabled
+                        # 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
+                            $_.AllowSafeDocsOpen -eq $false
                         }
-                    )
-                #>
-                $spamPolicies = Get-HostedOutboundSpamFilterPolicy
-                return $spamPolicies
-            }
-            '2.1.7' {
-                # Test-AntiPhishingPolicy.ps1
-                <#
-                    $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
-            }
-            '2.1.9' {
-                # Test-EnableDKIM.ps1
-                # 2.1.9 (L1) Ensure DKIM is enabled for all Exchange Online Domains
-                # Retrieve DKIM configuration for all domains
-                $dkimConfig = Get-DkimSigningConfig | Select-Object Domain, Enabled
-                # [object[]]
-                return $dkimConfig
-            }
-            '3.1.1' {
-                # Test-AuditLogSearch.ps1
-                # 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled
-                # Retrieve the audit log configuration
-                $auditLogConfig = Get-AdminAuditLogConfig | Select-Object UnifiedAuditLogIngestionEnabled
-                #
-                $auditLogResult = $auditLogConfig.UnifiedAuditLogIngestionEnabled
-                # [bool]
-                return $auditLogResult
-            }
-            '6.1.1' {
-                # Test-AuditDisabledFalse.ps1
-                # 6.1.1 (L1) Ensure 'AuditDisabled' organizationally is set to 'False'
-                # Retrieve the AuditDisabled configuration (Condition B)
-                $auditDisabledConfig = Get-OrganizationConfig | Select-Object AuditDisabled
-                # [bool]
-                $auditNotDisabled = -not $auditDisabledConfig.AuditDisabled
-                return $auditNotDisabled
-            }
-            '6.1.2' {
-                # Test-MailboxAuditingE3.ps1
-                $mailboxes = Get-EXOMailbox -PropertySets Audit
-                # [object[]]
-                return $mailboxes
-            }
-            '6.1.3' {
-                # Test-MailboxAuditingE5.ps1
-                $mailboxes = Get-EXOMailbox -PropertySets Audit
-                # [object[]]
-                return $mailboxes
-            }
-            '6.2.1' {
-                # Test-BlockMailForwarding.ps1
-                # 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 = Get-TransportRule | Where-Object { $null -ne $_.RedirectMessageTo }
-                if ($null -eq $transportRules) {
-                    $transportRules = 1
+                        # [psobject[]]
+                        return $atpPolicyResult
+                    }
+                    else {
+                        return 1
+                    }
                 }
-                # Step 2: Check all anti-spam outbound policies
-                $outboundSpamPolicies = Get-HostedOutboundSpamFilterPolicy
-                $nonCompliantSpamPolicies = $outboundSpamPolicies | Where-Object { $_.AutoForwardingMode -ne 'Off' }
-                return $transportRules, $nonCompliantSpamPolicies
-            }
-            '6.2.2' {
-                # Test-NoWhitelistDomains.ps1
-                # 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
-                # [object[]]
-                $whitelistedRules = Get-TransportRule | Where-Object { $_.SetSCL -eq -1 -and $null -ne $_.SenderDomainIs }
-                return $whitelistedRules
-            }
-            '6.2.3' {
-                # Test-IdentifyExternalEmail.ps1
-                # 6.2.3 (L1) Ensure email from external senders is identified
-                # Retrieve external sender tagging configuration
-                # [object[]]
-                $externalInOutlook = Get-ExternalInOutlook
-                return $externalInOutlook
-            }
-            '6.3.1' {
-                # Test-RestrictOutlookAddins.ps1
-                # 6.3.1 (L2) Ensure users installing Outlook add-ins is not allowed
-                $customPolicyFailures = @()
-                # Check all mailboxes for custom policies with unallowed add-ins
-                $roleAssignmentPolicies = Get-EXOMailbox | Select-Object -Unique RoleAssignmentPolicy
-                if ($roleAssignmentPolicies.RoleAssignmentPolicy) {
-                    foreach ($policy in $roleAssignmentPolicies) {
-                        if ($policy.RoleAssignmentPolicy) {
-                            $rolePolicyDetails = Get-RoleAssignmentPolicy -Identity $policy.RoleAssignmentPolicy
-                            $foundRoles = $rolePolicyDetails.AssignedRoles | Where-Object { $_ -in $relevantRoles }
-                            # Condition B: Using PowerShell, verify that MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are not assigned to users.
-                            if ($foundRoles) {
-                                $customPolicyFailures += "Policy: $($policy.RoleAssignmentPolicy): Roles: $($foundRoles -join ', ')"
+                '2.1.6' {
+                    # Test-SpamPolicyAdminNotify.ps1
+                    # Retrieve the hosted outbound spam filter policies
+                    # $spamPolicies Mock Object:
+                    <#
+                        # 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
+                    <#
+                        $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
+                }
+                '2.1.9' {
+                    # Test-EnableDKIM.ps1
+                    # 2.1.9 (L1) Ensure DKIM is enabled for all Exchange Online Domains
+                    # Retrieve DKIM configuration for all domains
+                    $dkimConfig = Get-DkimSigningConfig | Select-Object Domain, Enabled
+                    # [object[]]
+                    return $dkimConfig
+                }
+                '3.1.1' {
+                    # Test-AuditLogSearch.ps1
+                    # 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled
+                    # Retrieve the audit log configuration
+                    $auditLogConfig = Get-AdminAuditLogConfig | Select-Object UnifiedAuditLogIngestionEnabled
+                    #
+                    $auditLogResult = $auditLogConfig.UnifiedAuditLogIngestionEnabled
+                    # [bool]
+                    return $auditLogResult
+                }
+                '6.1.1' {
+                    # Test-AuditDisabledFalse.ps1
+                    # 6.1.1 (L1) Ensure 'AuditDisabled' organizationally is set to 'False'
+                    # Retrieve the AuditDisabled configuration (Condition B)
+                    $auditDisabledConfig = Get-OrganizationConfig | Select-Object AuditDisabled
+                    # [bool]
+                    $auditNotDisabled = -not $auditDisabledConfig.AuditDisabled
+                    return $auditNotDisabled
+                }
+                '6.1.2' {
+                    # Test-MailboxAuditingE3.ps1
+                    $mailboxes = Get-EXOMailbox -PropertySets Audit
+                    # [object[]]
+                    return $mailboxes
+                }
+                '6.1.3' {
+                    # Test-MailboxAuditingE5.ps1
+                    $mailboxes = Get-EXOMailbox -PropertySets Audit
+                    # [object[]]
+                    return $mailboxes
+                }
+                '6.2.1' {
+                    # Test-BlockMailForwarding.ps1
+                    # 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 = Get-TransportRule | Where-Object { $null -ne $_.RedirectMessageTo }
+                    if ($null -eq $transportRules) {
+                        $transportRules = 1
+                    }
+                    # Step 2: Check all anti-spam outbound policies
+                    $outboundSpamPolicies = Get-HostedOutboundSpamFilterPolicy
+                    $nonCompliantSpamPolicies = $outboundSpamPolicies | Where-Object { $_.AutoForwardingMode -ne 'Off' }
+                    return $transportRules, $nonCompliantSpamPolicies
+                }
+                '6.2.2' {
+                    # Test-NoWhitelistDomains.ps1
+                    # 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
+                    # [object[]]
+                    $whitelistedRules = Get-TransportRule | Where-Object { $_.SetSCL -eq -1 -and $null -ne $_.SenderDomainIs }
+                    return $whitelistedRules
+                }
+                '6.2.3' {
+                    # Test-IdentifyExternalEmail.ps1
+                    # 6.2.3 (L1) Ensure email from external senders is identified
+                    # Retrieve external sender tagging configuration
+                    # [object[]]
+                    $externalInOutlook = Get-ExternalInOutlook
+                    return $externalInOutlook
+                }
+                '6.3.1' {
+                    # Test-RestrictOutlookAddins.ps1
+                    # 6.3.1 (L2) Ensure users installing Outlook add-ins is not allowed
+                    $customPolicyFailures = @()
+                    # Check all mailboxes for custom policies with unallowed add-ins
+                    $roleAssignmentPolicies = Get-EXOMailbox | Select-Object -Unique RoleAssignmentPolicy
+                    if ($roleAssignmentPolicies.RoleAssignmentPolicy) {
+                        foreach ($policy in $roleAssignmentPolicies) {
+                            if ($policy.RoleAssignmentPolicy) {
+                                $rolePolicyDetails = Get-RoleAssignmentPolicy -Identity $policy.RoleAssignmentPolicy
+                                $foundRoles = $rolePolicyDetails.AssignedRoles | Where-Object { $_ -in $relevantRoles }
+                                # Condition B: Using PowerShell, verify that MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are not assigned to users.
+                                if ($foundRoles) {
+                                    $customPolicyFailures += "Policy: $($policy.RoleAssignmentPolicy): Roles: $($foundRoles -join ', ')"
+                                }
                             }
                         }
                     }
+                    # Check Default Role Assignment Policy
+                    $defaultPolicy = Get-RoleAssignmentPolicy "Default Role Assignment Policy"
+                    return $customPolicyFailures, $defaultPolicy
                 }
-                # Check Default Role Assignment Policy
-                $defaultPolicy = Get-RoleAssignmentPolicy "Default Role Assignment Policy"
-                return $customPolicyFailures, $defaultPolicy
+                '6.5.1' {
+                    # Test-ModernAuthExchangeOnline.ps1
+                    # Ensuring the ExchangeOnlineManagement module is available
+                    # 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-OrganizationConfig | Select-Object -Property Name, OAuth2ClientProfileEnabled
+                    return $orgConfig
+                }
+                '6.5.2' {
+                    # Test-MailTipsEnabled.ps1
+                    # 6.5.2 (L2) Ensure MailTips are enabled for end users
+                    # Retrieve organization configuration for MailTips settings
+                    # [object]
+                    $orgConfig = Get-OrganizationConfig | Select-Object MailTipsAllTipsEnabled, MailTipsExternalRecipientsTipsEnabled, MailTipsGroupMetricsEnabled, MailTipsLargeAudienceThreshold
+                    return $orgConfig
+                }
+                '6.5.3' {
+                    # Test-RestrictStorageProvidersOutlook.ps1
+                    # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
+                    # Retrieve all OwaMailbox policies
+                    # [object[]]
+                    $owaPolicies = Get-OwaMailboxPolicy
+                    return $owaPolicies
+                }
+                '8.6.1' {
+                    # 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 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 Mock Object
+                    <#
+                        $ReportSubmissionPolicy = [PSCustomObject]@{
+                            ReportJunkToCustomizedAddress               = $true
+                            ReportNotJunkToCustomizedAddress            = $true
+                            ReportPhishToCustomizedAddress              = $true
+                            ReportJunkAddresses                         = @('security@example.com')
+                            ReportNotJunkAddresses                      = @('security@example.com')
+                            ReportPhishAddresses                        = @('security@example.com')
+                            ReportChatMessageEnabled                    = $false
+                            ReportChatMessageToCustomizedAddressEnabled = $false
+                        }
+                    #>
+                    $ReportSubmissionPolicy = Get-ReportSubmissionPolicy | Select-Object -Property ReportJunkToCustomizedAddress, ReportNotJunkToCustomizedAddress, ReportPhishToCustomizedAddress, ReportJunkAddresses, ReportNotJunkAddresses, ReportPhishAddresses, ReportChatMessageEnabled, ReportChatMessageToCustomizedAddressEnabled
+                    return $ReportSubmissionPolicy
+                }
+                default { throw "No match found for test: $Rec" }
             }
-            '6.5.1' {
-                # Test-ModernAuthExchangeOnline.ps1
-                # Ensuring the ExchangeOnlineManagement module is available
-                # 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-OrganizationConfig | Select-Object -Property Name, OAuth2ClientProfileEnabled
-                return $orgConfig
-            }
-            '6.5.2' {
-                # Test-MailTipsEnabled.ps1
-                # 6.5.2 (L2) Ensure MailTips are enabled for end users
-                # Retrieve organization configuration for MailTips settings
-                # [object]
-                $orgConfig = Get-OrganizationConfig | Select-Object MailTipsAllTipsEnabled, MailTipsExternalRecipientsTipsEnabled, MailTipsGroupMetricsEnabled, MailTipsLargeAudienceThreshold
-                return $orgConfig
-            }
-            '6.5.3' {
-                # Test-RestrictStorageProvidersOutlook.ps1
-                # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
-                # Retrieve all OwaMailbox policies
-                # [object[]]
-                $owaPolicies = Get-OwaMailboxPolicy
-                return $owaPolicies
-            }
-            '8.6.1' {
-                # 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 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 Mock Object
-                <#
-                    $ReportSubmissionPolicy = [PSCustomObject]@{
-                        ReportJunkToCustomizedAddress               = $true
-                        ReportNotJunkToCustomizedAddress            = $true
-                        ReportPhishToCustomizedAddress              = $true
-                        ReportJunkAddresses                         = @('security@example.com')
-                        ReportNotJunkAddresses                      = @('security@example.com')
-                        ReportPhishAddresses                        = @('security@example.com')
-                        ReportChatMessageEnabled                    = $false
-                        ReportChatMessageToCustomizedAddressEnabled = $false
-                    }
-                #>
-                $ReportSubmissionPolicy = Get-ReportSubmissionPolicy | Select-Object -Property ReportJunkToCustomizedAddress, ReportNotJunkToCustomizedAddress, ReportPhishToCustomizedAddress, ReportJunkAddresses, ReportNotJunkAddresses, ReportPhishAddresses, ReportChatMessageEnabled, ReportChatMessageToCustomizedAddressEnabled
-                return $ReportSubmissionPolicy
-            }
-            default { throw "No match found for test: $Rec" }
+        }
+        catch {
+            throw "Get-CISExoOutput: `n$_"
         }
     }
     end {

source/Private/Get-CISMSTeamsOutput.ps1

@@ -34,296 +34,301 @@ function Get-CISMSTeamsOutput {
         #>
     }
     process {
-        Write-Verbose "Get-CISMSTeamsOutput: Retuning data for Rec: $Rec"
-        switch ($Rec) {
-            '8.1.1' {
-                # Test-TeamsExternalFileSharing.ps1
-                # 8.1.1 (L2) Ensure external file sharing in Teams is enabled for only approved cloud storage services
-                # Connect to Teams PowerShell using Connect-MicrosoftTeams
+        try {
+            Write-Verbose "Get-CISMSTeamsOutput: Retuning data for Rec: $Rec"
+            switch ($Rec) {
+                '8.1.1' {
+                    # Test-TeamsExternalFileSharing.ps1
+                    # 8.1.1 (L2) Ensure external file sharing in Teams is enabled for only approved cloud storage services
+                    # Connect to Teams PowerShell using Connect-MicrosoftTeams
 
-                # Condition A: The `AllowDropbox` setting is set to `False`.
-                # Condition B: The `AllowBox` setting is set to `False`.
-                # Condition C: The `AllowGoogleDrive` setting is set to `False`.
-                # Condition D: The `AllowShareFile` setting is set to `False`.
-                # Condition E: The `AllowEgnyte` setting is set to `False`.
+                    # Condition A: The `AllowDropbox` setting is set to `False`.
+                    # Condition B: The `AllowBox` setting is set to `False`.
+                    # Condition C: The `AllowGoogleDrive` setting is set to `False`.
+                    # Condition D: The `AllowShareFile` setting is set to `False`.
+                    # Condition E: The `AllowEgnyte` setting is set to `False`.
 
-                # Assuming that 'approvedProviders' is a list of approved cloud storage service names
-                # This list must be defined according to your organization's approved cloud storage services
-                # Add option for approved providers.
-                $clientConfig = Get-CsTeamsClientConfiguration
-                return $clientConfig
-            }
-            '8.1.2' {
-                # Test-BlockChannelEmails.ps1
-                # 8.1.2 (L1) Ensure users can't send emails to a channel email address
-                #
-                # 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: The `AllowEmailIntoChannel` setting in Teams is set to `False`.
-                #   - Condition B: The setting `Users can send emails to a channel email address` is set to `Off` in the Teams admin center.
-                #   - Condition C: Verification using PowerShell confirms that the `AllowEmailIntoChannel` setting is disabled.
-                #
-                # 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:
-                #   - Condition A: The `AllowEmailIntoChannel` setting in Teams is not set to `False`.
-                #   - Condition B: The setting `Users can send emails to a channel email address` is not set to `Off` in the Teams admin center.
-                #   - Condition C: Verification using PowerShell indicates that the `AllowEmailIntoChannel` setting is enabled.
+                    # Assuming that 'approvedProviders' is a list of approved cloud storage service names
+                    # This list must be defined according to your organization's approved cloud storage services
+                    # Add option for approved providers.
+                    $clientConfig = Get-CsTeamsClientConfiguration
+                    return $clientConfig
+                }
+                '8.1.2' {
+                    # Test-BlockChannelEmails.ps1
+                    # 8.1.2 (L1) Ensure users can't send emails to a channel email address
+                    #
+                    # 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: The `AllowEmailIntoChannel` setting in Teams is set to `False`.
+                    #   - Condition B: The setting `Users can send emails to a channel email address` is set to `Off` in the Teams admin center.
+                    #   - Condition C: Verification using PowerShell confirms that the `AllowEmailIntoChannel` setting is disabled.
+                    #
+                    # 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:
+                    #   - Condition A: The `AllowEmailIntoChannel` setting in Teams is not set to `False`.
+                    #   - Condition B: The setting `Users can send emails to a channel email address` is not set to `Off` in the Teams admin center.
+                    #   - Condition C: Verification using PowerShell indicates that the `AllowEmailIntoChannel` setting is enabled.
 
-                # Retrieve Teams client configuration
-                $teamsClientConfig = Get-CsTeamsClientConfiguration -Identity Global
-                return $teamsClientConfig
+                    # Retrieve Teams client configuration
+                    $teamsClientConfig = Get-CsTeamsClientConfiguration -Identity Global
+                    return $teamsClientConfig
+                }
+                '8.2.1' {
+                    # Test-TeamsExternalAccess.ps1
+                    # 8.2.1 (L1) Ensure 'external access' is restricted in the Teams admin center
+                    #
+                    # 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: The `AllowTeamsConsumer` setting is `False`.
+                    #   - Condition B: The `AllowPublicUsers` setting is `False`.
+                    #   - Condition C: The `AllowFederatedUsers` setting is `False` or, if `True`, the `AllowedDomains` contains only authorized domain names.
+                    #
+                    # 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:
+                    #   - Condition A: The `AllowTeamsConsumer` setting is not `False`.
+                    #   - Condition B: The `AllowPublicUsers` setting is not `False`.
+                    #   - Condition C: The `AllowFederatedUsers` setting is `True` and the `AllowedDomains` contains unauthorized domain names or is not configured correctly.
+                    # Connect to Teams PowerShell using Connect-MicrosoftTeams
+                    # $externalAccessConfig Mock Object
+                    <#
+                        $externalAccessConfig = [PSCustomObject]@{
+                            Identity                                    = 'Global'
+                            AllowedDomains                              = 'AllowAllKnownDomains'
+                            BlockedDomains                              = @()
+                            AllowFederatedUsers                         = $true
+                            AllowPublicUsers                            = $true
+                            AllowTeamsConsumer                          = $true
+                            AllowTeamsConsumerInbound                   = $true
+                        }
+                        $ApprovedFederatedDomains = @('msn.com', 'google.com')
+                        $externalAccessConfig = [PSCustomObject]@{
+                            Identity                                    = 'Global'
+                            AllowedDomains                              = @('msn.com', 'google.com')
+                            BlockedDomains                              = @()
+                            AllowFederatedUsers                         = $true
+                            AllowPublicUsers                            = $false
+                            AllowTeamsConsumer                          = $false
+                            AllowTeamsConsumerInbound                   = $true
+                        }
+                    #>
+                    $externalAccessConfig = Get-CsTenantFederationConfiguration
+                    return $externalAccessConfig
+                }
+                '8.5.1' {
+                    # Test-NoAnonymousMeetingJoin.ps1
+                    # 8.5.1 (L2) Ensure anonymous users can't join a meeting
+                    #
+                    # 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: `AllowAnonymousUsersToJoinMeeting` is set to `False`.
+                    #   - Condition B: Verification using the UI confirms that `Anonymous users can join a meeting` is set to `Off` in the Global meeting policy.
+                    #   - Condition C: PowerShell command output indicates that anonymous users are not allowed to join meetings.
+                    #
+                    # 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:
+                    #   - Condition A: `AllowAnonymousUsersToJoinMeeting` is not set to `False`.
+                    #   - Condition B: Verification using the UI shows that `Anonymous users can join a meeting` is not set to `Off` in the Global meeting policy.
+                    #   - Condition C: PowerShell command output indicates that anonymous users are allowed to join meetings.
+                    # Connect to Teams PowerShell using Connect-MicrosoftTeams
+                    # $teamsMeetingPolicy Mock Object
+                    <#
+                        $teamsMeetingPolicy = [PSCustomObject]@{
+                            AllowAnonymousUsersToJoinMeeting            = $true
+                        }
+                    #>
+                    $teamsMeetingPolicy = Get-CsTeamsMeetingPolicy -Identity Global
+                    return $teamsMeetingPolicy
+                }
+                '8.5.2' {
+                    # Test-NoAnonymousMeetingStart.ps1
+                    # 8.5.2 (L1) Ensure anonymous users and dial-in callers can't start a meeting
+                    #
+                    # 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: The `AllowAnonymousUsersToStartMeeting` setting in the Teams admin center is set to `False`.
+                    #   - Condition B: The setting for anonymous users and dial-in callers starting a meeting is configured to ensure they must wait in the lobby.
+                    #   - Condition C: Verification using the UI confirms that the setting `Anonymous users and dial-in callers can start a meeting` is set to `Off`.
+                    #
+                    # 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:
+                    #   - Condition A: The `AllowAnonymousUsersToStartMeeting` setting in the Teams admin center is not set to `False`.
+                    #   - Condition B: The setting for anonymous users and dial-in callers starting a meeting allows them to bypass the lobby.
+                    #   - Condition C: Verification using the UI indicates that the setting `Anonymous users and dial-in callers can start a meeting` is not set to `Off`.
+                    # Connect to Teams PowerShell using Connect-MicrosoftTeams
+                    # $CsTeamsMeetingPolicyAnonymous Mock Object
+                    <#
+                        $CsTeamsMeetingPolicyAnonymous = [PSCustomObject]@{
+                            AllowAnonymousUsersToStartMeeting           = $true
+                        }
+                    #>
+                    # Retrieve the Teams meeting policy for the global scope and check if anonymous users can start meetings
+                    $CsTeamsMeetingPolicyAnonymous = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowAnonymousUsersToStartMeeting
+                    return $CsTeamsMeetingPolicyAnonymous
+                }
+                '8.5.3' {
+                    # Test-OrgOnlyBypassLobby.ps1
+                    # 8.5.3 (L1) Ensure only people in my org can bypass the lobby
+                    #
+                    # 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: The `AutoAdmittedUsers` setting in the Teams meeting policy is set to `EveryoneInCompanyExcludingGuests`.
+                    #   - Condition B: The setting for "Who can bypass the lobby" is configured to "People in my org" using the UI.
+                    #   - Condition C: Verification using the Microsoft Teams admin center confirms that the meeting join & lobby settings are configured as recommended.
+                    #
+                    # 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:
+                    #   - Condition A: The `AutoAdmittedUsers` setting in the Teams meeting policy is not set to `EveryoneInCompanyExcludingGuests`.
+                    #   - Condition B: The setting for "Who can bypass the lobby" is not configured to "People in my org" using the UI.
+                    #   - Condition C: Verification using the Microsoft Teams admin center indicates that the meeting join & lobby settings are not configured as recommended.
+                    # Connect to Teams PowerShell using Connect-MicrosoftTeams
+                    # Retrieve the Teams meeting policy for lobby bypass settings
+                    # $CsTeamsMeetingPolicyLobby Mock Object
+                    <#
+                        $CsTeamsMeetingPolicyLobby = [PSCustomObject]@{
+                            AutoAdmittedUsers           = "OrganizerOnly"
+                        }
+                    #>
+                    $CsTeamsMeetingPolicyLobby = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AutoAdmittedUsers
+                    return $CsTeamsMeetingPolicyLobby
+                }
+                '8.5.4' {
+                    # Test-DialInBypassLobby.ps1
+                    # 8.5.4 (L1) Ensure users dialing in can't bypass the lobby
+                    #
+                    # 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: The `AllowPSTNUsersToBypassLobby` setting in the Global Teams meeting policy is set to `False`.
+                    #   - Condition B: Verification using the UI in the Microsoft Teams admin center confirms that "People dialing in can't bypass the lobby" is set to `Off`.
+                    #   - Condition C: Ensure that individuals who dial in by phone must wait in the lobby until admitted by a meeting organizer, co-organizer, or presenter.
+                    #
+                    # 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:
+                    #   - Condition A: The `AllowPSTNUsersToBypassLobby` setting in the Global Teams meeting policy is not set to `False`.
+                    #   - Condition B: Verification using the UI in the Microsoft Teams admin center shows that "People dialing in can't bypass the lobby" is not set to `Off`.
+                    #   - Condition C: Individuals who dial in by phone are able to join the meeting directly without waiting in the lobby.
+                    # Retrieve Teams meeting policy for PSTN users
+                    # $CsTeamsMeetingPolicyPSTN Mock Object
+                    <#
+                        $CsTeamsMeetingPolicyPSTN = [PSCustomObject]@{
+                            AllowPSTNUsersToBypassLobby           = $true
+                        }
+                    #>
+                    $CsTeamsMeetingPolicyPSTN = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowPSTNUsersToBypassLobby
+                    return $CsTeamsMeetingPolicyPSTN
+                }
+                '8.5.5' {
+                    # Test-MeetingChatNoAnonymous.ps1
+                    # 8.5.5 (L2) Ensure meeting chat does not allow anonymous users
+                    #
+                    # 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: The `MeetingChatEnabledType` setting in Teams is set to `EnabledExceptAnonymous`.
+                    #   - Condition B: The setting for meeting chat is configured to allow chat for everyone except anonymous users.
+                    #   - Condition C: Verification using the Teams Admin Center confirms that the meeting chat settings are configured as recommended.
+                    #
+                    # 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:
+                    #   - Condition A: The `MeetingChatEnabledType` setting in Teams is not set to `EnabledExceptAnonymous`.
+                    #   - Condition B: The setting for meeting chat allows chat for anonymous users.
+                    #   - Condition C: Verification using the Teams Admin Center indicates that the meeting chat settings are not configured as recommended.
+                    # Retrieve the Teams meeting policy for meeting chat
+                    # $CsTeamsMeetingPolicyChat Mock Object
+                    <#
+                        $CsTeamsMeetingPolicyChat = [PSCustomObject]@{
+                            MeetingChatEnabledType           = "Enabled"
+                        }
+                    #>
+                    $CsTeamsMeetingPolicyChat = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property MeetingChatEnabledType
+                    return $CsTeamsMeetingPolicyChat
+                }
+                '8.5.6' {
+                    # Test-OrganizersPresent.ps1
+                    # 8.5.6 (L2) Ensure only organizers and co-organizers can present
+                    #
+                    # 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: The `DesignatedPresenterRoleMode` setting in the Teams meeting policy is set to `OrganizerOnlyUserOverride`.
+                    #   - Condition B: Verification using the Teams admin center confirms that the setting "Who can present" is configured to "Only organizers and co-organizers".
+                    #   - Condition C: Verification using PowerShell confirms that the `DesignatedPresenterRoleMode` is set to `OrganizerOnlyUserOverride`.
+                    #
+                    # 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:
+                    #   - Condition A: The `DesignatedPresenterRoleMode` setting in the Teams meeting policy is not set to `OrganizerOnlyUserOverride`.
+                    #   - Condition B: Verification using the Teams admin center indicates that the setting "Who can present" is not configured to "Only organizers and co-organizers".
+                    #   - Condition C: Verification using PowerShell indicates that the `DesignatedPresenterRoleMode` is not set to `OrganizerOnlyUserOverride`.
+                    # Retrieve the Teams meeting policy for presenters
+                    # $CsTeamsMeetingPolicyPresenters Mock Object
+                    <#
+                        $CsTeamsMeetingPolicyPresenters = [PSCustomObject]@{
+                            DesignatedPresenterRoleMode           = "Enabled"
+                        }
+                    #>
+                    $CsTeamsMeetingPolicyPresenters = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property DesignatedPresenterRoleMode
+                    return $CsTeamsMeetingPolicyPresenters
+                }
+                '8.5.7' {
+                    # Test-ExternalNoControl.ps1
+                    # 8.5.7 (L1) Ensure external participants can't give or request control
+                    #
+                    # 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: Ensure the `AllowExternalParticipantGiveRequestControl` setting in Teams is set to `False`.
+                    #   - Condition B: The setting is verified through the Microsoft Teams admin center or via PowerShell command.
+                    #   - Condition C: Verification using the UI confirms that external participants are unable to give or request control.
+                    #
+                    # 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:
+                    #   - Condition A: The `AllowExternalParticipantGiveRequestControl` setting in Teams is not set to `False`.
+                    #   - Condition B: The setting is verified through the Microsoft Teams admin center or via PowerShell command.
+                    #   - Condition C: Verification using the UI indicates that external participants can give or request control.
+                    # Retrieve Teams meeting policy for external participant control
+                    # $CsTeamsMeetingPolicyControl Mock Object
+                    <#
+                        $CsTeamsMeetingPolicyControl = [PSCustomObject]@{
+                            AllowExternalParticipantGiveRequestControl           = $true
+                        }
+                    #>
+                    $CsTeamsMeetingPolicyControl = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowExternalParticipantGiveRequestControl
+                    return $CsTeamsMeetingPolicyControl
+                }
+                '8.6.1' {
+                    # 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 Mock Object
+                    <#
+                        $CsTeamsMessagingPolicy = [PSCustomObject]@{
+                            AllowSecurityEndUserReporting           = $true
+                        }
+                    #>
+                    $CsTeamsMessagingPolicy = Get-CsTeamsMessagingPolicy -Identity Global | Select-Object -Property AllowSecurityEndUserReporting
+                    return $CsTeamsMessagingPolicy
+                }
+                default { throw "No match found for test: $Rec" }
             }
-            '8.2.1' {
-                # Test-TeamsExternalAccess.ps1
-                # 8.2.1 (L1) Ensure 'external access' is restricted in the Teams admin center
-                #
-                # 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: The `AllowTeamsConsumer` setting is `False`.
-                #   - Condition B: The `AllowPublicUsers` setting is `False`.
-                #   - Condition C: The `AllowFederatedUsers` setting is `False` or, if `True`, the `AllowedDomains` contains only authorized domain names.
-                #
-                # 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:
-                #   - Condition A: The `AllowTeamsConsumer` setting is not `False`.
-                #   - Condition B: The `AllowPublicUsers` setting is not `False`.
-                #   - Condition C: The `AllowFederatedUsers` setting is `True` and the `AllowedDomains` contains unauthorized domain names or is not configured correctly.
-                # Connect to Teams PowerShell using Connect-MicrosoftTeams
-                # $externalAccessConfig Mock Object
-                <#
-                    $externalAccessConfig = [PSCustomObject]@{
-                        Identity                                    = 'Global'
-                        AllowedDomains                              = 'AllowAllKnownDomains'
-                        BlockedDomains                              = @()
-                        AllowFederatedUsers                         = $true
-                        AllowPublicUsers                            = $true
-                        AllowTeamsConsumer                          = $true
-                        AllowTeamsConsumerInbound                   = $true
-                    }
-                    $ApprovedFederatedDomains = @('msn.com', 'google.com')
-                    $externalAccessConfig = [PSCustomObject]@{
-                        Identity                                    = 'Global'
-                        AllowedDomains                              = @('msn.com', 'google.com')
-                        BlockedDomains                              = @()
-                        AllowFederatedUsers                         = $true
-                        AllowPublicUsers                            = $false
-                        AllowTeamsConsumer                          = $false
-                        AllowTeamsConsumerInbound                   = $true
-                    }
-                #>
-                $externalAccessConfig = Get-CsTenantFederationConfiguration
-                return $externalAccessConfig
-            }
-            '8.5.1' {
-                # Test-NoAnonymousMeetingJoin.ps1
-                # 8.5.1 (L2) Ensure anonymous users can't join a meeting
-                #
-                # 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: `AllowAnonymousUsersToJoinMeeting` is set to `False`.
-                #   - Condition B: Verification using the UI confirms that `Anonymous users can join a meeting` is set to `Off` in the Global meeting policy.
-                #   - Condition C: PowerShell command output indicates that anonymous users are not allowed to join meetings.
-                #
-                # 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:
-                #   - Condition A: `AllowAnonymousUsersToJoinMeeting` is not set to `False`.
-                #   - Condition B: Verification using the UI shows that `Anonymous users can join a meeting` is not set to `Off` in the Global meeting policy.
-                #   - Condition C: PowerShell command output indicates that anonymous users are allowed to join meetings.
-                # Connect to Teams PowerShell using Connect-MicrosoftTeams
-                # $teamsMeetingPolicy Mock Object
-                <#
-                    $teamsMeetingPolicy = [PSCustomObject]@{
-                        AllowAnonymousUsersToJoinMeeting            = $true
-                    }
-                #>
-                $teamsMeetingPolicy = Get-CsTeamsMeetingPolicy -Identity Global
-                return $teamsMeetingPolicy
-            }
-            '8.5.2' {
-                # Test-NoAnonymousMeetingStart.ps1
-                # 8.5.2 (L1) Ensure anonymous users and dial-in callers can't start a meeting
-                #
-                # 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: The `AllowAnonymousUsersToStartMeeting` setting in the Teams admin center is set to `False`.
-                #   - Condition B: The setting for anonymous users and dial-in callers starting a meeting is configured to ensure they must wait in the lobby.
-                #   - Condition C: Verification using the UI confirms that the setting `Anonymous users and dial-in callers can start a meeting` is set to `Off`.
-                #
-                # 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:
-                #   - Condition A: The `AllowAnonymousUsersToStartMeeting` setting in the Teams admin center is not set to `False`.
-                #   - Condition B: The setting for anonymous users and dial-in callers starting a meeting allows them to bypass the lobby.
-                #   - Condition C: Verification using the UI indicates that the setting `Anonymous users and dial-in callers can start a meeting` is not set to `Off`.
-                # Connect to Teams PowerShell using Connect-MicrosoftTeams
-                # $CsTeamsMeetingPolicyAnonymous Mock Object
-                <#
-                    $CsTeamsMeetingPolicyAnonymous = [PSCustomObject]@{
-                        AllowAnonymousUsersToStartMeeting           = $true
-                    }
-                #>
-                # Retrieve the Teams meeting policy for the global scope and check if anonymous users can start meetings
-                $CsTeamsMeetingPolicyAnonymous = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowAnonymousUsersToStartMeeting
-                return $CsTeamsMeetingPolicyAnonymous
-            }
-            '8.5.3' {
-                # Test-OrgOnlyBypassLobby.ps1
-                # 8.5.3 (L1) Ensure only people in my org can bypass the lobby
-                #
-                # 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: The `AutoAdmittedUsers` setting in the Teams meeting policy is set to `EveryoneInCompanyExcludingGuests`.
-                #   - Condition B: The setting for "Who can bypass the lobby" is configured to "People in my org" using the UI.
-                #   - Condition C: Verification using the Microsoft Teams admin center confirms that the meeting join & lobby settings are configured as recommended.
-                #
-                # 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:
-                #   - Condition A: The `AutoAdmittedUsers` setting in the Teams meeting policy is not set to `EveryoneInCompanyExcludingGuests`.
-                #   - Condition B: The setting for "Who can bypass the lobby" is not configured to "People in my org" using the UI.
-                #   - Condition C: Verification using the Microsoft Teams admin center indicates that the meeting join & lobby settings are not configured as recommended.
-                # Connect to Teams PowerShell using Connect-MicrosoftTeams
-                # Retrieve the Teams meeting policy for lobby bypass settings
-                # $CsTeamsMeetingPolicyLobby Mock Object
-                <#
-                    $CsTeamsMeetingPolicyLobby = [PSCustomObject]@{
-                        AutoAdmittedUsers           = "OrganizerOnly"
-                    }
-                #>
-                $CsTeamsMeetingPolicyLobby = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AutoAdmittedUsers
-                return $CsTeamsMeetingPolicyLobby
-            }
-            '8.5.4' {
-                # Test-DialInBypassLobby.ps1
-                # 8.5.4 (L1) Ensure users dialing in can't bypass the lobby
-                #
-                # 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: The `AllowPSTNUsersToBypassLobby` setting in the Global Teams meeting policy is set to `False`.
-                #   - Condition B: Verification using the UI in the Microsoft Teams admin center confirms that "People dialing in can't bypass the lobby" is set to `Off`.
-                #   - Condition C: Ensure that individuals who dial in by phone must wait in the lobby until admitted by a meeting organizer, co-organizer, or presenter.
-                #
-                # 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:
-                #   - Condition A: The `AllowPSTNUsersToBypassLobby` setting in the Global Teams meeting policy is not set to `False`.
-                #   - Condition B: Verification using the UI in the Microsoft Teams admin center shows that "People dialing in can't bypass the lobby" is not set to `Off`.
-                #   - Condition C: Individuals who dial in by phone are able to join the meeting directly without waiting in the lobby.
-                # Retrieve Teams meeting policy for PSTN users
-                # $CsTeamsMeetingPolicyPSTN Mock Object
-                <#
-                    $CsTeamsMeetingPolicyPSTN = [PSCustomObject]@{
-                        AllowPSTNUsersToBypassLobby           = $true
-                    }
-                #>
-                $CsTeamsMeetingPolicyPSTN = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowPSTNUsersToBypassLobby
-                return $CsTeamsMeetingPolicyPSTN
-            }
-            '8.5.5' {
-                # Test-MeetingChatNoAnonymous.ps1
-                # 8.5.5 (L2) Ensure meeting chat does not allow anonymous users
-                #
-                # 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: The `MeetingChatEnabledType` setting in Teams is set to `EnabledExceptAnonymous`.
-                #   - Condition B: The setting for meeting chat is configured to allow chat for everyone except anonymous users.
-                #   - Condition C: Verification using the Teams Admin Center confirms that the meeting chat settings are configured as recommended.
-                #
-                # 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:
-                #   - Condition A: The `MeetingChatEnabledType` setting in Teams is not set to `EnabledExceptAnonymous`.
-                #   - Condition B: The setting for meeting chat allows chat for anonymous users.
-                #   - Condition C: Verification using the Teams Admin Center indicates that the meeting chat settings are not configured as recommended.
-                # Retrieve the Teams meeting policy for meeting chat
-                # $CsTeamsMeetingPolicyChat Mock Object
-                <#
-                    $CsTeamsMeetingPolicyChat = [PSCustomObject]@{
-                        MeetingChatEnabledType           = "Enabled"
-                    }
-                #>
-                $CsTeamsMeetingPolicyChat = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property MeetingChatEnabledType
-                return $CsTeamsMeetingPolicyChat
-            }
-            '8.5.6' {
-                # Test-OrganizersPresent.ps1
-                # 8.5.6 (L2) Ensure only organizers and co-organizers can present
-                #
-                # 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: The `DesignatedPresenterRoleMode` setting in the Teams meeting policy is set to `OrganizerOnlyUserOverride`.
-                #   - Condition B: Verification using the Teams admin center confirms that the setting "Who can present" is configured to "Only organizers and co-organizers".
-                #   - Condition C: Verification using PowerShell confirms that the `DesignatedPresenterRoleMode` is set to `OrganizerOnlyUserOverride`.
-                #
-                # 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:
-                #   - Condition A: The `DesignatedPresenterRoleMode` setting in the Teams meeting policy is not set to `OrganizerOnlyUserOverride`.
-                #   - Condition B: Verification using the Teams admin center indicates that the setting "Who can present" is not configured to "Only organizers and co-organizers".
-                #   - Condition C: Verification using PowerShell indicates that the `DesignatedPresenterRoleMode` is not set to `OrganizerOnlyUserOverride`.
-                # Retrieve the Teams meeting policy for presenters
-                # $CsTeamsMeetingPolicyPresenters Mock Object
-                <#
-                    $CsTeamsMeetingPolicyPresenters = [PSCustomObject]@{
-                        DesignatedPresenterRoleMode           = "Enabled"
-                    }
-                #>
-                $CsTeamsMeetingPolicyPresenters = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property DesignatedPresenterRoleMode
-                return $CsTeamsMeetingPolicyPresenters
-            }
-            '8.5.7' {
-                # Test-ExternalNoControl.ps1
-                # 8.5.7 (L1) Ensure external participants can't give or request control
-                #
-                # 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: Ensure the `AllowExternalParticipantGiveRequestControl` setting in Teams is set to `False`.
-                #   - Condition B: The setting is verified through the Microsoft Teams admin center or via PowerShell command.
-                #   - Condition C: Verification using the UI confirms that external participants are unable to give or request control.
-                #
-                # 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:
-                #   - Condition A: The `AllowExternalParticipantGiveRequestControl` setting in Teams is not set to `False`.
-                #   - Condition B: The setting is verified through the Microsoft Teams admin center or via PowerShell command.
-                #   - Condition C: Verification using the UI indicates that external participants can give or request control.
-                # Retrieve Teams meeting policy for external participant control
-                # $CsTeamsMeetingPolicyControl Mock Object
-                <#
-                    $CsTeamsMeetingPolicyControl = [PSCustomObject]@{
-                        AllowExternalParticipantGiveRequestControl           = $true
-                    }
-                #>
-                $CsTeamsMeetingPolicyControl = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowExternalParticipantGiveRequestControl
-                return $CsTeamsMeetingPolicyControl
-            }
-            '8.6.1' {
-                # 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 Mock Object
-                <#
-                    $CsTeamsMessagingPolicy = [PSCustomObject]@{
-                        AllowSecurityEndUserReporting           = $true
-                    }
-                #>
-                $CsTeamsMessagingPolicy = Get-CsTeamsMessagingPolicy -Identity Global | Select-Object -Property AllowSecurityEndUserReporting
-                return $CsTeamsMessagingPolicy
-            }
-            default { throw "No match found for test: $Rec" }
+        }
+        catch {
+            throw "Get-CISMSTeamsOutput: `n$_"
         }
     }
     end {

source/Private/Get-CISMgOutput.ps1

@@ -38,76 +38,86 @@ function Get-CISMgOutput {
         #>
     }
     process {
-        Write-Verbose "Get-CISMgOutput: Retuning data for Rec: $Rec"
-        switch ($rec) {
-            '1.1.1' {
-                # 1.1.1
-                # Test-AdministrativeAccountCompliance
-                $AdminRoleAssignmentsAndUsers = Get-AdminRoleUserAndAssignment
-                return $AdminRoleAssignmentsAndUsers
-            }
-            '1.1.3' {
-                # Test-GlobalAdminsCount
-                # Step: Retrieve global admin role
-                $globalAdminRole = Get-MgDirectoryRole -Filter "RoleTemplateId eq '62e90394-69f5-4237-9190-012177145e10'"
-                # Step: Retrieve global admin members
-                $globalAdmins = Get-MgDirectoryRoleMember -DirectoryRoleId $globalAdminRole.Id
-                return $globalAdmins
-            }
-            '1.2.1' {
-                # Test-ManagedApprovedPublicGroups
-                $allGroups = Get-MgGroup -All | Where-Object { $_.Visibility -eq "Public" } | Select-Object DisplayName, Visibility
-                return $allGroups
-            }
-            '1.3.1' {
-                # Test-PasswordNeverExpirePolicy.ps1
-                $domains = if ($DomainName) {
-                    Get-MgDomain -DomainId $DomainName
+        try {
+            Write-Verbose "Get-CISMgOutput: Retuning data for Rec: $Rec"
+            switch ($rec) {
+                '1.1.1' {
+                    # 1.1.1
+                    # Test-AdministrativeAccountCompliance
+                    $AdminRoleAssignmentsAndUsers = Get-AdminRoleUserAndAssignment
+                    return $AdminRoleAssignmentsAndUsers
                 }
-                else {
-                    Get-MgDomain
+                '1.1.3' {
+                    # Test-GlobalAdminsCount
+                    # Step: Retrieve global admin role
+                    $globalAdminRole = Get-MgDirectoryRole -Filter "RoleTemplateId eq '62e90394-69f5-4237-9190-012177145e10'"
+                    # Step: Retrieve global admin members
+                    $globalAdmins = Get-MgDirectoryRoleMember -DirectoryRoleId $globalAdminRole.Id
+                    return $globalAdmins
                 }
-                return $domains
-            }
-            '5.1.2.3' {
-                # Test-RestrictTenantCreation
-                # Retrieve the tenant creation policy
-                $tenantCreationPolicy = (Get-MgPolicyAuthorizationPolicy).DefaultUserRolePermissions | Select-Object AllowedToCreateTenants
-                return $tenantCreationPolicy
-            }
-            '5.1.8.1' {
-                # Test-PasswordHashSync
-                # Retrieve password hash sync status (Condition A and C)
-                $passwordHashSync = Get-MgOrganization | Select-Object -ExpandProperty OnPremisesSyncEnabled
-                return $passwordHashSync
-            }
-            '6.1.2' {
-                # Test-MailboxAuditingE3
-                $tenantSkus = Get-MgSubscribedSku -All
-                $e3SkuPartNumber = "SPE_E3"
-                $founde3Sku = $tenantSkus | Where-Object { $_.SkuPartNumber -eq $e3SkuPartNumber }
-                if ($founde3Sku.Count -ne 0) {
-                    $allE3Users = Get-MgUser -Filter "assignedLicenses/any(x:x/skuId eq $($founde3Sku.SkuId) )" -All
-                    return $allE3Users
+                '1.2.1' {
+                    # Test-ManagedApprovedPublicGroups
+                    $allGroups = Get-MgGroup -All | Where-Object { $_.Visibility -eq "Public" } | Select-Object DisplayName, Visibility
+                    return $allGroups
                 }
-                else {
-                    return $null
+                '1.2.2' {
+                    # Test-BlockSharedMailboxSignIn.ps1
+                    $users = Get-MgUser
+                    return $users
                 }
+                '1.3.1' {
+                    # Test-PasswordNeverExpirePolicy.ps1
+                    $domains = if ($DomainName) {
+                        Get-MgDomain -DomainId $DomainName
+                    }
+                    else {
+                        Get-MgDomain
+                    }
+                    return $domains
+                }
+                '5.1.2.3' {
+                    # Test-RestrictTenantCreation
+                    # Retrieve the tenant creation policy
+                    $tenantCreationPolicy = (Get-MgPolicyAuthorizationPolicy).DefaultUserRolePermissions | Select-Object AllowedToCreateTenants
+                    return $tenantCreationPolicy
+                }
+                '5.1.8.1' {
+                    # Test-PasswordHashSync
+                    # Retrieve password hash sync status (Condition A and C)
+                    $passwordHashSync = Get-MgOrganization | Select-Object -ExpandProperty OnPremisesSyncEnabled
+                    return $passwordHashSync
+                }
+                '6.1.2' {
+                    # Test-MailboxAuditingE3
+                    $tenantSKUs = Get-MgSubscribedSku -All
+                    $e3SkuPartNumber = "SPE_E3"
+                    $foundE3Sku = $tenantSKUs | Where-Object { $_.SkuPartNumber -eq $e3SkuPartNumber }
+                    if ($foundE3Sku.Count -ne 0) {
+                        $allE3Users = Get-MgUser -Filter "assignedLicenses/any(x:x/skuId eq $($foundE3Sku.SkuId) )" -All
+                        return $allE3Users
+                    }
+                    else {
+                        return $null
+                    }
+                }
+                '6.1.3' {
+                    # Test-MailboxAuditingE5
+                    $tenantSKUs = Get-MgSubscribedSku -All
+                    $e5SkuPartNumber = "SPE_E5"
+                    $foundE5Sku = $tenantSKUs | Where-Object { $_.SkuPartNumber -eq $e5SkuPartNumber }
+                    if ($foundE5Sku.Count -ne 0) {
+                        $allE5Users = Get-MgUser -Filter "assignedLicenses/any(x:x/skuId eq $($foundE5Sku.SkuId) )" -All
+                        return $allE5Users
+                    }
+                    else {
+                        return $null
+                    }
+                }
+                default { throw "No match found for test: $Rec" }
             }
-            '6.1.3' {
-                # Test-MailboxAuditingE5
-                $tenantSkus = Get-MgSubscribedSku -All
-                $e5SkuPartNumber = "SPE_E5"
-                $founde5Sku = $tenantSkus | Where-Object { $_.SkuPartNumber -eq $e5SkuPartNumber }
-                if ($founde5Sku.Count -ne 0) {
-                    $allE5Users = Get-MgUser -Filter "assignedLicenses/any(x:x/skuId eq $($founde5Sku.SkuId) )" -All
-                    return $allE5Users
-                }
-                else {
-                    return $null
-                }
-            }
-            default { throw "No match found for test: $Rec" }
+        }
+        catch {
+            throw "Get-CISMgOutput: `n$_"
         }
     }
     end {

source/Private/Get-CISSpoOutput.ps1

@@ -1,119 +1,161 @@
 <#
     .SYNOPSIS
-        This is a sample Private function only visible within the module.
+        Retrieves configuration settings from SharePoint Online or PnP based on the specified recommendation.
     .DESCRIPTION
-        This sample function is not exported to the module and only return the data passed as parameter.
+        The Get-CISSpoOutput function retrieves specific configuration settings from SharePoint Online or PnP based on a recommendation number.
+        It dynamically switches between using SPO and PnP commands based on the provided authentication context.
+    .PARAMETER Rec
+        The recommendation number corresponding to the specific test to be run.
+    .INPUTS
+        None. You cannot pipe objects to this function.
+    .OUTPUTS
+        PSCustomObject
+            Returns configuration details for the specified recommendation.
     .EXAMPLE
-        $null = Get-CISSpoOutput -PrivateData 'NOTHING TO SEE HERE'
-    .PARAMETER PrivateData
-        The PrivateData parameter is what will be returned without transformation.
+        PS> Get-CISSpoOutput -Rec '7.2.1'
+        Retrieves the LegacyAuthProtocolsEnabled property from the SharePoint Online or PnP tenant.
 #>
 function Get-CISSpoOutput {
-    [cmdletBinding()]
+    [CmdletBinding()]
     param(
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory = $true, HelpMessage = "The recommendation number corresponding to the specific test to be run.")]
         [String]$Rec
     )
     begin {
-        # Begin Block #
-        <#
-            # Tests
-            7.2.1
-            7.2.2
-            7.2.3
-            7.2.4
-            7.2.5
-            7.2.6
-            7.2.7
-            7.2.9
-            7.2.10
-            7.3.1
-            7.3.2
-            7.3.4
-
-            # Test number array
-            $testNumbers = @('7.2.1', '7.2.2', '7.2.3', '7.2.4', '7.2.5', '7.2.6', '7.2.7', '7.2.9', '7.2.10', '7.3.1', '7.3.2', '7.3.4')
-        #>
+        # Check if PnP should be used
+        $UsePnP = $script:PnpAuth
+        # Determine the prefix based on the switch
+        $prefix = if ($UsePnP) { "PnP" } else { "SPO" }
+        # Define a hashtable to map the function calls
+        $commandMap = @{
+            # Test-ModernAuthSharePoint.ps1
+            # 7.2.1 (L1) Ensure Legacy Authentication Protocols are disabled
+            # $SPOTenant Mock Object
+            '7.2.1' = {
+                Invoke-Command {
+                    & "$((Get-Command -Name "Get-${prefix}Tenant").Name)"
+                } | Select-Object -Property LegacyAuthProtocolsEnabled
+            }
+            # Test-SharePointAADB2B.ps1
+            # 7.2.2 (L1) Ensure SharePoint and OneDrive integration with Azure AD B2B is enabled
+            # $SPOTenantAzureADB2B Mock Object
+            '7.2.2' = {
+                Invoke-Command {
+                    & "$((Get-Command -Name "Get-${prefix}Tenant").Name)"
+                } | Select-Object -Property EnableAzureADB2BIntegration
+            }
+            # Test-RestrictExternalSharing.ps1
+            # 7.2.3 (L1) Ensure external content sharing is restricted
+            # Retrieve the SharingCapability setting for the SharePoint tenant
+            # $SPOTenantSharingCapability Mock Object
+            '7.2.3' = {
+                Invoke-Command {
+                    & "$((Get-Command -Name "Get-${prefix}Tenant").Name)"
+                } | Select-Object -Property SharingCapability
+            }
+            # Test-OneDriveContentRestrictions.ps1
+            # 7.2.4 (L2) Ensure OneDrive content sharing is restricted
+            # $SPOTenant Mock Object
+            '7.2.4' = {
+                Invoke-Command {
+                    if ($prefix -eq "SPO") {
+                        & "$((Get-Command -Name "Get-${prefix}Tenant").Name)" | Select-Object -Property OneDriveSharingCapability
+                    } else {
+                        # Workaround until bugfix in PnP.PowerShell
+                        & "$((Get-Command -Name "Get-${prefix}Tenant").Name)" | Select-Object -Property OneDriveLoopSharingCapability | Select-Object @{Name = "OneDriveSharingCapability"; Expression = { $_.OneDriveLoopSharingCapability }}
+                    }
+                }
+            }
+            # Test-SharePointGuestsItemSharing.ps1
+            # 7.2.5 (L2) Ensure that SharePoint guest users cannot share items they don't own
+            # $SPOTenant Mock Object
+            '7.2.5' = {
+                Invoke-Command {
+                    & "$((Get-Command -Name "Get-${prefix}Tenant").Name)"
+                } | Select-Object -Property PreventExternalUsersFromResharing
+            }
+            # Test-SharePointExternalSharingDomains.ps1
+            # 7.2.6 (L2) Ensure SharePoint external sharing is managed through domain whitelist/blacklists
+            # Add Authorized Domains?
+            # $SPOTenant Mock Object
+            '7.2.6' = {
+                Invoke-Command {
+                    & "$((Get-Command -Name "Get-${prefix}Tenant").Name)"
+                } | Select-Object -Property SharingDomainRestrictionMode, SharingAllowedDomainList
+            }
+            # Test-LinkSharingRestrictions.ps1
+            # Retrieve link sharing configuration for SharePoint and OneDrive
+            # $SPOTenantLinkSharing Mock Object
+            '7.2.7' = {
+                Invoke-Command {
+                    & "$((Get-Command -Name "Get-${prefix}Tenant").Name)"
+                } | Select-Object -Property DefaultSharingLinkType
+            }
+            # Test-GuestAccessExpiration.ps1
+            # Retrieve SharePoint tenant settings related to guest access expiration
+            # $SPOTenantGuestAccess Mock Object
+            '7.2.9' = {
+                Invoke-Command {
+                    & "$((Get-Command -Name "Get-${prefix}Tenant").Name)"
+                } | Select-Object -Property ExternalUserExpirationRequired, ExternalUserExpireInDays
+            }
+            # Test-ReauthWithCode.ps1
+            # 7.2.10 (L1) Ensure reauthentication with verification code is restricted
+            # Retrieve reauthentication settings for SharePoint Online
+            # $SPOTenantReauthentication Mock Object
+            '7.2.10' = {
+                Invoke-Command {
+                    & "$((Get-Command -Name "Get-${prefix}Tenant").Name)"
+                } | Select-Object -Property EmailAttestationRequired, EmailAttestationReAuthDays
+            }
+            # Test-DisallowInfectedFilesDownload.ps1
+            # Retrieve the SharePoint tenant configuration
+            # $SPOTenantDisallowInfectedFileDownload Mock Object
+            '7.3.1' = {
+                Invoke-Command {
+                    & "$((Get-Command -Name "Get-${prefix}Tenant").Name)"
+                } | Select-Object -Property DisallowInfectedFileDownload
+            }
+            # Test-OneDriveSyncRestrictions.ps1
+            # Retrieve OneDrive sync client restriction settings
+            # Add isHybrid parameter?
+            # $SPOTenantSyncClientRestriction Mock Object
+            '7.3.2' = {
+                Invoke-Command {
+                    & "$((Get-Command -Name "Get-${prefix}TenantSyncClientRestriction").Name)"
+                } | Select-Object -Property TenantRestrictionEnabled, AllowedDomainList
+            }
+            # Test-RestrictCustomScripts.ps1
+            # Retrieve all site collections and select necessary properties
+            # $SPOSitesCustomScript Mock Object
+            '7.3.4' = {
+                Invoke-Command {
+                    if ($prefix -eq "SPO") {
+                        & "$((Get-Command -Name "Get-${prefix}Site").Name)" -Limit All | Select-Object Title, Url, DenyAddAndCustomizePages
+                    } else {
+                        & "$((Get-Command -Name "Get-${prefix}TenantSite").Name)" | Select-Object Title, Url, DenyAddAndCustomizePages
+                    }
+                }
+            }
+        }
     }
     process {
-        Write-Verbose "Retuning data for Rec: $Rec"
-        switch ($Rec) {
-            '7.2.1' {
-                # Test-ModernAuthSharePoint.ps1
-                $SPOTenant = Get-SPOTenant | Select-Object -Property LegacyAuthProtocolsEnabled
-                return $SPOTenant
+        try {
+            Write-Verbose "Returning data for Rec: $Rec"
+            if ($commandMap.ContainsKey($Rec)) {
+                # Invoke the script block associated with the command
+                $result = & $commandMap[$Rec] -ErrorAction Stop
+                return $result
             }
-            '7.2.2' {
-                # Test-SharePointAADB2B.ps1
-                # 7.2.2 (L1) Ensure SharePoint and OneDrive integration with Azure AD B2B is enabled
-                $SPOTenantAzureADB2B = Get-SPOTenant | Select-Object EnableAzureADB2BIntegration
-                return $SPOTenantAzureADB2B
+            else {
+                throw "No match found for test: $Rec"
             }
-            '7.2.3' {
-                # Test-RestrictExternalSharing.ps1
-                # 7.2.3 (L1) Ensure external content sharing is restricted
-                # Retrieve the SharingCapability setting for the SharePoint tenant
-                $SPOTenantSharingCapability = Get-SPOTenant | Select-Object SharingCapability
-                return $SPOTenantSharingCapability
-            }
-            '7.2.4' {
-                # Test-OneDriveContentRestrictions.ps1
-                $SPOTenant = Get-SPOTenant | Select-Object OneDriveSharingCapability
-                return $SPOTenant
-            }
-            '7.2.5' {
-                # Test-SharePointGuestsItemSharing.ps1
-                # 7.2.5 (L2) Ensure that SharePoint guest users cannot share items they don't own
-                $SPOTenant = Get-SPOTenant | Select-Object PreventExternalUsersFromResharing
-                return $SPOTenant
-            }
-            '7.2.6' {
-                # Test-SharePointExternalSharingDomains.ps1
-                # 7.2.6 (L2) Ensure SharePoint external sharing is managed through domain whitelist/blacklists
-                $SPOTenant = Get-SPOTenant | Select-Object SharingDomainRestrictionMode, SharingAllowedDomainList
-                return $SPOTenant
-            }
-            '7.2.7' {
-                # Test-LinkSharingRestrictions.ps1
-                # Retrieve link sharing configuration for SharePoint and OneDrive
-                $SPOTenantLinkSharing = Get-SPOTenant | Select-Object DefaultSharingLinkType
-                return $SPOTenantLinkSharing
-            }
-            '7.2.9' {
-                # Test-GuestAccessExpiration.ps1
-                # Retrieve SharePoint tenant settings related to guest access expiration
-                $SPOTenantGuestAccess = Get-SPOTenant | Select-Object ExternalUserExpirationRequired, ExternalUserExpireInDays
-                return $SPOTenantGuestAccess
-            }
-            '7.2.10' {
-                # Test-ReauthWithCode.ps1
-                # 7.2.10 (L1) Ensure reauthentication with verification code is restricted
-                # Retrieve reauthentication settings for SharePoint Online
-                $SPOTenantReauthentication = Get-SPOTenant | Select-Object EmailAttestationRequired, EmailAttestationReAuthDays
-                return $SPOTenantReauthentication
-            }
-            '7.3.1' {
-                # Test-DisallowInfectedFilesDownload.ps1
-                # Retrieve the SharePoint tenant configuration
-                $SPOTenantDisallowInfectedFileDownload = Get-SPOTenant | Select-Object DisallowInfectedFileDownload
-                return $SPOTenantDisallowInfectedFileDownload
-            }
-            '7.3.2' {
-                # Test-OneDriveSyncRestrictions.ps1
-                # Retrieve OneDrive sync client restriction settings
-                $SPOTenantSyncClientRestriction = Get-SPOTenantSyncClientRestriction | Select-Object TenantRestrictionEnabled, AllowedDomainList
-                return $SPOTenantSyncClientRestriction
-            }
-            '7.3.4' {
-                # Test-RestrictCustomScripts.ps1
-                # Retrieve all site collections and select necessary properties
-                $SPOSitesCustomScript = Get-SPOSite -Limit All | Select-Object Title, Url, DenyAddAndCustomizePages
-                return $SPOSitesCustomScript
-            }
-            default { throw "No match found for test: $Rec" }
+        }
+        catch {
+            throw "Get-CISSpoOutput: `n$_"
         }
     }
     end {
-        Write-Verbose "Retuning data for Rec: $Rec"
+        Write-Verbose "Finished processing for Rec: $Rec"
     }
-} # end function Get-CISMSTeamsOutput
+}

source/Private/Get-RequiredModule.ps1

@@ -4,20 +4,27 @@ function Get-RequiredModule {
     param (
         [Parameter(Mandatory = $true, ParameterSetName = 'AuditFunction')]
         [switch]$AuditFunction,
-
         [Parameter(Mandatory = $true, ParameterSetName = 'SyncFunction')]
         [switch]$SyncFunction
     )
-
     switch ($PSCmdlet.ParameterSetName) {
         'AuditFunction' {
-            return @(
-                @{ ModuleName = "ExchangeOnlineManagement"; RequiredVersion = "3.3.0"; SubModules = @() },
-                @{ ModuleName = "AzureAD"; RequiredVersion = "2.0.2.182"; SubModules = @() },
-                @{ ModuleName = "Microsoft.Graph"; RequiredVersion = "2.4.0"; SubModules = @("Groups", "DeviceManagement", "Users", "Identity.DirectoryManagement", "Identity.SignIns") },
-                @{ ModuleName = "Microsoft.Online.SharePoint.PowerShell"; RequiredVersion = "16.0.24009.12000"; SubModules = @() },
-                @{ ModuleName = "MicrosoftTeams"; RequiredVersion = "5.5.0"; SubModules = @() }
-            )
+            if (($script:PnpAuth)) {
+                return @(
+                    @{ ModuleName = "ExchangeOnlineManagement"; RequiredVersion = "3.3.0"; SubModules = @() },
+                    @{ ModuleName = "Microsoft.Graph"; RequiredVersion = "2.4.0"; SubModules = @("DeviceManagement", "Users", "Identity.DirectoryManagement", "Identity.SignIns") },
+                    @{ ModuleName = "PnP.PowerShell"; RequiredVersion = "2.5.0"; SubModules = @() },
+                    @{ ModuleName = "MicrosoftTeams"; RequiredVersion = "5.5.0"; SubModules = @() }
+                )
+            }
+            else {
+                return @(
+                    @{ ModuleName = "ExchangeOnlineManagement"; RequiredVersion = "3.3.0"; SubModules = @() },
+                    @{ ModuleName = "Microsoft.Graph"; RequiredVersion = "2.4.0"; SubModules = @("DeviceManagement", "Users", "Identity.DirectoryManagement", "Identity.SignIns") },
+                    @{ ModuleName = "Microsoft.Online.SharePoint.PowerShell"; RequiredVersion = "16.0.24009.12000"; SubModules = @() },
+                    @{ ModuleName = "MicrosoftTeams"; RequiredVersion = "5.5.0"; SubModules = @() }
+                )
+            }
         }
         'SyncFunction' {
             return @(

source/Private/Get-TestError.ps1

@@ -27,7 +27,7 @@ function Get-TestError {
     $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $LastError })
     # Call Initialize-CISAuditResult with error parameters
     $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
-    Write-Verbose "An error occurred during the test: `n$LastError" -Verbose
+    Write-Verbose "An error occurred during the test $recnum`: `n$LastError" -Verbose
     return $auditResult
 }
 

source/Private/Get-UniqueConnection.ps1

@@ -8,10 +8,7 @@ function Get-UniqueConnection {
 
     $uniqueConnections = @()
 
-    if ($Connections -contains "AzureAD" -or $Connections -contains "AzureAD | EXO" -or $Connections -contains "AzureAD | EXO | Microsoft Graph") {
-        $uniqueConnections += "AzureAD"
-    }
-    if ($Connections -contains "Microsoft Graph" -or $Connections -contains "AzureAD | EXO | Microsoft Graph") {
+    if ($Connections -contains "Microsoft Graph" -or $Connections -contains "AzureAD | EXO | Microsoft Graph" -or $Connections -contains "EXO | Microsoft Graph") {
         $uniqueConnections += "Microsoft Graph"
     }
     if ($Connections -contains "EXO" -or $Connections -contains "AzureAD | EXO" -or $Connections -contains "Microsoft Teams | EXO" -or $Connections -contains "AzureAD | EXO | Microsoft Graph") {

source/Private/Invoke-TestFunction.ps1

@@ -33,7 +33,7 @@ function Invoke-TestFunction {
         return $result
     }
     catch {
-        Write-Error "An error occurred during the test: $_"
+        Write-Error "An error occurred during the test $recnum`:: $_"
         $script:FailedTests.Add([PSCustomObject]@{ Test = $functionName; Error = $_ })
 
         # Call Initialize-CISAuditResult with error parameters

source/Private/Measure-AuditResult.ps1

@@ -18,15 +18,15 @@ function Measure-AuditResult {
     $passPercentage = if ($totalTests -eq 0) { 0 } else { [math]::Round(($passedTests / $totalTests) * 100, 2) }
 
     # Display the pass percentage to the user
-    Write-Host "Audit completed. $passedTests out of $totalTests tests passed." -ForegroundColor Cyan
-    Write-Host "Your passing percentage is $passPercentage%." -ForegroundColor Magenta
+    Write-Information "Audit completed. $passedTests out of $totalTests tests passed."
+    Write-Information "Your passing percentage is $passPercentage%."
 
     # Display details of failed tests
     if ($FailedTests.Count -gt 0) {
-        Write-Host "The following tests failed to complete:" -ForegroundColor Red
+        Write-Verbose "The following tests failed to complete:"
         foreach ($failedTest in $FailedTests) {
-            Write-Host "Test: $($failedTest.Test)" -ForegroundColor Yellow
-            Write-Host "Error: $($failedTest.Error)" -ForegroundColor Yellow
+            Write-Verbose "Test: $($failedTest.Test)"
+            Write-Verbose "Error: $($failedTest.Error)"
         }
     }
 }

source/Public/Export-M365SecurityAuditTable.ps1

@@ -1,228 +1,235 @@
 <#
     .SYNOPSIS
-    Exports M365 security audit results to a CSV file or outputs a specific test result as an object.
+        Exports Microsoft 365 security audit results to CSV or Excel files and supports outputting specific test results as objects.
     .DESCRIPTION
-    This function exports M365 security audit results from either an array of CISAuditResult objects or a CSV file.
-    It can export all results to a specified path or output a specific test result as an object.
+        The Export-M365SecurityAuditTable function exports Microsoft 365 security audit results from an array of CISAuditResult objects or a CSV file.
+        It can export all results to a specified path, output a specific test result as an object, and includes options for exporting results to Excel.
+        Additionally, it computes hashes for the exported files and includes them in the zip archive for verification purposes.
     .PARAMETER AuditResults
-    An array of CISAuditResult objects containing the audit results.
+        An array of CISAuditResult objects containing the audit results. This parameter is mandatory when exporting from audit results.
     .PARAMETER CsvPath
-    The path to a CSV file containing the audit results.
+        The path to a CSV file containing the audit results. This parameter is mandatory when exporting from a CSV file.
     .PARAMETER 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".
-    .PARAMETER ExportAllTests
-    Switch to export all test results.
+        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". This parameter is used to output a specific test result.
+    .PARAMETER ExportNestedTables
+        Switch to export all test results. When specified, all test results are exported to the specified path.
     .PARAMETER ExportPath
-    The path where the CSV files will be exported.
+        The path where the CSV or Excel files will be exported. This parameter is mandatory when exporting all tests.
     .PARAMETER ExportOriginalTests
-    Switch to export the original audit results to a CSV file.
+        Switch to export the original audit results to a CSV file. When specified, the original test results are exported along with the processed results.
     .PARAMETER ExportToExcel
-    Switch to export the results to an Excel file.
+        Switch to export the results to an Excel file. When specified, results are exported in Excel format.
     .INPUTS
-    [CISAuditResult[]], [string]
+        [CISAuditResult[]] - An array of CISAuditResult objects.
+            [string] - A path to a CSV file.
     .OUTPUTS
-    [PSCustomObject]
+        [PSCustomObject] - A custom object containing the path to the zip file and its hash.
     .EXAMPLE
-    Export-M365SecurityAuditTable -AuditResults $object -OutputTestNumber 6.1.2
-    # Output object for a single test number from audit results
+        Export-M365SecurityAuditTable -AuditResults $object -OutputTestNumber 6.1.2
+            # Outputs the result of test number 6.1.2 from the provided audit results as an object.
     .EXAMPLE
-    Export-M365SecurityAuditTable -ExportAllTests -AuditResults $object -ExportPath "C:\temp"
-    # Export all results from audit results to the specified path
+        Export-M365SecurityAuditTable -ExportNestedTables -AuditResults $object -ExportPath "C:\temp"
+            # Exports all audit results to the specified path in CSV format.
     .EXAMPLE
-    Export-M365SecurityAuditTable -CsvPath "C:\temp\auditresultstoday1.csv" -OutputTestNumber 6.1.2
-    # Output object for a single test number from CSV
+        Export-M365SecurityAuditTable -CsvPath "C:\temp\auditresultstoday1.csv" -OutputTestNumber 6.1.2
+            # Outputs the result of test number 6.1.2 from the CSV file as an object.
     .EXAMPLE
-    Export-M365SecurityAuditTable -ExportAllTests -CsvPath "C:\temp\auditresultstoday1.csv" -ExportPath "C:\temp"
-    # Export all results from CSV to the specified path
+        Export-M365SecurityAuditTable -ExportNestedTables -CsvPath "C:\temp\auditresultstoday1.csv" -ExportPath "C:\temp"
+            # Exports all audit results from the CSV file to the specified path in CSV format.
     .EXAMPLE
-    Export-M365SecurityAuditTable -ExportAllTests -AuditResults $object -ExportPath "C:\temp" -ExportOriginalTests
-    # Export all results from audit results to the specified path along with the original tests
+        Export-M365SecurityAuditTable -ExportNestedTables -AuditResults $object -ExportPath "C:\temp" -ExportOriginalTests
+            # Exports all audit results along with the original test results to the specified path in CSV format.
     .EXAMPLE
-    Export-M365SecurityAuditTable -ExportAllTests -CsvPath "C:\temp\auditresultstoday1.csv" -ExportPath "C:\temp" -ExportOriginalTests
-    # Export all results from CSV to the specified path along with the original tests
+        Export-M365SecurityAuditTable -ExportNestedTables -CsvPath "C:\temp\auditresultstoday1.csv" -ExportPath "C:\temp" -ExportOriginalTests
+            # Exports all audit results from the CSV file along with the original test results to the specified path in CSV format.
+    .EXAMPLE
+        Export-M365SecurityAuditTable -ExportNestedTables -AuditResults $object -ExportPath "C:\temp" -ExportToExcel
+            # Exports all audit results to the specified path in Excel format.
     .LINK
-    https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Export-M365SecurityAuditTable
+        https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Export-M365SecurityAuditTable
 #>
 function Export-M365SecurityAuditTable {
-    [CmdletBinding()]
+    [CmdletBinding(SupportsShouldProcess, ConfirmImpact = 'High')]
     [OutputType([PSCustomObject])]
     param (
         [Parameter(Mandatory = $true, Position = 1, ParameterSetName = "ExportAllResultsFromAuditResults")]
         [Parameter(Mandatory = $true, Position = 2, ParameterSetName = "OutputObjectFromAuditResultsSingle")]
         [CISAuditResult[]]$AuditResults,
-
         [Parameter(Mandatory = $true, Position = 1, ParameterSetName = "ExportAllResultsFromCsv")]
         [Parameter(Mandatory = $true, Position = 2, ParameterSetName = "OutputObjectFromCsvSingle")]
         [ValidateScript({ (Test-Path $_) -and ((Get-Item $_).PSIsContainer -eq $false) })]
         [string]$CsvPath,
-
         [Parameter(Mandatory = $true, Position = 1, ParameterSetName = "OutputObjectFromAuditResultsSingle")]
         [Parameter(Mandatory = $true, Position = 1, ParameterSetName = "OutputObjectFromCsvSingle")]
         [ValidateSet("1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4")]
         [string]$OutputTestNumber,
-
         [Parameter(Mandatory = $false, Position = 0, ParameterSetName = "ExportAllResultsFromAuditResults")]
         [Parameter(Mandatory = $false, Position = 0, ParameterSetName = "ExportAllResultsFromCsv")]
-        [switch]$ExportAllTests,
-
+        [switch]$ExportNestedTables,
         [Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromAuditResults")]
         [Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromCsv")]
         [string]$ExportPath,
-
-        [Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromAuditResults")]
-        [Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromCsv")]
-        [switch]$ExportOriginalTests,
-
         [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromAuditResults")]
         [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromCsv")]
-        [switch]$ExportToExcel
+        [switch]$ExportOriginalTests,
+        [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromAuditResults")]
+        [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromCsv")]
+        [switch]$ExportToExcel,
+        # Add Prefix to filename after date when outputting to excel or csv.
+        [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromAuditResults")]
+        [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromCsv")]
+        # Validate that the count of letters in the prefix is less than 5.
+        [ValidateLength(0, 5)]
+        [string]$Prefix = "Corp"
     )
-    if ($ExportToExcel) {
-        Assert-ModuleAvailability -ModuleName ImportExcel -RequiredVersion "7.8.9"
-    }
-    if ($PSCmdlet.ParameterSetName -like "ExportAllResultsFromCsv" -or $PSCmdlet.ParameterSetName -eq "OutputObjectFromCsvSingle") {
-        $AuditResults = Import-Csv -Path $CsvPath | ForEach-Object {
-            $params = @{
-                Rec           = $_.Rec
-                Result        = [bool]$_.Result
-                Status        = $_.Status
-                Details       = $_.Details
-                FailureReason = $_.FailureReason
+    Begin {
+        $createdFiles = @() # Initialize an array to keep track of created files
+
+        if ($ExportToExcel) {
+            if ($PSCmdlet.ShouldProcess("ImportExcel v7.8.9", "Assert-ModuleAvailability")) {
+                Assert-ModuleAvailability -ModuleName ImportExcel -RequiredVersion "7.8.9"
             }
-            Initialize-CISAuditResult @params
         }
-    }
-
-    if ($ExportAllTests) {
-        $TestNumbers = "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4"
-    }
-
-    $results = @()
-
-    $testsToProcess = if ($OutputTestNumber) { @($OutputTestNumber) } else { $TestNumbers }
-
-    foreach ($test in $testsToProcess) {
-        $auditResult = $AuditResults | Where-Object { $_.Rec -eq $test }
-        if (-not $auditResult) {
-            Write-Information "No audit results found for the test number $test."
-            continue
+        if ($PSCmdlet.ParameterSetName -like "ExportAllResultsFromCsv" -or $PSCmdlet.ParameterSetName -eq "OutputObjectFromCsvSingle") {
+            $AuditResults = Import-Csv -Path $CsvPath | ForEach-Object {
+                $params = @{
+                    Rec           = $_.Rec
+                    Result        = [bool]$_.Result
+                    Status        = $_.Status
+                    Details       = $_.Details
+                    FailureReason = $_.FailureReason
+                }
+                Initialize-CISAuditResult @params
+            }
         }
-
-        switch ($test) {
-            "6.1.2" {
-                $details = $auditResult.Details
-                if ($details -ne "No M365 E3 licenses found.") {
+        if ($ExportNestedTables) {
+            $TestNumbers = "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4"
+        }
+        $results = @()
+        $testsToProcess = if ($OutputTestNumber) { @($OutputTestNumber) } else { $TestNumbers }
+    }
+    Process {
+        foreach ($test in $testsToProcess) {
+            $auditResult = $AuditResults | Where-Object { $_.Rec -eq $test }
+            if (-not $auditResult) {
+                Write-Information "No audit results found for the test number $test."
+                continue
+            }
+            switch ($test) {
+                "6.1.2" {
+                    $details = $auditResult.Details
+                    $newObjectDetails = Get-AuditMailboxDetail -Details $details -Version '6.1.2'
+                    $results += [PSCustomObject]@{ TestNumber = $test; Details = $newObjectDetails }
+                }
+                "6.1.3" {
+                    $details = $auditResult.Details
+                    $newObjectDetails = Get-AuditMailboxDetail -Details $details -Version '6.1.3'
+                    $results += [PSCustomObject]@{ TestNumber = $test; Details = $newObjectDetails }
+                }
+                Default {
+                    $details = $auditResult.Details
                     $csv = $details | ConvertFrom-Csv -Delimiter '|'
+                    $results += [PSCustomObject]@{ TestNumber = $test; Details = $csv }
                 }
-                else {
-                    $csv = $null
-                }
-
-                if ($null -ne $csv) {
-                    foreach ($row in $csv) {
-                        $row.AdminActionsMissing = (Get-Action -AbbreviatedActions $row.AdminActionsMissing.Split(',') -ReverseActionType Admin | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }) -join ','
-                        $row.DelegateActionsMissing = (Get-Action -AbbreviatedActions $row.DelegateActionsMissing.Split(',') -ReverseActionType Delegate | Where-Object { $_ -notin @("MailItemsAccessed") }) -join ','
-                        $row.OwnerActionsMissing = (Get-Action -AbbreviatedActions $row.OwnerActionsMissing.Split(',') -ReverseActionType Owner | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }) -join ','
-                    }
-                    $newObjectDetails = $csv
-                }
-                else {
-                    $newObjectDetails = $details
-                }
-                $results += [PSCustomObject]@{ TestNumber = $test; Details = $newObjectDetails }
-            }
-            "6.1.3" {
-                $details = $auditResult.Details
-                if ($details -ne "No M365 E5 licenses found.") {
-                    $csv = $details | ConvertFrom-Csv -Delimiter '|'
-                }
-                else {
-                    $csv = $null
-                }
-
-                if ($null -ne $csv) {
-                    foreach ($row in $csv) {
-                        $row.AdminActionsMissing = (Get-Action -AbbreviatedActions $row.AdminActionsMissing.Split(',') -ReverseActionType Admin) -join ','
-                        $row.DelegateActionsMissing = (Get-Action -AbbreviatedActions $row.DelegateActionsMissing.Split(',') -ReverseActionType Delegate) -join ','
-                        $row.OwnerActionsMissing = (Get-Action -AbbreviatedActions $row.OwnerActionsMissing.Split(',') -ReverseActionType Owner) -join ','
-                    }
-                    $newObjectDetails = $csv
-                }
-                else {
-                    $newObjectDetails = $details
-                }
-                $results += [PSCustomObject]@{ TestNumber = $test; Details = $newObjectDetails }
-            }
-            Default {
-                $details = $auditResult.Details
-                $csv = $details | ConvertFrom-Csv -Delimiter '|'
-                $results += [PSCustomObject]@{ TestNumber = $test; Details = $csv }
             }
         }
     }
-
-    if ($ExportPath) {
-        $timestamp = (Get-Date).ToString("yyyy.MM.dd_HH.mm.ss")
-        $exportedTests = @()
-
-        foreach ($result in $results) {
-            $testDef = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $result.TestNumber }
-            if ($testDef) {
-                $fileName = "$ExportPath\$($timestamp)_$($result.TestNumber).$($testDef.TestFileName -replace '\.ps1$').csv"
-                if ($result.Details.Count -eq 0) {
-                    Write-Information "No results found for test number $($result.TestNumber)." -InformationAction Continue
-                }
-                else {
-                    if (($result.Details -ne "No M365 E3 licenses found.") -and ($result.Details -ne "No M365 E5 licenses found.")) {
-                        if ($ExportToExcel) {
-                            $xlsxPath = [System.IO.Path]::ChangeExtension($fileName, '.xlsx')
-                            $result.Details | Export-Excel -Path $xlsxPath -WorksheetName Table -TableName Table -AutoSize -TableStyle Medium2
+    End {
+        if ($ExportPath) {
+            if ($PSCmdlet.ShouldProcess("Export-M365SecurityAuditTable", "Exporting results to $ExportPath")) {
+                $timestamp = (Get-Date).ToString("yyyy.MM.dd_HH.mm.ss")
+                $exportedTests = @()
+                foreach ($result in $results) {
+                    $testDef = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $result.TestNumber }
+                    if ($testDef) {
+                        $fileName = "$ExportPath\$($timestamp)_$($result.TestNumber).$($testDef.TestFileName -replace '\.ps1$').csv"
+                        if ($result.Details.Count -eq 0) {
+                            Write-Information "No results found for test number $($result.TestNumber)."
                         }
                         else {
-                            $result.Details | Export-Csv -Path $fileName -NoTypeInformation
+                            if (($result.Details -ne "No M365 E3 licenses found.") -and ($result.Details -ne "No M365 E5 licenses found.")) {
+                                if ($ExportToExcel) {
+                                    $xlsxPath = [System.IO.Path]::ChangeExtension($fileName, '.xlsx')
+                                    $result.Details | Export-Excel -Path $xlsxPath -WorksheetName Table -TableName Table -AutoSize -TableStyle Medium2
+                                    $createdFiles += $xlsxPath # Add the created file to the array
+                                }
+                                else {
+                                    $result.Details | Export-Csv -Path $fileName -NoTypeInformation
+                                    $createdFiles += $fileName # Add the created file to the array
+                                }
+                                $exportedTests += $result.TestNumber
+                            }
                         }
-                        $exportedTests += $result.TestNumber
                     }
                 }
+                if ($exportedTests.Count -gt 0) {
+                    Write-Information "The following tests were exported: $($exportedTests -join ', ')"
+                }
+                else {
+                    if ($ExportOriginalTests) {
+                        Write-Information "Full audit results exported however, none of the following tests had exports: `n1.1.1, 1.3.1, 6.1.2, 6.1.3, 7.3.4"
+                    }
+                    else {
+                        Write-Information "No specified tests were included in the export."
+                    }
+                }
+                if ($ExportOriginalTests) {
+                    # Define the test numbers to check
+                    $TestNumbersToCheck = "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4"
+                    # Check for large details and update the AuditResults array
+                    $updatedAuditResults = Get-ExceededLengthResultDetail -AuditResults $AuditResults -TestNumbersToCheck $TestNumbersToCheck -ExportedTests $exportedTests -DetailsLengthLimit 30000 -PreviewLineCount 25
+                    $originalFileName = "$ExportPath\$timestamp`_$Prefix-M365FoundationsAudit.csv"
+                    if ($ExportToExcel) {
+                        $xlsxPath = [System.IO.Path]::ChangeExtension($originalFileName, '.xlsx')
+                        $updatedAuditResults | Export-Excel -Path $xlsxPath -WorksheetName Table -TableName Table -AutoSize -TableStyle Medium2
+                        $createdFiles += $xlsxPath # Add the created file to the array
+                    }
+                    else {
+                        $updatedAuditResults | Export-Csv -Path $originalFileName -NoTypeInformation
+                        $createdFiles += $originalFileName # Add the created file to the array
+                    }
+                }
+                # Hash each file and add it to a dictionary
+                # Hash each file and save the hashes to a text file
+                $hashFilePath = "$ExportPath\$timestamp`_Hashes.txt"
+                $fileHashes = @()
+                foreach ($file in $createdFiles) {
+                    $hash = Get-FileHash -Path $file -Algorithm SHA256
+                    $fileHashes += "$($file): $($hash.Hash)"
+                }
+                $fileHashes | Set-Content -Path $hashFilePath
+                $createdFiles += $hashFilePath # Add the hash file to the array
+                # Create a zip file and add all the created files
+                $zipFilePath = "$ExportPath\$timestamp`_$Prefix-M365FoundationsAudit.zip"
+                Compress-Archive -Path $createdFiles -DestinationPath $zipFilePath
+                # Remove the original files after they have been added to the zip
+                foreach ($file in $createdFiles) {
+                    Remove-Item -Path $file -Force
+                }
+                # Compute the hash for the zip file and rename it
+                $zipHash = Get-FileHash -Path $zipFilePath -Algorithm SHA256
+                $newZipFilePath = "$ExportPath\$timestamp`_$Prefix-M365FoundationsAudit_$($zipHash.Hash.Substring(0, 8)).zip"
+                Rename-Item -Path $zipFilePath -NewName $newZipFilePath
+                # Output the zip file path with hash
+                return [PSCustomObject]@{
+                    ZipFilePath = $newZipFilePath
+                }
             }
-        }
-        if ($exportedTests.Count -gt 0) {
-            Write-Information "The following tests were exported: $($exportedTests -join ', ')" -InformationAction Continue
-        }
-        else {
-            if ($ExportOriginalTests) {
-                Write-Information "Full audit results exported however, none of the following tests had exports: `n1.1.1, 1.3.1, 6.1.2, 6.1.3, 7.3.4" -InformationAction Continue
+        } # End of ExportPath
+        elseif ($OutputTestNumber) {
+            if ($results[0].Details) {
+                return $results[0].Details
             }
             else {
-                Write-Information "No specified tests were included in the export." -InformationAction Continue
+                Write-Information "No results found for test number $($OutputTestNumber)."
             }
         }
-
-        if ($ExportOriginalTests) {
-            # Define the test numbers to check
-            $TestNumbersToCheck = "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4"
-
-            # Check for large details and update the AuditResults array
-            $updatedAuditResults = Get-ExceededLengthResultDetail -AuditResults $AuditResults -TestNumbersToCheck $TestNumbersToCheck -ExportedTests $exportedTests -DetailsLengthLimit 30000 -PreviewLineCount 25
-            $originalFileName = "$ExportPath\$timestamp`_M365FoundationsAudit.csv"
-            if ($ExportToExcel) {
-                $xlsxPath = [System.IO.Path]::ChangeExtension($originalFileName, '.xlsx')
-                $updatedAuditResults | Export-Excel -Path $xlsxPath -WorksheetName Table -TableName Table -AutoSize -TableStyle Medium2
-            }
-            else {
-            $updatedAuditResults | Export-Csv -Path $originalFileName -NoTypeInformation
-            }
-        }
-    }
-    elseif ($OutputTestNumber) {
-        if ($results[0].Details) {
-            return $results[0].Details
-        }
         else {
-            Write-Information "No results found for test number $($OutputTestNumber)." -InformationAction Continue
+            Write-Error "No valid operation specified. Please provide valid parameters."
         }
+        # Output the created files at the end
+        #if ($createdFiles.Count -gt 0) {
+        ###########    $createdFiles
+        #}
     }
-    else {
-        Write-Error "No valid operation specified. Please provide valid parameters."
-    }
-}
+}

source/Public/Get-AdminRoleUserLicense.ps1

@@ -8,19 +8,19 @@
 .EXAMPLE
     PS> Get-AdminRoleUserLicense
 
-    This example retrieves all administrative role users along with their licenses by connecting to Microsoft Graph using the default scopes.
+        This example retrieves all administrative role users along with their licenses by connecting to Microsoft Graph using the default scopes.
 .EXAMPLE
     PS> Get-AdminRoleUserLicense -SkipGraphConnection
 
-    This example retrieves all administrative role users along with their licenses without attempting to connect to Microsoft Graph, assuming that the connection is already established.
+        This example retrieves all administrative role users along with their licenses without attempting to connect to Microsoft Graph, assuming that the connection is already established.
 .INPUTS
     None. You cannot pipe objects to Get-AdminRoleUserLicense.
 .OUTPUTS
     PSCustomObject
-    Returns a custom object for each user with administrative roles that includes the following properties: RoleName, UserName, UserPrincipalName, UserId, HybridUser, and Licenses.
+        Returns a custom object for each user with administrative roles that includes the following properties: RoleName, UserName, UserPrincipalName, UserId, HybridUser, and Licenses.
 .NOTES
     Creation Date:  2024-04-15
-    Purpose/Change: Initial function development to support Microsoft 365 administrative role auditing.
+        Purpose/Change: Initial function development to support Microsoft 365 administrative role auditing.
 .LINK
     https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-AdminRoleUserLicense
 #>

source/Public/Get-MFAStatus.ps1

@@ -7,20 +7,20 @@
         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.
     .EXAMPLE
         Get-MFAStatus
-        Retrieves the MFA status for all Azure Active Directory users.
+            Retrieves the MFA status for all Azure Active Directory users.
     .EXAMPLE
         Get-MFAStatus -UserId "example@domain.com"
-        Retrieves the MFA status for the specified user with the UPN "example@domain.com".
+            Retrieves the MFA status for the specified user with the UPN "example@domain.com".
     .OUTPUTS
         System.Object
-        Returns a sorted list of custom objects containing the following properties:
-        - UserPrincipalName
-        - DisplayName
-        - MFAState
-        - MFADefaultMethod
-        - MFAPhoneNumber
-        - PrimarySMTP
-        - Aliases
+            Returns a sorted list of custom objects containing the following properties:
+                - UserPrincipalName
+                - DisplayName
+                - MFAState
+                - MFADefaultMethod
+                - MFAPhoneNumber
+                - PrimarySMTP
+                - Aliases
     .NOTES
         The function requires the MSOL module to be installed and connected to your tenant.
         Ensure that you have the necessary permissions to read user and MFA status information.

source/Public/Grant-M365SecurityAuditConsent.ps1

@@ -16,11 +16,11 @@
     .EXAMPLE
         Grant-M365SecurityAuditConsent -UserPrincipalNameForConsent user@example.com
 
-        Grants Microsoft Graph permissions to user@example.com for the client application with the specified Application ID.
+            Grants Microsoft Graph permissions to user@example.com for the client application with the specified Application ID.
     .EXAMPLE
         Grant-M365SecurityAuditConsent -UserPrincipalNameForConsent user@example.com -SkipGraphConnection
 
-        Grants Microsoft Graph permissions to user@example.com, skipping the connection to Microsoft Graph.
+            Grants Microsoft Graph permissions to user@example.com, skipping the connection to Microsoft Graph.
     .NOTES
         This function requires the Microsoft.Graph module version 2.4.0 or higher.
     .LINK

source/Public/Invoke-M365SecurityAudit.ps1

@@ -2,15 +2,17 @@
     .SYNOPSIS
         Invokes a security audit for Microsoft 365 environments.
     .DESCRIPTION
-        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.
+        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 in alignment with CIS benchmarks designated "Automatic".
     .PARAMETER TenantAdminUrl
         The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.
     .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.
+        The domain name of the Microsoft 365 environment to test. It is optional and will trigger various tests to run only for the specified domain.
+            Tests Affected: 2.1.9/Test-EnableDKIM, 1.3.1/Test-PasswordNeverExpirePolicy, 2.1.4/Test-SafeAttachmentsPolicy
     .PARAMETER ELevel
         Specifies the E-Level (E3 or E5) for the audit. This parameter is optional and can be combined with the ProfileLevel parameter.
     .PARAMETER ProfileLevel
-        Specifies the profile level (L1 or L2) for the audit. This parameter is optional and can be combined with the ELevel parameter.
+        Specifies the profile level (L1 or L2) for the audit. This parameter is mandatory, but only when ELevel is selected. Otherwise it is not required.
     .PARAMETER IncludeIG1
         If specified, includes tests where IG1 is true.
     .PARAMETER IncludeIG2
@@ -22,9 +24,11 @@
     .PARAMETER SkipRecommendation
         Specifies specific recommendations to exclude from the audit. Accepts an array of recommendation numbers.
     .PARAMETER ApprovedCloudStorageProviders
-        Specifies the approved cloud storage providers for the audit. Accepts an array of cloud storage provider names.
+        Specifies the approved cloud storage providers for the audit. Accepts an array of cloud storage provider names for test 8.1.1/Test-TeamsExternalFileSharing.
+            Acceptable values: 'GoogleDrive', 'ShareFile', 'Box', 'DropBox', 'Egnyte'
     .PARAMETER ApprovedFederatedDomains
-        Specifies the approved federated domains for the audit test 8.2.1. Accepts an array of allowed domain names.
+        Specifies the approved federated domains for the audit test 8.2.1/Test-TeamsExternalAccess. Accepts an array of allowed domain names.
+            Additional Tests may include this parameter in the future.
     .PARAMETER DoNotConnect
         If specified, the cmdlet will not establish a connection to Microsoft 365 services.
     .PARAMETER DoNotDisconnect
@@ -33,88 +37,48 @@
         If specified, the cmdlet will not check for the presence of required modules.
     .PARAMETER DoNotConfirmConnections
         If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.
+    .PARAMETER AuthParams
+        Specifies an authentication object containing parameters for application-based authentication. If provided, this will be used for connecting to services.
     .EXAMPLE
         PS> Invoke-M365SecurityAudit
-
-        Performs a security audit using default parameters.
-        Output:
-        Status      : Fail
-        ELevel      : E3
-        ProfileLevel: L1
-        Connection  : Microsoft Graph
-        Rec         : 1.1.1
-        Result      : False
-        Details     : Non-compliant accounts:
-                        Username        | Roles                  | HybridStatus | Missing Licence
-                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
-                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
-        FailureReason: Non-Compliant Accounts: 2
+            # Performs a security audit using default parameters.
     .EXAMPLE
         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:
-        Status      : Fail
-        ELevel      : E5
-        ProfileLevel: L1
-        Connection  : Microsoft Graph
-        Rec         : 1.1.1
-        Result      : False
-        Details     : Non-compliant accounts:
-                        Username        | Roles                  | HybridStatus | Missing Licence
-                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
-                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
-        FailureReason: Non-Compliant Accounts: 2
+            # Performs a security audit for the E5 level and L1 profile in the specified Microsoft 365 environment.
     .EXAMPLE
         PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -IncludeIG1
-
-        Performs an audit including all tests where IG1 is true.
-        Output:
-        Status      : Fail
-        ELevel      : E3
-        ProfileLevel: L1
-        Connection  : Microsoft Graph
-        Rec         : 1.1.1
-        Result      : False
-        Details     : Non-compliant accounts:
-                        Username        | Roles                  | HybridStatus | Missing Licence
-                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
-                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
-        FailureReason: Non-Compliant Accounts: 2
+            # Performs a security audit while including tests where IG1 is true.
     .EXAMPLE
         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
-        ELevel      : E3
-        ProfileLevel: L1
-        Connection  : Microsoft Graph
-        Rec         : 1.1.1
-        Result      : False
-        Details     : Non-compliant accounts:
-                        Username        | Roles                  | HybridStatus | Missing Licence
-                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
-                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
-        FailureReason: Non-Compliant Accounts: 2
+            # Performs an audit while excluding specific recommendations 1.1.3 and 2.1.1.
     .EXAMPLE
         PS> $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com"
+        PS> Export-M365SecurityAuditTable -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests -ExportAllTests
+    .EXAMPLE
+        # (PowerShell 7.x Only) Creating a new authentication object for the security audit for app-based authentication.
+        PS> $authParams = New-M365SecurityAuditAuthObject `
+                -ClientCertThumbPrint "ABCDEF1234567890ABCDEF1234567890ABCDEF12" `
+                -ClientId "12345678-1234-1234-1234-123456789012" `
+                -TenantId "12345678-1234-1234-1234-123456789012" `
+                -OnMicrosoftUrl "yourcompany.onmicrosoft.com" `
+                -SpAdminUrl "https://yourcompany-admin.sharepoint.com"
+            Invoke-M365SecurityAudit -AuthParams $authParams -TenantAdminUrl "https://yourcompany-admin.sharepoint.com"
+        # Or:
         PS> $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation
-
-        Captures the audit results into a variable and exports them to a CSV file.
-        Output:
-        CISAuditResult[]
-        auditResults.csv
+            # Captures the audit results into a variable and exports them to a CSV file (Nested tables will be truncated).
+                Output:
+                    CISAuditResult[]
+                    auditResults.csv
     .EXAMPLE
         PS> Invoke-M365SecurityAudit -WhatIf
-
-        Displays what would happen if the cmdlet is run without actually performing the audit.
-        Output:
-        What if: Performing the operation "Invoke-M365SecurityAudit" on target "Microsoft 365 environment".
+            Displays what would happen if the cmdlet is run without actually performing the audit.
+                Output:
+                    What if: Performing the operation "Invoke-M365SecurityAudit" on target "Microsoft 365 environment".
     .INPUTS
         None. You cannot pipe objects to Invoke-M365SecurityAudit.
     .OUTPUTS
         CISAuditResult[]
-        The cmdlet returns an array of CISAuditResult objects representing the results of the security audit.
+            The cmdlet returns an array of CISAuditResult objects representing the results of the security audit.
     .NOTES
         - This module is based on CIS benchmarks.
         - Governed by the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
@@ -126,7 +90,8 @@
         https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit
 #>
 function Invoke-M365SecurityAudit {
-    [CmdletBinding(SupportsShouldProcess = $true, DefaultParameterSetName = 'Default')]
+    # Add confirm to high
+    [CmdletBinding(SupportsShouldProcess = $true, ConfirmImpact = "High" , DefaultParameterSetName = 'Default')]
     [OutputType([CISAuditResult[]])]
     param (
         [Parameter(Mandatory = $false, HelpMessage = "The SharePoint tenant admin URL, which should end with '-admin.sharepoint.com'. If not specified none of the Sharepoint Online tests will run.")]
@@ -189,19 +154,25 @@ function Invoke-M365SecurityAudit {
         [Parameter(Mandatory = $false, HelpMessage = "Specifies that the cmdlet will not check for the presence of required modules.")]
         [switch]$NoModuleCheck,
         [Parameter(Mandatory = $false, HelpMessage = "Specifies that the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.")]
-        [switch]$DoNotConfirmConnections
+        [switch]$DoNotConfirmConnections,
+        [Parameter(Mandatory = $false, HelpMessage = "Specifies an authentication object containing parameters for application-based authentication.")]
+        [CISAuthenticationParameters]$AuthParams
     )
     Begin {
         if ($script:MaximumFunctionCount -lt 8192) {
+            Write-Verbose "Setting the `$script:MaximumFunctionCount to 8192 for the test run."
             $script:MaximumFunctionCount = 8192
         }
+        if ($AuthParams) {
+            $script:PnpAuth = $true
+        }
         # Ensure required modules are installed
         $requiredModules = Get-RequiredModule -AuditFunction
         # Format the required modules list
         $requiredModulesFormatted = Format-RequiredModuleList -RequiredModules $requiredModules
         # Check and install required modules if necessary
-        if (!($NoModuleCheck) -and $PSCmdlet.ShouldProcess("Check for required modules: $requiredModulesFormatted", "Check")) {
-            Write-Host "Checking for and installing required modules..." -ForegroundColor DarkMagenta
+        if (!($NoModuleCheck) -and $PSCmdlet.ShouldProcess("Modules: $requiredModulesFormatted", "Assert-ModuleAvailability")) {
+            Write-Information "Checking for and installing required modules..."
             foreach ($module in $requiredModules) {
                 Assert-ModuleAvailability -ModuleName $module.ModuleName -RequiredVersion $module.RequiredVersion -SubModules $module.SubModules
             }
@@ -251,46 +222,59 @@ function Invoke-M365SecurityAudit {
         try {
             $actualUniqueConnections = Get-UniqueConnection -Connections $requiredConnections
             if (!($DoNotConnect) -and $PSCmdlet.ShouldProcess("Establish connections to Microsoft 365 services: $($actualUniqueConnections -join ', ')", "Connect")) {
-                Write-Host "Establishing connections to Microsoft 365 services: $($actualUniqueConnections -join ', ')" -ForegroundColor DarkMagenta
-                Connect-M365Suite -TenantAdminUrl $TenantAdminUrl -RequiredConnections $requiredConnections -SkipConfirmation:$DoNotConfirmConnections
+                Write-Information "Establishing connections to Microsoft 365 services: $($actualUniqueConnections -join ', ')"
+                Connect-M365Suite -TenantAdminUrl $TenantAdminUrl -RequiredConnections $requiredConnections -SkipConfirmation:$DoNotConfirmConnections -AuthParams $AuthParams
             }
         }
         catch {
-            Write-Host "Connection execution aborted: $_" -ForegroundColor Red
-            break
+            Throw "Connection execution aborted: $_"
         }
         try {
-            Write-Host "A total of $($totalTests) tests were selected to run..." -ForegroundColor DarkMagenta
-            # Import the test functions
-            $testFiles | ForEach-Object {
-                $currentTestIndex++
-                Write-Progress -Activity "Loading Test Scripts" -Status "Loading $($currentTestIndex) of $($totalTests): $($_.Name)" -PercentComplete (($currentTestIndex / $totalTests) * 100)
-                Try {
-                    # Dot source the test function
-                    . $_.FullName
+            if ($PSCmdlet.ShouldProcess("Measure and display audit results for $($totalTests) tests", "Measure")) {
+                Write-Information "A total of $($totalTests) tests were selected to run..."
+                # Import the test functions
+                $testFiles | ForEach-Object {
+                    $currentTestIndex++
+                    Write-Progress -Activity "Loading Test Scripts" -Status "Loading $($currentTestIndex) of $($totalTests): $($_.Name)" -PercentComplete (($currentTestIndex / $totalTests) * 100)
+                    Try {
+                        # Dot source the test function
+                        . $_.FullName
+                    }
+                    Catch {
+                        # Log the error and add the test to the failed tests collection
+                        Write-Verbose "Failed to load test function $($_.Name): $_"
+                        $script:FailedTests.Add([PSCustomObject]@{ Test = $_.Name; Error = $_ })
+                    }
                 }
-                Catch {
-                    # Log the error and add the test to the failed tests collection
-                    Write-Verbose "Failed to load test function $($_.Name): $_" -Verbose
-                    $script:FailedTests.Add([PSCustomObject]@{ Test = $_.Name; Error = $_ })
-                }
-            }
-            $currentTestIndex = 0
-            # Execute each test function from the prepared list
-            foreach ($testFunction in $testFiles) {
-                $currentTestIndex++
-                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")) {
+                $currentTestIndex = 0
+                # Execute each test function from the prepared list
+                foreach ($testFunction in $testFiles) {
+                    $currentTestIndex++
+                    Write-Progress -Activity "Executing Tests" -Status "Executing $($currentTestIndex) of $($totalTests): $($testFunction.Name)" -PercentComplete (($currentTestIndex / $totalTests) * 100)
+                    $functionName = $testFunction.BaseName
+                    Write-Information "Executing test function: $functionName"
                     $auditResult = Invoke-TestFunction -FunctionFile $testFunction -DomainName $DomainName -ApprovedCloudStorageProviders $ApprovedCloudStorageProviders -ApprovedFederatedDomains $ApprovedFederatedDomains
                     # Add the result to the collection
                     [void]$allAuditResults.Add($auditResult)
                 }
+                # Call the private function to calculate and display results
+                Measure-AuditResult -AllAuditResults $allAuditResults -FailedTests $script:FailedTests
+                # Return all collected audit results
+                # Define the test numbers to check
+                $TestNumbersToCheck = "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4"
+                # Check for large details in the audit results
+                $exceedingTests = Get-ExceededLengthResultDetail -AuditResults $allAuditResults -TestNumbersToCheck $TestNumbersToCheck -ReturnExceedingTestsOnly -DetailsLengthLimit 30000
+                if ($exceedingTests.Count -gt 0) {
+                    Write-Information "The following tests exceeded the details length limit: $($exceedingTests -join ', ')"
+                    Write-Information "( Assuming the results were instantiated. Ex: `$object = invoke-M365SecurityAudit )`nUse the following command and adjust as necessary to view the full details of the test results:"
+                    Write-Information "Export-M365SecurityAuditTable -ExportAllTests -AuditResults `$object -ExportPath `"C:\temp`" -ExportOriginalTests"
+                }
+                return $allAuditResults.ToArray() | Sort-Object -Property Rec
             }
         }
         catch {
             # Log the error and add the test to the failed tests collection
-            Write-Verbose "Invoke-M365SecurityAudit: Failed to load test function $($_.Name): $_" -Verbose
+            throw "Failed to execute test function $($testFunction.Name): $_"
             $script:FailedTests.Add([PSCustomObject]@{ Test = $_.Name; Error = $_ })
         }
         finally {
@@ -301,20 +285,6 @@ function Invoke-M365SecurityAudit {
         }
     }
     End {
-        if ($PSCmdlet.ShouldProcess("Measure and display audit results for $($totalTests) tests", "Measure")) {
-            # Call the private function to calculate and display results
-            Measure-AuditResult -AllAuditResults $allAuditResults -FailedTests $script:FailedTests
-            # Return all collected audit results
-            # Define the test numbers to check
-            $TestNumbersToCheck = "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4"
-            # Check for large details in the audit results
-            $exceedingTests = Get-ExceededLengthResultDetail -AuditResults $allAuditResults -TestNumbersToCheck $TestNumbersToCheck -ReturnExceedingTestsOnly -DetailsLengthLimit 30000
-            if ($exceedingTests.Count -gt 0) {
-                Write-Information "The following tests exceeded the details length limit: $($exceedingTests -join ', ')" -InformationAction Continue
-                Write-Host "(Assuming the results were instantiated. Ex: `$object = invoke-M365SecurityAudit) Use the following command and adjust as neccesary to view the full details of the test results:" -ForegroundColor DarkCyan
-                Write-Host "Export-M365SecurityAuditTable -ExportAllTests -AuditResults `$object -ExportPath `"C:\temp`" -ExportOriginalTests" -ForegroundColor Green
-            }
-            return $allAuditResults.ToArray() | Sort-Object -Property Rec
-        }
+
     }
-}
+}

source/Public/New-M365SecurityAuditAuthObject.ps1

@@ -0,0 +1,64 @@
+<#
+    .SYNOPSIS
+        Creates a new CISAuthenticationParameters object for Microsoft 365 authentication.
+    .DESCRIPTION
+        The New-M365SecurityAuditAuthObject function constructs a new CISAuthenticationParameters object
+        containing the necessary credentials and URLs for authenticating to various Microsoft 365 services.
+        It validates input parameters to ensure they conform to expected formats and length requirements.
+        An app registration in Azure AD with the required permissions to EXO, SPO, MSTeams and MgGraph is needed.
+    .PARAMETER ClientCertThumbPrint
+        The thumbprint of the client certificate used for authentication. It must be a 40-character hexadecimal string.
+        This certificate is used to authenticate the application in Azure AD.
+    .PARAMETER ClientId
+        The Client ID (Application ID) of the Azure AD application. It must be a valid GUID format.
+    .PARAMETER TenantId
+        The Tenant ID of the Azure AD directory. It must be a valid GUID format representing your Microsoft 365 tenant.
+    .PARAMETER OnMicrosoftUrl
+        The URL of your onmicrosoft.com domain. It should be in the format 'example.onmicrosoft.com'.
+    .PARAMETER SpAdminUrl
+        The SharePoint admin URL, which should end with '-admin.sharepoint.com'. This URL is used for connecting to SharePoint Online.
+    .INPUTS
+        None. You cannot pipe objects to this function.
+    .OUTPUTS
+        CISAuthenticationParameters
+            The function returns an instance of the CISAuthenticationParameters class containing the authentication details.
+    .EXAMPLE
+        PS> $authParams = New-M365SecurityAuditAuthObject -ClientCertThumbPrint "ABCDEF1234567890ABCDEF1234567890ABCDEF12" `
+                                                            -ClientId "12345678-1234-1234-1234-123456789012" `
+                                                            -TenantId "12345678-1234-1234-1234-123456789012" `
+                                                            -OnMicrosoftUrl "yourcompany.onmicrosoft.com" `
+                                                            -SpAdminUrl "https://yourcompany-admin.sharepoint.com"
+        Creates a new CISAuthenticationParameters object with the specified credentials and URLs, validating each parameter's format and length.
+    .NOTES
+        Requires PowerShell 7.0 or later.
+#>
+function New-M365SecurityAuditAuthObject {
+    [CmdletBinding()]
+    [OutputType([CISAuthenticationParameters])]
+    param(
+        [Parameter(Mandatory = $true, HelpMessage = "The 40-character hexadecimal thumbprint of the client certificate.")]
+        [ValidatePattern("^[0-9a-fA-F]{40}$")]  # Regex for a valid thumbprint format
+        [ValidateLength(40, 40)]  # Enforce exact length
+        [string]$ClientCertThumbPrint,
+        [Parameter(Mandatory = $true, HelpMessage = "The Client ID (GUID format) of the Azure AD application.")]
+        [ValidatePattern("^[0-9a-fA-F\-]{36}$")]  # Regex for a valid GUID
+        [string]$ClientId,
+        [Parameter(Mandatory = $true, HelpMessage = "The Tenant ID (GUID format) of the Azure AD directory.")]
+        [ValidatePattern("^[0-9a-fA-F\-]{36}$")]  # Regex for a valid GUID
+        [string]$TenantId,
+        [Parameter(Mandatory = $true, HelpMessage = "The onmicrosoft.com domain URL (e.g., 'example.onmicrosoft.com').")]
+        [ValidatePattern("^[a-zA-Z0-9]+\.onmicrosoft\.com$")]  # Regex for a valid onmicrosoft.com URL
+        [string]$OnMicrosoftUrl,
+        [Parameter(Mandatory = $true, HelpMessage = "The SharePoint admin URL ending with '-admin.sharepoint.com'.")]
+        [ValidatePattern("^https:\/\/[a-zA-Z0-9\-]+\-admin\.sharepoint\.com$")]  # Regex for a valid SharePoint admin URL
+        [string]$SpAdminUrl
+    )
+    # Create and return the authentication parameters object
+    return [CISAuthenticationParameters]::new(
+        $ClientCertThumbPrint,
+        $ClientId,
+        $TenantId,
+        $OnMicrosoftUrl,
+        $SpAdminUrl
+    )
+}

source/Public/Remove-RowsWithEmptyCSVStatus.ps1

@@ -9,7 +9,7 @@
         The name of the worksheet within the Excel file to be processed.
     .EXAMPLE
         PS C:\> Remove-RowsWithEmptyCSVStatus -FilePath "C:\Reports\Report.xlsx" -WorksheetName "Sheet1"
-        This command imports data from the "Sheet1" worksheet in the "Report.xlsx" file, removes rows where the 'CSV_Status' column is empty, and saves the filtered data to a new file named "Report-Filtered.xlsx" in the same directory.
+            This command imports data from the "Sheet1" worksheet in the "Report.xlsx" file, removes rows where the 'CSV_Status' column is empty, and saves the filtered data to a new file named "Report-Filtered.xlsx" in the same directory.
     .NOTES
         This function requires the ImportExcel module to be installed.
 #>
@@ -22,28 +22,21 @@ function Remove-RowsWithEmptyCSVStatus {
         [Parameter(Mandatory = $true)]
         [string]$WorksheetName
     )
-
     # Import the Excel file
     $ExcelData = Import-Excel -Path $FilePath -WorksheetName $WorksheetName
-
     # Check if CSV_Status column exists
     if (-not $ExcelData.PSObject.Properties.Match("CSV_Status")) {
         throw "CSV_Status column not found in the worksheet."
     }
-
     # Filter rows where CSV_Status is not empty
     $FilteredData = $ExcelData | Where-Object { $null -ne $_.CSV_Status -and $_.CSV_Status -ne '' }
-
     # Get the original file name and directory
     $OriginalFileName = [System.IO.Path]::GetFileNameWithoutExtension($FilePath)
     $Directory = [System.IO.Path]::GetDirectoryName($FilePath)
-
     # Create a new file name for the filtered data
     $NewFileName = "$OriginalFileName-Filtered.xlsx"
     $NewFilePath = Join-Path -Path $Directory -ChildPath $NewFileName
-
     # Export the filtered data to a new Excel file
     $FilteredData | Export-Excel -Path $NewFilePath -WorksheetName $WorksheetName -Show
-
     Write-Output "Filtered Excel file created at $NewFilePath"
 }

source/Public/Sync-CISExcelAndCsvData.ps1

@@ -1,27 +1,27 @@
 <#
     .SYNOPSIS
-    Synchronizes and updates data in an Excel worksheet with new information from a CSV file, including audit dates.
+        Synchronizes and updates data in an Excel worksheet with new information from a CSV file, including audit dates.
     .DESCRIPTION
-    The Sync-CISExcelAndCsvData function merges and updates data in a specified Excel worksheet from a CSV file. This includes adding or updating fields for connection status, details, failure reasons, and the date of the update. It's designed to ensure that the Excel document maintains a running log of changes over time, ideal for tracking remediation status and audit history.
+        The Sync-CISExcelAndCsvData function merges and updates data in a specified Excel worksheet from a CSV file. This includes adding or updating fields for connection status, details, failure reasons, and the date of the update. It's designed to ensure that the Excel document maintains a running log of changes over time, ideal for tracking remediation status and audit history.
     .PARAMETER ExcelPath
-    Specifies the path to the Excel file to be updated. This parameter is mandatory.
+        Specifies the path to the Excel file to be updated. This parameter is mandatory.
     .PARAMETER CsvPath
-    Specifies the path to the CSV file containing new data. This parameter is mandatory.
+        Specifies the path to the CSV file containing new data. This parameter is mandatory.
     .PARAMETER SheetName
-    Specifies the name of the worksheet in the Excel file where data will be merged and updated. This parameter is mandatory.
+        Specifies the name of the worksheet in the Excel file where data will be merged and updated. This parameter is mandatory.
     .EXAMPLE
-    PS> Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -CsvPath "path\to\data.csv" -SheetName "AuditData"
-    Updates the 'AuditData' worksheet in 'excel.xlsx' with data from 'data.csv', adding new information and the date of the update.
+        PS> Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -CsvPath "path\to\data.csv" -SheetName "AuditData"
+            Updates the 'AuditData' worksheet in 'excel.xlsx' with data from 'data.csv', adding new information and the date of the update.
     .INPUTS
-    System.String
-    The function accepts strings for file paths and worksheet names.
+        System.String
+            The function accepts strings for file paths and worksheet names.
     .OUTPUTS
     None
     The function directly updates the Excel file and does not output any objects.
     .NOTES
-    - Ensure that the 'ImportExcel' module is installed and up to date to handle Excel file manipulations.
-    - It is recommended to back up the Excel file before running this function to avoid accidental data loss.
-    - The CSV file should have columns that match expected headers like 'Connection', 'Details', 'FailureReason', and 'Status' for correct data mapping.
+        - Ensure that the 'ImportExcel' module is installed and up to date to handle Excel file manipulations.
+        - It is recommended to back up the Excel file before running this function to avoid accidental data loss.
+        - The CSV file should have columns that match expected headers like 'Connection', 'Details', 'FailureReason', and 'Status' for correct data mapping.
     .LINK
     https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Sync-CISExcelAndCsvData
 #>

source/en-US/M365FoundationsCISReport-help.xml

@@ -39,13 +39,47 @@
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
+          <maml:name>WhatIf</maml:name>
+          <maml:description>
+            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+          <maml:name>Confirm</maml:name>
+          <maml:description>
+            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
         <maml:name>Export-M365SecurityAuditTable</maml:name>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
-          <maml:name>ExportAllTests</maml:name>
+          <maml:name>ExportNestedTables</maml:name>
           <maml:description>
-            <maml:para>Switch to export all test results.</maml:para>
+            <maml:para>Switch to export all test results. When specified, all test results are exported to the specified path.</maml:para>
           </maml:description>
           <dev:type>
             <maml:name>SwitchParameter</maml:name>
@@ -77,7 +111,7 @@
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>ExportOriginalTests</maml:name>
           <maml:description>
             <maml:para>Switch to export the original audit results to a CSV file.</maml:para>
@@ -99,6 +133,52 @@
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>Prefix</maml:name>
+          <maml:description>
+            <maml:para>Add Prefix to filename after date when outputting to excel or csv. Validate that the count of letters in the prefix is less than 5.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>Corp</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
+          <maml:name>WhatIf</maml:name>
+          <maml:description>
+            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+          <maml:name>Confirm</maml:name>
+          <maml:description>
+            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
         <maml:name>Export-M365SecurityAuditTable</maml:name>
@@ -126,13 +206,47 @@
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
+          <maml:name>WhatIf</maml:name>
+          <maml:description>
+            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+          <maml:name>Confirm</maml:name>
+          <maml:description>
+            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
         <maml:name>Export-M365SecurityAuditTable</maml:name>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
-          <maml:name>ExportAllTests</maml:name>
+          <maml:name>ExportNestedTables</maml:name>
           <maml:description>
-            <maml:para>Switch to export all test results.</maml:para>
+            <maml:para>Switch to export all test results. When specified, all test results are exported to the specified path.</maml:para>
           </maml:description>
           <dev:type>
             <maml:name>SwitchParameter</maml:name>
@@ -164,7 +278,7 @@
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
-        <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
           <maml:name>ExportOriginalTests</maml:name>
           <maml:description>
             <maml:para>Switch to export the original audit results to a CSV file.</maml:para>
@@ -186,6 +300,52 @@
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>Prefix</maml:name>
+          <maml:description>
+            <maml:para>Add Prefix to filename after date when outputting to excel or csv. Validate that the count of letters in the prefix is less than 5.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>Corp</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
+          <maml:name>WhatIf</maml:name>
+          <maml:description>
+            <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+          <maml:name>Confirm</maml:name>
+          <maml:description>
+            <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+          </maml:description>
+          <dev:type>
+            <maml:name>SwitchParameter</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>False</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
@@ -226,9 +386,9 @@
         <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
       <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
-        <maml:name>ExportAllTests</maml:name>
+        <maml:name>ExportNestedTables</maml:name>
         <maml:description>
-          <maml:para>Switch to export all test results.</maml:para>
+          <maml:para>Switch to export all test results. When specified, all test results are exported to the specified path.</maml:para>
         </maml:description>
         <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
         <dev:type>
@@ -249,7 +409,7 @@
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
-      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
         <maml:name>ExportOriginalTests</maml:name>
         <maml:description>
           <maml:para>Switch to export the original audit results to a CSV file.</maml:para>
@@ -273,11 +433,67 @@
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+        <maml:name>Prefix</maml:name>
+        <maml:description>
+          <maml:para>Add Prefix to filename after date when outputting to excel or csv. Validate that the count of letters in the prefix is less than 5.</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+        <dev:type>
+          <maml:name>String</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>Corp</dev:defaultValue>
+      </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
+        <maml:name>WhatIf</maml:name>
+        <maml:description>
+          <maml:para>Shows what would happen if the cmdlet runs. The cmdlet is not run.</maml:para>
+        </maml:description>
+        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+        <dev:type>
+          <maml:name>SwitchParameter</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>False</dev:defaultValue>
+      </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="cf">
+        <maml:name>Confirm</maml:name>
+        <maml:description>
+          <maml:para>Prompts you for confirmation before running the cmdlet.</maml:para>
+        </maml:description>
+        <command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
+        <dev:type>
+          <maml:name>SwitchParameter</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>False</dev:defaultValue>
+      </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+        <maml:name>ProgressAction</maml:name>
+        <maml:description>
+          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+        <dev:type>
+          <maml:name>ActionPreference</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
     </command:parameters>
     <command:inputTypes>
       <command:inputType>
         <dev:type>
-          <maml:name>[CISAuditResult[]], [string]</maml:name>
+          <maml:name>[CISAuditResult[]] - An array of CISAuditResult objects.</maml:name>
+        </dev:type>
+        <maml:description>
+          <maml:para></maml:para>
+        </maml:description>
+      </command:inputType>
+      <command:inputType>
+        <dev:type>
+          <maml:name>[string] - A path to a CSV file.</maml:name>
         </dev:type>
         <maml:description>
           <maml:para></maml:para>
@@ -287,7 +503,7 @@
     <command:returnValues>
       <command:returnValue>
         <dev:type>
-          <maml:name>[PSCustomObject]</maml:name>
+          <maml:name>[PSCustomObject] - A custom object containing the path to the zip file and its hash.</maml:name>
         </dev:type>
         <maml:description>
           <maml:para></maml:para>
@@ -382,6 +598,18 @@
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
@@ -397,6 +625,18 @@
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+        <maml:name>ProgressAction</maml:name>
+        <maml:description>
+          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+        <dev:type>
+          <maml:name>ActionPreference</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
     </command:parameters>
     <command:inputTypes>
       <command:inputType>
@@ -492,6 +732,18 @@
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
@@ -519,6 +771,18 @@
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+        <maml:name>ProgressAction</maml:name>
+        <maml:description>
+          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+        <dev:type>
+          <maml:name>ActionPreference</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
     </command:parameters>
     <command:inputTypes />
     <command:returnValues>
@@ -718,6 +982,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
@@ -805,6 +1081,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+        <maml:name>ProgressAction</maml:name>
+        <maml:description>
+          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+        <dev:type>
+          <maml:name>ActionPreference</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
     </command:parameters>
     <command:inputTypes />
     <command:returnValues>
@@ -976,6 +1264,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>AuthParams</maml:name>
+          <maml:description>
+            <maml:para>Specifies an authentication object containing parameters for application-based authentication. If provided, this will be used for connecting to services.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">CISAuthenticationParameters</command:parameterValue>
+          <dev:type>
+            <maml:name>CISAuthenticationParameters</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
           <maml:name>WhatIf</maml:name>
           <maml:description>
@@ -998,6 +1298,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
         <maml:name>Invoke-M365SecurityAudit</maml:name>
@@ -1104,6 +1416,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>AuthParams</maml:name>
+          <maml:description>
+            <maml:para>Specifies an authentication object containing parameters for application-based authentication. If provided, this will be used for connecting to services.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">CISAuthenticationParameters</command:parameterValue>
+          <dev:type>
+            <maml:name>CISAuthenticationParameters</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
           <maml:name>WhatIf</maml:name>
           <maml:description>
@@ -1126,6 +1450,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
         <maml:name>Invoke-M365SecurityAudit</maml:name>
@@ -1232,6 +1568,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>AuthParams</maml:name>
+          <maml:description>
+            <maml:para>Specifies an authentication object containing parameters for application-based authentication. If provided, this will be used for connecting to services.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">CISAuthenticationParameters</command:parameterValue>
+          <dev:type>
+            <maml:name>CISAuthenticationParameters</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
           <maml:name>WhatIf</maml:name>
           <maml:description>
@@ -1254,6 +1602,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
         <maml:name>Invoke-M365SecurityAudit</maml:name>
@@ -1360,6 +1720,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>AuthParams</maml:name>
+          <maml:description>
+            <maml:para>Specifies an authentication object containing parameters for application-based authentication. If provided, this will be used for connecting to services.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">CISAuthenticationParameters</command:parameterValue>
+          <dev:type>
+            <maml:name>CISAuthenticationParameters</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
           <maml:name>WhatIf</maml:name>
           <maml:description>
@@ -1382,6 +1754,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
         <maml:name>Invoke-M365SecurityAudit</maml:name>
@@ -1489,6 +1873,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>AuthParams</maml:name>
+          <maml:description>
+            <maml:para>Specifies an authentication object containing parameters for application-based authentication. If provided, this will be used for connecting to services.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">CISAuthenticationParameters</command:parameterValue>
+          <dev:type>
+            <maml:name>CISAuthenticationParameters</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
           <maml:name>WhatIf</maml:name>
           <maml:description>
@@ -1511,6 +1907,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
       <command:syntaxItem>
         <maml:name>Invoke-M365SecurityAudit</maml:name>
@@ -1618,6 +2026,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+          <maml:name>AuthParams</maml:name>
+          <maml:description>
+            <maml:para>Specifies an authentication object containing parameters for application-based authentication. If provided, this will be used for connecting to services.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">CISAuthenticationParameters</command:parameterValue>
+          <dev:type>
+            <maml:name>CISAuthenticationParameters</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
         <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
           <maml:name>WhatIf</maml:name>
           <maml:description>
@@ -1640,6 +2060,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
           </dev:type>
           <dev:defaultValue>False</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
@@ -1823,6 +2255,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="none">
+        <maml:name>AuthParams</maml:name>
+        <maml:description>
+          <maml:para>Specifies an authentication object containing parameters for application-based authentication. If provided, this will be used for connecting to services.</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">CISAuthenticationParameters</command:parameterValue>
+        <dev:type>
+          <maml:name>CISAuthenticationParameters</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
       <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="wi">
         <maml:name>WhatIf</maml:name>
         <maml:description>
@@ -1847,6 +2291,18 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
         </dev:type>
         <dev:defaultValue>False</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+        <maml:name>ProgressAction</maml:name>
+        <maml:description>
+          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+        <dev:type>
+          <maml:name>ActionPreference</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
     </command:parameters>
     <command:inputTypes>
       <command:inputType>
@@ -1951,6 +2407,218 @@ PS&gt; $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation</d
       </maml:navigationLink>
     </command:relatedLinks>
   </command:command>
+  <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10" xmlns:MSHelp="http://msdn.microsoft.com/mshelp">
+    <command:details>
+      <command:name>New-M365SecurityAuditAuthObject</command:name>
+      <command:verb>New</command:verb>
+      <command:noun>M365SecurityAuditAuthObject</command:noun>
+      <maml:description>
+        <maml:para>Creates a new CISAuthenticationParameters object for Microsoft 365 authentication.</maml:para>
+      </maml:description>
+    </command:details>
+    <maml:description>
+      <maml:para>The New-M365SecurityAuditAuthObject function constructs a new CISAuthenticationParameters object containing the necessary credentials and URLs for authenticating to various Microsoft 365 services. It validates input parameters to ensure they conform to expected formats and length requirements. An app registration in Azure AD with the required permissions to EXO, SPO, MSTeams and MgGraph is needed.</maml:para>
+    </maml:description>
+    <command:syntax>
+      <command:syntaxItem>
+        <maml:name>New-M365SecurityAuditAuthObject</maml:name>
+        <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
+          <maml:name>ClientCertThumbPrint</maml:name>
+          <maml:description>
+            <maml:para>The thumbprint of the client certificate used for authentication. It must be a 40-character hexadecimal string. This certificate is used to authenticate the application in Azure AD.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="2" aliases="none">
+          <maml:name>ClientId</maml:name>
+          <maml:description>
+            <maml:para>The Client ID (Application ID) of the Azure AD application. It must be a valid GUID format.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="3" aliases="none">
+          <maml:name>TenantId</maml:name>
+          <maml:description>
+            <maml:para>The Tenant ID of the Azure AD directory. It must be a valid GUID format representing your Microsoft 365 tenant.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="4" aliases="none">
+          <maml:name>OnMicrosoftUrl</maml:name>
+          <maml:description>
+            <maml:para>The URL of your onmicrosoft.com domain. It should be in the format 'example.onmicrosoft.com'.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="5" aliases="none">
+          <maml:name>SpAdminUrl</maml:name>
+          <maml:description>
+            <maml:para>The SharePoint admin URL, which should end with '-admin.sharepoint.com'. This URL is used for connecting to SharePoint Online.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+          <dev:type>
+            <maml:name>String</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
+      </command:syntaxItem>
+    </command:syntax>
+    <command:parameters>
+      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="1" aliases="none">
+        <maml:name>ClientCertThumbPrint</maml:name>
+        <maml:description>
+          <maml:para>The thumbprint of the client certificate used for authentication. It must be a 40-character hexadecimal string. This certificate is used to authenticate the application in Azure AD.</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+        <dev:type>
+          <maml:name>String</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
+      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="2" aliases="none">
+        <maml:name>ClientId</maml:name>
+        <maml:description>
+          <maml:para>The Client ID (Application ID) of the Azure AD application. It must be a valid GUID format.</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+        <dev:type>
+          <maml:name>String</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
+      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="3" aliases="none">
+        <maml:name>TenantId</maml:name>
+        <maml:description>
+          <maml:para>The Tenant ID of the Azure AD directory. It must be a valid GUID format representing your Microsoft 365 tenant.</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+        <dev:type>
+          <maml:name>String</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
+      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="4" aliases="none">
+        <maml:name>OnMicrosoftUrl</maml:name>
+        <maml:description>
+          <maml:para>The URL of your onmicrosoft.com domain. It should be in the format 'example.onmicrosoft.com'.</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+        <dev:type>
+          <maml:name>String</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
+      <command:parameter required="true" variableLength="true" globbing="false" pipelineInput="False" position="5" aliases="none">
+        <maml:name>SpAdminUrl</maml:name>
+        <maml:description>
+          <maml:para>The SharePoint admin URL, which should end with '-admin.sharepoint.com'. This URL is used for connecting to SharePoint Online.</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+        <dev:type>
+          <maml:name>String</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+        <maml:name>ProgressAction</maml:name>
+        <maml:description>
+          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+        <dev:type>
+          <maml:name>ActionPreference</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
+    </command:parameters>
+    <command:inputTypes>
+      <command:inputType>
+        <dev:type>
+          <maml:name>None. You cannot pipe objects to this function.</maml:name>
+        </dev:type>
+        <maml:description>
+          <maml:para></maml:para>
+        </maml:description>
+      </command:inputType>
+    </command:inputTypes>
+    <command:returnValues>
+      <command:returnValue>
+        <dev:type>
+          <maml:name>CISAuthenticationParameters</maml:name>
+        </dev:type>
+        <maml:description>
+          <maml:para></maml:para>
+        </maml:description>
+      </command:returnValue>
+      <command:returnValue>
+        <dev:type>
+          <maml:name>The function returns an instance of the CISAuthenticationParameters class containing the authentication details.</maml:name>
+        </dev:type>
+        <maml:description>
+          <maml:para></maml:para>
+        </maml:description>
+      </command:returnValue>
+    </command:returnValues>
+    <maml:alertSet>
+      <maml:alert>
+        <maml:para>Requires PowerShell 7.0 or later.</maml:para>
+      </maml:alert>
+    </maml:alertSet>
+    <command:examples>
+      <command:example>
+        <maml:title>-------------------------- EXAMPLE 1 --------------------------</maml:title>
+        <dev:code>$authParams = New-M365SecurityAuditAuthObject -ClientCertThumbPrint "ABCDEF1234567890ABCDEF1234567890ABCDEF12" `
+                                                    -ClientId "12345678-1234-1234-1234-123456789012" `
+                                                    -TenantId "12345678-1234-1234-1234-123456789012" `
+                                                    -OnMicrosoftUrl "yourcompany.onmicrosoft.com" `
+                                                    -SpAdminUrl "https://yourcompany-admin.sharepoint.com"
+Creates a new CISAuthenticationParameters object with the specified credentials and URLs, validating each parameter's format and length.</dev:code>
+        <dev:remarks>
+          <maml:para></maml:para>
+        </dev:remarks>
+      </command:example>
+    </command:examples>
+    <command:relatedLinks />
+  </command:command>
   <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10" xmlns:MSHelp="http://msdn.microsoft.com/mshelp">
     <command:details>
       <command:name>Remove-RowsWithEmptyCSVStatus</command:name>
@@ -1990,6 +2658,18 @@ PS&gt; $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation</d
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
@@ -2017,6 +2697,18 @@ PS&gt; $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation</d
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+        <maml:name>ProgressAction</maml:name>
+        <maml:description>
+          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+        <dev:type>
+          <maml:name>ActionPreference</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
     </command:parameters>
     <command:inputTypes />
     <command:returnValues />
@@ -2088,6 +2780,18 @@ This command imports data from the "Sheet1" worksheet in the "Report.xlsx" file,
           </dev:type>
           <dev:defaultValue>None</dev:defaultValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+          <maml:name>ProgressAction</maml:name>
+          <maml:description>
+            <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+          <dev:type>
+            <maml:name>ActionPreference</maml:name>
+            <maml:uri />
+          </dev:type>
+          <dev:defaultValue>None</dev:defaultValue>
+        </command:parameter>
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
@@ -2127,6 +2831,18 @@ This command imports data from the "Sheet1" worksheet in the "Report.xlsx" file,
         </dev:type>
         <dev:defaultValue>None</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="false" variableLength="true" globbing="false" pipelineInput="False" position="named" aliases="proga">
+        <maml:name>ProgressAction</maml:name>
+        <maml:description>
+          <maml:para>{{ Fill ProgressAction Description }}</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">ActionPreference</command:parameterValue>
+        <dev:type>
+          <maml:name>ActionPreference</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>None</dev:defaultValue>
+      </command:parameter>
     </command:parameters>
     <command:inputTypes>
       <command:inputType>

source/en-US/about_M365FoundationsCISReport.help.txt

@@ -30,9 +30,11 @@ Optional Subtopics
 EXAMPLES
     # Example 1: Performing a security audit based on CIS benchmarks
     $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com"
+    $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -ApprovedCloudStorageProviders "DropBox" -ApprovedFederatedDomains "northwind.com"
     
-    # Example 2: Exporting a security audit table to a CSV file
-    Export-M365SecurityAuditTable -ExportAllTests -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests
+    # Example 2: Exporting a security audit and it's nested tables to zipped CSV files
+    Export-M365SecurityAuditTable -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests -ExportAllTests
+        # Output Ex: 2024.07.07_14.55.55_M365FoundationsAudit_368B2E2F.zip
     
     # Example 3: Retrieving licenses for users in administrative roles
     Get-AdminRoleUserLicense
@@ -48,6 +50,14 @@ EXAMPLES
     
     # Example 7: Granting Microsoft Graph permissions to the auditor
     Grant-M365SecurityAuditConsent -UserPrincipalNameForConsent 'user@example.com'
+    
+    # Example 8: (PowerShell 7.x Only) Creating a new authentication object for the security audit for app-based authentication.
+    $authParams = New-M365SecurityAuditAuthObject -ClientCertThumbPrint "ABCDEF1234567890ABCDEF1234567890ABCDEF12" `
+                                                                -ClientId "12345678-1234-1234-1234-123456789012" `
+                                                                -TenantId "12345678-1234-1234-1234-123456789012" `
+                                                                -OnMicrosoftUrl "yourcompany.onmicrosoft.com" `
+                                                                -SpAdminUrl "https://yourcompany-admin.sharepoint.com"
+    Invoke-M365SecurityAudit -AuthParams $authParams -TenantAdminUrl "https://yourcompany-admin.sharepoint.com"
 
 NOTE
     Ensure that you have the necessary permissions and administrative roles in

source/helper/TestDefinitions.csv

@@ -2,7 +2,7 @@
 1,Test-AdministrativeAccountCompliance.ps1,1.1.1,Ensure Administrative accounts are separate and cloud-only,E3,L1,5.4,Restrict Administrator Privileges to Dedicated Administrator Accounts,TRUE,TRUE,TRUE,FALSE,Microsoft Graph
 2,Test-GlobalAdminsCount.ps1,1.1.3,Ensure that between two and four global admins are designated,E3,L1,5.1,Establish and Maintain an Inventory of Accounts,TRUE,TRUE,TRUE,TRUE,Microsoft Graph
 3,Test-ManagedApprovedPublicGroups.ps1,1.2.1,Ensure that only organizationally managed/approved public groups exist,E3,L2,3.3,Configure Data Access Control Lists,TRUE,TRUE,TRUE,TRUE,Microsoft Graph
-4,Test-BlockSharedMailboxSignIn.ps1,1.2.2,Ensure sign-in to shared mailboxes is blocked,E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,AzureAD | EXO
+4,Test-BlockSharedMailboxSignIn.ps1,1.2.2,Ensure sign-in to shared mailboxes is blocked,E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,EXO | Microsoft Graph
 5,Test-PasswordNeverExpirePolicy.ps1,1.3.1,Ensure the 'Password expiration policy' is set to 'Set passwords to never expire',E3,L1,5.2,Use Unique Passwords,TRUE,TRUE,TRUE,TRUE,Microsoft Graph
 6,Test-ExternalSharingCalendars.ps1,1.3.3,Ensure 'External sharing' of calendars is not available,E3,L2,4.8,Uninstall or Disable Unnecessary Services on Enterprise Assets and Software,FALSE,TRUE,TRUE,TRUE,EXO
 7,Test-CustomerLockbox.ps1,1.3.6,Ensure the customer lockbox feature is enabled,E5,L2,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,EXO

source/tests/Test-AntiPhishingPolicy.ps1

@@ -215,7 +215,7 @@ function Test-AntiPhishingPolicy {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
+            Write-Error "An error occurred during the test $recnum`:: $_"
             $auditResult = Get-TestError -LastError $_ -recnum $recnum
         }
     }

source/tests/Test-BlockSharedMailboxSignIn.ps1

@@ -58,9 +58,9 @@ function Test-BlockSharedMailboxSignIn {
                     }
                 )
             #>
-            $users = Get-CISAadOutput -Rec $recnum
+            $users = Get-CISMgOutput -Rec $recnum
             # Step: Retrieve details of shared mailboxes from Azure AD (Condition B: Pass/Fail)
-            $sharedMailboxDetails = $users | Where-Object {$_.objectid -in $objectids}
+            $sharedMailboxDetails = $users | Where-Object {$_.id -in $objectids}
             # Step: Identify enabled mailboxes (Condition B: Pass/Fail)
             $enabledMailboxes = $sharedMailboxDetails | Where-Object { $_.AccountEnabled } | ForEach-Object { $_.DisplayName }
             $allBlocked = $enabledMailboxes.Count -eq 0

source/tests/Test-DisallowInfectedFilesDownload.ps1

@@ -5,17 +5,14 @@ function Test-DisallowInfectedFilesDownload {
         # Aligned
         # Define your parameters here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "7.3.1"
+        Write-Verbose "Running Test-DisallowInfectedFilesDownload for $recnum..."
     }
-
     process {
-
         try {
             # 7.3.1 (L2) Ensure Office 365 SharePoint infected files are disallowed for download
             #
@@ -32,28 +29,30 @@ function Test-DisallowInfectedFilesDownload {
             #   - Condition A: The `DisallowInfectedFileDownload` setting is not set to `True`.
             #   - Condition B: The setting does not prevent users from downloading infected files.
             #   - Condition C: Verification using the PowerShell command indicates that the setting is incorrectly configured.
-
             # Retrieve the SharePoint tenant configuration
+            # $SPOTenantDisallowInfectedFileDownload Mock Object
+            <#
+                $SPOTenantDisallowInfectedFileDownload = [PSCustomObject]@{
+                    DisallowInfectedFileDownload           = $false
+                }
+            #>
             $SPOTenantDisallowInfectedFileDownload = Get-CISSpoOutput -Rec $recnum
-
             # Condition A: The `DisallowInfectedFileDownload` setting is set to `True`
             $isDisallowInfectedFileDownloadEnabled = $SPOTenantDisallowInfectedFileDownload.DisallowInfectedFileDownload
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $isDisallowInfectedFileDownloadEnabled) {
-                "Downloading infected files is not disallowed."  # Condition B: The setting does not prevent users from downloading infected files
+                "Downloading infected files is not disallowed. To ensure infected files cannot be downloaded, use the following command:`n" + ` # Condition B: The setting does not prevent users from downloading infected files
+                "Set-SPOTenant -DisallowInfectedFileDownload `$true"
             }
             else {
                 "N/A"
             }
-
             $details = if ($isDisallowInfectedFileDownloadEnabled) {
                 "DisallowInfectedFileDownload: True"  # Condition C: Verification confirms the setting is correctly configured
             }
             else {
                 "DisallowInfectedFileDownload: False"  # Condition C: Verification indicates the setting is incorrectly configured
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -69,9 +68,8 @@ function Test-DisallowInfectedFilesDownload {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult
     }
-}
+}

source/tests/Test-ExternalSharingCalendars.ps1

@@ -5,12 +5,14 @@ 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:
@@ -25,19 +27,12 @@ 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 = @()
@@ -47,43 +42,47 @@ function Test-ExternalSharingCalendars {
                     $sharingPolicyDetails += "$($policy.Name): Enabled"
                 }
             }
-            # Retrieve calendars with publishing enabled (from 1.3.3b)
-            # $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
+            $failureRemediation = @'
+# Get all mailboxes
+$mailboxes = Get-Mailbox -ResultSize Unlimited
+
+# Initialize a hashtable to store calendar folder names
+$calendarFolders = @{}
+# Get the default calendar folder names for all mailboxes
+$mailboxes | ForEach-Object {
+    $calendarFolderName = [string](Get-EXOMailboxFolderStatistics $_.PrimarySmtpAddress -FolderScope Calendar | Where-Object { $_.FolderType -eq 'Calendar' }).Name
+    $calendarFolders[$_.PrimarySmtpAddress] = $calendarFolderName
+}
+# Get the calendar folder settings for each mailbox
+foreach ($mailbox in $mailboxes) {
+    $primarySmtpAddress = $mailbox.PrimarySmtpAddress
+    $calendarFolder = $calendarFolders[$primarySmtpAddress]
+    # Get users calendar folder settings for their default Calendar folder
+    $calendar = Get-MailboxCalendarFolder -Identity "$primarySmtpAddress:\$calendarFolder"
+    # Check if calendar publishing is enabled and display a message
+    if ($calendar.PublishEnabled) {
+        Write-Host -ForegroundColor Yellow "Calendar publishing is enabled for $primarySmtpAddress on $($calendar.PublishedCalendarUrl)"
+    }
+}
+'@
+            # Step: Prepare failure reasons and details based on compliance (Condition A & B: Fail)
             $failureReasons = if (-not $isExternalSharingDisabled) {
-                $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
+                "Calendar sharing with external users is enabled in one or more policies.`n`n" + `
+                "Use the following command to verify which users are sharing calendars prior to disabling:`n`n" + `
+                $failureRemediation
             }
             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:`n$($sharingPolicyDetails -join ', ')"
+                "Enabled Sharing Policies: $($sharingPolicyDetails -join ', ')"
             }
+
             # Step: Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -99,6 +98,7 @@ function Test-ExternalSharingCalendars {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
+
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-GuestAccessExpiration.ps1

@@ -5,17 +5,14 @@ function Test-GuestAccessExpiration {
         # Aligned
         # Define your parameters here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "7.2.9"
+        Write-Verbose "Running Test-GuestAccessExpiration for $recnum..."
     }
-
     process {
-
         try {
             # 7.2.9 (L1) Ensure guest access to a site or OneDrive will expire automatically
             #
@@ -32,21 +29,25 @@ function Test-GuestAccessExpiration {
             #   - Condition A: The ExternalUserExpirationRequired setting in SharePoint is not set to True.
             #   - Condition B: The ExternalUserExpireInDays setting in SharePoint is configured to more than 30 days.
             #   - Condition C: Verification using the SharePoint Admin Center indicates that guest access is not set to expire automatically after the specified number of days.
-
             # Retrieve SharePoint tenant settings related to guest access expiration
+            # $SPOTenantGuestAccess Mock Object
+            <#
+                $SPOTenantGuestAccess = [PSCustomObject]@{
+                    ExternalUserExpirationRequired           = "$false"
+                    ExternalUserExpireInDays                 = "60"
+                }
+            #>
             $SPOTenantGuestAccess = Get-CISSpoOutput -Rec $recnum
             $isGuestAccessExpirationConfiguredCorrectly = $SPOTenantGuestAccess.ExternalUserExpirationRequired -and $SPOTenantGuestAccess.ExternalUserExpireInDays -le 30
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $isGuestAccessExpirationConfiguredCorrectly) {
-                "Guest access expiration is not configured to automatically expire within 30 days or less."
+                "Guest access expiration is not configured to automatically expire within 30 days or less. To remediate this setting, use the Set-SPOTenant command:`n`n" + `
+                "Set-SPOTenant -ExternalUserExpirationRequired `$true -ExternalUserExpireInDays 30"
             }
             else {
                 "N/A"
             }
-
             $details = "ExternalUserExpirationRequired: $($SPOTenantGuestAccess.ExternalUserExpirationRequired); ExternalUserExpireInDays: $($SPOTenantGuestAccess.ExternalUserExpireInDays)"
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec            = $recnum
@@ -62,7 +63,6 @@ function Test-GuestAccessExpiration {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-LinkSharingRestrictions.ps1

@@ -6,14 +6,13 @@ function Test-LinkSharingRestrictions {
         # Define your parameters here
         # Test behavior in prod
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "7.2.7"
+        Write-Verbose "Running Test-LinkSharingRestrictions for $recnum..."
     }
-
     process {
         try {
             # 7.2.7 (L1) Ensure link sharing is restricted in SharePoint and OneDrive
@@ -31,21 +30,24 @@ function Test-LinkSharingRestrictions {
             #   - Condition A: The `DefaultSharingLinkType` setting in SharePoint and OneDrive is not set to `Direct`.
             #   - Condition B: The setting `Choose the type of link that's selected by default when users share files and folders in SharePoint and OneDrive` is not set to `Specific people (only the people the user specifies)`.
             #   - Condition C: Verification using the UI indicates that the link sharing settings are not configured as recommended.
-
             # Retrieve link sharing configuration for SharePoint and OneDrive
+            # $SPOTenantLinkSharing Mock Object
+            <#
+                $$SPOTenantLinkSharing = [PSCustomObject]@{
+                    DefaultSharingLinkType           = "Direct"
+                }
+            #>
             $SPOTenantLinkSharing = Get-CISSpoOutput -Rec $recnum
             $isLinkSharingRestricted = $SPOTenantLinkSharing.DefaultSharingLinkType -eq 'Direct'  # Or 'SpecificPeople' as per the recommendation
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $isLinkSharingRestricted) {
-                "Link sharing is not restricted to 'Specific people'. Current setting: $($SPOTenantLinkSharing.DefaultSharingLinkType)"
+                "Link sharing is not restricted to 'Specific people'. Current setting: $($SPOTenantLinkSharing.DefaultSharingLinkType). To remediate this setting, use the Set-SPOTenant command:`n`n" + `
+                "Set-SPOTenant -DefaultSharingLinkType Direct"
             }
             else {
                 "N/A"
             }
-
             $details = "DefaultSharingLinkType: $($SPOTenantLinkSharing.DefaultSharingLinkType)"
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -55,14 +57,12 @@ function Test-LinkSharingRestrictions {
                 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-MailboxAuditingE3.ps1

@@ -24,13 +24,15 @@ function Test-MailboxAuditingE3 {
         #>
         # 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"
+        $version = $recnum
+        $actionDictionaries = Get-Action -Dictionaries -Version $version
+        # E3 specific actions
+        $AdminActions = $actionDictionaries.AdminActions.Keys
+        $DelegateActions = $actionDictionaries.DelegateActions.Keys
+        $OwnerActions = $actionDictionaries.OwnerActions.Keys
+        $allFailures = @()
+
         Write-Verbose "Running Test-MailboxAuditingE3 for $recnum..."
         $allUsers = Get-CISMgOutput -Rec $recnum
         $processedUsers = @{}  # Dictionary to track processed users
@@ -52,17 +54,17 @@ function Test-MailboxAuditingE3 {
                     if ($mailbox.AuditEnabled) {
                         foreach ($action in $AdminActions) {
                             if ($mailbox.AuditAdmin -notcontains $action) {
-                                $missingAdminActions += (Get-Action -Actions $action -ActionType "Admin")
+                                $missingAdminActions += (Get-Action -Actions $action -ActionType "Admin" -Version $version)
                             }
                         }
                         foreach ($action in $DelegateActions) {
                             if ($mailbox.AuditDelegate -notcontains $action) {
-                                $missingDelegateActions += (Get-Action -Actions $action -ActionType "Delegate")
+                                $missingDelegateActions += (Get-Action -Actions $action -ActionType "Delegate" -Version $version)
                             }
                         }
                         foreach ($action in $OwnerActions) {
                             if ($mailbox.AuditOwner -notcontains $action) {
-                                $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner")
+                                $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner" -Version $version)
                             }
                         }
                         if ($missingAdminActions.Count -gt 0 -or $missingDelegateActions.Count -gt 0 -or $missingOwnerActions.Count -gt 0) {
@@ -99,7 +101,7 @@ function Test-MailboxAuditingE3 {
                 $auditResult = Initialize-CISAuditResult @params
             }
             catch {
-                Write-Error "An error occurred during the test: $_"
+                Write-Error "An error occurred during the test $recnum`:: $_"
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }

source/tests/Test-MailboxAuditingE5.ps1

@@ -24,13 +24,14 @@ 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
+        $recnum = "6.1.3"
+        $version = $recnum
+        $actionDictionaries = Get-Action -Dictionaries -Version $version
         $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
     }
@@ -52,19 +53,19 @@ function Test-MailboxAuditingE5 {
                         # Validate Admin actions
                         foreach ($action in $AdminActions) {
                             if ($mailbox.AuditAdmin -notcontains $action) {
-                                $missingAdminActions += (Get-Action -Actions $action -ActionType "Admin") # Condition B
+                                $missingAdminActions += (Get-Action -Actions $action -ActionType "Admin" -Version $version) # Condition B
                             }
                         }
                         # Validate Delegate actions
                         foreach ($action in $DelegateActions) {
                             if ($mailbox.AuditDelegate -notcontains $action) {
-                                $missingDelegateActions += (Get-Action -Actions $action -ActionType "Delegate") # Condition C
+                                $missingDelegateActions += (Get-Action -Actions $action -ActionType "Delegate" -Version $version) # Condition C
                             }
                         }
                         # Validate Owner actions
                         foreach ($action in $OwnerActions) {
                             if ($mailbox.AuditOwner -notcontains $action) {
-                                $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner") # Condition D
+                                $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner" -Version $version) # Condition D
                             }
                         }
                         if ($missingAdminActions.Count -gt 0 -or $missingDelegateActions.Count -gt 0 -or $missingOwnerActions.Count -gt 0) {
@@ -102,7 +103,7 @@ function Test-MailboxAuditingE5 {
                 $auditResult = Initialize-CISAuditResult @params
             }
             catch {
-                Write-Error "An error occurred during the test: $_"
+                Write-Error "An error occurred during the test $recnum`:: $_"
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
@@ -130,4 +131,4 @@ function Test-MailboxAuditingE5 {
         }
         return $auditResult
     }
-}
+}

source/tests/Test-ModernAuthSharePoint.ps1

@@ -12,16 +12,14 @@ function Test-ModernAuthSharePoint {
 
         # Initialization code, if needed
         $recnum = "7.2.1"
-
+        Write-Verbose "Running Test-ModernAuthSharePoint for $recnum..."
         <#
         # Conditions for 7.2.1 (L1) Ensure modern authentication for SharePoint applications is required
-
         ## 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: The setting "Apps that don't use modern authentication" is set to "Block access" in the SharePoint admin center.
         #   - Condition B: The PowerShell command `Get-SPOTenant | ft LegacyAuthProtocolsEnabled` returns `False`.
-
         ## 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,23 +27,25 @@ function Test-ModernAuthSharePoint {
         #   - Condition B: The PowerShell command `Get-SPOTenant | ft LegacyAuthProtocolsEnabled` returns `True`.
         #>
     }
-
     process {
         try {
             # 7.2.1 (L1) Ensure modern authentication for SharePoint applications is required
+            # $SPOTenant Mock Object
+            <#
+                $SPOTenant = [PSCustomObject]@{
+                    LegacyAuthProtocolsEnabled           = $true
+                }
+            #>
             $SPOTenant = Get-CISSpoOutput -Rec $recnum
             $modernAuthForSPRequired = -not $SPOTenant.LegacyAuthProtocolsEnabled
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $modernAuthForSPRequired) {
-                "Legacy authentication protocols are enabled" # Fail Condition B
+                "Legacy authentication protocols are enabled. The following command can be used to disable:`nSet-SPOTenant -LegacyAuthProtocolsEnabled `$false" # Fail Condition B
             }
             else {
                 "N/A"
             }
-
             $details = "LegacyAuthProtocolsEnabled: $($SPOTenant.LegacyAuthProtocolsEnabled)" # Details for Condition B
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -61,7 +61,6 @@ function Test-ModernAuthSharePoint {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-OneDriveContentRestrictions.ps1

@@ -5,7 +5,6 @@ function Test-OneDriveContentRestrictions {
         # Aligned
         # Define your parameters here
     )
-
     begin {
         # 7.2.4 (L2) Ensure OneDrive content sharing is restricted
         #
@@ -22,36 +21,38 @@ function Test-OneDriveContentRestrictions {
         #   - Condition A: The OneDriveSharingCapability setting is not configured to "Disabled" using the PowerShell cmdlet `Get-SPOTenant | fl OneDriveSharingCapability`.
         #   - Condition B: The OneDriveSharingCapability is not set to "Only people in your organization" in the SharePoint admin center under Policies > Sharing > OneDrive.
         #   - Condition C: OneDrive content sharing is more permissive than SharePoint content sharing.
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "7.2.4"
+        Write-Verbose "Running Test-OneDriveContentRestrictions for $recnum..."
     }
-
     process {
         try {
             # 7.2.4 (L2) Ensure OneDrive content sharing is restricted
-
             # Retrieve OneDrive sharing capability settings
+            # $SPOTenant Mock Object
+            <#
+                $SPOTenant = [PSCustomObject]@{
+                    OneDriveSharingCapability           = "ExternalUserAndGuestSharing"
+                }
+            #>
             $SPOTenant = Get-CISSpoOutput -Rec $recnum
             $isOneDriveSharingRestricted = $SPOTenant.OneDriveSharingCapability -eq 'Disabled'
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $isOneDriveSharingRestricted) {
-                "OneDrive content sharing is not restricted to 'Disabled'. Current setting: $($SPOTenant.OneDriveSharingCapability)"
+                "OneDrive content sharing is not restricted to 'Disabled'. To remediate this setting, use the Set-SPOTenant command.`n`n" + `
+                "Set-SPOTenant -OneDriveSharingCapability Disabled"
             }
             else {
                 "N/A"
             }
-
             $details = if ($isOneDriveSharingRestricted) {
                 "OneDrive content sharing is restricted."
             }
             else {
                 "OneDriveSharingCapability: $($SPOTenant.OneDriveSharingCapability)"
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -67,7 +68,6 @@ function Test-OneDriveContentRestrictions {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return auditResult
         return $auditResult

source/tests/Test-OneDriveSyncRestrictions.ps1

@@ -5,14 +5,13 @@ function Test-OneDriveSyncRestrictions {
         # Aligned
         # Define your parameters here
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "7.3.2"
+        Write-Verbose "Running Test-OneDriveSyncRestrictions for $recnum..."
     }
-
     process {
         try {
             # 7.3.2 (L2) Ensure OneDrive sync is restricted for unmanaged devices
@@ -30,20 +29,20 @@ function Test-OneDriveSyncRestrictions {
             #   - Condition A: "Allow syncing only on computers joined to specific domains" is not enabled.
             #   - Condition B: "TenantRestrictionEnabled" is set to False.
             #   - Condition C: "AllowedDomainList" does not contain the trusted domain GUIDs from the on-premises environment.
-
             # Retrieve OneDrive sync client restriction settings
             $SPOTenantSyncClientRestriction = Get-CISSpoOutput -Rec $recnum
             $isSyncRestricted = $SPOTenantSyncClientRestriction.TenantRestrictionEnabled -and $SPOTenantSyncClientRestriction.AllowedDomainList
-
             # Condition A: Check if TenantRestrictionEnabled is True
             # Condition B: Ensure AllowedDomainList contains trusted domains GUIDs
             $failureReasons = if (-not $isSyncRestricted) {
-                "OneDrive sync is not restricted to managed devices. TenantRestrictionEnabled should be True and AllowedDomainList should contain trusted domains GUIDs."
+                "OneDrive sync is not restricted to managed devices. For hybrid devices, TenantRestrictionEnabled should be True and AllowedDomainList should contain trusted domains GUIDs.`n" + `
+                "To remediate this setting, edit and use the Set-SPOTenantSyncClientRestriction command below:`n" + `
+                "Set-SPOTenantSyncClientRestriction -TenantRestrictionEnabled `$true -AllowedDomainList `"<GUID1>`",`"<GUID2>`"`n`n" + `
+                "Note: Utilize the -BlockMacSync:`$true parameter if you are not using conditional access to ensure Macs cannot sync."
             }
             else {
                 "N/A"
             }
-
             # Condition C: Prepare details based on whether sync is restricted
             $details = if ($isSyncRestricted) {
                 "OneDrive sync is restricted for unmanaged devices."
@@ -51,7 +50,6 @@ function Test-OneDriveSyncRestrictions {
             else {
                 "TenantRestrictionEnabled: $($SPOTenantSyncClientRestriction.TenantRestrictionEnabled); AllowedDomainList: $($SPOTenantSyncClientRestriction.AllowedDomainList -join ', ')"
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -67,7 +65,6 @@ function Test-OneDriveSyncRestrictions {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return auditResult
         return $auditResult

source/tests/Test-PasswordNeverExpirePolicy.ps1

@@ -45,13 +45,12 @@ function Test-PasswordNeverExpirePolicy {
                 $isDefault = $domain.IsDefault
                 # Step (Condition C): Determine if the notification window is set to 30 days
                 $notificationWindow = $domain.PasswordNotificationWindowInDays
-                $notificationPolIsCompliant = $notificationWindow -eq 30
+                $notificationPolIsCompliant = $true # No longer a requirement
                 # Step (Condition A): Retrieve password expiration policy
                 $passwordPolicy = $domain.PasswordValidityPeriodInDays
                 $pwPolIsCompliant = $passwordPolicy -eq 2147483647
                 # Step (Condition A & B): Determine if the policy is compliant
                 $overallResult = $overallResult -and $notificationPolIsCompliant -and $pwPolIsCompliant
-
                 # Step (Condition A & B): Prepare failure reasons and details based on compliance
                 $failureReasons = if ($notificationPolIsCompliant -and $pwPolIsCompliant) {
                     "N/A"
@@ -59,18 +58,14 @@ function Test-PasswordNeverExpirePolicy {
                 else {
                     "Password expiration is not set to never expire or notification window is not set to 30 days for domain $domainName. Run the following command to remediate: `nUpdate-MgDomain -DomainId $domainName -PasswordValidityPeriodInDays 2147483647 -PasswordNotificationWindowInDays 30`n"
                 }
-
                 $details = "$domainName|$passwordPolicy days|$notificationWindow days|$isDefault"
-
                 # Add details and failure reasons to the lists
                 $detailsList += $details
                 $failureReasonsList += $failureReasons
             }
-
             # Prepare the final failure reason and details
             $finalFailureReason = $failureReasonsList -join "`n"
             $finalDetails = $detailsList -join "`n"
-
             # Step: Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -86,7 +81,6 @@ function Test-PasswordNeverExpirePolicy {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-ReauthWithCode.ps1

@@ -5,7 +5,6 @@ function Test-ReauthWithCode {
         # Aligned
         # Define your parameters here
     )
-
     begin {
         <#
         Conditions for 7.2.10 (L1) Ensure reauthentication with verification code is restricted
@@ -22,31 +21,34 @@ function Test-ReauthWithCode {
         #   - Condition A: The `EmailAttestationRequired` property is set to `False`.
         #   - Condition B: The `EmailAttestationReAuthDays` property is set to more than `15`.
         #>
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "7.2.10"
+        Write-Verbose "Running Test-ReauthWithCode for $recnum..."
     }
-
     process {
         try {
             # 7.2.10 (L1) Ensure reauthentication with verification code is restricted
-
             # Retrieve reauthentication settings for SharePoint Online
+            # $SPOTenantReauthentication Mock Object
+            <#
+                $SPOTenantReauthentication = [PSCustomObject]@{
+                    EmailAttestationRequired                    = "$false"
+                    EmailAttestationReAuthDays                  = "30"
+                }
+            #>
             $SPOTenantReauthentication = Get-CISSpoOutput -Rec $recnum
             $isReauthenticationRestricted = $SPOTenantReauthentication.EmailAttestationRequired -and $SPOTenantReauthentication.EmailAttestationReAuthDays -le 15
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $isReauthenticationRestricted) {
-                "Reauthentication with verification code does not require reauthentication within 15 days or less."
+                "Reauthentication with verification code does not require reauthentication within 15 days or less. To remediate this setting, use the Set-SPOTenant command:`n" + `
+                "Set-SPOTenant -EmailAttestationRequired `$true -EmailAttestationReAuthDays 15"
             }
             else {
                 "N/A"
             }
-
             $details = "EmailAttestationRequired: $($SPOTenantReauthentication.EmailAttestationRequired); EmailAttestationReAuthDays: $($SPOTenantReauthentication.EmailAttestationReAuthDays)"
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -62,7 +64,6 @@ function Test-ReauthWithCode {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return auditResult
         return $auditResult

source/tests/Test-RestrictCustomScripts.ps1

@@ -4,15 +4,13 @@ function Test-RestrictCustomScripts {
     param (
         # Define your parameters here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         # . .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "7.3.4"
+        Write-Verbose "Running Test-RestrictCustomScripts for $recnum..."
     }
-
     process {
         try {
             # 7.3.4 (L1) Ensure custom script execution is restricted on site collections
@@ -30,23 +28,27 @@ function Test-RestrictCustomScripts {
             #   - Condition A: The `DenyAddAndCustomizePages` setting is not set to `Enabled` for any site collection.
             #   - Condition B: The setting is not validated through PowerShell commands, indicating misconfiguration.
             #   - Condition C: Verification using the SharePoint Admin Center indicates that the `DenyAddAndCustomizePages` setting is not enforced.
-
             # Retrieve all site collections and select necessary properties
+            # $SPOSitesCustomScript Mock Object
+            <#
+                $SPOSitesCustomScript = [PSCustomObject]@{
+                    Title           = "Site Collection 1"
+                    Url             = "https://contoso.sharepoint.com/sites/site1"
+                    DenyAddAndCustomizePages = "Enabled"
+                }
+            #>
             $SPOSitesCustomScript = Get-CISSpoOutput -Rec $recnum
-
             # Process URLs to replace 'sharepoint.com' with '<SPUrl>'
             $processedUrls = $SPOSitesCustomScript | ForEach-Object {
                 $_.Url = $_.Url -replace 'sharepoint\.com', '<SPUrl>'
                 $_
             }
-
             # Find sites where custom scripts are allowed
             $customScriptAllowedSites = $processedUrls | Where-Object { $_.DenyAddAndCustomizePages -ne 'Enabled' }
             #$verbosePreference = 'Continue'
             # Check the total length of URLs
             $totalUrlLength = ($customScriptAllowedSites.Url -join '').Length
             Write-Verbose "Total length of URLs: $totalUrlLength"
-
             # Extract hostnames from allowed sites if the total length exceeds the limit
             $mostUsedHostname = $null
             if ($totalUrlLength -gt 20000) {
@@ -57,7 +59,6 @@ function Test-RestrictCustomScripts {
                     }
                 }
                 Write-Verbose "Extracted hostnames: $($hostnames -join ', ')"
-
                 # Find the most used hostname using the Get-MostCommonWord function
                 $mostUsedHostname = Get-MostCommonWord -InputStrings $hostnames
                 Write-Verbose "Most used hostname: $mostUsedHostname"
@@ -65,7 +66,6 @@ function Test-RestrictCustomScripts {
             #$verbosePreference = 'SilentlyContinue'
             # Compliance is true if no sites allow custom scripts
             $complianceResult = $customScriptAllowedSites.Count -eq 0
-
             # Gather details for non-compliant sites (where custom scripts are allowed)
             $nonCompliantSiteDetails = $customScriptAllowedSites | ForEach-Object {
                 $url = $_.Url
@@ -74,32 +74,29 @@ function Test-RestrictCustomScripts {
                 }
                 "$(if ($_.Title) {$_.Title} else {"NoTitle"})|$url"
             }
-
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $complianceResult) {
-                "Some site collections are not restricting custom script execution. Review Details property for sites that are not aligned with the benchmark."
+                "Some site collections are not restricting custom script execution. Review Details property for sites that are not aligned with the benchmark.`n" + `
+                "To remediate this setting, use the following command:`n" + `
+                "Set-SPOSite -Identity <SiteUrl> -DenyAddAndCustomizePages `$true"
             }
             else {
                 "N/A"
             }
-
             $details = if ($complianceResult) {
                 "All site collections have custom script execution restricted"
             }
             else {
                 "Title|Url`n" + ($nonCompliantSiteDetails -join "`n")
             }
-
             # Convert details to PSObject and check length
             $detailsPSObject = $details | ConvertFrom-Csv -Delimiter '|'
             $detailsLength = ($detailsPSObject | ForEach-Object { $_.Url }).Length
-
             if ($detailsLength -gt 32767) {
                 # Create a preview of the first 10 results
                 $preview = $detailsPSObject | Select-Object -First 10 | ForEach-Object { "$($_.Title)|$($_.Url)" }
                 $details = "The output is too large. Here is a preview of the first 10 results:`n`n" + ($preview -join "`n") + "`n`nPlease run the test with the following commands to get the full details:`n`nGet-SPOSite -Limit All | Where-Object { `$.DenyAddAndCustomizePages -ne 'Enabled' } | Select-Object Title, Url"
             }
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum

source/tests/Test-RestrictExternalSharing.ps1

@@ -5,18 +5,15 @@ function Test-RestrictExternalSharing {
         # Aligned
         # Define your parameters here
     )
-
     begin {
     <#
         Conditions for 7.2.3 (L1) Ensure external content sharing is restricted
-
         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: The SharingCapability is set to "ExternalUserSharingOnly" or more restrictive in the SharePoint admin center.
         - Condition B: Using PowerShell, the SharingCapability property for the SharePoint tenant is set to "ExternalUserSharingOnly", "ExistingExternalUserSharingOnly", or "Disabled".
         - Condition C: The external sharing settings in SharePoint Online and OneDrive are set to the same or a more restrictive level than the organization’s sharing settings.
-
         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:
@@ -24,34 +21,37 @@ function Test-RestrictExternalSharing {
         - Condition B: Using PowerShell, the SharingCapability property for the SharePoint tenant is set to "Anyone" or "ExternalUserAndGuestSharing".
         - Condition C: The external sharing settings in SharePoint Online and OneDrive are set to a more permissive level than the organization’s sharing settings.
     #>
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
         $recnum = "7.2.3"
+        Write-Verbose "Running Test-RestrictExternalSharing for $recnum..."
     }
-
     process {
         try {
             # 7.2.3 (L1) Ensure external content sharing is restricted
-
             # Retrieve the SharingCapability setting for the SharePoint tenant
+            <#
+                $SPOTenantSharingCapability = [PSCustomObject]@{
+                    SharingCapability           = "ExternalUserAndGuestSharing"
+                }
+            #>
             $SPOTenantSharingCapability = Get-CISSpoOutput -Rec $recnum
             $isRestricted = $SPOTenantSharingCapability.SharingCapability -in @('ExternalUserSharingOnly', 'ExistingExternalUserSharingOnly', 'Disabled')
-
             # Prepare failure reasons and details based on compliance
             # Condition B: Using PowerShell, the SharingCapability property for the SharePoint tenant is set to "ExternalUserSharingOnly", "ExistingExternalUserSharingOnly", or "Disabled".
             $failureReasons = if (-not $isRestricted) {
-                "External content sharing is not adequately restricted. Current setting: $($SPOTenantSharingCapability.SharingCapability)"
+                "External content sharing is not adequately restricted. Current setting: $($SPOTenantSharingCapability.SharingCapability)`n" + `
+                "The acceptable values for SharingCapability are: 'ExternalUserSharingOnly', 'ExistingExternalUserSharingOnly', or 'Disabled'.`n" + `
+                "To remediate this setting, use the Set-SPOTenant cmdlet to set the SharingCapability property to an acceptable value:`n`n" + `
+                "Set-SPOTenant -SharingCapability <acceptable value from above>"
             }
             else {
                 "N/A"
             }
-
             # Condition A: The SharingCapability is set to "ExternalUserSharingOnly" or more restrictive in the SharePoint admin center.
             # Condition C: The external sharing settings in SharePoint Online and OneDrive are set to the same or a more restrictive level than the organization’s sharing settings.
             $details = "SharingCapability: $($SPOTenantSharingCapability.SharingCapability)"
-
             # Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -67,7 +67,6 @@ function Test-RestrictExternalSharing {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return auditResult
         return $auditResult

source/tests/Test-SafeAttachmentsPolicy.ps1

@@ -1,19 +1,22 @@
 function Test-SafeAttachmentsPolicy {
     [CmdletBinding()]
     [OutputType([CISAuditResult])]
-    param ()
+    param (
+        [Parameter(Mandatory = $false)]
+        [string]$DomainName
+    )
     begin {
         $recnum = "2.1.4"
         Write-Verbose "Running Test-SafeAttachmentsPolicy for $recnum..."
         <#
             Conditions for 2.1.4 (L2) Ensure Safe Attachments policy is enabled:
             Validate test for a pass:
-                - Ensure the highest priority Safe Attachments policy is enabled.
-                - Check if the policy's action is set to 'Block'.
+                - Ensure Safe Attachments policies are enabled.
+                - Check if each policy's action is set to 'Block'.
                 - Confirm the QuarantineTag is set to 'AdminOnlyAccessPolicy'.
                 - Verify that the Redirect setting is disabled.
             Validate test for a fail:
-                - If the highest priority Safe Attachments policy's action is not set to 'Block'.
+                - If any Safe Attachments policy's action is not set to 'Block'.
                 - If the QuarantineTag is not set to 'AdminOnlyAccessPolicy'.
                 - If the Redirect setting is enabled.
                 - If no enabled Safe Attachments policies are found.
@@ -33,35 +36,47 @@ function Test-SafeAttachmentsPolicy {
                 }
             )
         #>
-        $safeAttachmentPolicies = Get-CISExoOutput -Rec $recnum
+        $safeAttachmentPolicies, $safeAttachmentRules = Get-CISExoOutput -Rec $recnum
+        $safeAttachmentPolicies = $safeAttachmentPolicies | Where-Object { $_.Identity -in $safeAttachmentRules.SafeAttachmentPolicy }
         if ($safeAttachmentPolicies -ne 1) {
             try {
-                $highestPriorityPolicy = $safeAttachmentPolicies | Select-Object -First 1
+                if ($DomainName) {
+                    $safeAttachmentPolicies = $safeAttachmentPolicies | Where-Object { $_.Identity -eq ($safeAttachmentRules | Sort-Object -Property Priority | Where-Object { $_.RecipientDomainIs -in $DomainName } | Select-Object -ExpandProperty SafeAttachmentPolicy -First 1) }
+                    $RecipientDomains = $safeAttachmentRules | Where-Object { $_.SafeAttachmentPolicy -eq $safeAttachmentPolicies.Identity } | Select-Object -ExpandProperty RecipientDomainIs
+                }
                 # Initialize details and failure reasons
                 $details = @()
                 $failureReasons = @()
-                # Check policy specifics as per CIS benchmark requirements
-                if ($highestPriorityPolicy.Action -ne 'Block') {
-                    $failureReasons += "Policy action is not set to 'Block'."
+                foreach ($policy in $safeAttachmentPolicies) {
+                    # Check policy specifics as per CIS benchmark requirements
+                    if ($Policy.Action -ne 'Block') {
+                        $failureReasons += "Policy: $($Policy.Identity); Action is not set to 'Block'."
+                    }
+                    if ($Policy.QuarantineTag -ne 'AdminOnlyAccessPolicy') {
+                        $failureReasons += "Policy: $($Policy.Identity); Quarantine is not set to 'AdminOnlyAccessPolicy'."
+                    }
+                    if ($Policy.Redirect -ne $false) {
+                        $failureReasons += "Policy: $($Policy.Identity); Redirect is not disabled."
+                    }
+                    # The result is a pass if there are no failure reasons
+                    $details += [PSCustomObject]@{
+                        Policy        = ($Policy.Identity).trim()
+                        Action        = $Policy.Action
+                        QuarantineTag = $Policy.QuarantineTag
+                        Redirect      = $Policy.Redirect
+                        Enabled       = $Policy.Enable
+                        Priority      = [int]($safeAttachmentRules | Where-Object { $_.SafeAttachmentPolicy -eq $Policy.Identity } | Select-Object -ExpandProperty Priority)
+                    }
                 }
-                if ($highestPriorityPolicy.QuarantineTag -ne 'AdminOnlyAccessPolicy') {
-                    $failureReasons += "Quarantine policy is not set to 'AdminOnlyAccessPolicy'."
-                }
-                if ($highestPriorityPolicy.Redirect -ne $false) {
-                    $failureReasons += "Redirect is not disabled."
-                }
-                # 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
+                if ($RecipientDomains) {
+                    $failureReasons += "Recipient domain(s): '$($RecipientDomains -join ', ' )' included in tested policy."
                 }
                 # Format details for output manually
-                $detailsString = "Policy|Action|QuarantineTag|Redirect|Enabled`n" + ($details |
-                    ForEach-Object { "$($_.Policy)|$($_.Action)|$($_.QuarantineTag)|$($_.Redirect)|$($_.Enabled)`n" }
+                $detailsString = "Policy|Action|QuarantineTag|Redirect|Enabled|Priority`n" + `
+                ($details | ForEach-Object {
+                        "$($_.Policy)|$($_.Action)|$($_.QuarantineTag)|$($_.Redirect)|$($_.Enabled)|$($_.Priority)`n"
+                    }
                 )
                 $failureReasonsString = ($failureReasons -join "`n")
                 # Create and populate the CISAuditResult object
@@ -75,7 +90,7 @@ function Test-SafeAttachmentsPolicy {
                 $auditResult = Initialize-CISAuditResult @params
             }
             catch {
-                Write-Error "An error occurred during the test: $_"
+                Write-Error "An error occurred during the test $recnum`:: $_"
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }

source/tests/Test-SafeAttachmentsTeams.ps1

@@ -88,7 +88,7 @@ AllowSafeDocsOpen: $($_.AllowSafeDocsOpen)
                 $auditResult = Initialize-CISAuditResult @params
             }
             catch {
-                Write-Error "An error occurred during the test: $_"
+                Write-Error "An error occurred during the test $recnum`:: $_"
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }

source/tests/Test-SafeLinksOfficeApps.ps1

@@ -58,7 +58,7 @@ function Test-SafeLinksOfficeApps {
                 $auditResult = Initialize-CISAuditResult @params
             }
             catch {
-                Write-Error "An error occurred during the test: $_"
+                Write-Error "An error occurred during the test $recnum`:: $_"
                 # Retrieve the description from the test definitions
                 $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
                 $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }

source/tests/Test-SharePointAADB2B.ps1

@@ -5,7 +5,6 @@ function Test-SharePointAADB2B {
         # Aligned
         # Define your parameters here
     )
-
     begin {
         # Conditions for 7.2.2 (L1) Ensure SharePoint and OneDrive integration with Azure AD B2B is enabled
         #
@@ -22,26 +21,29 @@ function Test-SharePointAADB2B {
         #   - Condition A: The `EnableAzureADB2BIntegration` property is set to `False` for the SharePoint tenant.
         #   - Condition B: The integration between SharePoint, OneDrive, and Azure AD B2B is not active.
         #   - Condition C: Guest accounts are not managed in Azure AD and are not subject to access policies.
-
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
-
         $recnum = "7.2.2"
+        Write-Verbose "Running Test-SharePointAADB2B for $recnum..."
     }
-
     process {
         try {
             # 7.2.2 (L1) Ensure SharePoint and OneDrive integration with Azure AD B2B is enabled
+            # $SPOTenantAzureADB2B Mock Object
+            <#
+                $SPOTenantAzureADB2B = [PSCustomObject]@{
+                    EnableAzureADB2BIntegration           = $false
+                }
+            #>
             $SPOTenantAzureADB2B = Get-CISSpoOutput -Rec $recnum
-
             # Populate the auditResult object with the required properties
             $params = @{
                 Rec           = $recnum
                 Result        = $SPOTenantAzureADB2B.EnableAzureADB2BIntegration
                 Status        = if ($SPOTenantAzureADB2B.EnableAzureADB2BIntegration) { "Pass" } else { "Fail" }
                 Details       = "EnableAzureADB2BIntegration: $($SPOTenantAzureADB2B.EnableAzureADB2BIntegration)"
-                FailureReason = if (-not $SPOTenantAzureADB2B.EnableAzureADB2BIntegration) { "Azure AD B2B integration is not enabled" } else { "N/A" }
+                FailureReason = if (-not $SPOTenantAzureADB2B.EnableAzureADB2BIntegration) { "Azure AD B2B integration is not enabled. The following command can be used to enable:`nSet-SPOTenant -EnableAzureADB2BIntegration `$true" } else { "N/A" }
             }
             $auditResult = Initialize-CISAuditResult @params
         }
@@ -50,7 +52,6 @@ function Test-SharePointAADB2B {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return auditResult
         return $auditResult

source/tests/Test-SharePointExternalSharingDomains.ps1

@@ -5,14 +5,12 @@ function Test-SharePointExternalSharingDomains {
         # Aligned
         # Define your parameters here
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
         $recnum = "7.2.6"
-
+        Write-Verbose "Running Test-SharePointExternalSharingDomains for $recnum..."
         # Conditions for 7.2.6 (L2) Ensure SharePoint external sharing is managed through domain whitelist/blacklists
         #
         # Validate test for a pass:
@@ -29,13 +27,18 @@ function Test-SharePointExternalSharingDomains {
         #   - Condition B: The "SharingDomainRestrictionMode" is not set to "AllowList" using PowerShell.
         #   - Condition C: The "SharingAllowedDomainList" does not contain the domains trusted by the organization for external sharing.
     }
-
     process {
         try {
             # 7.2.6 (L2) Ensure SharePoint external sharing is managed through domain whitelist/blacklists
             $SPOTenant = Get-CISSpoOutput -Rec $recnum
+            # $SPOTenant Mock Object
+            <#
+                $SPOTenant = [PSCustomObject]@{
+                    SharingDomainRestrictionMode           = "AllowList"
+                    SharingAllowedDomainList                = "domain1.com", "domain2.com"
+                }
+            #>
             $isDomainRestrictionConfigured = $SPOTenant.SharingDomainRestrictionMode -eq 'AllowList'
-
             # Populate the auditResult object with the required properties
             $params = @{
                 Rec           = $recnum
@@ -51,7 +54,6 @@ function Test-SharePointExternalSharingDomains {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return auditResult
         return $auditResult

source/tests/Test-SharePointGuestsItemSharing.ps1

@@ -5,14 +5,12 @@ function Test-SharePointGuestsItemSharing {
         # Aligned
         # Define your parameters here
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
-
         $recnum = "7.2.5"
-
+        Write-Verbose "Running Test-SharePointGuestsItemSharing for $recnum..."
         # Conditions for 7.2.5 (L2) Ensure that SharePoint guest users cannot share items they don't own
         #
         # Validate test for a pass:
@@ -29,20 +27,24 @@ function Test-SharePointGuestsItemSharing {
         #   - Condition B: The SharePoint admin center setting "Allow guests to share items they don't own" is checked.
         #   - Condition C: Ensure that external users can re-share items they don't own.
     }
-
     process {
         try {
             # 7.2.5 (L2) Ensure that SharePoint guest users cannot share items they don't own
+            # $SPOTenant Mock Object
+            <#
+                $SPOTenant = [PSCustomObject]@{
+                    PreventExternalUsersFromResharing           = $false
+                }
+            #>
             $SPOTenant = Get-CISSpoOutput -Rec $recnum
             $isGuestResharingPrevented = $SPOTenant.PreventExternalUsersFromResharing
-
             # Populate the auditResult object with the required properties
             $params = @{
                 Rec           = $recnum
                 Result        = $isGuestResharingPrevented
                 Status        = if ($isGuestResharingPrevented) { "Pass" } else { "Fail" }
                 Details       = "PreventExternalUsersFromResharing: $isGuestResharingPrevented"
-                FailureReason = if (-not $isGuestResharingPrevented) { "Guest users can reshare items they don't own." } else { "N/A" }
+                FailureReason = if (-not $isGuestResharingPrevented) { "Guest users can reshare items they don't own. To prevent external users from resharing content they don't own,`nuse the following command:`nSet-SPOTenant -PreventExternalUsersFromResharing `$True" } else { "N/A" }
             }
             $auditResult = Initialize-CISAuditResult @params
         }
@@ -51,7 +53,6 @@ function Test-SharePointGuestsItemSharing {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return auditResult
         return $auditResult

source/tests/Test-SpamPolicyAdminNotify.ps1

@@ -108,7 +108,7 @@ function Test-SpamPolicyAdminNotify {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
+            Write-Error "An error occurred during the test $recnum`:: $_"
             $auditResult = Get-TestError -LastError $_ -recnum $recnum
         }
     }

tests/Unit/Private/Get-AuditMailboxDetail.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'
+            }
+        }
+    }
+}
+