Merge pull request #136 from CriticalSolutionsNetwork/135-add-parameter-validation-to-new-parameters

135 add parameter validation to new parameters

.github/workflows/powershell.yml

@@ -0,0 +1,50 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+#
+# https://github.com/microsoft/action-psscriptanalyzer
+# For more information on PSScriptAnalyzer in general, see
+# https://github.com/PowerShell/PSScriptAnalyzer
+
+name: PSScriptAnalyzer
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '33 20 * * 4'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+    name: PSScriptAnalyzer
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Run PSScriptAnalyzer
+        uses: microsoft/psscriptanalyzer-action@6b2948b1944407914a58661c49941824d149734f
+        with:
+          # Check https://github.com/microsoft/action-psscriptanalyzer for more info about the options.
+          # The below set up runs PSScriptAnalyzer to your entire repository and runs some basic security rules.
+          path: .\source
+          recurse: true
+          # Include your own basic security rules. Removing this option will run all the rules
+          includeRule: '"PSAvoidGlobalAliases", "PSAvoidUsingConvertToSecureStringWithPlainText", "PSAvoidUsingPlainTextForPassword", "PSAvoidUsingInvokeExpression", "PSUseApprovedVerbs", "PSAvoidUsingPositionalParameters", "PSAvoidUsingEmptyCatchBlock", "PSAvoidUsingDeprecatedManifestFields", "PSAvoidUsingUserNameAndPasswordParams", "PSAvoidUsingCmdletAliases"'
+
+          output: results.sarif
+
+      # Upload the SARIF file generated in the previous step
+      - name: Upload SARIF results file
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: results.sarif

.gitignore

@@ -16,3 +16,4 @@ markdownissues.txt
 node_modules
 package-lock.json
 Aligned.xlsx
+test-gh1.ps1

CHANGELOG.md

@@ -4,6 +4,219 @@ The format is based on and uses the types of changes according to [Keep a Change
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed parameter validation for new parameters in `Invoke-M365SecurityAudit` function.
+
+## [0.1.19] - 2024-06-30
+
+### Added
+
+- Added `ApprovedCloudStorageProviders` parameter to `Invoke-M365SecurityAudit` to allow for testing of approved cloud storage providers for 8.1.1.
+- Added `ApprovedFederatedDomains` parameter to `Invoke-M365SecurityAudit` to allow for testing of approved federated domains for 8.5.1.
+
+### Fixed
+
+- Fixed various MSTeams tests to be more accurate and include more properties in the output.
+
+## [0.1.18] - 2024-06-29
+
+### Added
+
+- Added `Get-PhishPolicyDetail` and `Test-PhishPolicyCompliance` private functions to help test for phishing policy compliance.
+
+### Fixed
+
+- Fixed various EXO test to be more accurate and include more properties in the output.
+
+#### Changed
+
+- Changed main function parameter for Domain to `DomainName`.
+
+## [0.1.17] - 2024-06-28
+
+### Fixed
+
+- Fixed `Get-ExceededLengthResultDetail` function paramter validation for Exported Tests to allow for Null.
+
+## [0.1.16] - 2024-06-26
+
+### Added
+
+- Added `Grant-M365SecurityAuditConsent` function to consent to the Microsoft Graph Powershell API for a user.
+
+## [0.1.15] - 2024-06-26
+
+### Fixed
+
+- Fixed test 8.6.1 to include all of the following properties in it's checks and output: `ReportJunkToCustomizedAddress`, `ReportNotJunkToCustomizedAddress`, `ReportPhishToCustomizedAddress`,`ReportJunkAddresses`,`ReportNotJunkAddresses`,`ReportPhishAddresses`,`ReportChatMessageEnabled`,`ReportChatMessageToCustomizedAddressEnabled`
+- Fixed help `about_M365FoundationsCISReport` examples.
+- Fixed `Export-M365SecurityAuditTable` to properly export when nested table tests are not included.
+
+### Changed
+
+- Changed output of failure reason and details for 8.5.3 and 8.6.1 to be in line with other tests.
+
+## [0.1.14] - 2024-06-23
+
+### Fixed
+
+- Fixed test 1.3.1 to include notification window for password expiration.
+- Fixed 6.1.1 test definition to include the correct connection.
+- Removed banner and warning from EXO and AzureAD connection step.
+- Fixed missing CommentBlock for `Remove-RowsWithEmptyCSVStatus` function.
+- Fixed formatting and color for various Write-Host messages.
+
+### Added
+
+- Added export to excel to `Export-M365SecurityAuditTable` function.
+- `Get-AdminRoleUserLicense` function to get the license of a user with admin roles for 1.1.1.
+- Skip MSOL connection confirmation to `Get-MFAStatus` function.
+- Added `Get-CISMgOutput` function to get the output of the Microsoft Graph API per test.
+- Added `Get-CISExoOutput` function to get the output of the Exchange Online API per test.
+- Added `Get-CISMSTeamsOutput` function to get the output of the Microsoft Teams API per test.
+- Added `Get-CISSPOOutput` function to get the output of the SharePoint Online API per test.
+- Added `Get-TestError` function to get the error output of a test.
+- Updated Microsoft Graph tests to utilize the new output functions ('1.1.1', '1.1.3', '1.2.1', '1.3.1', '5.1.2.3', '5.1.8.1', '6.1.2', '6.1.3')
+- Updated EXO tests to utilize the new output functions ('1.2.2', '1.3.3', '1.3.6', '2.1.1', '2.1.2', '2.1.3', '2.1.4', '2.1.5', '2.1.6', '2.1.7', '2.1.9', '3.1.1', '6.1.1', '6.1.2', '6.1.3', '6.2.1', '6.2.2', '6.2.3', '6.3.1', '6.5.1', '6.5.2', '6.5.3', '8.6.1').
+- Updated MSTeams tests to utilize the new output functions ('8.1.1', '8.1.2', '8.2.1', '8.5.1', '8.5.2', '8.5.3', '8.5.4', '8.5.5', '8.5.6', '8.5.7', '8.6.1')
+- Updated SPO tests to utilize the new output functions ('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')
+
+## [0.1.13] - 2024-06-18
+
+### Added
+
+- Added tenant output to connect function.
+- Added skip tenant connection confirmation to main function.
+
+### Fixed
+
+- Fixed comment examples for `Export-M365SecurityAuditTable`.
+
+### Changed
+
+- Updated `Sync-CISExcelAndCsvData` to be one function.
+
+## [0.1.12] - 2024-06-17
+
+### Added
+
+- Added `Export-M365SecurityAuditTable` public function to export applicable audit results to a table format.
+- Added paramter to `Export-M365SecurityAuditTable` to specify output of the original audit results.
+- Added `Remove-RowsWithEmptyCSVStatus` public function to remove rows with empty status from the CSV file.
+- Added `Get-Action` private function to retrieve the action for the test 6.1.2 and 6.1.3 tests.
+- Added output modifications to tests that produce tables to ensure they can be exported with the new `Export-M365SecurityAuditTable` function.
+
+## [0.1.11] - 2024-06-14
+
+### Added
+
+- Added Get-MFAStatus function to help with auditing mfa for conditional access controls.
+
+### Fixed
+
+- Fixed 6.1.2/6.1.3 tests to minimize calls to the Graph API.
+- Fixed 2.1.1,2.1.4,2.1.5 to suppress error messages and create a standard object when no e5"
+
+## [0.1.10] - 2024-06-12
+
+### Added
+
+- Added condition comments to each test.
+
+### Fixed
+
+- Fixed csv CIS controls that were not matched correctly.
+
+## [0.1.9] - 2024-06-10
+
+### Fixed
+
+- Fixed bug in 1.1.1 that caused the test to fail/pass incorrectly. Added verbose output.
+
+### Docs
+
+- Updated helper csv formatting for one cis control.
+
+
+## [0.1.8] - 2024-06-09
+
+### Added
+
+- Added output type to functions.
+
+### Fixed
+
+- Whatif support for `Invoke-M365SecurityAudit`.
+- Whatif module output and module install process.
+
+## [0.1.7] - 2024-06-08
+
+### Added
+
+- Added pipeline support to `Sync-CISExcelAndCsvData` function for `[CISAuditResult[]]` input.
+
+### Changed
+
+- Updated `Connect-M365Suite` to make `TenantAdminUrl` an optional parameter.
+- Updated `Invoke-M365SecurityAudit` to make `TenantAdminUrl` an optional parameter.
+- Improved connection handling and error messaging in `Connect-M365Suite`.
+- Enhanced `Invoke-M365SecurityAudit` to allow flexible inclusion and exclusion of specific recommendations, IG filters, and profile levels.
+- SupportsShoudProcess to also bypass connection checks in `Invoke-M365SecurityAudit` as well as Disconnect-M365Suite.
+
+## [0.1.6] - 2024-06-08
+
+### Added
+
+- Added pipeline support to `Sync-CISExcelAndCsvData` function for `[CISAuditResult[]]` input.
+
+## [0.1.5] - 2024-06-08
+
+### Added
+
+- Updated test definitions for CIS Microsoft 365 Foundations Benchmark for better error handling and object output when errors occur.
+- Added a parameter to the `Initialize-CISAuditResult` function to allow for a static failed object to be created when an error occurs.
+- Refactored `Invoke-M365SecurityAudit` to include a new private function `Invoke-TestFunction` for executing test functions and handling errors.
+- Added a new private function `Measure-AuditResult` to calculate and display audit results.
+- Enhanced error logging to capture failed test details and display them at the end of the audit.
+- Added a private function `Get-RequiredModule` to initialize the `$requiredModules` variable for better code organization in the main script.
+- Updated `Test-MailboxAuditingE3` and `Test-MailboxAuditingE5` functions to use `Format-MissingAction` for structuring missing actions into a pipe-separated table format.
+- Added more verbose logging to `Test-BlockMailForwarding` and improved error handling for better troubleshooting.
+- Improved `Test-RestrictCustomScripts` to handle long URL lengths better by extracting and replacing common hostnames, and provided detailed output.
+- Added sorting to output.
+- Created new functions for improved modularity.
+- Parameter validation for Excel and CSV path in sync function.
+- Added Output type to tests.
+- Added `M365DomainForPWPolicyTest` parameter to `Invoke-M365SecurityAudit` to specify testing only the default domain for password expiration policy when '1.3.1' is included in the tests.
+
+### Fixed
+
+- Ensured the `Invoke-TestFunction` returns a `CISAuditResult` object, which is then managed in the `Invoke-M365SecurityAudit` function.
+- Corrected the usage of the join operation within `$details` in `Test-BlockMailForwarding` to handle arrays properly.
+- Fixed the logic in `Test-RestrictCustomScripts` to accurately replace and manage URLs, ensuring compliance checks are correctly performed.
+- Updated the `Test-MailboxAuditingE3` and `Test-MailboxAuditingE5` functions to handle the `$allFailures` variable correctly, ensuring accurate pass/fail results.
+- Fixed the connections in helper CSV and connect function.
+- Removed verbose preference from `Test-RestrictCustomScripts`.
+- Ensured that the output in `Test-BlockMailForwarding` does not include extra spaces between table headers and data.
+- Fixed output in `Test-MailboxAuditingE3` and `Test-MailboxAuditingE5` to correctly align with the new table format.
+- Added step 1 and step 2 in `Test-BlockMailForwarding` details to ensure comprehensive compliance checks.
+- Fixed the issue with the output in `Test-RestrictCustomScripts` to ensure no extra spaces between table headers and data.
+
+## [0.1.4] - 2024-05-30
+
+### Added
+
+- Test definitions filter function.
+- Logging function for future use.
+- Test grade written to console.
+
+### Changed
+
+- Updated sync function to include connection info.
+- Refactored connect/disconnect functions to evaluate needed connections.
+
+## [0.1.3] - 2024-05-28
+
 ### Added
 
 - Array list to store the results of the audit.
@@ -27,7 +240,6 @@ The format is based on and uses the types of changes according to [Keep a Change
 
 - Updated comments and documentation for new functions.
 
-
 ## [0.1.2] - 2024-04-29
 
 ### Added

SECURITY.md

@@ -0,0 +1,18 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.1.4   | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.

help/Export-M365SecurityAuditTable.md

@@ -0,0 +1,202 @@
+---
+external help file: M365FoundationsCISReport-help.xml
+Module Name: M365FoundationsCISReport
+online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Export-M365SecurityAuditTable
+schema: 2.0.0
+---
+
+# Export-M365SecurityAuditTable
+
+## SYNOPSIS
+Exports M365 security audit results to a CSV file or outputs a specific test result as an object.
+
+## SYNTAX
+
+### OutputObjectFromAuditResultsSingle
+```
+Export-M365SecurityAuditTable [-AuditResults] <CISAuditResult[]> [-OutputTestNumber] <String>
+ [<CommonParameters>]
+```
+
+### ExportAllResultsFromAuditResults
+```
+Export-M365SecurityAuditTable [-AuditResults] <CISAuditResult[]> [-ExportAllTests] -ExportPath <String>
+ [-ExportOriginalTests] [-ExportToExcel] [<CommonParameters>]
+```
+
+### OutputObjectFromCsvSingle
+```
+Export-M365SecurityAuditTable [-CsvPath] <String> [-OutputTestNumber] <String> [<CommonParameters>]
+```
+
+### ExportAllResultsFromCsv
+```
+Export-M365SecurityAuditTable [-CsvPath] <String> [-ExportAllTests] -ExportPath <String> [-ExportOriginalTests]
+ [-ExportToExcel] [<CommonParameters>]
+```
+
+## 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.
+
+## EXAMPLES
+
+### EXAMPLE 1
+```
+Export-M365SecurityAuditTable -AuditResults $object -OutputTestNumber 6.1.2
+# Output object for a single test number from audit results
+```
+
+### EXAMPLE 2
+```
+Export-M365SecurityAuditTable -ExportAllTests -AuditResults $object -ExportPath "C:\temp"
+# Export all results from audit results to the specified path
+```
+
+### EXAMPLE 3
+```
+Export-M365SecurityAuditTable -CsvPath "C:\temp\auditresultstoday1.csv" -OutputTestNumber 6.1.2
+# Output object for a single test number from CSV
+```
+
+### EXAMPLE 4
+```
+Export-M365SecurityAuditTable -ExportAllTests -CsvPath "C:\temp\auditresultstoday1.csv" -ExportPath "C:\temp"
+# Export all results from CSV to the specified path
+```
+
+### EXAMPLE 5
+```
+Export-M365SecurityAuditTable -ExportAllTests -AuditResults $object -ExportPath "C:\temp" -ExportOriginalTests
+# Export all results from audit results to the specified path along with the original tests
+```
+
+### EXAMPLE 6
+```
+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
+```
+
+## PARAMETERS
+
+### -AuditResults
+An array of CISAuditResult objects containing the audit results.
+
+```yaml
+Type: CISAuditResult[]
+Parameter Sets: OutputObjectFromAuditResultsSingle, ExportAllResultsFromAuditResults
+Aliases:
+
+Required: True
+Position: 3
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -CsvPath
+The path to a CSV file containing the audit results.
+
+```yaml
+Type: String
+Parameter Sets: OutputObjectFromCsvSingle, ExportAllResultsFromCsv
+Aliases:
+
+Required: True
+Position: 3
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -OutputTestNumber
+The test number to output as an object.
+Valid values are "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4".
+
+```yaml
+Type: String
+Parameter Sets: OutputObjectFromAuditResultsSingle, OutputObjectFromCsvSingle
+Aliases:
+
+Required: True
+Position: 2
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ExportAllTests
+Switch to export all test results.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
+Aliases:
+
+Required: False
+Position: 1
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ExportPath
+The path where the CSV files will be exported.
+
+```yaml
+Type: String
+Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ExportOriginalTests
+Switch to export the original audit results to a CSV file.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
+Aliases:
+
+Required: True
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ExportToExcel
+Switch to export the results to an Excel file.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+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]
+## OUTPUTS
+
+### [PSCustomObject]
+## NOTES
+
+## RELATED LINKS
+
+[https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Export-M365SecurityAuditTable](https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Export-M365SecurityAuditTable)
+

help/Get-AdminRoleUserLicense.md

@@ -0,0 +1,74 @@
+---
+external help file: M365FoundationsCISReport-help.xml
+Module Name: M365FoundationsCISReport
+online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-AdminRoleUserLicense
+schema: 2.0.0
+---
+
+# Get-AdminRoleUserLicense
+
+## SYNOPSIS
+Retrieves user licenses and roles for administrative accounts from Microsoft 365 via the Graph API.
+
+## SYNTAX
+
+```
+Get-AdminRoleUserLicense [-SkipGraphConnection] [<CommonParameters>]
+```
+
+## DESCRIPTION
+The Get-AdminRoleUserLicense function connects to Microsoft Graph and retrieves all users who are assigned administrative roles along with their user details and licenses.
+This function is useful for auditing and compliance checks to ensure that administrators have appropriate licenses and role assignments.
+
+## EXAMPLES
+
+### EXAMPLE 1
+```
+Get-AdminRoleUserLicense
+```
+
+This example retrieves all administrative role users along with their licenses by connecting to Microsoft Graph using the default scopes.
+
+### EXAMPLE 2
+```
+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.
+
+## PARAMETERS
+
+### -SkipGraphConnection
+A switch parameter that, when set, skips the connection to Microsoft Graph if already established.
+This is useful for batch processing or when used within scripts where multiple calls are made and the connection is managed externally.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+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 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.
+## NOTES
+Creation Date:  2024-04-15
+Purpose/Change: Initial function development to support Microsoft 365 administrative role auditing.
+
+## RELATED LINKS
+
+[https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-AdminRoleUserLicense](https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-AdminRoleUserLicense)
+

help/Get-MFAStatus.md

@@ -0,0 +1,93 @@
+---
+external help file: M365FoundationsCISReport-help.xml
+Module Name: M365FoundationsCISReport
+online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-MFAStatus
+schema: 2.0.0
+---
+
+# Get-MFAStatus
+
+## SYNOPSIS
+Retrieves the MFA (Multi-Factor Authentication) status for Azure Active Directory users.
+
+## SYNTAX
+
+```
+Get-MFAStatus [[-UserId] <String>] [-SkipMSOLConnectionChecks] [<CommonParameters>]
+```
+
+## DESCRIPTION
+The Get-MFAStatus function connects to Microsoft Online Service and retrieves the MFA status for all Azure Active Directory users, excluding guest accounts.
+Optionally, you can specify a single user by their User Principal Name (UPN) to get their MFA status.
+
+## EXAMPLES
+
+### EXAMPLE 1
+```
+Get-MFAStatus
+Retrieves the MFA status for all Azure Active Directory users.
+```
+
+### EXAMPLE 2
+```
+Get-MFAStatus -UserId "example@domain.com"
+Retrieves the MFA status for the specified user with the UPN "example@domain.com".
+```
+
+## PARAMETERS
+
+### -UserId
+The User Principal Name (UPN) of a specific user to retrieve MFA status for.
+If not provided, the function retrieves MFA status for all users.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 1
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -SkipMSOLConnectionChecks
+{{ Fill SkipMSOLConnectionChecks Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+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
+
+## OUTPUTS
+
+### System.Object
+### 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.
+
+## RELATED LINKS
+
+[https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-MFAStatus](https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-MFAStatus)
+

help/Grant-M365SecurityAuditConsent.md

@@ -0,0 +1,163 @@
+---
+external help file: M365FoundationsCISReport-help.xml
+Module Name: M365FoundationsCISReport
+online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Grant-M365SecurityAuditConsent
+schema: 2.0.0
+---
+
+# Grant-M365SecurityAuditConsent
+
+## SYNOPSIS
+Grants Microsoft Graph permissions for an auditor.
+
+## SYNTAX
+
+```
+Grant-M365SecurityAuditConsent [-UserPrincipalNameForConsent] <String> [-SkipGraphConnection]
+ [-SkipModuleCheck] [-SuppressRevertOutput] [-DoNotDisconnect] [-WhatIf] [-Confirm] [<CommonParameters>]
+```
+
+## DESCRIPTION
+This function grants the specified Microsoft Graph permissions to a user, allowing the user to perform audits.
+It connects to Microsoft Graph, checks if a service principal exists for the client application, creates it if it does not exist, and then grants the specified permissions.
+Finally, it assigns the app to the user.
+
+## EXAMPLES
+
+### EXAMPLE 1
+```
+Grant-M365SecurityAuditConsent -UserPrincipalNameForConsent user@example.com
+```
+
+Grants Microsoft Graph permissions to user@example.com for the client application with the specified Application ID.
+
+### EXAMPLE 2
+```
+Grant-M365SecurityAuditConsent -UserPrincipalNameForConsent user@example.com -SkipGraphConnection
+```
+
+Grants Microsoft Graph permissions to user@example.com, skipping the connection to Microsoft Graph.
+
+## PARAMETERS
+
+### -UserPrincipalNameForConsent
+Specify the UPN of the user to grant consent for.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: 1
+Default value: None
+Accept pipeline input: True (ByPropertyName, ByValue)
+Accept wildcard characters: False
+```
+
+### -SkipGraphConnection
+If specified, skips connecting to Microsoft Graph.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -SkipModuleCheck
+If specified, skips the check for the Microsoft.Graph module.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -SuppressRevertOutput
+If specified, suppresses the output of the revert commands.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -DoNotDisconnect
+If specified, does not disconnect from Microsoft Graph after granting consent.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+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
+```
+
+### 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
+
+## OUTPUTS
+
+### System.Void
+## NOTES
+This function requires the Microsoft.Graph module version 2.4.0 or higher.
+
+## RELATED LINKS
+
+[https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Grant-M365SecurityAuditConsent](https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Grant-M365SecurityAuditConsent)
+

help/Invoke-M365SecurityAudit.md

@@ -0,0 +1,450 @@
+---
+external help file: M365FoundationsCISReport-help.xml
+Module Name: M365FoundationsCISReport
+online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit
+schema: 2.0.0
+---
+
+# Invoke-M365SecurityAudit
+
+## SYNOPSIS
+Invokes a security audit for Microsoft 365 environments.
+
+## SYNTAX
+
+### Default (Default)
+```
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>]
+ [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+```
+
+### ELevelFilter
+```
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -ELevel <String>
+ -ProfileLevel <String> [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>]
+ [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm]
+ [<CommonParameters>]
+```
+
+### IG1Filter
+```
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG1]
+ [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+```
+
+### IG2Filter
+```
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG2]
+ [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+```
+
+### IG3Filter
+```
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] [-IncludeIG3]
+ [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+```
+
+### RecFilter
+```
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -IncludeRecommendation <String[]>
+ [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+```
+
+### SkipRecFilter
+```
+Invoke-M365SecurityAudit [-TenantAdminUrl <String>] [-DomainName <String>] -SkipRecommendation <String[]>
+ [-ApprovedCloudStorageProviders <String[]>] [-ApprovedFederatedDomains <String[]>] [-DoNotConnect]
+ [-DoNotDisconnect] [-NoModuleCheck] [-DoNotConfirmConnections] [-WhatIf] [-Confirm] [<CommonParameters>]
+```
+
+## 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.
+
+## EXAMPLES
+
+### EXAMPLE 1
+```
+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
+
+### EXAMPLE 2
+```
+Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "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
+
+### EXAMPLE 3
+```
+Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "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
+
+### EXAMPLE 4
+```
+Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "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
+```
+
+### EXAMPLE 5
+```
+$auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com"
+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
+
+### EXAMPLE 6
+```
+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".
+
+## PARAMETERS
+
+### -TenantAdminUrl
+The URL of the tenant admin.
+If not specified, none of the SharePoint Online tests will run.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -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.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ELevel
+Specifies the E-Level (E3 or E5) for the audit.
+This parameter is optional and can be combined with the ProfileLevel parameter.
+
+```yaml
+Type: String
+Parameter Sets: ELevelFilter
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ProfileLevel
+Specifies the profile level (L1 or L2) for the audit.
+This parameter is optional and can be combined with the ELevel parameter.
+
+```yaml
+Type: String
+Parameter Sets: ELevelFilter
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -IncludeIG1
+If specified, includes tests where IG1 is true.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: IG1Filter
+Aliases:
+
+Required: True
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -IncludeIG2
+If specified, includes tests where IG2 is true.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: IG2Filter
+Aliases:
+
+Required: True
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -IncludeIG3
+If specified, includes tests where IG3 is true.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: IG3Filter
+Aliases:
+
+Required: True
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -IncludeRecommendation
+Specifies specific recommendations to include in the audit.
+Accepts an array of recommendation numbers.
+
+```yaml
+Type: String[]
+Parameter Sets: RecFilter
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -SkipRecommendation
+Specifies specific recommendations to exclude from the audit.
+Accepts an array of recommendation numbers.
+
+```yaml
+Type: String[]
+Parameter Sets: SkipRecFilter
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ApprovedCloudStorageProviders
+Specifies the approved cloud storage providers for the audit. Accepts an array of cloud storage provider names.
+
+```yaml
+Type: String[]
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: @()
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ApprovedFederatedDomains
+Specifies the approved federated domains for the audit test 8.2.1. Accepts an array of allowed domain names.
+
+```yaml
+Type: String[]
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -DoNotConnect
+If specified, the cmdlet will not establish a connection to Microsoft 365 services.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -DoNotDisconnect
+If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -NoModuleCheck
+If specified, the cmdlet will not check for the presence of required modules.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -DoNotConfirmConnections
+If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+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
+```
+
+### 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 Invoke-M365SecurityAudit.
+## OUTPUTS
+
+### CISAuditResult[]
+### 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.
+- Commercial use is not permitted. This module cannot be sold or used for commercial purposes.
+- Modifications and sharing are allowed under the same license.
+- For full license details, visit: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en
+- Register for CIS Benchmarks at: https://www.cisecurity.org/cis-benchmarks
+
+## RELATED LINKS
+
+[https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit](https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit)
+

help/M365FoundationsCISReport.md

@@ -0,0 +1,34 @@
+---
+Module Name: M365FoundationsCISReport
+Module Guid: 0d064bfb-d1ce-484b-a173-993b55984dc9
+Download Help Link: {{Please enter Link manually}}
+Help Version: 1.0.0.0
+Locale: en-US
+---
+
+# M365FoundationsCISReport Module
+## Description
+The `M365FoundationsCISReport` module provides a set of cmdlets to audit and report on the security compliance of Microsoft 365 environments based on CIS (Center for Internet Security) benchmarks. It enables administrators to generate detailed reports, sync data with CIS Excel sheets, and perform security audits to ensure compliance.
+
+## M365FoundationsCISReport Cmdlets
+### [Export-M365SecurityAuditTable](Export-M365SecurityAuditTable)
+Exports M365 security audit results to a CSV file or outputs a specific test result as an object.
+
+### [Get-AdminRoleUserLicense](Get-AdminRoleUserLicense)
+Retrieves user licenses and roles for administrative accounts from Microsoft 365 via the Graph API.
+
+### [Get-MFAStatus](Get-MFAStatus)
+Retrieves the MFA (Multi-Factor Authentication) status for Azure Active Directory users.
+
+### [Grant-M365SecurityAuditConsent](Grant-M365SecurityAuditConsent)
+Grants Microsoft Graph permissions for an auditor.
+
+### [Invoke-M365SecurityAudit](Invoke-M365SecurityAudit)
+Invokes a security audit for Microsoft 365 environments.
+
+### [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.
+
+### [Sync-CISExcelAndCsvData](Sync-CISExcelAndCsvData)
+Synchronizes and updates data in an Excel worksheet with new information from a CSV file, including audit dates.
+

help/Remove-RowsWithEmptyCSVStatus.md

@@ -0,0 +1,73 @@
+---
+external help file: M365FoundationsCISReport-help.xml
+Module Name: M365FoundationsCISReport
+online version:
+schema: 2.0.0
+---
+
+# Remove-RowsWithEmptyCSVStatus
+
+## SYNOPSIS
+Removes rows from an Excel worksheet where the 'CSV_Status' column is empty and saves the result to a new file.
+
+## SYNTAX
+
+```
+Remove-RowsWithEmptyCSVStatus [-FilePath] <String> [-WorksheetName] <String> [<CommonParameters>]
+```
+
+## DESCRIPTION
+The Remove-RowsWithEmptyCSVStatus function imports data from a specified worksheet in an Excel file, checks for the presence of the 'CSV_Status' column, and filters out rows where the 'CSV_Status' column is empty.
+The filtered data is then exported to a new Excel file with a '-Filtered' suffix added to the original file name.
+
+## EXAMPLES
+
+### EXAMPLE 1
+```
+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.
+```
+
+## PARAMETERS
+
+### -FilePath
+The path to the Excel file to be processed.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: 1
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -WorksheetName
+The name of the worksheet within the Excel file to be processed.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: 2
+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
+
+## OUTPUTS
+
+## NOTES
+This function requires the ImportExcel module to be installed.
+
+## RELATED LINKS

help/Sync-CISExcelAndCsvData.md

@@ -0,0 +1,102 @@
+---
+external help file: M365FoundationsCISReport-help.xml
+Module Name: M365FoundationsCISReport
+online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Sync-CISExcelAndCsvData
+schema: 2.0.0
+---
+
+# Sync-CISExcelAndCsvData
+
+## SYNOPSIS
+Synchronizes and updates data in an Excel worksheet with new information from a CSV file, including audit dates.
+
+## SYNTAX
+
+```
+Sync-CISExcelAndCsvData [[-ExcelPath] <String>] [[-CsvPath] <String>] [[-SheetName] <String>]
+ [<CommonParameters>]
+```
+
+## 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.
+
+## EXAMPLES
+
+### EXAMPLE 1
+```
+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.
+```
+
+## PARAMETERS
+
+### -ExcelPath
+Specifies the path to the Excel file to be updated.
+This parameter is mandatory.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 1
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -CsvPath
+Specifies the path to the CSV file containing new data.
+This parameter is mandatory.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 2
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -SheetName
+Specifies the name of the worksheet in the Excel file where data will be merged and updated.
+This parameter is mandatory.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 3
+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
+
+### 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.
+
+## RELATED LINKS
+
+[https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Sync-CISExcelAndCsvData](https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Sync-CISExcelAndCsvData)
+

help/about_M365FoundationsCISReport.md

@@ -0,0 +1,59 @@
+# M365FoundationsCISReport
+## about_M365FoundationsCISReport
+
+# SHORT DESCRIPTION
+The `M365FoundationsCISReport` module provides cmdlets for auditing and reporting on the security compliance of Microsoft 365 environments based on CIS benchmarks.
+
+# LONG DESCRIPTION
+The `M365FoundationsCISReport` module is designed to help administrators ensure that their Microsoft 365 environments adhere to the security best practices outlined by the Center for Internet Security (CIS). The module includes cmdlets for performing comprehensive security audits, generating detailed reports, and synchronizing audit results with CIS benchmark Excel sheets. It aims to streamline the process of maintaining security compliance and improving the overall security posture of Microsoft 365 environments.
+
+## Optional Subtopics
+### Auditing and Reporting
+The module provides cmdlets that allow for the auditing of various security aspects of Microsoft 365 environments, including user MFA status, administrative role licenses, and more. The results can be exported and analyzed to ensure compliance with CIS benchmarks.
+
+### Data Synchronization
+The module includes functionality to synchronize audit results with CIS benchmark data stored in Excel sheets. This ensures that the documentation is always up-to-date with the latest audit findings.
+
+# EXAMPLES
+```powershell
+# Example 1: Performing a security audit based on CIS benchmarks
+$auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com"
+
+# Example 2: Exporting a security audit table to a CSV file
+Export-M365SecurityAuditTable -ExportAllTests -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests
+
+# Example 3: Retrieving licenses for users in administrative roles
+Get-AdminRoleUserLicense
+
+# 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'
+```
+
+# 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.
+
+# 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.
+
+# 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/)
+
+# KEYWORDS
+- Microsoft 365
+- Security Audit
+- CIS Benchmarks
+- Compliance
+- MFA
+- User Licenses
+- Security Reporting

helpers/Build-Help.ps1

@@ -4,14 +4,61 @@ Import-Module .\output\module\M365FoundationsCISReport\*\*.psd1
 
 
 <#
-    $ver = "v0.1.2"
+    $ver = "v0.1.18"
     git checkout main
     git pull origin main
-    git tag -a $ver -m "Release version $ver Bugfix Update"
+    git tag -a $ver -m "Release version $ver refactor Update"
     git push origin $ver
     "Fix: PR #37"
     git push origin $ver
     # git tag -d $ver
 #>
 
+$OutputFolder = ".\help"
+$parameters = @{
+    Module = "M365FoundationsCISReport"
+    OutputFolder = $OutputFolder
+    AlphabeticParamsOrder = $true
+    WithModulePage = $true
+    ExcludeDontShow = $true
+    Encoding = [System.Text.Encoding]::UTF8
+}
+New-MarkdownHelp @parameters
+New-MarkdownAboutHelp -OutputFolder $OutputFolder -AboutName "M365FoundationsCISReport"
 
+
+####
+$parameters = @{
+    Path = ".\help"
+    RefreshModulePage = $true
+    AlphabeticParamsOrder = $true
+    UpdateInputOutput = $true
+    ExcludeDontShow = $true
+    LogPath = ".\log.txt"
+    Encoding = [System.Text.Encoding]::UTF8
+}
+Update-MarkdownHelpModule @parameters -Force
+Update-MarkdownHelpModule -Path ".\help" -RefreshModulePage -Force
+New-ExternalHelp -Path ".\help" -OutputPath ".\source\en-US" -force
+
+
+
+# Install Secret Management
+Install-Module -Name "Microsoft.PowerShell.SecretManagement", `
+"SecretManagement.JustinGrote.CredMan" -Scope CurrentUser
+
+# Register Vault
+Register-SecretVault -Name ModuleBuildCreds -ModuleName `
+"SecretManagement.JustinGrote.CredMan" -ErrorAction Stop
+
+
+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

helpers/CIS 365 v3.0.0 Controls/Test-MailboxAuditingE3_6.1.2_E3L1_IG1_IG2_IG3.ps1

@@ -60,7 +60,7 @@ function Test-MailboxAuditingE3_6.1.2_E3L1_IG1_IG2_IG3 {
                     }
 
                     if ($missingActions) {
-                        $formattedActions = Format-MissingActions $missingActions
+                        $formattedActions = Format-MissingAction $missingActions
                         $allFailures += "$userUPN`: AuditEnabled - True; $formattedActions"
                     }
                     # Mark the user as processed
@@ -83,7 +83,7 @@ function Test-MailboxAuditingE3_6.1.2_E3L1_IG1_IG2_IG3 {
     }
 }
 
-function Format-MissingActions {
+function Format-MissingAction {
     param ([array]$missingActions)
 
     $actionGroups = @{

helpers/CIS 365 v3.0.0 Controls/Test-MailboxAuditingE5_6.1.3_E5L1_IG1_IG2_IG3.ps1

@@ -60,7 +60,7 @@ function Test-MailboxAuditingE5_6.1.3_E5L1_IG1_IG2_IG3 {
                     }
 
                     if ($missingActions) {
-                        $formattedActions = Format-MissingActions $missingActions
+                        $formattedActions = Format-MissingAction $missingActions
                         $allFailures += "$userUPN`: AuditEnabled - True; $formattedActions"
                     }
                     else {
@@ -92,7 +92,7 @@ function Test-MailboxAuditingE5_6.1.3_E5L1_IG1_IG2_IG3 {
     }
 }
 
-function Format-MissingActions {
+function Format-MissingAction {
     param ([array]$missingActions)
 
     $actionGroups = @{

source/Private/Assert-ModuleAvailability.ps1

@@ -1,30 +1,34 @@
 function Assert-ModuleAvailability {
+    [OutputType([void]) ]
     param(
         [string]$ModuleName,
         [string]$RequiredVersion,
-        [string]$SubModuleName
+        [string[]]$SubModules = @()
     )
 
     try {
         $module = Get-Module -ListAvailable -Name $ModuleName | Where-Object { $_.Version -ge [version]$RequiredVersion }
 
-        if ($null -eq $module) {$auditResult.Profile
+        if ($null -eq $module) {
-            Write-Host "Installing $ModuleName module..."
+            Write-Host "Installing $ModuleName module..." -ForegroundColor Yellow
             Install-Module -Name $ModuleName -RequiredVersion $RequiredVersion -Force -AllowClobber -Scope CurrentUser | Out-Null
         }
         elseif ($module.Version -lt [version]$RequiredVersion) {
-            Write-Host "Updating $ModuleName module to required version..."
+            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."
+            Write-Host "$ModuleName module is already at required version or newer." -ForegroundColor Gray
         }
 
-        if ($SubModuleName) {
+        if ($SubModules.Count -gt 0) {
-            Import-Module -Name "$ModuleName.$SubModuleName" -RequiredVersion $RequiredVersion -ErrorAction Stop | Out-Null
+            foreach ($subModule in $SubModules) {
-        }
+                Write-Host "Importing submodule $ModuleName.$subModule..." -ForegroundColor DarkGray
-        else {
+                Import-Module -Name "$ModuleName.$subModule" -RequiredVersion $RequiredVersion -ErrorAction Stop | Out-Null
-            Import-Module -Name $ModuleName -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 {

source/Private/Connect-M365Suite.ps1

@@ -1,56 +1,122 @@
 function Connect-M365Suite {
+    [OutputType([void])]
     [CmdletBinding()]
     param (
-        # Parameter to specify the SharePoint Online Tenant Admin URL
+        [Parameter(Mandatory = $false)]
+        [string]$TenantAdminUrl,
+
         [Parameter(Mandatory)]
-        [string]$TenantAdminUrl
+        [string[]]$RequiredConnections,
+
+        [Parameter(Mandatory = $false)]
+        [switch]$SkipConfirmation
     )
-$VerbosePreference = "SilentlyContinue"
+
+    $VerbosePreference = "SilentlyContinue"
+    $tenantInfo = @()
+    $connectedServices = @()
+
     try {
-
+        if ($RequiredConnections -contains "AzureAD" -or $RequiredConnections -contains "AzureAD | EXO" -or $RequiredConnections -contains "AzureAD | EXO | Microsoft Graph") {
-        # Attempt to connect to Azure Active Directory
+            Write-Host "Connecting to Azure Active Directory..." -ForegroundColor Yellow
-        Write-Host "Connecting to Azure Active Directory..." -ForegroundColor Cyan
+            Connect-AzureAD -WarningAction SilentlyContinue | Out-Null
-        Connect-AzureAD | Out-Null
+            $tenantDetails = Get-AzureADTenantDetail -WarningAction SilentlyContinue
-        Write-Host "Successfully connected to Azure Active Directory." -ForegroundColor Green
+            $tenantInfo += [PSCustomObject]@{
-
+                Service = "Azure Active Directory"
-        # Attempt to connect to Exchange Online
+                TenantName = $tenantDetails.DisplayName
-        Write-Host "Connecting to Exchange Online..." -ForegroundColor Cyan
+                TenantID = $tenantDetails.ObjectId
-        Connect-ExchangeOnline | Out-Null
+            }
-        Write-Host "Successfully connected to Exchange Online." -ForegroundColor Green
+            $connectedServices += "AzureAD"
-        try {
+            Write-Host "Successfully connected to Azure Active Directory." -ForegroundColor Green
-            # Attempt to connect to Microsoft Graph with specified scopes
-            Write-Host "Connecting to Microsoft Graph with scopes: Directory.Read.All, Domain.Read.All, Policy.Read.All, Organization.Read.All" -ForegroundColor Cyan
-            Connect-MgGraph -Scopes "Directory.Read.All", "Domain.Read.All", "Policy.Read.All", "Organization.Read.All" -NoWelcome | Out-Null
-            Write-Host "Successfully connected to Microsoft Graph with specified scopes." -ForegroundColor Green
-        }
-        catch {
-            Write-Host "Failed to connect o MgGraph, attempting device auth." -ForegroundColor Yellow
-            # Attempt to connect to Microsoft Graph with specified scopes
-            Write-Host "Connecting to Microsoft Graph using device auth with scopes: Directory.Read.All, Domain.Read.All, Policy.Read.All, Organization.Read.All" -ForegroundColor Cyan
-            Connect-MgGraph -Scopes "Directory.Read.All", "Domain.Read.All", "Policy.Read.All", "Organization.Read.All" -UseDeviceCode -NoWelcome | Out-Null
-            Write-Host "Successfully connected to Microsoft Graph with specified scopes." -ForegroundColor Green
         }
 
-        # Validate SharePoint Online Tenant Admin URL
+        if ($RequiredConnections -contains "Microsoft Graph" -or $RequiredConnections -contains "EXO | Microsoft Graph") {
-        if (-not $TenantAdminUrl) {
+            Write-Host "Connecting to Microsoft Graph with scopes: Directory.Read.All, Domain.Read.All, Policy.Read.All, Organization.Read.All" -ForegroundColor Yellow
-            throw "SharePoint Online Tenant Admin URL is required."
+            try {
+                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"
+                    TenantName = $graphOrgDetails.DisplayName
+                    TenantID = $graphOrgDetails.Id
+                }
+                $connectedServices += "Microsoft Graph"
+                Write-Host "Successfully connected to Microsoft Graph with specified scopes." -ForegroundColor Green
+            }
+            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
+                }
+                $connectedServices += "Microsoft Graph"
+                Write-Host "Successfully connected to Microsoft Graph with specified scopes." -ForegroundColor Green
+            }
         }
 
-        # Attempt to connect to SharePoint Online
+        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 SharePoint Online..." -ForegroundColor Cyan
+            Write-Host "Connecting to Exchange Online..." -ForegroundColor Yellow
-        Connect-SPOService -Url $TenantAdminUrl | Out-Null
+            Connect-ExchangeOnline -ShowBanner:$false | Out-Null
-        Write-Host "Successfully connected to SharePoint Online." -ForegroundColor Green
+            $exoTenant = (Get-OrganizationConfig).Identity
+            $tenantInfo += [PSCustomObject]@{
+                Service = "Exchange Online"
+                TenantName = $exoTenant
+                TenantID = "N/A"
+            }
+            $connectedServices += "EXO"
+            Write-Host "Successfully connected to Exchange Online." -ForegroundColor Green
+        }
 
-        # Attempt to connect to Microsoft Teams
+        if ($RequiredConnections -contains "SPO") {
-        Write-Host "Connecting to Microsoft Teams..." -ForegroundColor Cyan
+            Write-Host "Connecting to SharePoint Online..." -ForegroundColor Yellow
-        Connect-MicrosoftTeams | Out-Null
+            Connect-SPOService -Url $TenantAdminUrl | Out-Null
-        Write-Host "Successfully connected to Microsoft Teams." -ForegroundColor Green
+            $spoContext = Get-SPOCrossTenantHostUrl
+            $tenantName = Get-UrlLine -Output $spoContext
+            $tenantInfo += [PSCustomObject]@{
+                Service = "SharePoint Online"
+                TenantName = $tenantName
+            }
+            $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
+            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)"
+            }
+            $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."
+            }
+        }
     }
     catch {
         $VerbosePreference = "Continue"
         Write-Host "There was an error establishing one or more connections: $_" -ForegroundColor Red
         throw $_
     }
+
     $VerbosePreference = "Continue"
 }
-

source/Private/Disconnect-M365Suite.ps1

@@ -1,39 +1,60 @@
 function Disconnect-M365Suite {
+    [OutputType([void])]
+    param (
+        [Parameter(Mandatory)]
+        [string[]]$RequiredConnections
+    )
+
     # Clean up sessions
     try {
-        Write-Host "Disconnecting from Exchange Online..." -ForegroundColor Green
+        if ($RequiredConnections -contains "EXO" -or $RequiredConnections -contains "AzureAD | EXO" -or $RequiredConnections -contains "Microsoft Teams | EXO") {
-        Disconnect-ExchangeOnline -Confirm:$false | Out-Null
+            Write-Host "Disconnecting from Exchange Online..." -ForegroundColor Green
+            Disconnect-ExchangeOnline -Confirm:$false | Out-Null
+        }
     }
     catch {
         Write-Warning "Failed to disconnect from Exchange Online: $_"
     }
+
     try {
-        Write-Host "Disconnecting from Azure AD..." -ForegroundColor Green
+        if ($RequiredConnections -contains "AzureAD" -or $RequiredConnections -contains "AzureAD | EXO") {
-        Disconnect-AzureAD | Out-Null
+            Write-Host "Disconnecting from Azure AD..." -ForegroundColor Green
+            Disconnect-AzureAD | Out-Null
+        }
     }
     catch {
         Write-Warning "Failed to disconnect from Azure AD: $_"
     }
+
     try {
-        Write-Host "Disconnecting from Microsoft Graph..." -ForegroundColor Green
+        if ($RequiredConnections -contains "Microsoft Graph") {
-        Disconnect-MgGraph | Out-Null
+            Write-Host "Disconnecting from Microsoft Graph..." -ForegroundColor Green
+            Disconnect-MgGraph | Out-Null
+        }
     }
     catch {
         Write-Warning "Failed to disconnect from Microsoft Graph: $_"
     }
+
     try {
-        Write-Host "Disconnecting from SharePoint Online..." -ForegroundColor Green
+        if ($RequiredConnections -contains "SPO") {
-        Disconnect-SPOService | Out-Null
+            Write-Host "Disconnecting from SharePoint Online..." -ForegroundColor Green
+            Disconnect-SPOService | Out-Null
+        }
     }
     catch {
         Write-Warning "Failed to disconnect from SharePoint Online: $_"
     }
+
     try {
-        Write-Host "Disconnecting from Microsoft Teams..." -ForegroundColor Green
+        if ($RequiredConnections -contains "Microsoft Teams" -or $RequiredConnections -contains "Microsoft Teams | EXO") {
-        Disconnect-MicrosoftTeams | Out-Null
+            Write-Host "Disconnecting from Microsoft Teams..." -ForegroundColor Green
+            Disconnect-MicrosoftTeams | Out-Null
+        }
     }
     catch {
         Write-Warning "Failed to disconnect from Microsoft Teams: $_"
     }
-    Write-Host "All sessions have been disconnected." -ForegroundColor Green
+
+    Write-Host "All necessary sessions have been disconnected." -ForegroundColor Green
 }

source/Private/Format-RequiredModuleList.ps1

@@ -0,0 +1,19 @@
+function Format-RequiredModuleList {
+    [CmdletBinding()]
+    [OutputType([string])]
+    param (
+        [Parameter(Mandatory = $true)]
+        [System.Object[]]$RequiredModules
+    )
+
+    $requiredModulesFormatted = ""
+    foreach ($module in $RequiredModules) {
+        if ($module.SubModules -and $module.SubModules.Count -gt 0) {
+            $subModulesFormatted = $module.SubModules -join ', '
+            $requiredModulesFormatted += "$($module.ModuleName) (SubModules: $subModulesFormatted), "
+        } else {
+            $requiredModulesFormatted += "$($module.ModuleName), "
+        }
+    }
+    return $requiredModulesFormatted.TrimEnd(", ")
+}

source/Private/Get-Action.ps1

@@ -0,0 +1,113 @@
+function Get-Action {
+    [CmdletBinding(DefaultParameterSetName = "GetDictionaries")]
+    param (
+        [Parameter(Position = 0, ParameterSetName = "GetDictionaries")]
+        [switch]$Dictionaries,
+
+        [Parameter(Position = 0, ParameterSetName = "ConvertActions")]
+        [string[]]$Actions,
+
+        [Parameter(Position = 1, Mandatory = $true, ParameterSetName = "ConvertActions")]
+        [ValidateSet("Admin", "Delegate", "Owner")]
+        [string]$ActionType,
+
+        [Parameter(Position = 0, ParameterSetName = "ReverseActions")]
+        [string[]]$AbbreviatedActions,
+
+        [Parameter(Position = 1, Mandatory = $true, ParameterSetName = "ReverseActions")]
+        [ValidateSet("Admin", "Delegate", "Owner")]
+        [string]$ReverseActionType
+    )
+
+    $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'
+        }
+        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
+        }
+        "ConvertActions" {
+            $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
+        }
+        "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]
+                }
+            }
+            return $fullNames
+        }
+    }
+}

source/Private/Get-AdminRoleUserAndAssignment.ps1

@@ -0,0 +1,38 @@
+function Get-AdminRoleUserAndAssignment {
+    [CmdletBinding()]
+    param ()
+
+    $result = @{}
+
+    # Get the DisplayNames of all admin roles
+    $adminRoleNames = (Get-MgDirectoryRole | Where-Object { $null -ne $_.RoleTemplateId }).DisplayName
+
+    # Get Admin Roles
+    $adminRoles = Get-MgRoleManagementDirectoryRoleDefinition | Where-Object { ($adminRoleNames -contains $_.DisplayName) -and ($_.DisplayName -ne "Directory Synchronization Accounts") }
+
+    foreach ($role in $adminRoles) {
+        Write-Verbose "Processing role: $($role.DisplayName)"
+        $roleAssignments = Get-MgRoleManagementDirectoryRoleAssignment -Filter "roleDefinitionId eq '$($role.Id)'"
+
+        foreach ($assignment in $roleAssignments) {
+            Write-Verbose "Processing role assignment for principal ID: $($assignment.PrincipalId)"
+            $userDetails = Get-MgUser -UserId $assignment.PrincipalId -Property "DisplayName, UserPrincipalName, Id, OnPremisesSyncEnabled" -ErrorAction SilentlyContinue
+
+            if ($userDetails) {
+                Write-Verbose "Retrieved user details for: $($userDetails.UserPrincipalName)"
+                $licenses = Get-MgUserLicenseDetail -UserId $assignment.PrincipalId -ErrorAction SilentlyContinue
+
+                if (-not $result[$role.DisplayName]) {
+                    $result[$role.DisplayName] = @()
+                }
+                $result[$role.DisplayName] += [PSCustomObject]@{
+                    AssignmentId = $assignment.Id
+                    UserDetails  = $userDetails
+                    Licenses     = $licenses
+                }
+            }
+        }
+    }
+
+    return $result
+}

source/Private/Get-CISAadOutput.ps1

@@ -0,0 +1,39 @@
+<#
+    .SYNOPSIS
+        This is a sample Private function only visible within the module.
+    .DESCRIPTION
+        This sample function is not exported to the module and only return the data passed as parameter.
+    .EXAMPLE
+        $null = Get-Get-CISAadOutput -PrivateData 'NOTHING TO SEE HERE'
+    .PARAMETER PrivateData
+        The PrivateData parameter is what will be returned without transformation.
+#>
+function Get-CISAadOutput {
+    [cmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [String]$Rec
+    )
+    begin {
+        # Begin Block #
+    <#
+        # Tests
+        1.2.2
+        # Test number
+        $testNumbers ="1.2.2"
+    #>
+    }
+    process {
+        switch ($Rec) {
+            '1.2.2' {
+                # Test-BlockSharedMailboxSignIn.ps1
+                $users = Get-AzureADUser
+            }
+            default { throw "No match found for test: $Rec" }
+        }
+    }
+    end {
+        Write-Verbose "Get-CISAadOutput: Retuning data for Rec: $Rec"
+        return $users
+    }
+} # end function Get-CISAadOutput

source/Private/Get-CISExoOutput.ps1

@@ -0,0 +1,539 @@
+<#
+    .SYNOPSIS
+        This is a sample Private function only visible within the module.
+    .DESCRIPTION
+        This sample function is not exported to the module and only return the data passed as parameter.
+    .EXAMPLE
+        $null = Get-CISExoOutput -PrivateData 'NOTHING TO SEE HERE'
+    .PARAMETER PrivateData
+        The PrivateData parameter is what will be returned without transformation.
+#>
+function Get-CISExoOutput {
+    [cmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [String]$Rec
+    )
+    begin {
+        # Begin Block #
+        <#
+        # Tests
+        1.2.2
+        1.3.3
+        1.3.6
+        2.1.1
+        2.1.2
+        2.1.3
+        2.1.4
+        2.1.5
+        2.1.6
+        2.1.7
+        2.1.9
+        3.1.1
+        6.1.1
+        6.1.2
+        6.1.3
+        6.2.1
+        6.2.2
+        6.2.3
+        6.3.1
+        6.5.1
+        6.5.2
+        6.5.3
+        8.6.1
+        # Test number array
+        $testNumbers = @('1.2.2', '1.3.3', '1.3.6', '2.1.1', '2.1.2', '2.1.3', '2.1.4', '2.1.5', '2.1.6', '2.1.7', '2.1.9', '3.1.1', '6.1.1', '6.1.2', '6.1.3', '6.2.1', '6.2.2', '6.2.3', '6.3.1', '6.5.1', '6.5.2', '6.5.3', '8.6.1')
+    #>
+    }
+    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:
+                    <#
+                        $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.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:
+                    <#
+                        $safeAttachmentPolicies = @(
+                            [PSCustomObject]@{
+                                Policy        = "Strict Preset Security Policy"
+                                Action        = "Block"
+                                QuarantineTag = "AdminOnlyAccessPolicy"
+                                Redirect      = $false
+                                Enabled       = $true
+                            }
+                        )
+                    #>
+                    $safeAttachmentPolicies = Get-SafeAttachmentPolicy -ErrorAction SilentlyContinue | Where-Object { $_.Enable -eq $true }
+                    # [object[]]
+                    return $safeAttachmentPolicies
+                    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:
+                    <#
+                        $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
+                    }
+                    # [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"
+                        }
+                    )
+                #>
+                $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
+            }
+            '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" }
+        }
+    }
+    end {
+        Write-Verbose "Retuning data for Rec: $Rec"
+    }
+} # end function Get-CISExoOutput
+

source/Private/Get-CISMSTeamsOutput.ps1

@@ -0,0 +1,333 @@
+<#
+    .SYNOPSIS
+        This is a sample Private function only visible within the module.
+    .DESCRIPTION
+        This sample function is not exported to the module and only return the data passed as parameter.
+    .EXAMPLE
+        $null = Get-CISMSTeamsOutput -PrivateData 'NOTHING TO SEE HERE'
+    .PARAMETER PrivateData
+        The PrivateData parameter is what will be returned without transformation.
+#>
+function Get-CISMSTeamsOutput {
+    [cmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [String]$Rec
+    )
+    begin {
+        # Begin Block #
+        <#
+            # Tests
+            8.1.1
+            8.1.2
+            8.2.1
+            8.5.1
+            8.5.2
+            8.5.3
+            8.5.4
+            8.5.5
+            8.5.6
+            8.5.7
+            8.6.1
+            # Test number array
+            $testNumbers = @('8.1.1', '8.1.2', '8.2.1', '8.5.1', '8.5.2', '8.5.3', '8.5.4', '8.5.5', '8.5.6', '8.5.7', '8.6.1')
+        #>
+    }
+    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
+
+                # 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.
+
+                # 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" }
+        }
+    }
+    end {
+        Write-Verbose "Retuning data for Rec: $Rec"
+    }
+} # end function Get-CISMSTeamsOutput
+

source/Private/Get-CISMgOutput.ps1

@@ -0,0 +1,110 @@
+function Get-CISMgOutput {
+    <#
+    .SYNOPSIS
+    This is a sample Private function only visible within the module.
+
+    .DESCRIPTION
+    This sample function is not exported to the module and only return the data passed as parameter.
+
+    .EXAMPLE
+    $null = Get-CISMgOutput -PrivateData 'NOTHING TO SEE HERE'
+
+    .PARAMETER PrivateData
+    The PrivateData parameter is what will be returned without transformation.
+
+#>
+    [cmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [String]$Rec,
+        [Parameter(Mandatory = $false)]
+        [String]$DomainName
+    )
+
+    begin {
+        # Begin Block #
+        # Tests
+        <#
+            1.1.1
+            1.1.3
+            1.2.1
+            1.3.1
+            5.1.2.3
+            5.1.8.1
+            6.1.2
+            6.1.3
+            # Test number array
+            $testNumbers = @('1.1.1', '1.1.3', '1.2.1', '1.3.1', '5.1.2.3', '5.1.8.1', '6.1.2', '6.1.3')
+        #>
+    }
+    process {
+        Write-Verbose "Get-CISMgOutput: Retuning data for Rec: $Rec"
+        switch ($rec) {
+            '1.1.1' {
+                # 1.1.1
+                $AdminRoleAssignmentsAndUsers = Get-AdminRoleUserAndAssignment
+                return $AdminRoleAssignmentsAndUsers
+            }
+            '1.1.3' {
+                # 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' {
+                $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
+                }
+                else {
+                    Get-MgDomain
+                }
+                return $domains
+            }
+            '5.1.2.3' {
+                # Retrieve the tenant creation policy
+                $tenantCreationPolicy = (Get-MgPolicyAuthorizationPolicy).DefaultUserRolePermissions | Select-Object AllowedToCreateTenants
+                return $tenantCreationPolicy
+            }
+            '5.1.8.1' {
+                # Retrieve password hash sync status (Condition A and C)
+                $passwordHashSync = Get-MgOrganization | Select-Object -ExpandProperty OnPremisesSyncEnabled
+                return $passwordHashSync
+            }
+            '6.1.2' {
+                $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' {
+                $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" }
+        }
+    }
+    end {
+        Write-Verbose "Retuning data for Rec: $Rec"
+    }
+} # end function Get-CISMgOutput
+

source/Private/Get-CISSpoOutput.ps1

@@ -0,0 +1,119 @@
+<#
+    .SYNOPSIS
+        This is a sample Private function only visible within the module.
+    .DESCRIPTION
+        This sample function is not exported to the module and only return the data passed as parameter.
+    .EXAMPLE
+        $null = Get-CISSpoOutput -PrivateData 'NOTHING TO SEE HERE'
+    .PARAMETER PrivateData
+        The PrivateData parameter is what will be returned without transformation.
+#>
+function Get-CISSpoOutput {
+    [cmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [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')
+        #>
+    }
+    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
+            }
+            '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
+            }
+            '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" }
+        }
+    }
+    end {
+        Write-Verbose "Retuning data for Rec: $Rec"
+    }
+} # end function Get-CISMSTeamsOutput

source/Private/Get-ExceededLengthResultDetail.ps1

@@ -0,0 +1,54 @@
+function Get-ExceededLengthResultDetail {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true, ParameterSetName = 'UpdateArray')]
+        [Parameter(Mandatory = $true, ParameterSetName = 'ReturnExceedingTests')]
+        [object[]]$AuditResults,
+
+        [Parameter(Mandatory = $true, ParameterSetName = 'UpdateArray')]
+        [Parameter(Mandatory = $true, ParameterSetName = 'ReturnExceedingTests')]
+        [string[]]$TestNumbersToCheck,
+
+        [Parameter(Mandatory = $false, ParameterSetName = 'UpdateArray')]
+        [string[]]$ExportedTests,
+
+        [Parameter(Mandatory = $true, ParameterSetName = 'ReturnExceedingTests')]
+        [switch]$ReturnExceedingTestsOnly,
+
+        [int]$DetailsLengthLimit = 30000,
+
+        [Parameter(Mandatory = $true, ParameterSetName = 'UpdateArray')]
+        [int]$PreviewLineCount = 50
+    )
+
+    $exceedingTests = @()
+    $updatedResults = @()
+
+    for ($i = 0; $i -lt $AuditResults.Count; $i++) {
+        $auditResult = $AuditResults[$i]
+        if ($auditResult.Rec -in $TestNumbersToCheck) {
+            if ($auditResult.Details.Length -gt $DetailsLengthLimit) {
+                if ($ReturnExceedingTestsOnly) {
+                    $exceedingTests += $auditResult.Rec
+                } else {
+                    $previewLines = ($auditResult.Details -split '\r?\n' | Select-Object -First $PreviewLineCount) -join "`n"
+                    $message = "The test result is too large to be exported to CSV. Use the audit result and the export function for full output.`n`nPreview:`n$previewLines"
+
+                    if ($ExportedTests -contains $auditResult.Rec) {
+                        Write-Information "The test result for $($auditResult.Rec) is too large for CSV and was included in the export. Check the exported files."
+                        $auditResult.Details = $message
+                    } else {
+                        $auditResult.Details = $message
+                    }
+                }
+            }
+        }
+        $updatedResults += $auditResult
+    }
+
+    if ($ReturnExceedingTestsOnly) {
+        return $exceedingTests
+    } else {
+        return $updatedResults
+    }
+}

source/Private/Get-MostCommonWord.ps1

@@ -0,0 +1,24 @@
+function Get-MostCommonWord {
+    [CmdletBinding()]
+    [OutputType([string])]
+    param (
+        [Parameter(Mandatory = $true)]
+        [string[]]$InputStrings
+    )
+
+    # Combine all strings into one large string
+    $allText = $InputStrings -join ' '
+
+    # Split the large string into words
+    $words = $allText -split '\s+'
+
+    # Group words and count occurrences
+    $wordGroups = $words | Group-Object | Sort-Object Count -Descending
+
+    # Return the most common word if it occurs at least 3 times
+    if ($wordGroups.Count -gt 0 -and $wordGroups[0].Count -ge 3) {
+        return $wordGroups[0].Name
+    } else {
+        return $null
+    }
+}

source/Private/Get-PhishPolicyDetail.ps1

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

source/Private/Get-RequiredModule.ps1

@@ -0,0 +1,31 @@
+function Get-RequiredModule {
+    [CmdletBinding(DefaultParameterSetName = 'AuditFunction')]
+    [OutputType([System.Object[]])]
+    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 = @() }
+            )
+        }
+        'SyncFunction' {
+            return @(
+                @{ ModuleName = "ImportExcel"; RequiredVersion = "7.8.9"; SubModules = @() }
+            )
+        }
+        default {
+            throw "Please specify either -AuditFunction or -SyncFunction switch."
+        }
+    }
+}

source/Private/Get-TestDefinitionsObject.ps1

@@ -0,0 +1,65 @@
+function Get-TestDefinitionsObject {
+    [CmdletBinding()]
+    [OutputType([object[]])]
+    param (
+        [Parameter(Mandatory = $true)]
+        [object[]]$TestDefinitions,
+
+        [Parameter(Mandatory = $true)]
+        [string]$ParameterSetName,
+
+        [string]$ELevel,
+        [string]$ProfileLevel,
+        [string[]]$IncludeRecommendation,
+        [string[]]$SkipRecommendation
+    )
+
+    Write-Verbose "Initial test definitions count: $($TestDefinitions.Count)"
+
+    switch ($ParameterSetName) {
+        'ELevelFilter' {
+            Write-Verbose "Applying ELevelFilter"
+            if ($null -ne $ELevel -and $null -ne $ProfileLevel) {
+                Write-Verbose "Filtering on ELevel = $ELevel and ProfileLevel = $ProfileLevel"
+                $TestDefinitions = $TestDefinitions | Where-Object {
+                    $_.ELevel -eq $ELevel -and $_.ProfileLevel -eq $ProfileLevel
+                }
+            }
+            elseif ($null -ne $ELevel) {
+                Write-Verbose "Filtering on ELevel = $ELevel"
+                $TestDefinitions = $TestDefinitions | Where-Object {
+                    $_.ELevel -eq $ELevel
+                }
+            }
+            elseif ($null -ne $ProfileLevel) {
+                Write-Verbose "Filtering on ProfileLevel = $ProfileLevel"
+                $TestDefinitions = $TestDefinitions | Where-Object {
+                    $_.ProfileLevel -eq $ProfileLevel
+                }
+            }
+        }
+        'IG1Filter' {
+            Write-Verbose "Applying IG1Filter"
+            $TestDefinitions = $TestDefinitions | Where-Object { $_.IG1 -eq 'TRUE' }
+        }
+        'IG2Filter' {
+            Write-Verbose "Applying IG2Filter"
+            $TestDefinitions = $TestDefinitions | Where-Object { $_.IG2 -eq 'TRUE' }
+        }
+        'IG3Filter' {
+            Write-Verbose "Applying IG3Filter"
+            $TestDefinitions = $TestDefinitions | Where-Object { $_.IG3 -eq 'TRUE' }
+        }
+        'RecFilter' {
+            Write-Verbose "Applying RecFilter"
+            $TestDefinitions = $TestDefinitions | Where-Object { $IncludeRecommendation -contains $_.Rec }
+        }
+        'SkipRecFilter' {
+            Write-Verbose "Applying SkipRecFilter"
+            $TestDefinitions = $TestDefinitions | Where-Object { $SkipRecommendation -notcontains $_.Rec }
+        }
+    }
+
+    Write-Verbose "Filtered test definitions count: $($TestDefinitions.Count)"
+    return $TestDefinitions
+}

source/Private/Get-TestError.ps1

@@ -0,0 +1,33 @@
+
+
+<#
+    .SYNOPSIS
+    This is a sample Private function only visible within the module.
+
+    .DESCRIPTION
+    This sample function is not exported to the module and only return the data passed as parameter.
+
+    .EXAMPLE
+    $null = Get-TestError -PrivateData 'NOTHING TO SEE HERE'
+
+    .PARAMETER PrivateData
+    The PrivateData parameter is what will be returned without transformation.
+
+#>
+
+function Get-TestError {
+    [cmdletBinding()]
+    param (
+        $LastError,
+        $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" }
+    $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
+    return $auditResult
+}
+

source/Private/Get-UniqueConnection.ps1

@@ -0,0 +1,28 @@
+function Get-UniqueConnection {
+    [CmdletBinding()]
+    [OutputType([string[]])]
+    param (
+        [Parameter(Mandatory = $true)]
+        [string[]]$Connections
+    )
+
+    $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") {
+        $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") {
+        $uniqueConnections += "EXO"
+    }
+    if ($Connections -contains "SPO") {
+        $uniqueConnections += "SPO"
+    }
+    if ($Connections -contains "Microsoft Teams" -or $Connections -contains "Microsoft Teams | EXO") {
+        $uniqueConnections += "Microsoft Teams"
+    }
+
+    return $uniqueConnections | Sort-Object -Unique
+}

source/Private/Get-UrlLine.ps1

@@ -0,0 +1,32 @@
+<#
+    .SYNOPSIS
+        This is a sample Private function only visible within the module.
+
+    .DESCRIPTION
+        This sample function is not exported to the module and only return the data passed as parameter.
+
+    .EXAMPLE
+        $null = Get-UrlLine -PrivateData 'NOTHING TO SEE HERE'
+
+    .PARAMETER PrivateData
+        The PrivateData parameter is what will be returned without transformation.
+#>
+function Get-UrlLine {
+    [cmdletBinding()]
+    [OutputType([string])]
+        param (
+            [Parameter(Mandatory=$true)]
+            [string]$Output
+        )
+        # Split the output into lines
+        $Lines = $Output -split "`n"
+        # Iterate over each line
+        foreach ($Line in $Lines) {
+            # If the line starts with 'https', return it
+            if ($Line.StartsWith('https')) {
+                return $Line.Trim()
+            }
+        }
+        # If no line starts with 'https', return an empty string
+        return $null
+    }

source/Private/Initialize-CISAuditResult.ps1

@@ -1,19 +1,24 @@
 function Initialize-CISAuditResult {
+    [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         [Parameter(Mandatory = $true)]
         [string]$Rec,
 
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory = $true, ParameterSetName = 'Full')]
         [bool]$Result,
 
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory = $true, ParameterSetName = 'Full')]
         [string]$Status,
 
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory = $true, ParameterSetName = 'Full')]
         [string]$Details,
 
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory = $true, ParameterSetName = 'Full')]
-        [string]$FailureReason
+        [string]$FailureReason,
+
+        [Parameter(ParameterSetName = 'Error')]
+        [switch]$Failure
     )
 
     # Import the test definitions CSV file
@@ -22,6 +27,10 @@ function Initialize-CISAuditResult {
     # Find the row that matches the provided recommendation (Rec)
     $testDefinition = $testDefinitions | Where-Object { $_.Rec -eq $Rec }
 
+    if (-not $testDefinition) {
+        throw "Test definition for recommendation '$Rec' not found."
+    }
+
     # Create an instance of CISAuditResult and populate it
     $auditResult = [CISAuditResult]::new()
     $auditResult.Rec = $Rec
@@ -36,10 +45,18 @@ function Initialize-CISAuditResult {
     $auditResult.Automated = [bool]::Parse($testDefinition.Automated)
     $auditResult.Connection = $testDefinition.Connection
     $auditResult.CISControlVer = 'v8'
-    $auditResult.Result = $Result
+
-    $auditResult.Status = $Status
+    if ($PSCmdlet.ParameterSetName -eq 'Full') {
-    $auditResult.Details = $Details
+        $auditResult.Result = $Result
-    $auditResult.FailureReason = $FailureReason
+        $auditResult.Status = $Status
+        $auditResult.Details = $Details
+        $auditResult.FailureReason = $FailureReason
+    } elseif ($PSCmdlet.ParameterSetName -eq 'Error') {
+        $auditResult.Result = $false
+        $auditResult.Status = 'Fail'
+        $auditResult.Details = "An error occurred while processing the test."
+        $auditResult.FailureReason = "Initialization error: Failed to process the test."
+    }
 
     return $auditResult
 }

source/Private/Initialize-LargeTestTable.ps1

@@ -0,0 +1,36 @@
+<#
+    .SYNOPSIS
+    This function generates a large table with the specified number of lines.
+    .DESCRIPTION
+    This function generates a large table with the specified number of lines. The table has a header and each line has the same format.
+    .EXAMPLE
+    Initialize-LargeTestTable -lineCount 1000
+    .PARAMETER lineCount
+    The number of lines to generate.
+    .INPUTS
+    System.Int32
+    .OUTPUTS
+    System.String
+    .NOTES
+    The function is intended for testing purposes.
+#>
+function Initialize-LargeTestTable {
+    [cmdletBinding()]
+    [OutputType([string])]
+    param(
+        [Parameter()]
+        [int]$lineCount = 1000 # Number of lines to generate
+    )
+    process {
+        $header = "UserPrincipalName|AuditEnabled|AdminActionsMissing|DelegateActionsMissing|OwnerActionsMissing"
+        $lineTemplate = "user{0}@contosonorthwind.net|True|FB,CP,MV|FB,MV|ML,MV,CR"
+        # Generate the header and lines
+        $lines = @($header)
+        for ($i = 1; $i -le $lineCount; $i++) {
+            $lines += [string]::Format($lineTemplate, $i)
+        }
+        $output = $lines -join "`n"
+        Write-Host "Details character count: $($output.Length)"
+        return $output
+    }
+}

source/Private/Invoke-TestFunction.ps1

@@ -0,0 +1,43 @@
+function Invoke-TestFunction {
+    [OutputType([CISAuditResult[]])]
+    param (
+        [Parameter(Mandatory = $true)]
+        [PSObject]$FunctionFile,
+        [Parameter(Mandatory = $false)]
+        [string]$DomainName,
+        [Parameter(Mandatory = $false)]
+        [string[]]$ApprovedCloudStorageProviders,
+        [Parameter(Mandatory = $false)]
+        [string[]]$ApprovedFederatedDomains
+    )
+
+    $functionName = $FunctionFile.BaseName
+    $functionCmd = Get-Command -Name $functionName
+
+    # Check if the test function needs DomainName parameter
+    $paramList = @{}
+    if ('DomainName' -in $functionCmd.Parameters.Keys) {
+        $paramList.DomainName = $DomainName
+    }
+    if ('ApprovedCloudStorageProviders' -in $functionCmd.Parameters.Keys) {
+        $paramList.ApprovedCloudStorageProviders = $ApprovedCloudStorageProviders
+    }
+    if ('ApprovedFederatedDomains' -in $functionCmd.Parameters.Keys) {
+        $paramList.ApprovedFederatedDomains = $ApprovedFederatedDomains
+    }
+    # Use splatting to pass parameters
+    Write-Verbose "Running $functionName..."
+    try {
+        $result = & $functionName @paramList
+        # Assuming each function returns an array of CISAuditResult or a single CISAuditResult
+        return $result
+    }
+    catch {
+        Write-Error "An error occurred during the test: $_"
+        $script:FailedTests.Add([PSCustomObject]@{ Test = $functionName; Error = $_ })
+
+        # Call Initialize-CISAuditResult with error parameters
+        $auditResult = Initialize-CISAuditResult -Rec $functionName -Failure
+        return $auditResult
+    }
+}

source/Private/Measure-AuditResult.ps1

@@ -0,0 +1,32 @@
+function Measure-AuditResult {
+    [OutputType([void])]
+    param (
+        [Parameter(Mandatory = $true)]
+        [System.Collections.ArrayList]$AllAuditResults,
+
+        [Parameter(Mandatory = $false)]
+        [System.Collections.ArrayList]$FailedTests
+    )
+
+    # Calculate the total number of tests
+    $totalTests = $AllAuditResults.Count
+
+    # Calculate the number of passed tests
+    $passedTests = $AllAuditResults.ToArray() | Where-Object { $_.Result -eq $true } | Measure-Object | Select-Object -ExpandProperty Count
+
+    # Calculate the pass percentage
+    $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
+
+    # Display details of failed tests
+    if ($FailedTests.Count -gt 0) {
+        Write-Host "The following tests failed to complete:" -ForegroundColor Red
+        foreach ($failedTest in $FailedTests) {
+            Write-Host "Test: $($failedTest.Test)" -ForegroundColor Yellow
+            Write-Host "Error: $($failedTest.Error)" -ForegroundColor Yellow
+        }
+    }
+}

source/Private/Merge-CISExcelAndCsvData.ps1

@@ -1,47 +0,0 @@
-function Merge-CISExcelAndCsvData {
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory = $true)]
-        [string]$ExcelPath,
-
-        [Parameter(Mandatory = $true)]
-        [string]$WorksheetName,
-
-        [Parameter(Mandatory = $true)]
-        [string]$CsvPath
-    )
-
-    process {
-        # Import data from Excel and CSV
-        $import = Import-Excel -Path $ExcelPath -WorksheetName $WorksheetName
-        $csvData = Import-Csv -Path $CsvPath
-
-        # Define a function to create a merged object
-        function CreateMergedObject($excelItem, $csvRow) {
-            $newObject = New-Object PSObject
-
-            foreach ($property in $excelItem.PSObject.Properties) {
-                $newObject | Add-Member -MemberType NoteProperty -Name $property.Name -Value $property.Value
-            }
-
-            $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Status' -Value $csvRow.Status
-            $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Details' -Value $csvRow.Details
-            $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_FailureReason' -Value $csvRow.FailureReason
-
-            return $newObject
-        }
-
-        # Iterate over each item in the imported Excel object and merge with CSV data
-        $mergedData = foreach ($item in $import) {
-            $csvRow = $csvData | Where-Object { $_.Rec -eq $item.'recommendation #' }
-            if ($csvRow) {
-                CreateMergedObject -excelItem $item -csvRow $csvRow
-            } else {
-                CreateMergedObject -excelItem $item -csvRow ([PSCustomObject]@{Status=$null; Details=$null; FailureReason=$null})
-            }
-        }
-
-        # Return the merged data
-        return $mergedData
-    }
-}

source/Private/Test-IsAdmin.ps1

@@ -0,0 +1,22 @@
+function Test-IsAdmin {
+    <#
+    .SYNOPSIS
+    Checks if the current user is an administrator on the machine.
+    .DESCRIPTION
+    This private function returns a Boolean value indicating whether
+    the current user has administrator privileges on the machine.
+    It does this by creating a new WindowsPrincipal object, passing
+    in a WindowsIdentity object representing the current user, and
+    then checking if that principal is in the Administrator role.
+    .INPUTS
+    None.
+    .OUTPUTS
+    Boolean. Returns True if the current user is an administrator, and False otherwise.
+    .EXAMPLE
+    PS C:\> Test-IsAdmin
+    True
+    #>
+
+    # Create a new WindowsPrincipal object for the current user and check if it is in the Administrator role
+    (New-Object Security.Principal.WindowsPrincipal ([Security.Principal.WindowsIdentity]::GetCurrent())).IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)
+}

source/Private/Test-PhishPolicyCompliance.ps1

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

source/Private/Update-CISExcelWorksheet.ps1

@@ -1,33 +0,0 @@
-function Update-CISExcelWorksheet {
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory = $true)]
-        [string]$ExcelPath,
-
-        [Parameter(Mandatory = $true)]
-        [string]$WorksheetName,
-
-        [Parameter(Mandatory = $true)]
-        [psobject[]]$Data,
-
-        [Parameter(Mandatory = $false)]
-        [int]$StartingRowIndex = 2 # Default starting row index, assuming row 1 has headers
-    )
-
-    process {
-        # Load the existing Excel sheet
-        $excelPackage = Open-ExcelPackage -Path $ExcelPath
-        $worksheet = $excelPackage.Workbook.Worksheets[$WorksheetName]
-
-        if (-not $worksheet) {
-            throw "Worksheet '$WorksheetName' not found in '$ExcelPath'"
-        }
-
-
-        # Update the worksheet with the provided data
-        Update-WorksheetCells -Worksheet $worksheet -Data $Data -StartingRowIndex $StartingRowIndex
-
-        # Save and close the Excel package
-        Close-ExcelPackage $excelPackage
-    }
-}

source/Private/Update-WorksheetCells.ps1

@@ -1,28 +0,0 @@
-        function Update-WorksheetCells {
-            param (
-                $Worksheet,
-                $Data,
-                $StartingRowIndex
-            )
-
-            # Check and set headers
-            $firstItem = $Data[0]
-            $colIndex = 1
-            foreach ($property in $firstItem.PSObject.Properties) {
-                if ($StartingRowIndex -eq 2 -and $Worksheet.Cells[1, $colIndex].Value -eq $null) {
-                    $Worksheet.Cells[1, $colIndex].Value = $property.Name
-                }
-                $colIndex++
-            }
-
-            # Iterate over each row in the data and update cells
-            $rowIndex = $StartingRowIndex
-            foreach ($item in $Data) {
-                $colIndex = 1
-                foreach ($property in $item.PSObject.Properties) {
-                    $Worksheet.Cells[$rowIndex, $colIndex].Value = $property.Value
-                    $colIndex++
-                }
-                $rowIndex++
-            }
-        }

source/Private/Write-AuditLog.ps1

@@ -0,0 +1,212 @@
+function Write-AuditLog {
+    <#
+    .SYNOPSIS
+        Writes log messages to the console and updates the script-wide log variable.
+    .DESCRIPTION
+        The Write-AuditLog function writes log messages to the console based on the severity (Verbose, Warning, or Error) and updates
+        the script-wide log variable ($script:LogString) with the log entry. You can use the Start, End, and EndFunction switches to
+        manage the lifecycle of the logging.
+    .INPUTS
+        System.String
+        You can pipe a string to the Write-AuditLog function as the Message parameter.
+        You can also pipe an object with a Severity property as the Severity parameter.
+    .OUTPUTS
+        None
+        The Write-AuditLog function doesn't output any objects to the pipeline. It writes messages to the console and updates the
+        script-wide log variable ($script:LogString).
+    .PARAMETER BeginFunction
+        Sets the message to "Begin [FunctionName] function log.", where FunctionName is the name of the calling function, and adds it to the log variable.
+    .PARAMETER Message
+        The message string to log.
+    .PARAMETER Severity
+        The severity of the log message. Accepted values are 'Information', 'Warning', and 'Error'. Defaults to 'Information'.
+    .PARAMETER Start
+        Initializes the script-wide log variable and sets the message to "Begin [FunctionName] Log.", where FunctionName is the name of the calling function.
+    .PARAMETER End
+        Sets the message to "End Log" and exports the log to a CSV file if the OutputPath parameter is provided.
+    .PARAMETER EndFunction
+        Sets the message to "End [FunctionName] log.", where FunctionName is the name of the calling function, and adds it to the log variable.
+    .PARAMETER OutputPath
+        The file path for exporting the log to a CSV file when using the End switch.
+    .EXAMPLE
+        Write-AuditLog -Message "This is a test message."
+
+        Writes a test message with the default severity (Information) to the console and adds it to the log variable.
+    .EXAMPLE
+        Write-AuditLog -Message "This is a warning message." -Severity "Warning"
+
+        Writes a warning message to the console and adds it to the log variable.
+    .EXAMPLE
+        Write-AuditLog -Start
+
+        Initializes the log variable and sets the message to "Begin [FunctionName] Log.", where FunctionName is the name of the calling function.
+    .EXAMPLE
+        Write-AuditLog -BeginFunction
+
+        Sets the message to "Begin [FunctionName] function log.", where FunctionName is the name of the calling function, and adds it to the log variable.
+    .EXAMPLE
+        Write-AuditLog -EndFunction
+
+        Sets the message to "End [FunctionName] log.", where FunctionName is the name of the calling function, and adds it to the log variable.
+    .EXAMPLE
+        Write-AuditLog -End -OutputPath "C:\Logs\auditlog.csv"
+
+        Sets the message to "End Log", adds it to the log variable, and exports the log to a CSV file.
+    .NOTES
+    Author: DrIOSx
+#>
+    [CmdletBinding(DefaultParameterSetName = 'Default')]
+    param(
+        ###
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Input a Message string.',
+            Position = 0,
+            ParameterSetName = 'Default',
+            ValueFromPipeline = $true
+        )]
+        [ValidateNotNullOrEmpty()]
+        [string]$Message,
+        ###
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Information, Warning or Error.',
+            Position = 1,
+            ParameterSetName = 'Default',
+            ValueFromPipelineByPropertyName = $true
+        )]
+        [ValidateNotNullOrEmpty()]
+        [ValidateSet('Information', 'Warning', 'Error')]
+        [string]$Severity = 'Information',
+        ###
+        [Parameter(
+            Mandatory = $false,
+            ParameterSetName = 'End'
+        )]
+        [switch]$End,
+        ###
+        [Parameter(
+            Mandatory = $false,
+            ParameterSetName = 'BeginFunction'
+        )]
+        [switch]$BeginFunction,
+        [Parameter(
+            Mandatory = $false,
+            ParameterSetName = 'EndFunction'
+        )]
+        [switch]$EndFunction,
+        ###
+        [Parameter(
+            Mandatory = $false,
+            ParameterSetName = 'Start'
+        )]
+        [switch]$Start,
+        ###
+        [Parameter(
+            Mandatory = $false,
+            ParameterSetName = 'End'
+        )]
+        [string]$OutputPath
+    )
+    begin {
+        $ErrorActionPreference = "SilentlyContinue"
+        # Define variables to hold information about the command that was invoked.
+        $ModuleName = $Script:MyInvocation.MyCommand.Name -replace '\..*'
+        $callStack = Get-PSCallStack
+        if ($callStack.Count -gt 1) {
+            $FuncName = $callStack[1].Command
+        } else {
+            $FuncName = "DirectCall"  # Or any other default name you prefer
+        }
+        #Write-Verbose "Funcname Name is $FuncName!" -Verbose
+        $ModuleVer = $MyInvocation.MyCommand.Version.ToString()
+        # Set the error action preference to continue.
+        $ErrorActionPreference = "Continue"
+    }
+    process {
+        try {
+            if (-not $Start -and -not (Test-Path variable:script:LogString)) {
+                throw "The logging variable is not initialized. Please call Write-AuditLog with the -Start switch or ensure $script:LogString is set."
+            }
+            $Function = $($FuncName + '.v' + $ModuleVer)
+            if ($Start) {
+                $script:LogString = @()
+                $Message = '+++ Begin Log | ' + $Function + ' |'
+            }
+            elseif ($BeginFunction) {
+                $Message = '>>> Begin Function Log | ' + $Function + ' |'
+            }
+            $logEntry = [pscustomobject]@{
+                Time      = ((Get-Date).ToString('yyyy-MM-dd hh:mmTss'))
+                Module    = $ModuleName
+                PSVersion = ($PSVersionTable.PSVersion).ToString()
+                PSEdition = ($PSVersionTable.PSEdition).ToString()
+                IsAdmin   = $(Test-IsAdmin)
+                User      = "$Env:USERDOMAIN\$Env:USERNAME"
+                HostName  = $Env:COMPUTERNAME
+                InvokedBy = $Function
+                Severity  = $Severity
+                Message   = $Message
+                RunID     = -1
+            }
+            if ($BeginFunction) {
+                $maxRunID = ($script:LogString | Where-Object { $_.InvokedBy -eq $Function } | Measure-Object -Property RunID -Maximum).Maximum
+                if ($null -eq $maxRunID) { $maxRunID = -1 }
+                $logEntry.RunID = $maxRunID + 1
+            }
+            else {
+                $lastRunID = ($script:LogString | Where-Object { $_.InvokedBy -eq $Function } | Select-Object -Last 1).RunID
+                if ($null -eq $lastRunID) { $lastRunID = 0 }
+                $logEntry.RunID = $lastRunID
+            }
+            if ($EndFunction) {
+                $FunctionStart = "$((($script:LogString | Where-Object {$_.InvokedBy -eq $Function -and $_.RunId -eq $lastRunID } | Sort-Object Time)[0]).Time)"
+                $startTime = ([DateTime]::ParseExact("$FunctionStart", 'yyyy-MM-dd hh:mmTss', $null))
+                $endTime = Get-Date
+                $timeTaken = $endTime - $startTime
+                $Message = '<<< End Function Log   | ' + $Function + ' | Runtime: ' + "$($timeTaken.Minutes) min $($timeTaken.Seconds) sec"
+                $logEntry.Message = $Message
+            }
+            elseif ($End) {
+                $startTime = ([DateTime]::ParseExact($($script:LogString[0].Time), 'yyyy-MM-dd hh:mmTss', $null))
+                $endTime = Get-Date
+                $timeTaken = $endTime - $startTime
+                $Message = '--- End Log   | ' + $Function + ' | Runtime: ' + "$($timeTaken.Minutes) min $($timeTaken.Seconds) sec"
+                $logEntry.Message = $Message
+            }
+            $script:LogString += $logEntry
+            switch ($Severity) {
+                'Warning' {
+                    Write-Warning ('[WARNING] ! ' + $Message)
+                    $UserInput = Read-Host "Warning encountered! Do you want to continue? (Y/N)"
+                    if ($UserInput -eq 'N') {
+                        throw "Script execution stopped by user."
+                    }
+                }
+                'Error'       { Write-Error ('[ERROR] X - ' + $FuncName + ' ' + $Message) -ErrorAction Continue }
+                'Verbose'     { Write-Verbose ('[VERBOSE] ~ ' + $Message) }
+                Default { Write-Information ('[INFO] * ' + $Message)  -InformationAction Continue}
+            }
+        }
+        catch {
+            throw "Write-AuditLog encountered an error (process block): $($_)"
+        }
+
+    }
+    end {
+        try {
+            if ($End) {
+                if (-not [string]::IsNullOrEmpty($OutputPath)) {
+                    $script:LogString | Export-Csv -Path $OutputPath -NoTypeInformation
+                    Write-Verbose "LogPath: $(Split-Path -Path $OutputPath -Parent)"
+                }
+                else {
+                    throw "OutputPath is not specified for End action."
+                }
+            }
+        }
+        catch {
+            throw "Error in Write-AuditLog (end block): $($_.Exception.Message)"
+        }
+    }
+}

source/Public/Export-M365SecurityAuditTable.ps1

@@ -0,0 +1,228 @@
+<#
+    .SYNOPSIS
+    Exports M365 security audit results to a CSV file or outputs a specific test result as an object.
+    .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.
+    .PARAMETER AuditResults
+    An array of CISAuditResult objects containing the audit results.
+    .PARAMETER CsvPath
+    The path to a CSV file containing the audit results.
+    .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.
+    .PARAMETER ExportPath
+    The path where the CSV files will be exported.
+    .PARAMETER ExportOriginalTests
+    Switch to export the original audit results to a CSV file.
+    .PARAMETER ExportToExcel
+    Switch to export the results to an Excel file.
+    .INPUTS
+    [CISAuditResult[]], [string]
+    .OUTPUTS
+    [PSCustomObject]
+    .EXAMPLE
+    Export-M365SecurityAuditTable -AuditResults $object -OutputTestNumber 6.1.2
+    # Output object for a single test number from audit results
+    .EXAMPLE
+    Export-M365SecurityAuditTable -ExportAllTests -AuditResults $object -ExportPath "C:\temp"
+    # Export all results from audit results to the specified path
+    .EXAMPLE
+    Export-M365SecurityAuditTable -CsvPath "C:\temp\auditresultstoday1.csv" -OutputTestNumber 6.1.2
+    # Output object for a single test number from CSV
+    .EXAMPLE
+    Export-M365SecurityAuditTable -ExportAllTests -CsvPath "C:\temp\auditresultstoday1.csv" -ExportPath "C:\temp"
+    # Export all results from CSV to the specified path
+    .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
+    .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
+    .LINK
+    https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Export-M365SecurityAuditTable
+#>
+function Export-M365SecurityAuditTable {
+    [CmdletBinding()]
+    [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,
+
+        [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
+    )
+    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
+            }
+            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
+        }
+
+        switch ($test) {
+            "6.1.2" {
+                $details = $auditResult.Details
+                if ($details -ne "No M365 E3 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 | 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
+                        }
+                        else {
+                            $result.Details | Export-Csv -Path $fileName -NoTypeInformation
+                        }
+                        $exportedTests += $result.TestNumber
+                    }
+                }
+            }
+        }
+        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
+            }
+            else {
+                Write-Information "No specified tests were included in the export." -InformationAction Continue
+            }
+        }
+
+        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
+        }
+    }
+    else {
+        Write-Error "No valid operation specified. Please provide valid parameters."
+    }
+}

source/Public/Get-AdminRoleUserLicense.ps1

@@ -25,6 +25,7 @@
     https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-AdminRoleUserLicense
 #>
 function Get-AdminRoleUserLicense {
+    [OutputType([System.Collections.ArrayList])]
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $false)]
@@ -40,33 +41,37 @@ function Get-AdminRoleUserLicense {
         $userIds = [System.Collections.ArrayList]::new()
     }
 
-    Process {
+    process {
-        $adminroles = Get-MgRoleManagementDirectoryRoleDefinition | Where-Object { $_.DisplayName -like "*Admin*" }
+        Write-Verbose "Retrieving all admin roles"
+        $adminRoleNames = (Get-MgDirectoryRole | Where-Object { $null -ne $_.RoleTemplateId }).DisplayName
 
-        foreach ($role in $adminroles) {
+        Write-Verbose "Filtering admin roles"
-            $usersInRole = Get-MgRoleManagementDirectoryRoleAssignment -Filter "roleDefinitionId eq '$($role.Id)'"
+        $adminRoles = Get-MgRoleManagementDirectoryRoleDefinition | Where-Object { ($adminRoleNames -contains $_.DisplayName) -and ($_.DisplayName -ne "Directory Synchronization Accounts") }
 
-            foreach ($user in $usersInRole) {
+        foreach ($role in $adminRoles) {
-                $userDetails = Get-MgUser -UserId $user.PrincipalId -Property "DisplayName, UserPrincipalName, Id, onPremisesSyncEnabled" -ErrorAction SilentlyContinue
+            Write-Verbose "Processing role: $($role.DisplayName)"
+            $roleAssignments = Get-MgRoleManagementDirectoryRoleAssignment -Filter "roleDefinitionId eq '$($role.Id)'"
+
+            foreach ($assignment in $roleAssignments) {
+                Write-Verbose "Processing role assignment for principal ID: $($assignment.PrincipalId)"
+                $userDetails = Get-MgUser -UserId $assignment.PrincipalId -Property "DisplayName, UserPrincipalName, Id, OnPremisesSyncEnabled" -ErrorAction SilentlyContinue
 
                 if ($userDetails) {
-                    [void]($userIds.Add($user.PrincipalId))
+                    Write-Verbose "Retrieved user details for: $($userDetails.UserPrincipalName)"
-                    [void](
+                    [void]($userIds.Add($userDetails.Id))
-                        $adminRoleUsers.Add(
+                    [void]($adminRoleUsers.Add([PSCustomObject]@{
-                            [PSCustomObject]@{
+                        RoleName          = $role.DisplayName
-                                RoleName          = $role.DisplayName
+                        UserName          = $userDetails.DisplayName
-                                UserName          = $userDetails.DisplayName
+                        UserPrincipalName = $userDetails.UserPrincipalName
-                                UserPrincipalName = $userDetails.UserPrincipalName
+                        UserId            = $userDetails.Id
-                                UserId            = $userDetails.Id
+                        HybridUser        = [bool]$userDetails.OnPremisesSyncEnabled
-                                HybridUser        = $userDetails.onPremisesSyncEnabled
+                        Licenses          = $null  # Initialize as $null
-                                Licenses          = $null  # Initialize as $null
+                    }))
-                            }
-                        )
-                    )
                 }
             }
         }
 
+        Write-Verbose "Retrieving licenses for admin role users"
         foreach ($userId in $userIds.ToArray() | Select-Object -Unique) {
             $licenses = Get-MgUserLicenseDetail -UserId $userId -ErrorAction SilentlyContinue
             if ($licenses) {
@@ -78,7 +83,7 @@ function Get-AdminRoleUserLicense {
         }
     }
 
-    End {
+    end {
         Write-Host "Disconnecting from Microsoft Graph..." -ForegroundColor Green
         Disconnect-MgGraph | Out-Null
         return $adminRoleUsers

source/Public/Get-MFAStatus.ps1

@@ -0,0 +1,107 @@
+<#
+    .SYNOPSIS
+        Retrieves the MFA (Multi-Factor Authentication) status for Azure Active Directory users.
+    .DESCRIPTION
+        The Get-MFAStatus function connects to Microsoft Online Service and retrieves the MFA status for all Azure Active Directory users, excluding guest accounts. Optionally, you can specify a single user by their User Principal Name (UPN) to get their MFA status.
+    .PARAMETER UserId
+        The User Principal Name (UPN) of a specific user to retrieve MFA status for. If not provided, the function retrieves MFA status for all users.
+    .EXAMPLE
+        Get-MFAStatus
+        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".
+    .OUTPUTS
+        System.Object
+        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.
+    .LINK
+    https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-MFAStatus
+#>
+function Get-MFAStatus {
+    [OutputType([System.Object])]
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $false)]
+        [ValidateNotNullOrEmpty()]
+        [string]$UserId,
+        [switch]$SkipMSOLConnectionChecks
+    )
+
+    begin {
+        # Connect to Microsoft Online service
+        Import-Module MSOnline -ErrorAction SilentlyContinue
+    }
+
+    process {
+        if (Get-Module MSOnline){
+            if (-not $SkipMSOLConnectionChecks) {
+                Connect-MsolService
+            }
+            Write-Host "Finding Azure Active Directory Accounts..."
+            # Get all users, excluding guests
+            $Users = if ($PSBoundParameters.ContainsKey('UserId')) {
+                Get-MsolUser -UserPrincipalName $UserId
+            } else {
+                Get-MsolUser -All | Where-Object { $_.UserType -ne "Guest" }
+            }
+            $Report = [System.Collections.Generic.List[Object]]::new() # Create output list
+            Write-Host "Processing $($Users.Count) accounts..."
+            ForEach ($User in $Users) {
+                $MFADefaultMethod = ($User.StrongAuthenticationMethods | Where-Object { $_.IsDefault -eq "True" }).MethodType
+                $MFAPhoneNumber = $User.StrongAuthenticationUserDetails.PhoneNumber
+                $PrimarySMTP = $User.ProxyAddresses | Where-Object { $_ -clike "SMTP*" } | ForEach-Object { $_ -replace "SMTP:", "" }
+                $Aliases = $User.ProxyAddresses | Where-Object { $_ -clike "smtp*" } | ForEach-Object { $_ -replace "smtp:", "" }
+
+                If ($User.StrongAuthenticationRequirements) {
+                    $MFAState = $User.StrongAuthenticationRequirements.State
+                }
+                Else {
+                    $MFAState = 'Disabled'
+                }
+
+                If ($MFADefaultMethod) {
+                    Switch ($MFADefaultMethod) {
+                        "OneWaySMS" { $MFADefaultMethod = "Text code authentication phone" }
+                        "TwoWayVoiceMobile" { $MFADefaultMethod = "Call authentication phone" }
+                        "TwoWayVoiceOffice" { $MFADefaultMethod = "Call office phone" }
+                        "PhoneAppOTP" { $MFADefaultMethod = "Authenticator app or hardware token" }
+                        "PhoneAppNotification" { $MFADefaultMethod = "Microsoft authenticator app" }
+                    }
+                }
+                Else {
+                    $MFADefaultMethod = "Not enabled"
+                }
+
+                $ReportLine = [PSCustomObject] @{
+                    UserPrincipalName = $User.UserPrincipalName
+                    DisplayName       = $User.DisplayName
+                    MFAState          = $MFAState
+                    MFADefaultMethod  = $MFADefaultMethod
+                    MFAPhoneNumber    = $MFAPhoneNumber
+                    PrimarySMTP       = ($PrimarySMTP -join ',')
+                    Aliases           = ($Aliases -join ',')
+                    isLicensed        = $User.isLicensed
+                }
+
+                $Report.Add($ReportLine)
+            }
+
+            Write-Host "Processing complete."
+            Write-Host "To disconnect from the MsolService close the powershell session or wait for the session to expire."
+            return $Report | Select-Object UserPrincipalName, DisplayName, MFAState, MFADefaultMethod, MFAPhoneNumber, PrimarySMTP, Aliases, isLicensed | Sort-Object UserPrincipalName
+        }
+        else {
+            Write-Host "You must first install MSOL using:`nInstall-Module MSOnline -Scope CurrentUser -Force"
+        }
+    }
+}

source/Public/Grant-M365SecurityAuditConsent.ps1

@@ -0,0 +1,182 @@
+<#
+    .SYNOPSIS
+    Grants Microsoft Graph permissions for an auditor.
+    .DESCRIPTION
+        This function grants the specified Microsoft Graph permissions to a user, allowing the user to perform audits. It connects to Microsoft Graph, checks if a service principal exists for the client application, creates it if it does not exist, and then grants the specified permissions. Finally, it assigns the app to the user.
+    .PARAMETER UserPrincipalNameForConsent
+        The UPN or ID of the user to grant consent for.
+    .PARAMETER SkipGraphConnection
+        If specified, skips connecting to Microsoft Graph.
+    .PARAMETER DoNotDisconnect
+        If specified, does not disconnect from Microsoft Graph after granting consent.
+    .PARAMETER SkipModuleCheck
+        If specified, skips the check for the Microsoft.Graph module.
+    .PARAMETER SuppressRevertOutput
+        If specified, suppresses the output of the revert commands.
+    .EXAMPLE
+        Grant-M365SecurityAuditConsent -UserPrincipalNameForConsent user@example.com
+
+        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.
+    .NOTES
+        This function requires the Microsoft.Graph module version 2.4.0 or higher.
+    .LINK
+        https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Grant-M365SecurityAuditConsent
+#>
+function Grant-M365SecurityAuditConsent {
+    [CmdletBinding(
+        SupportsShouldProcess = $true,
+        ConfirmImpact = 'High'
+    )]
+    [OutputType([void])]
+    param (
+        [Parameter(
+            Mandatory = $true,
+            Position = 0,
+            ValueFromPipeline = $true,
+            ValueFromPipelineByPropertyName = $true,
+            HelpMessage = 'Specify the UPN of the user to grant consent for.'
+        )]
+        [ValidatePattern('^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$')]
+        [String]$UserPrincipalNameForConsent,
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Skip connecting to Microsoft Graph.'
+        )]
+        [switch]$SkipGraphConnection,
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Skip the check for the Microsoft.Graph module.'
+        )]
+        [switch]$SkipModuleCheck,
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Suppress the output of the revert commands.'
+        )]
+        [switch]$SuppressRevertOutput,
+        [Parameter(
+            Mandatory = $false,
+            HelpMessage = 'Do not disconnect from Microsoft Graph after granting consent.'
+        )]
+        [switch]$DoNotDisconnect
+    )
+    begin {
+        if (!($SkipModuleCheck)) {
+            Assert-ModuleAvailability -ModuleName Microsoft.Graph -RequiredVersion "2.4.0"
+        }
+        # Adjusted from: https://learn.microsoft.com/en-us/entra/identity/enterprise-apps/grant-consent-single-user?pivots=msgraph-powershell
+        # Needed: A user account with a Privileged Role Administrator, Application Administrator, or Cloud Application Administrator
+        # The app for which consent is being granted.
+        $clientAppId = "14d82eec-204b-4c2f-b7e8-296a70dab67e" # Microsoft Graph PowerShell
+        # The API to which access will be granted. Microsoft Graph PowerShell makes API
+        # requests to the Microsoft Graph API, so we'll use that here.
+        $resourceAppId = "00000003-0000-0000-c000-000000000000" # Microsoft Graph API
+        # The permissions to grant.
+        $permissions = @("Directory.Read.All", "Domain.Read.All", "Policy.Read.All", "Organization.Read.All")
+        # The user on behalf of whom access will be granted. The app will be able to access
+        # the API on behalf of this user.
+        $userUpnOrId = $UserPrincipalNameForConsent
+    }
+    process {
+        try {
+            if (-not $SkipGraphConnection -and $PSCmdlet.ShouldProcess("Scopes: User.ReadBasic.All, Application.ReadWrite.All, DelegatedPermissionGrant.ReadWrite.All, AppRoleAssignment.ReadWrite.All", "Connect-MgGraph")) {
+                # Step 0. Connect to Microsoft Graph PowerShell. We need User.ReadBasic.All to get
+                #    users' IDs, Application.ReadWrite.All to list and create service principals,
+                #    DelegatedPermissionGrant.ReadWrite.All to create delegated permission grants,
+                #    and AppRoleAssignment.ReadWrite.All to assign an app role.
+                #    WARNING: These are high-privilege permissions!
+                Write-Host "Connecting to Microsoft Graph with scopes: User.ReadBasic.All, Application.ReadWrite.All, DelegatedPermissionGrant.ReadWrite.All, AppRoleAssignment.ReadWrite.All" -ForegroundColor Yellow
+                Connect-MgGraph -Scopes ("User.ReadBasic.All Application.ReadWrite.All " + "DelegatedPermissionGrant.ReadWrite.All " + "AppRoleAssignment.ReadWrite.All") -NoWelcome
+                $context = Get-MgContext
+                Write-Host "Connected to Microsoft Graph with user: $(($context.Account)) with the authtype `"$($context.AuthType)`" for the `"$($context.Environment)`" environment." -ForegroundColor Green
+            }
+        }
+        catch {
+            throw "Connection execution aborted: $_"
+            break
+        }
+        try {
+            if ($PSCmdlet.ShouldProcess("Create Microsoft Graph API service princial if not found", "New-MgServicePrincipal")) {
+                # Step 1. Check if a service principal exists for the client application.
+                #     If one doesn't exist, create it.
+                $clientSp = Get-MgServicePrincipal -Filter "appId eq '$($clientAppId)'" -ErrorAction SilentlyContinue
+                if (-not $clientSp) {
+                    Write-Host "Client service principal not found. Creating one." -ForegroundColor Yellow
+                    $clientSp = New-MgServicePrincipal -AppId $clientAppId
+                }
+                $user = Get-MgUser -UserId $userUpnOrId
+                if (!($user)) {
+                    throw "User with UPN or ID `"$userUpnOrId`" not found."
+                }
+                Write-Verbose "User: $($user.UserPrincipalName) Found!"
+                $resourceSp = Get-MgServicePrincipal -Filter "appId eq '$($resourceAppId)'"
+                $scopeToGrant = $permissions -join " "
+                $existingGrant = Get-MgOauth2PermissionGrant -Filter "clientId eq '$($clientSp.Id)' and principalId eq '$($user.Id)' and resourceId eq '$($resourceSp.Id)'"
+            }
+            if (-not $existingGrant -and $PSCmdlet.ShouldProcess("User: $userUpnOrId for Microsoft Graph PowerShell Scopes: $($permissions -join ', ')", "New-MgOauth2PermissionGrant: Granting Consent")) {
+                # Step 2. Create a delegated permission that grants the client app access to the
+                #     API, on behalf of the user.
+                $grant = New-MgOauth2PermissionGrant -ResourceId $resourceSp.Id -Scope $scopeToGrant -ClientId $clientSp.Id -ConsentType "Principal" -PrincipalId $user.Id
+                Write-Host "Consent granted to user $($user.UserPrincipalName) for Microsoft Graph API with scopes: $((($grant.Scope) -split ' ') -join ', ')" -ForegroundColor Green
+            }
+            if ($existingGrant -and $PSCmdlet.ShouldProcess("Update existing Microsoft Graph permissions for user $userUpnOrId", "Update-MgOauth2PermissionGrant")) {
+                # Step 2. Update the existing permission grant with the new scopes.
+                Write-Host "Updating existing permission grant for user $($user.UserPrincipalName)." -ForegroundColor Yellow
+                $updatedGrant = Update-MgOauth2PermissionGrant -PermissionGrantId $existingGrant.Id -Scope $scopeToGrant -Confirm:$false
+                Write-Host "Updated permission grant with ID $($updatedGrant.Id) for scopes: $scopeToGrant" -ForegroundColor Green
+            }
+            if ($PSCmdlet.ShouldProcess("Assigning app to user $userUpnOrId", "New-MgServicePrincipalAppRoleAssignedTo")) {
+                # Step 3. Assign the app to the user. This ensures that the user can sign in if assignment
+                #     is required, and ensures that the app shows up under the user's My Apps portal.
+                if ($clientSp.AppRoles | Where-Object { $_.AllowedMemberTypes -contains "User" }) {
+                    Write-Warning "A default app role assignment cannot be created because the client application exposes user-assignable app roles. You must assign the user a specific app role for the app to be listed in the user's My Apps access panel."
+                }
+                else {
+                    # The app role ID 00000000-0000-0000-0000-000000000000 is the default app role
+                    # indicating that the app is assigned to the user, but not for any specific
+                    # app role.
+                    $assignment = New-MgServicePrincipalAppRoleAssignedTo -ServicePrincipalId $clientSp.Id -ResourceId $clientSp.Id -PrincipalId $user.Id -AppRoleId "00000000-0000-0000-0000-000000000000"
+                    # $assignments = Get-MgServicePrincipalAppRoleAssignedTo -ServicePrincipalId $assignment.ResourceId -All -WhatIf
+                }
+            }
+        }
+        catch {
+            throw "An error occurred while granting consent:`n$_"
+        }
+        finally {
+            if (!($DoNotDisconnect) -and $PSCmdlet.ShouldProcess("Disconnect from Microsoft Graph", "Disconnect")) {
+                # Clean up sessions
+                Write-Host "Disconnecting from Microsoft Graph." -ForegroundColor Yellow
+                Disconnect-MgGraph | Out-Null
+            }
+        }
+    }
+    end {
+        if (-not $SuppressRevertOutput -and $PSCmdlet.ShouldProcess("Instructions to undo this change", "Generate Revert Commands")) {
+            <#
+                # Instructions to revert the changes made by this script
+                $resourceAppId = "00000003-0000-0000-c000-000000000000"
+                $clientAppId = "14d82eec-204b-4c2f-b7e8-296a70dab67e"
+                # Get the user object
+                #$user = Get-MgUser -UserId "user@example.com"
+                $resourceSp = Get-MgServicePrincipal -Filter "appId eq '$($resourceAppId)'"
+                # Get the service principal using $clientAppId
+                $clientSp = Get-MgServicePrincipal -Filter "appId eq '$($clientAppId)'"
+                $existingGrant = Get-MgOauth2PermissionGrant -Filter "clientId eq '$($clientSp.Id)' and principalId eq '$($user.Id)' and resourceId eq '$($resourceSp.Id)'"
+                # Get all app role assignments for the service principal
+                $appRoleAssignments = Get-MgServicePrincipalAppRoleAssignedTo -ServicePrincipalId $clientSp.Id -All
+                # At index of desired user assignment
+                Remove-MgServicePrincipalAppRoleAssignedTo -AppRoleAssignmentId $appRoleAssignments[1].Id -ServicePrincipalId $clientSp.Id
+                Remove-MgOAuth2PermissionGrant -OAuth2PermissionGrantId  $existingGrant.Id
+            #>
+            Write-Host "App assigned to user $($assignment.PrincipalDisplayName) for $($assignment.ResourceDisplayName) at $($assignment.CreatedDateTime)." -ForegroundColor Green
+            Write-Host "If you made a mistake and would like to remove the assignement for `"$($user.UserPrincipalName)`", you can run the following:`n" -ForegroundColor Yellow
+            Write-Host "Connect-MgGraph -Scopes (`"User.ReadBasic.All Application.ReadWrite.All `" + `"DelegatedPermissionGrant.ReadWrite.All `" + `"AppRoleAssignment.ReadWrite.All`")" -ForegroundColor Cyan
+            Write-Host "Remove-MgServicePrincipalAppRoleAssignedTo -AppRoleAssignmentId `"$($assignment.Id)`" -ServicePrincipalId `"$($assignment.ResourceId)`"" -ForegroundColor Cyan
+            Write-Host "Remove-MgOAuth2PermissionGrant -OAuth2PermissionGrantId `"$($grant.Id)`"" -ForegroundColor Cyan
+        }
+    }
+}

source/Public/Invoke-M365SecurityAudit.ps1

@@ -1,54 +1,120 @@
 <#
     .SYNOPSIS
-    Invokes a security audit for Microsoft 365 environments.
+        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, such as compliance with CIS benchmarks.
     .PARAMETER TenantAdminUrl
-    The URL of the tenant admin. This parameter is mandatory.
+        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. This parameter is mandatory.
+        The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.
     .PARAMETER ELevel
-    Specifies the E-Level (E3 or E5) for the audit. This parameter is optional and can be combined with the ProfileLevel parameter.
+        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 optional and can be combined with the ELevel parameter.
     .PARAMETER IncludeIG1
-    If specified, includes tests where IG1 is true.
+        If specified, includes tests where IG1 is true.
     .PARAMETER IncludeIG2
-    If specified, includes tests where IG2 is true.
+        If specified, includes tests where IG2 is true.
     .PARAMETER IncludeIG3
-    If specified, includes tests where IG3 is true.
+        If specified, includes tests where IG3 is true.
     .PARAMETER IncludeRecommendation
-    Specifies specific recommendations to include in the audit. Accepts an array of recommendation numbers.
+        Specifies specific recommendations to include in the audit. Accepts an array of recommendation numbers.
     .PARAMETER SkipRecommendation
-    Specifies specific recommendations to exclude from the audit. Accepts an array of recommendation numbers.
+        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.
+    .PARAMETER ApprovedFederatedDomains
+        Specifies the approved federated domains for the audit test 8.2.1. Accepts an array of allowed domain names.
     .PARAMETER DoNotConnect
-    If specified, the cmdlet will not establish a connection to Microsoft 365 services.
+        If specified, the cmdlet will not establish a connection to Microsoft 365 services.
     .PARAMETER DoNotDisconnect
-    If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.
+        If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.
     .PARAMETER NoModuleCheck
-    If specified, the cmdlet will not check for the presence of required modules.
+        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.
     .EXAMPLE
-    PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -ELevel "E5" -ProfileLevel "L1"
+        PS> Invoke-M365SecurityAudit
 
-    Performs a security audit for the E5 level and L1 profile in the specified Microsoft 365 environment.
+        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
     .EXAMPLE
-    PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -IncludeIG1
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -ELevel "E5" -ProfileLevel "L1"
 
-    Performs an audit including all tests where IG1 is true.
+        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
     .EXAMPLE
-    PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -SkipRecommendation '1.1.3', '2.1.1'
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -IncludeIG1
 
-    Performs an audit while excluding specific recommendations 1.1.3 and 2.1.1.
+        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
     .EXAMPLE
-    PS> $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com"
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -SkipRecommendation '1.1.3', '2.1.1'
-    PS> $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation
+        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
+    .EXAMPLE
+        PS> $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com"
+        PS> $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation
 
-    Captures the audit results into a variable and exports them to a CSV file.
+        Captures the audit results into a variable and exports them to a CSV file.
+        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".
     .INPUTS
-    None. You cannot pipe objects to Invoke-M365SecurityAudit.
+        None. You cannot pipe objects to Invoke-M365SecurityAudit.
     .OUTPUTS
-    CISAuditResult[]
+        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.
@@ -57,42 +123,36 @@
         - For full license details, visit: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en
         - Register for CIS Benchmarks at: https://www.cisecurity.org/cis-benchmarks
     .LINK
-    https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit
+        https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit
 #>
-
 function Invoke-M365SecurityAudit {
     [CmdletBinding(SupportsShouldProcess = $true, DefaultParameterSetName = 'Default')]
     [OutputType([CISAuditResult[]])]
     param (
-        [Parameter(Mandatory = $true)]
+        [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.")]
+        [ValidatePattern('^https://[a-zA-Z0-9-]+-admin\.sharepoint\.com$')]
         [string]$TenantAdminUrl,
-
+        [Parameter(Mandatory = $false, HelpMessage = "Specify this to test only the default domain for password expiration and DKIM Config for tests '1.3.1' and 2.1.9. The domain name of your organization, e.g., 'example.com'.")]
-        [Parameter(Mandatory = $true)]
+        [ValidatePattern('^[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$')]
         [string]$DomainName,
-
         # E-Level with optional ProfileLevel selection
-        [Parameter(ParameterSetName = 'ELevelFilter')]
+        [Parameter(Mandatory = $true, ParameterSetName = 'ELevelFilter', HelpMessage = "Specifies the E-Level (E3 or E5) for the audit.")]
         [ValidateSet('E3', 'E5')]
         [string]$ELevel,
-
+        [Parameter(Mandatory = $true, ParameterSetName = 'ELevelFilter', HelpMessage = "Specifies the profile level (L1 or L2) for the audit.")]
-        [Parameter(ParameterSetName = 'ELevelFilter')]
         [ValidateSet('L1', 'L2')]
         [string]$ProfileLevel,
-
         # IG Filters, one at a time
-        [Parameter(ParameterSetName = 'IG1Filter')]
+        [Parameter(Mandatory = $true, ParameterSetName = 'IG1Filter', HelpMessage = "Includes tests where IG1 is true.")]
         [switch]$IncludeIG1,
-
+        [Parameter(Mandatory = $true, ParameterSetName = 'IG2Filter', HelpMessage = "Includes tests where IG2 is true.")]
-        [Parameter(ParameterSetName = 'IG2Filter')]
         [switch]$IncludeIG2,
-
+        [Parameter(Mandatory = $true, ParameterSetName = 'IG3Filter', HelpMessage = "Includes tests where IG3 is true.")]
-        [Parameter(ParameterSetName = 'IG3Filter')]
         [switch]$IncludeIG3,
-
         # Inclusion of specific recommendation numbers
-        [Parameter(ParameterSetName = 'RecFilter')]
+        [Parameter(Mandatory = $true, ParameterSetName = 'RecFilter', HelpMessage = "Specifies specific recommendations to include in the audit. Accepts an array of recommendation numbers.")]
         [ValidateSet(
-            '1.1.1','1.1.3', '1.2.1', '1.2.2', '1.3.1', '1.3.3', '1.3.6', '2.1.1', '2.1.2', `
+            '1.1.1', '1.1.3', '1.2.1', '1.2.2', '1.3.1', '1.3.3', '1.3.6', '2.1.1', '2.1.2', `
                 '2.1.3', '2.1.4', '2.1.5', '2.1.6', '2.1.7', '2.1.9', '3.1.1', '5.1.2.3', `
                 '5.1.8.1', '6.1.1', '6.1.2', '6.1.3', '6.2.1', '6.2.2', '6.2.3', '6.3.1', `
                 '6.5.1', '6.5.2', '6.5.3', '7.2.1', '7.2.10', '7.2.2', '7.2.3', '7.2.4', `
@@ -101,11 +161,10 @@ function Invoke-M365SecurityAudit {
                 '8.5.7', '8.6.1'
         )]
         [string[]]$IncludeRecommendation,
-
         # Exclusion of specific recommendation numbers
-        [Parameter(ParameterSetName = 'SkipRecFilter')]
+        [Parameter(Mandatory = $true, ParameterSetName = 'SkipRecFilter', HelpMessage = "Specifies specific recommendations to exclude from the audit. Accepts an array of recommendation numbers.")]
         [ValidateSet(
-            '1.1.1','1.1.3', '1.2.1', '1.2.2', '1.3.1', '1.3.3', '1.3.6', '2.1.1', '2.1.2', `
+            '1.1.1', '1.1.3', '1.2.1', '1.2.2', '1.3.1', '1.3.3', '1.3.6', '2.1.1', '2.1.2', `
                 '2.1.3', '2.1.4', '2.1.5', '2.1.6', '2.1.7', '2.1.9', '3.1.1', '5.1.2.3', `
                 '5.1.8.1', '6.1.1', '6.1.2', '6.1.3', '6.2.1', '6.2.2', '6.2.3', '6.3.1', `
                 '6.5.1', '6.5.2', '6.5.3', '7.2.1', '7.2.10', '7.2.2', '7.2.3', '7.2.4', `
@@ -114,147 +173,148 @@ function Invoke-M365SecurityAudit {
                 '8.5.7', '8.6.1'
         )]
         [string[]]$SkipRecommendation,
-
         # Common parameters for all parameter sets
+        [Parameter(Mandatory = $false, HelpMessage = "Specifies the approved cloud storage providers for the audit. Accepts an array of cloud storage provider names.")]
+        [ValidateSet(
+            'GoogleDrive', 'ShareFile', 'Box', 'DropBox', 'Egnyte'
+        )]
+        [string[]]$ApprovedCloudStorageProviders = @(),
+        [Parameter(Mandatory = $false, HelpMessage = "Specifies the approved federated domains for the audit test 8.2.1. Accepts an array of allowed domain names.")]
+        [ValidatePattern('^[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$')]
+        [string[]]$ApprovedFederatedDomains,
+        [Parameter(Mandatory = $false, HelpMessage = "Specifies that the cmdlet will not establish a connection to Microsoft 365 services.")]
         [switch]$DoNotConnect,
+        [Parameter(Mandatory = $false, HelpMessage = "Specifies that the cmdlet will not disconnect from Microsoft 365 services after execution.")]
         [switch]$DoNotDisconnect,
-        [switch]$NoModuleCheck
+        [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
     )
-
-
-
     Begin {
         if ($script:MaximumFunctionCount -lt 8192) {
             $script:MaximumFunctionCount = 8192
         }
         # Ensure required modules are installed
-        # Define the required modules and versions in a hashtable
+        $requiredModules = Get-RequiredModule -AuditFunction
-        if (!($NoModuleCheck)) {
+        # Format the required modules list
-            $requiredModules = @(
+        $requiredModulesFormatted = Format-RequiredModuleList -RequiredModules $requiredModules
-                @{ ModuleName = "ExchangeOnlineManagement"; RequiredVersion = "3.3.0" },
+        # Check and install required modules if necessary
-                @{ ModuleName = "AzureAD"; RequiredVersion = "2.0.2.182" },
+        if (!($NoModuleCheck) -and $PSCmdlet.ShouldProcess("Check for required modules: $requiredModulesFormatted", "Check")) {
-                @{ ModuleName = "Microsoft.Graph"; RequiredVersion = "2.4.0"; SubModuleName = "Authentication" },
+            Write-Host "Checking for and installing required modules..." -ForegroundColor DarkMagenta
-                @{ ModuleName = "Microsoft.Graph"; RequiredVersion = "2.4.0"; SubModuleName = "Users" },
-                @{ ModuleName = "Microsoft.Graph"; RequiredVersion = "2.4.0"; SubModuleName = "Groups" },
-                @{ ModuleName = "Microsoft.Graph"; RequiredVersion = "2.4.0"; SubModuleName = "DirectoryObjects" },
-                @{ ModuleName = "Microsoft.Graph"; RequiredVersion = "2.4.0"; SubModuleName = "Domains" },
-                @{ ModuleName = "Microsoft.Graph"; RequiredVersion = "2.4.0"; SubModuleName = "Reports" },
-                @{ ModuleName = "Microsoft.Graph"; RequiredVersion = "2.4.0"; SubModuleName = "Mail" },
-                @{ ModuleName = "Microsoft.Online.SharePoint.PowerShell"; RequiredVersion = "16.0.24009.12000" },
-                @{ ModuleName = "MicrosoftTeams"; RequiredVersion = "5.5.0" }
-            )
             foreach ($module in $requiredModules) {
-                Assert-ModuleAvailability -ModuleName $module.ModuleName -RequiredVersion $module.RequiredVersion -SubModuleName $module.SubModuleName
+                Assert-ModuleAvailability -ModuleName $module.ModuleName -RequiredVersion $module.RequiredVersion -SubModules $module.SubModules
             }
         }
-
-
-        # Loop through each required module and assert its availability
-
-        # Establishing connections
-        #if (!($DoNotConnect -or $DoNotTest)) {
-        # Establishing connections
-        if (!($DoNotConnect)) {
-            Connect-M365Suite -TenantAdminUrl $TenantAdminUrl
-        }
-
         # Load test definitions from CSV
         $testDefinitionsPath = Join-Path -Path $PSScriptRoot -ChildPath "helper\TestDefinitions.csv"
         $testDefinitions = Import-Csv -Path $testDefinitionsPath
         # Load the Test Definitions into the script scope for use in other functions
         $script:TestDefinitionsObject = $testDefinitions
         # Apply filters based on parameter sets
-        switch ($PSCmdlet.ParameterSetName) {
+        $params = @{
-            'ELevelFilter' {
+            TestDefinitions       = $testDefinitions
-                if ($null -ne $ELevel -and $null -ne $ProfileLevel) {
+            ParameterSetName      = $PSCmdlet.ParameterSetName
-                    $testDefinitions = $testDefinitions | Where-Object {
+            ELevel                = $ELevel
-                        $_.ELevel -eq $ELevel -and $_.ProfileLevel -eq $ProfileLevel
+            ProfileLevel          = $ProfileLevel
-                    }
+            IncludeRecommendation = $IncludeRecommendation
+            SkipRecommendation    = $SkipRecommendation
+        }
+        $testDefinitions = Get-TestDefinitionsObject @params
+        # Extract unique connections needed
+        $requiredConnections = $testDefinitions.Connection | Sort-Object -Unique
+        if ($requiredConnections -contains 'SPO') {
+            if (-not $TenantAdminUrl) {
+                $requiredConnections = $requiredConnections | Where-Object { $_ -ne 'SPO' }
+                $testDefinitions = $testDefinitions | Where-Object { $_.Connection -ne 'SPO' }
+                if ($null -eq $testDefinitions) {
+                    throw "No tests to run as no SharePoint Online tests are available."
                 }
-                elseif ($null -ne $ELevel) {
-                    $testDefinitions = $testDefinitions | Where-Object {
-                        $_.ELevel -eq $ELevel
-                    }
-                }
-                elseif ($null -ne $ProfileLevel) {
-                    $testDefinitions = $testDefinitions | Where-Object {
-                        $_.ProfileLevel -eq $ProfileLevel
-                    }
-                }
-            }
-            'IG1Filter' {
-                $testDefinitions = $testDefinitions | Where-Object { $_.IG1 -eq 'TRUE' }
-            }
-            'IG2Filter' {
-                $testDefinitions = $testDefinitions | Where-Object { $_.IG2 -eq 'TRUE' }
-            }
-            'IG3Filter' {
-                $testDefinitions = $testDefinitions | Where-Object { $_.IG3 -eq 'TRUE' }
-            }
-            'RecFilter' {
-                $testDefinitions = $testDefinitions | Where-Object { $IncludeRecommendation -contains $_.Rec }
-            }
-            'SkipRecFilter' {
-                $testDefinitions = $testDefinitions | Where-Object { $SkipRecommendation -notcontains $_.Rec }
             }
         }
-        # End switch ($PSCmdlet.ParameterSetName)
-
         # Determine which test files to load based on filtering
         $testsToLoad = $testDefinitions.TestFileName | ForEach-Object { $_ -replace '.ps1$', '' }
-
-        # Display the tests that would be loaded if the function is called with -WhatIf
-
         Write-Verbose "The $(($testsToLoad).count) test/s that would be loaded based on filter criteria:"
         $testsToLoad | ForEach-Object { Write-Verbose " $_" }
+        # Initialize a collection to hold failed test details
+        $script:FailedTests = [System.Collections.ArrayList]::new()
     } # End Begin
-
     Process {
-        $allAuditResults = [System.Collections.ArrayList]::new() #@()  # Initialize a collection to hold all results
+        $allAuditResults = [System.Collections.ArrayList]::new() # Initialize a collection to hold all results
-
         # Dynamically dot-source the test scripts
         $testsFolderPath = Join-Path -Path $PSScriptRoot -ChildPath "tests"
         $testFiles = Get-ChildItem -Path $testsFolderPath -Filter "Test-*.ps1" |
         Where-Object { $testsToLoad -contains $_.BaseName }
-
+        $totalTests = $testFiles.Count
-        # Import the test functions
+        $currentTestIndex = 0
-        $testFiles | ForEach-Object {
+        # Establishing connections if required
-            Try {
+        try {
-                . $_.FullName
+            $actualUniqueConnections = Get-UniqueConnection -Connections $requiredConnections
-            }
+            if (!($DoNotConnect) -and $PSCmdlet.ShouldProcess("Establish connections to Microsoft 365 services: $($actualUniqueConnections -join ', ')", "Connect")) {
-            Catch {
+                Write-Host "Establishing connections to Microsoft 365 services: $($actualUniqueConnections -join ', ')" -ForegroundColor DarkMagenta
-                Write-Error "Failed to load test function $($_.Name): $_"
+                Connect-M365Suite -TenantAdminUrl $TenantAdminUrl -RequiredConnections $requiredConnections -SkipConfirmation:$DoNotConfirmConnections
             }
         }
-
+        catch {
-        # Execute each test function from the prepared list
+            Write-Host "Connection execution aborted: $_" -ForegroundColor Red
-        foreach ($testFunction in $testFiles) {
+            break
-            $functionName = $testFunction.BaseName
+        }
-            $functionCmd = Get-Command -Name $functionName
+        try {
-
+            Write-Host "A total of $($totalTests) tests were selected to run..." -ForegroundColor DarkMagenta
-            # Check if the test function needs DomainName parameter
+            # Import the test functions
-            $paramList = @{}
+            $testFiles | ForEach-Object {
-            if ('DomainName' -in $functionCmd.Parameters.Keys) {
+                $currentTestIndex++
-                $paramList.DomainName = $DomainName
+                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): $_" -Verbose
+                    $script:FailedTests.Add([PSCustomObject]@{ Test = $_.Name; Error = $_ })
+                }
             }
-
+            $currentTestIndex = 0
-            # Use splatting to pass parameters
+            # Execute each test function from the prepared list
-            if ($PSCmdlet.ShouldProcess($functionName, "Execute test")) {
+            foreach ($testFunction in $testFiles) {
-                Write-Host "Running $functionName..."
+                $currentTestIndex++
-                $result = & $functionName @paramList
+                Write-Progress -Activity "Executing Tests" -Status "Executing $($currentTestIndex) of $($totalTests): $($testFunction.Name)" -PercentComplete (($currentTestIndex / $totalTests) * 100)
-                # Assuming each function returns an array of CISAuditResult or a single CISAuditResult
+                $functionName = $testFunction.BaseName
-                [void]($allAuditResults.add($Result))
+                if ($PSCmdlet.ShouldProcess($functionName, "Execute test")) {
+                    $auditResult = Invoke-TestFunction -FunctionFile $testFunction -DomainName $DomainName -ApprovedCloudStorageProviders $ApprovedCloudStorageProviders -ApprovedFederatedDomains $ApprovedFederatedDomains
+                    # Add the result to the collection
+                    [void]$allAuditResults.Add($auditResult)
+                }
+            }
+        }
+        catch {
+            # Log the error and add the test to the failed tests collection
+            Write-Verbose "Invoke-M365SecurityAudit: Failed to load test function $($_.Name): $_" -Verbose
+            $script:FailedTests.Add([PSCustomObject]@{ Test = $_.Name; Error = $_ })
+        }
+        finally {
+            if (!($DoNotDisconnect) -and $PSCmdlet.ShouldProcess("Disconnect from Microsoft 365 services: $($actualUniqueConnections -join ', ')", "Disconnect")) {
+                # Clean up sessions
+                Disconnect-M365Suite -RequiredConnections $requiredConnections
             }
         }
     }
-
     End {
-        if (!($DoNotDisconnect)) {
+        if ($PSCmdlet.ShouldProcess("Measure and display audit results for $($totalTests) tests", "Measure")) {
-            # Clean up sessions
+            # Call the private function to calculate and display results
-            Disconnect-M365Suite
+            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
         }
-        # Return all collected audit results
-        return $allAuditResults.ToArray()
-        # Check if the Disconnect switch is present
     }
 }

source/Public/Remove-RowsWithEmptyCSVStatus.ps1

@@ -0,0 +1,49 @@
+<#
+    .SYNOPSIS
+        Removes rows from an Excel worksheet where the 'CSV_Status' column is empty and saves the result to a new file.
+    .DESCRIPTION
+        The Remove-RowsWithEmptyCSVStatus function imports data from a specified worksheet in an Excel file, checks for the presence of the 'CSV_Status' column, and filters out rows where the 'CSV_Status' column is empty. The filtered data is then exported to a new Excel file with a '-Filtered' suffix added to the original file name.
+    .PARAMETER FilePath
+        The path to the Excel file to be processed.
+    .PARAMETER WorksheetName
+        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.
+    .NOTES
+        This function requires the ImportExcel module to be installed.
+#>
+function Remove-RowsWithEmptyCSVStatus {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)]
+        [string]$FilePath,
+
+        [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,61 +1,102 @@
 <#
     .SYNOPSIS
-    Synchronizes data between an Excel file and a CSV file and optionally updates the Excel worksheet.
+    Synchronizes and updates data in an Excel worksheet with new information from a CSV file, including audit dates.
     .DESCRIPTION
-    The Sync-CISExcelAndCsvData function merges data from a specified Excel file and a CSV file based on a common key. It can also update the Excel worksheet with the merged data. This function is particularly useful for updating Excel records with additional data from a CSV file while preserving the original formatting and structure of the Excel worksheet.
+    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
-    The path to the Excel file that contains the original data. This parameter is mandatory.
+    Specifies the path to the Excel file to be updated. This parameter is mandatory.
-    .PARAMETER WorksheetName
-    The name of the worksheet within the Excel file that contains the data to be synchronized. This parameter is mandatory.
     .PARAMETER CsvPath
-    The path to the CSV file containing data to be merged with the Excel data. This parameter is mandatory.
+    Specifies the path to the CSV file containing new data. This parameter is mandatory.
-    .PARAMETER SkipUpdate
+    .PARAMETER SheetName
-    If specified, the function will return the merged data object without updating the Excel worksheet. This is useful for previewing the merged data.
+    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" -WorksheetName "DataSheet" -CsvPath "path\to\data.csv"
+    PS> Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -CsvPath "path\to\data.csv" -SheetName "AuditData"
-    Merges data from 'data.csv' into 'excel.xlsx' on the 'DataSheet' worksheet and updates the worksheet with the merged data.
+    Updates the 'AuditData' worksheet in 'excel.xlsx' with data from 'data.csv', adding new information and the date of the update.
-    .EXAMPLE
-    PS> $mergedData = Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -WorksheetName "DataSheet" -CsvPath "path\to\data.csv" -SkipUpdate
-    Retrieves the merged data object for preview without updating the Excel worksheet.
     .INPUTS
-    None. You cannot pipe objects to Sync-CISExcelAndCsvData.
+    System.String
+    The function accepts strings for file paths and worksheet names.
     .OUTPUTS
-    Object[]
+    None
-    If the SkipUpdate switch is used, the function returns an array of custom objects representing the merged data.
+    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.
+    - Ensure that the 'ImportExcel' module is installed and up to date to handle Excel file manipulations.
-    - It is recommended to backup the Excel file before running this script to prevent accidental data loss.
+    - It is recommended to back up the Excel file before running this function to avoid accidental data loss.
-    - This function is part of the CIS Excel and CSV Data Management Toolkit.
+    - 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
 #>
 
 function Sync-CISExcelAndCsvData {
+    [OutputType([void])]
     [CmdletBinding()]
-    param (
+    param(
-        [Parameter(Mandatory = $true)]
         [string]$ExcelPath,
-
-        [Parameter(Mandatory = $true)]
-        [string]$WorksheetName,
-
-        [Parameter(Mandatory = $true)]
         [string]$CsvPath,
-
+        [string]$SheetName
-        [Parameter(Mandatory = $false)]
-        [switch]$SkipUpdate
     )
 
-    process {
+    # Import the CSV file
-        # Merge Excel and CSV data
+    $csvData = Import-Csv -Path $CsvPath
-        $mergedData = Merge-CISExcelAndCsvData -ExcelPath $ExcelPath -WorksheetName $WorksheetName -CsvPath $CsvPath
 
-        # Output the merged data if the user chooses to skip the update
+    # Get the current date in the specified format
-        if ($SkipUpdate) {
+    $currentDate = Get-Date -Format "yyyy-MM-ddTHH:mm:ss"
-            return $mergedData
+
-        } else {
+    # Load the Excel workbook
-            # Update the Excel worksheet with the merged data
+    $excelPackage = Open-ExcelPackage -Path $ExcelPath
-            Update-CISExcelWorksheet -ExcelPath $ExcelPath -WorksheetName $WorksheetName -Data $mergedData
+    $worksheet = $excelPackage.Workbook.Worksheets[$SheetName]
+
+    # Define and check new headers, including the date header
+    $lastCol = $worksheet.Dimension.End.Column
+    $newHeaders = @("CSV_Connection", "CSV_Status", "CSV_Date", "CSV_Details", "CSV_FailureReason")
+    $existingHeaders = $worksheet.Cells[1, 1, 1, $lastCol].Value
+
+    # Add new headers if they do not exist
+    foreach ($header in $newHeaders) {
+        if ($header -notin $existingHeaders) {
+            $lastCol++
+            $worksheet.Cells[1, $lastCol].Value = $header
         }
     }
+
+    # Save changes made to add headers
+    $excelPackage.Save()
+
+    # Update the worksheet variable to include possible new columns
+    $worksheet = $excelPackage.Workbook.Worksheets[$SheetName]
+
+    # Mapping the headers to their corresponding column numbers
+    $headerMap = @{}
+    for ($col = 1; $col -le $worksheet.Dimension.End.Column; $col++) {
+        $headerMap[$worksheet.Cells[1, $col].Text] = $col
+    }
+
+    # For each record in CSV, find the matching row and update/add data
+    foreach ($row in $csvData) {
+        # Find the matching recommendation # row
+        $matchRow = $null
+        for ($i = 2; $i -le $worksheet.Dimension.End.Row; $i++) {
+            if ($worksheet.Cells[$i, $headerMap['Recommendation #']].Text -eq $row.rec) {
+                $matchRow = $i
+                break
+            }
+        }
+
+        # Update values if a matching row is found
+        if ($matchRow) {
+            foreach ($header in $newHeaders) {
+                if ($header -eq 'CSV_Date') {
+                    $columnIndex = $headerMap[$header]
+                    $worksheet.Cells[$matchRow, $columnIndex].Value = $currentDate
+                } else {
+                    $csvKey = $header -replace 'CSV_', ''
+                    $columnIndex = $headerMap[$header]
+                    $worksheet.Cells[$matchRow, $columnIndex].Value = $row.$csvKey
+                }
+            }
+        }
+    }
+
+    # Save the updated Excel file
+    $excelPackage.Save()
+    $excelPackage.Dispose()
 }

source/en-US/about_M365FoundationsCISReport.help.txt

@@ -1,24 +1,79 @@
-TOPIC
+TOPIC
-    about_M365FoundationsCISReport
+    about_m365foundationscisreport
 
 SHORT DESCRIPTION
-    Automated assessment of 50 CIS 365 Foundations v3.0.0 benchmark.
+    The `M365FoundationsCISReport` module provides cmdlets for auditing and
+    reporting on the security compliance of Microsoft 365 environments based on
+    CIS benchmarks.
 
 LONG DESCRIPTION
-    Automated assessment of 50 CIS 365 Foundations v3.0.0 benchmark.
+    The `M365FoundationsCISReport` module is designed to help administrators
+    ensure that their Microsoft 365 environments adhere to the security best
+    practices outlined by the Center for Internet Security (CIS). The module
+    includes cmdlets for performing comprehensive security audits, generating
+    detailed reports, and synchronizing audit results with CIS benchmark Excel
+    sheets. It aims to streamline the process of maintaining security compliance
+    and improving the overall security posture of Microsoft 365 environments.
+
+Optional Subtopics
+    AUDITING AND REPORTING
+    The module provides cmdlets that allow for the auditing of various security
+    aspects of Microsoft 365 environments, including user MFA status,
+    administrative role licenses, and more. The results can be exported and
+    analyzed to ensure compliance with CIS benchmarks.
+
+    DATA SYNCHRONIZATION
+    The module includes functionality to synchronize audit results with CIS
+    benchmark data stored in Excel sheets. This ensures that the documentation
+    is always up-to-date with the latest audit findings.
 
 EXAMPLES
-    PS C:\> {{ add examples here }}
+    # Example 1: Performing a security audit based on CIS benchmarks
+    $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com"
     
-NOTE:
+    # Example 2: Exporting a security audit table to a CSV file
-    Thank you to all those who contributed to this module, by writing code, sharing opinions, and provided feedback.
+    Export-M365SecurityAuditTable -ExportAllTests -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests
     
-TROUBLESHOOTING NOTE:
+    # Example 3: Retrieving licenses for users in administrative roles
-    Look out on the Github repository for issues and new releases.
+    Get-AdminRoleUserLicense
+    
+    # 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'
+
+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.
+
+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.
 
 SEE ALSO
-    - {{ Please add Project URI such as github }}}
+    -
+    CIS Benchmarks
+    -
+    Microsoft 365 Security Documentation
+    -
+    PowerShell Documentation
 
 KEYWORDS
-    {{ Add comma separated keywords here }}
+    - Microsoft 365
+    - Security Audit
+    - CIS Benchmarks
+    - Compliance
+    - MFA
+    - User Licenses
+    - Security Reporting
 

source/helper/TestDefinitions.csv

@@ -1,5 +1,5 @@
 Index,TestFileName,Rec,RecDescription,ELevel,ProfileLevel,CISControl,CISDescription,IG1,IG2,IG3,Automated,Connection
-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,AzureAD
+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
@@ -10,16 +10,16 @@
 9,Test-CommonAttachmentFilter.ps1,2.1.2,Ensure the Common Attachment Types Filter is enabled,E3,L1,9.6,Block Unnecessary File Types,FALSE,TRUE,TRUE,TRUE,EXO
 10,Test-NotifyMalwareInternal.ps1,2.1.3,Ensure notifications for internal users sending malware is Enabled,E3,L1,17.5,Assign Key Roles and Responsibilities,FALSE,TRUE,TRUE,TRUE,EXO
 11,Test-SafeAttachmentsPolicy.ps1,2.1.4,Ensure Safe Attachments policy is enabled,E5,L2,9.7,Deploy and Maintain Email Server Anti-Malware Protections,FALSE,FALSE,TRUE,TRUE,EXO
-12,Test-SafeAttachmentsTeams.ps1,2.1.5,"Ensure Safe Attachments for SharePoint, OneDrive, and Microsoft Teams is Enabled",E5,L2,"9.7, 10.1","Deploy and Maintain Email Server Anti-Malware Protections, Deploy and Maintain Anti-Malware Software",TRUE,TRUE,TRUE,TRUE,EXO
+12,Test-SafeAttachmentsTeams.ps1,2.1.5,"Ensure Safe Attachments for SharePoint, OneDrive, and Microsoft Teams is Enabled",E5,L2,"9.7,10.1","Deploy and Maintain Email Server Anti-Malware Protections, Deploy and Maintain Anti-Malware Software",TRUE,TRUE,TRUE,TRUE,EXO
 13,Test-SpamPolicyAdminNotify.ps1,2.1.6,Ensure Exchange Online Spam Policies are set to notify administrators,E3,L1,17.5,Assign Key Roles and Responsibilities,FALSE,TRUE,TRUE,TRUE,EXO
 14,Test-AntiPhishingPolicy.ps1,2.1.7,Ensure that an anti-phishing policy has been created,E5,L1,9.7,Deploy and Maintain Email Server Anti-Malware Protections,FALSE,FALSE,TRUE,TRUE,EXO
 15,Test-EnableDKIM.ps1,2.1.9,Ensure that DKIM is enabled for all Exchange Online Domains,E3,L1,9.5,Implement DMARC,FALSE,TRUE,TRUE,TRUE,EXO
 16,Test-AuditLogSearch.ps1,3.1.1,Ensure Microsoft 365 audit log search is Enabled,E3,L1,8.2,Collect Audit Logs,TRUE,TRUE,TRUE,TRUE,EXO
 17,Test-RestrictTenantCreation.ps1,5.1.2.3,Ensure 'Restrict non-admin users from creating tenants' is set to 'Yes',E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,Microsoft Graph
 18,Test-PasswordHashSync.ps1,5.1.8.1,Ensure password hash sync is enabled for hybrid deployments,E3,L1,6.7,Centralize Access Control,FALSE,TRUE,TRUE,TRUE,Microsoft Graph
-19,Test-AuditDisabledFalse.ps1,6.1.1,Ensure 'AuditDisabled' organizationally is set to 'False',E3,L1,8.2,Collect Audit Logs,TRUE,TRUE,TRUE,TRUE,Microsoft Graph
+19,Test-AuditDisabledFalse.ps1,6.1.1,Ensure 'AuditDisabled' organizationally is set to 'False',E3,L1,8.2,Collect Audit Logs,TRUE,TRUE,TRUE,TRUE,EXO
-20,Test-MailboxAuditingE3.ps1,6.1.2,Ensure mailbox auditing for Office E3 users is Enabled,E3,L1,8.2,Collect audit logs.,TRUE,TRUE,TRUE,TRUE,EXO
+20,Test-MailboxAuditingE3.ps1,6.1.2,Ensure mailbox auditing for Office E3 users is Enabled,E3,L1,8.2,Collect audit logs.,TRUE,TRUE,TRUE,TRUE,EXO | Microsoft Graph
-21,Test-MailboxAuditingE5.ps1,6.1.3,Ensure mailbox auditing for Office E5 users is Enabled,E5,L1,8.2,Collect audit logs.,TRUE,TRUE,TRUE,TRUE,EXO
+21,Test-MailboxAuditingE5.ps1,6.1.3,Ensure mailbox auditing for Office E5 users is Enabled,E5,L1,8.2,Collect audit logs.,TRUE,TRUE,TRUE,TRUE,EXO | Microsoft Graph
 22,Test-BlockMailForwarding.ps1,6.2.1,Ensure all forms of mail forwarding are blocked and/or disabled,E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,EXO
 23,Test-NoWhitelistDomains.ps1,6.2.2,Ensure mail transport rules do not whitelist specific domains,E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,EXO
 24,Test-IdentifyExternalEmail.ps1,6.2.3,Ensure email from external senders is identified,E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,EXO
@@ -28,14 +28,14 @@
 27,Test-MailTipsEnabled.ps1,6.5.2,Ensure MailTips are enabled for end users,E3,L2,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,EXO
 28,Test-RestrictStorageProvidersOutlook.ps1,6.5.3,Ensure additional storage providers are restricted in Outlook on the web,E3,L2,3.3,Configure Data Access Control Lists,TRUE,TRUE,TRUE,TRUE,EXO
 29,Test-ModernAuthSharePoint.ps1,7.2.1,Modern Authentication for SharePoint Applications,E3,L1,3.1,Encrypt Sensitive Data in Transit,FALSE,TRUE,TRUE,TRUE,SPO
-30,Test-SharePointAADB2B.ps1,7.2.2,Ensure reauthentication with verification code is restricted,E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,SPO
+30,Test-SharePointAADB2B.ps1,7.2.2,Ensure SharePoint and OneDrive integration with Azure AD B2B is enabled,E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,SPO
-31,Test-RestrictExternalSharing.ps1,7.2.3,Ensure SharePoint and OneDrive integration with Azure AD B2B is enabled,E3,L1,0,Explicitly Not Mapped,TRUE,TRUE,TRUE,TRUE,SPO
+31,Test-RestrictExternalSharing.ps1,7.2.3,Ensure external content sharing is restricted,E3,L1,3.3,Configure Data Access Control Lists,TRUE,TRUE,TRUE,TRUE,SPO
-32,Test-OneDriveContentRestrictions.ps1,7.2.4,Ensure external content sharing is restricted,E3,L2,3.3,Configure Data Access Control Lists,TRUE,TRUE,TRUE,TRUE,SPO
+32,Test-OneDriveContentRestrictions.ps1,7.2.4,Ensure OneDrive content sharing is restricted,E3,L2,3.3,Configure Data Access Control Lists,TRUE,TRUE,TRUE,TRUE,SPO
-33,Test-SharePointGuestsItemSharing.ps1,7.2.5,Ensure OneDrive content sharing is restricted,E3,L2,3.3,Configure Data Access Control Lists,TRUE,TRUE,TRUE,TRUE,SPO
+33,Test-SharePointGuestsItemSharing.ps1,7.2.5,Ensure that SharePoint guest users cannot share items they don't own,E3,L2,3.3,Configure Data Access Control Lists,TRUE,TRUE,TRUE,TRUE,SPO
-34,Test-SharePointExternalSharingDomains.ps1,7.2.6,Ensure that SharePoint guest users cannot share items they don't own,E3,L2,3.3,Configure Data Access Control Lists,TRUE,TRUE,TRUE,TRUE,SPO
+34,Test-SharePointExternalSharingDomains.ps1,7.2.6,Ensure SharePoint external sharing is managed through domain whitelist/blacklists,E3,L2,3.3,Configure Data Access Control Lists,TRUE,TRUE,TRUE,TRUE,SPO
-35,Test-LinkSharingRestrictions.ps1,7.2.7,Ensure SharePoint external sharing is managed through domain whitelist/blacklists,E3,L1,3.3,Configure Data Access Control Lists,TRUE,TRUE,TRUE,TRUE,SPO
+35,Test-LinkSharingRestrictions.ps1,7.2.7,Ensure link sharing is restricted in SharePoint and OneDrive,E3,L1,3.3,Configure Data Access Control Lists,TRUE,TRUE,TRUE,TRUE,SPO
-36,Test-GuestAccessExpiration.ps1,7.2.9,Ensure link sharing is restricted in SharePoint and OneDrive,E3,L1,3.3,Configure Data Access Control Lists,FALSE,FALSE,FALSE,TRUE,SPO
+36,Test-GuestAccessExpiration.ps1,7.2.9,Ensure guest access to a site or OneDrive will expire automatically,E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,SPO
-37,Test-ReauthWithCode.ps1,7.2.10,Ensure guest access to a site or OneDrive will expire automatically,E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,SPO
+37,Test-ReauthWithCode.ps1,7.2.10,Ensure reauthentication with verification code is restricted,E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,SPO
 38,Test-DisallowInfectedFilesDownload.ps1,7.3.1,Ensure Office 365 SharePoint infected files are disallowed for download,E5,L2,10.1,Deploy and Maintain Anti-Malware Software,TRUE,TRUE,TRUE,TRUE,SPO
 39,Test-OneDriveSyncRestrictions.ps1,7.3.2,Ensure OneDrive sync is restricted for unmanaged devices,E3,L2,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,SPO
 40,Test-RestrictCustomScripts.ps1,7.3.4,Ensure custom script execution is restricted on site collections,E3,L1,2.7,Allowlist Authorized Scripts,FALSE,FALSE,TRUE,TRUE,SPO

source/tests/Test-AdministrativeAccountCompliance.ps1

@@ -1,79 +1,115 @@
 function Test-AdministrativeAccountCompliance {
     [CmdletBinding()]
-    param (
+    param ()
-        # Aligned
-        # Parameters can be added if needed
-    )
 
     begin {
-        #. .\source\Classes\CISAuditResult.ps1
+        # The following conditions are checked:
+        # Condition A: The administrative account is cloud-only (not synced).
+        # Condition B: The account is assigned a valid license (e.g., Microsoft Entra ID P1 or P2).
+        # Condition C: The administrative account does not have any other application assignments (only valid licenses).
         $validLicenses = @('AAD_PREMIUM', 'AAD_PREMIUM_P2')
+        $recnum = "1.1.1"
+        Write-Verbose "Starting Test-AdministrativeAccountCompliance with Rec: $recnum"
     }
 
     process {
-        $adminRoles = Get-MgRoleManagementDirectoryRoleDefinition | Where-Object { $_.DisplayName -like "*Admin*" }
-        $adminRoleUsers = @()
 
-        foreach ($role in $adminRoles) {
+        try {
-            $roleAssignments = Get-MgRoleManagementDirectoryRoleAssignment -Filter "roleDefinitionId eq '$($role.Id)'"
+            # Retrieve admin roles, assignments, and user details including licenses
+            Write-Verbose "Retrieving admin roles, assignments, and user details including licenses"
+            $adminRoleAssignments = Get-CISMgOutput -Rec $recnum
 
-            foreach ($assignment in $roleAssignments) {
+            $adminRoleUsers = @()
-                $userDetails = Get-MgUser -UserId $assignment.PrincipalId -Property "DisplayName, UserPrincipalName, Id, OnPremisesSyncEnabled" -ErrorAction SilentlyContinue
+
-                if ($userDetails) {
+            foreach ($roleName in $adminRoleAssignments.Keys) {
-                    $licenses = Get-MgUserLicenseDetail -UserId $assignment.PrincipalId -ErrorAction SilentlyContinue
+                $assignments = $adminRoleAssignments[$roleName]
+                foreach ($assignment in $assignments) {
+                    $userDetails = $assignment.UserDetails
+                    $userId = $userDetails.Id
+                    $userPrincipalName = $userDetails.UserPrincipalName
+                    $licenses = $assignment.Licenses
                     $licenseString = if ($licenses) { ($licenses.SkuPartNumber -join '|') } else { "No Licenses Found" }
 
+                    # Condition A: Check if the account is cloud-only
+                    $cloudOnlyStatus = if ($userDetails.OnPremisesSyncEnabled) { "Fail" } else { "Pass" }
+
+                    # Condition B: Check if the account has valid licenses
+                    $hasValidLicense = $licenses.SkuPartNumber | ForEach-Object { $validLicenses -contains $_ }
+                    $validLicensesStatus = if ($hasValidLicense) { "Pass" } else { "Fail" }
+
+                    # Condition C: Check if the account has no other licenses
+                    $hasInvalidLicense = $licenses.SkuPartNumber | ForEach-Object { $validLicenses -notcontains $_ }
+                    $invalidLicenses = $licenses.SkuPartNumber | Where-Object { $validLicenses -notcontains $_ }
+                    $applicationAssignmentStatus = if ($hasInvalidLicense) { "Fail" } else { "Pass" }
+
+                    Write-Verbose "User: $userPrincipalName, Cloud-Only: $cloudOnlyStatus, Valid Licenses: $validLicensesStatus, Invalid Licenses: $($invalidLicenses -join ', ')"
+
+                    # Collect user information
                     $adminRoleUsers += [PSCustomObject]@{
-                        UserName   = $userDetails.UserPrincipalName
+                        UserName                    = $userPrincipalName
-                        RoleName   = $role.DisplayName
+                        RoleName                    = $roleName
-                        UserId     = $userDetails.Id
+                        UserId                      = $userId
-                        HybridUser = $userDetails.OnPremisesSyncEnabled
+                        HybridUser                  = $userDetails.OnPremisesSyncEnabled
-                        Licenses   = $licenseString
+                        Licenses                    = $licenseString
+                        CloudOnlyStatus             = $cloudOnlyStatus
+                        ValidLicensesStatus         = $validLicensesStatus
+                        ApplicationAssignmentStatus = $applicationAssignmentStatus
                     }
                 }
             }
-        }
 
-        $uniqueAdminRoleUsers = $adminRoleUsers | Group-Object -Property UserName | ForEach-Object {
+            # Group admin role users by UserName and collect unique roles and licenses
-            $first = $_.Group | Select-Object -First 1
+            Write-Verbose "Grouping admin role users by UserName"
-            $roles = ($_.Group.RoleName -join ', ')
+            $uniqueAdminRoleUsers = $adminRoleUsers | Group-Object -Property UserName | ForEach-Object {
-            $licenses = (($_.Group | Select-Object -ExpandProperty Licenses) -join ',').Split(',') | Select-Object -Unique
+                $first = $_.Group | Select-Object -First 1
+                $roles = ($_.Group.RoleName -join ', ')
+                $licenses = (($_.Group | Select-Object -ExpandProperty Licenses) -join ',').Split(',') | Select-Object -Unique
 
-            $first | Select-Object UserName, UserId, HybridUser, @{Name = 'Roles'; Expression = { $roles } }, @{Name = 'Licenses'; Expression = { $licenses -join '|' } }
+                $first | Select-Object UserName, UserId, HybridUser, @{Name = 'Roles'; Expression = { $roles } }, @{Name = 'Licenses'; Expression = { $licenses -join '|' } }, CloudOnlyStatus, ValidLicensesStatus, ApplicationAssignmentStatus
-        }
+            }
 
-        $nonCompliantUsers = $uniqueAdminRoleUsers | Where-Object {
+            # Identify non-compliant users based on conditions A, B, and C
-            $_.HybridUser -or
+            Write-Verbose "Identifying non-compliant users based on conditions"
-            -not ($_.Licenses -split '\|' | Where-Object { $validLicenses -contains $_ })
+            $nonCompliantUsers = $uniqueAdminRoleUsers | Where-Object {
-        }
+                $_.HybridUser -or # Fails Condition A
+                $_.ValidLicensesStatus -eq "Fail" -or # Fails Condition B
+                $_.ApplicationAssignmentStatus -eq "Fail" # Fails Condition C
+            }
 
-        $failureReasons = $nonCompliantUsers | ForEach-Object {
+            # Generate failure reasons
-            $accountType = if ($_.HybridUser) { "Hybrid" } else { "Cloud-Only" }
+            Write-Verbose "Generating failure reasons for non-compliant users"
-            $missingLicenses = $validLicenses | Where-Object { $_ -notin ($_.Licenses -split '\|') }
+            $failureReasons = $nonCompliantUsers | ForEach-Object {
-            "$($_.UserName)|$($_.Roles)|$accountType|Missing: $($missingLicenses -join ',')"
+                "$($_.UserName)|$($_.Roles)|$($_.CloudOnlyStatus)|$($_.ValidLicensesStatus)|$($_.ApplicationAssignmentStatus)"
-        }
+            }
-        $failureReasons = $failureReasons -join "`n"
+            $failureReasons = $failureReasons -join "`n"
-        $details = if ($nonCompliantUsers) {
+            $failureReason = if ($nonCompliantUsers) {
-            "Non-Compliant Accounts: $($nonCompliantUsers.Count)`nDetails:`n" + ($nonCompliantUsers | ForEach-Object { $_.UserName }) -join "`n"
+                "Non-Compliant Accounts: $($nonCompliantUsers.Count)"
-        }
+            }
-        else {
+            else {
-            "Compliant Accounts: $($uniqueAdminRoleUsers.Count)"
+                "Compliant Accounts: $($uniqueAdminRoleUsers.Count)"
-        }
+            }
 
-        $result = $nonCompliantUsers.Count -eq 0
+            $result = $nonCompliantUsers.Count -eq 0
-        $status = if ($result) { 'Pass' } else { 'Fail' }
+            $status = if ($result) { 'Pass' } else { 'Fail' }
-        $failureReason = if ($nonCompliantUsers) { "Non-compliant accounts: `nUsername | Roles | HybridStatus | Missing Licence`n$failureReasons" } else { "N/A" }
+            $details = if ($nonCompliantUsers) { "Username | Roles | Cloud-Only Status | EntraID P1/P2 License Status | Other Applications Assigned Status`n$failureReasons" } else { "N/A" }
 
-        # Create the parameter splat
+            Write-Verbose "Assessment completed. Result: $status"
-        $params = @{
+
-            Rec            = "1.1.1"
+            # Create the parameter splat
-            Result         = $result
+            $params = @{
-            Status         = $status
+                Rec           = $recnum
-            Details        = $details
+                Result        = $result
-            FailureReason  = $failureReason
+                Status        = $status
+                Details       = $details
+                FailureReason = $failureReason
+            }
+
+            $auditResult = Initialize-CISAuditResult @params
+        }
+        catch {
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-AntiPhishingPolicy.ps1

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

source/tests/Test-AuditDisabledFalse.ps1

@@ -1,49 +1,65 @@
 function Test-AuditDisabledFalse {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     # Aligned
     param (
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
+        # Conditions for 6.1.1 (L1) Ensure 'AuditDisabled' organizationally is set to 'False'
+        #
+        # Validate test for a pass:
+        # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        # - Specific conditions to check:
+        #   - Condition A: The `AuditDisabled` organizational setting is set to `False` in the Microsoft 365 admin center.
+        #   - Condition B: Using PowerShell, the `AuditDisabled` property in the organization's configuration is set to `False`.
+        #   - Condition C: Ensure mailbox auditing is enabled by default at the organizational level.
+        #
+        # 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 `AuditDisabled` organizational setting is set to `True` in the Microsoft 365 admin center.
+        #   - Condition B: Using PowerShell, the `AuditDisabled` property in the organization's configuration is set to `True`.
+        #   - Condition C: Mailbox auditing is not enabled by default at the organizational level.
         # Initialization code, if needed
+        $recnum = "6.1.1"
+        Write-Verbose "Running Test-AuditDisabledFalse for $recnum..."
     }
-
     process {
-        # 6.1.1 (L1) Ensure 'AuditDisabled' organizationally is set to 'False'
+        try {
-
+            # 6.1.1 (L1) Ensure 'AuditDisabled' organizationally is set to 'False'
-        # Retrieve the AuditDisabled configuration
+            # Retrieve the AuditDisabled configuration (Condition B)
-        $auditDisabledConfig = Get-OrganizationConfig | Select-Object AuditDisabled
+            $auditNotDisabled = Get-CISExoOutput -Rec $recnum
-        $auditNotDisabled = -not $auditDisabledConfig.AuditDisabled
+            # Prepare failure reasons and details based on compliance
-
+            $failureReasons = if (-not $auditNotDisabled) {
-        # Prepare failure reasons and details based on compliance
+                "AuditDisabled is set to True"  # Condition A Fail
-        $failureReasons = if (-not $auditNotDisabled) {
+            }
-            "AuditDisabled is set to True"
+            else {
+                "N/A"
+            }
+            $details = if ($auditNotDisabled) {
+                "Audit is not disabled organizationally"  # Condition C Pass
+            }
+            else {
+                "Audit is disabled organizationally"  # Condition C Fail
+            }
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $auditNotDisabled
+                Status        = if ($auditNotDisabled) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($auditNotDisabled) {
-            "Audit is not disabled organizationally"
-        }
-        else {
-            "Audit is disabled organizationally"
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "6.1.1"
-            Result         = $auditNotDisabled
-            Status         = if ($auditNotDisabled) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-AuditLogSearch.ps1

@@ -1,50 +1,66 @@
 function Test-AuditLogSearch {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "3.1.1"
+        Write-Verbose "Running Test-AuditLogSearch for $recnum..."
+        <#
+        Conditions for 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled
+        Validate test for a pass:
+        - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        - Specific conditions to check:
+            - Condition A: Audit log search is enabled in the Microsoft Purview compliance portal.
+            - Condition B: The audit log retains user and admin activity for 90 days.
+            - Condition C: Audit log search capabilities are functional (search results are displayed for activities within the past 30 days).
+        Validate test for a fail:
+        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+        - Specific conditions to check:
+            - Condition A: Audit log search is not enabled in the Microsoft Purview compliance portal.
+            - Condition B: The audit log does not retain user and admin activity for 90 days.
+            - Condition C: Audit log search capabilities are non-functional (no search results are displayed for activities within the past 30 days).
+        #>
     }
-
     process {
-        # 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled
+        try {
-
+            # 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled
-        # Retrieve the audit log configuration
+            $auditLogResult = Get-CISExoOutput -Rec $recnum
-        $auditLogConfig = Get-AdminAuditLogConfig | Select-Object UnifiedAuditLogIngestionEnabled
+            # Prepare failure reasons and details based on compliance
-        $auditLogResult = $auditLogConfig.UnifiedAuditLogIngestionEnabled
+            $failureReasons = if (-not $auditLogResult) {
-
+                # Condition A (Fail): Audit log search is not enabled in the Microsoft Purview compliance portal
-        # Prepare failure reasons and details based on compliance
+                "Audit log search is not enabled"
-        $failureReasons = if (-not $auditLogResult) {
+            }
-            "Audit log search is not enabled"
+            else {
+                "N/A"
+            }
+            $details = if ($auditLogResult) {
+                # Condition A (Pass): Audit log search is enabled in the Microsoft Purview compliance portal
+                "UnifiedAuditLogIngestionEnabled: True"
+            }
+            else {
+                "UnifiedAuditLogIngestionEnabled: False"
+            }
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $auditLogResult
+                Status        = if ($auditLogResult) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($auditLogResult) {
-            "UnifiedAuditLogIngestionEnabled: True"
-        }
-        else {
-            "UnifiedAuditLogIngestionEnabled: False"
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "3.1.1"
-            Result         = $auditLogResult
-            Status         = if ($auditLogResult) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
-
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-BlockChannelEmails.ps1

@@ -1,49 +1,65 @@
 function Test-BlockChannelEmails {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be added here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "8.1.2"
+        Write-Verbose "Running Test-BlockChannelEmails for $recnum..."
     }
-
     process {
-        # 8.1.2 (L1) Ensure users can't send emails to a channel email address
+        try {
-
+            # 8.1.2 (L1) Ensure users can't send emails to a channel email address
-        # Retrieve Teams client configuration
+            #
-        $teamsClientConfig = Get-CsTeamsClientConfiguration -Identity Global
+            # Validate test for a pass:
-        $allowEmailIntoChannel = $teamsClientConfig.AllowEmailIntoChannel
+            # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-
+            # - Specific conditions to check:
-        # Prepare failure reasons and details based on compliance
+            #   - Condition A: The `AllowEmailIntoChannel` setting in Teams is set to `False`.
-        $failureReasons = if ($allowEmailIntoChannel) {
+            #   - Condition B: The setting `Users can send emails to a channel email address` is set to `Off` in the Teams admin center.
-            "Emails can be sent to a channel email address"
+            #   - 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-CISMSTeamsOutput -Rec $recnum
+            $allowEmailIntoChannel = $teamsClientConfig.AllowEmailIntoChannel
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = if ($allowEmailIntoChannel) {
+                "Emails can be sent to a channel email address" # Condition A Fail: AllowEmailIntoChannel is True
+            }
+            else {
+                "N/A" # Condition A Pass: AllowEmailIntoChannel is False
+            }
+            $details = if ($allowEmailIntoChannel) {
+                "AllowEmailIntoChannel is set to True" # Condition B Fail: Emails are allowed
+            }
+            else {
+                "AllowEmailIntoChannel is set to False" # Condition B Pass: Emails are blocked
+            }
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec            = $recnum
+                Result         = -not $allowEmailIntoChannel
+                Status         = if (-not $allowEmailIntoChannel) { "Pass" } else { "Fail" }
+                Details        = $details
+                FailureReason  = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($allowEmailIntoChannel) {
-            "AllowEmailIntoChannel is set to True"
-        }
-        else {
-            "AllowEmailIntoChannel is set to False"
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "8.1.2"
-            Result         = -not $allowEmailIntoChannel
-            Status         = if (-not $allowEmailIntoChannel) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-BlockMailForwarding.ps1

@@ -1,50 +1,85 @@
 function Test-BlockMailForwarding {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
-        # Aligned Compare
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "6.2.1"
+        Write-Verbose "Running Test-BlockMailForwarding for $recnum..."
+        <#
+        Conditions for 6.2.1 (L1) Ensure all forms of mail forwarding are blocked and/or disabled
+        Validate test for a pass:
+        - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        - Specific conditions to check:
+          - Condition A: Transport rules do not forward email to external domains.
+          - Condition B: Anti-spam outbound policy is configured to disable automatic email forwarding to external domains.
+          - Condition C: No exceptions to the forwarding rules unless explicitly defined by organizational policy.
+        Validate test for a fail:
+        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+        - Specific conditions to check:
+          - Condition A: One or more transport rules forward email to external domains.
+          - Condition B: Anti-spam outbound policy does not disable automatic email forwarding to external domains.
+          - Condition C: Unapproved exceptions to the forwarding rules are present.
+        #>
     }
-
     process {
-        # 6.2.1 (L1) Ensure all forms of mail forwarding are blocked and/or disabled
+        try {
-
+            # 6.2.1 (L1) Ensure all forms of mail forwarding are blocked and/or disabled
-        # Retrieve the transport rules that redirect messages
+            # Step 1: Retrieve the transport rules that redirect messages
-        $transportRules = Get-TransportRule | Where-Object { $null -ne $_.RedirectMessageTo }
+            $transportRules,$nonCompliantSpamPolicies = Get-CISExoOutput -Rec $recnum
-        $forwardingBlocked = $transportRules.Count -eq 0
+            $transportForwardingBlocked = $transportRules.Count -eq 0
-
+            # Step 2: Check all anti-spam outbound policies
-        # Prepare failure reasons and details based on compliance
+            $nonCompliantSpamPoliciesArray = @($nonCompliantSpamPolicies)
-        $failureReasons = if ($transportRules.Count -gt 0) {
+            $spamForwardingBlocked = $nonCompliantSpamPoliciesArray.Count -eq 0
-            "Mail forwarding rules found: $($transportRules.Name -join ', ')"
+            # Determine overall compliance
+            $forwardingBlocked = $transportForwardingBlocked -and $spamForwardingBlocked
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = @()
+            $details = @()
+            if ($transportRules -ne 1) {
+                # Fail Condition A
+                $failureReasons += "Mail forwarding rules found: $($transportRules.Name -join ', ')"
+                $details += "Transport Rules Details:`nRule Name|Redirects To"
+                $details += $transportRules | ForEach-Object {
+                    "$($_.Name)|$($_.RedirectMessageTo -join ', ')"
+                }
+                $details += "`n"
+            }
+            if ($nonCompliantSpamPoliciesArray.Count -gt 0) {
+                # Fail Condition B
+                $failureReasons += "Outbound spam policies allowing automatic forwarding found."
+                $details += "Policy|AutoForwardingMode"
+                $details += $nonCompliantSpamPoliciesArray | ForEach-Object {
+                    "$($_.Name)|$($_.AutoForwardingMode)"
+                }
+            }
+            if ($failureReasons.Count -eq 0) {
+                $failureReasons = "N/A"
+                $details = "Both transport rules and outbound spam policies are configured correctly to block forwarding."
+            }
+            else {
+                $failureReasons = $failureReasons -join " | "
+                $details = $details -join "`n"
+            }
+            # Populate the audit result
+            $params = @{
+                Rec           = $recnum
+                Result        = $forwardingBlocked
+                Status        = if ($forwardingBlocked) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($transportRules.Count -gt 0) {
-            $transportRules | ForEach-Object {
-                "$($_.Name) redirects to $($_.RedirectMessageTo)"
-            } -join " | "
-        }
-        else {
-            "Step 1: No forwarding rules found. Please proceed with Step 2 described in CIS Benchmark."
-        }
-
-        $params = @{
-            Rec            = "6.2.1"
-            Result         = $forwardingBlocked
-            Status         = if ($forwardingBlocked) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-BlockSharedMailboxSignIn.ps1

@@ -1,7 +1,7 @@
 function Test-BlockSharedMailboxSignIn {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
-        # Aligned
         # Parameters can be added if needed
     )
 
@@ -9,43 +9,90 @@ function Test-BlockSharedMailboxSignIn {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "1.2.2"
+        Write-Verbose "Running Test-BlockSharedMailboxSignIn for $recnum..."
+        # Conditions for 1.2.2 (L1) Ensure sign-in to shared mailboxes is blocked
+        #
+        # Validate test for a pass:
+        # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        # - Specific conditions to check:
+        #   - Condition A: No shared mailboxes have the "Sign-in blocked" option disabled in the properties pane on the Microsoft 365 admin center.
+        #   - Condition B: Using PowerShell, the `AccountEnabled` property for all shared mailboxes is set to `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:
+        #   - Condition A: One or more shared mailboxes have the "Sign-in blocked" option enabled in the properties pane on the Microsoft 365 admin center.
+        #   - Condition B: Using PowerShell, the `AccountEnabled` property for one or more shared mailboxes is set to `True`.
     }
-
     process {
-        # 1.2.2 (L1) Ensure sign-in to shared mailboxes is blocked
+        try {
-
+            # Step: Retrieve shared mailbox details
-        # Retrieve shared mailbox details
+            # $objectids Mock Object
-        $MBX = Get-EXOMailbox -RecipientTypeDetails SharedMailbox
+            <#
-        $sharedMailboxDetails = $MBX | ForEach-Object { Get-AzureADUser -ObjectId $_.ExternalDirectoryObjectId }
+                $objectids = @(
-        $enabledMailboxes = $sharedMailboxDetails | Where-Object { $_.AccountEnabled } | ForEach-Object { $_.DisplayName }
+                    "123e4567-e89b-12d3-a456-426614174000",
-        $allBlocked = $enabledMailboxes.Count -eq 0
+                    "987e6543-21ba-12d3-a456-426614174000",
-
+                    "abcddcba-98fe-76dc-a456-426614174000"
-        # Prepare failure reasons and details based on compliance
+                )
-        $failureReasons = if (-not $allBlocked) {
+            #>
-            "Some mailboxes have sign-in enabled: $($enabledMailboxes -join ', ')"
+            $objectids = Get-CISExoOutput -Rec $recnum
+            # Step: Retrieve user details from Azure AD
+            # $users Mock Object
+            <#
+                $accountDetails = @(
+                    [PSCustomObject]@{
+                        ObjectId = "123e4567-e89b-12d3-a456-426614174000"
+                        DisplayName = "SMBuser1"
+                        AccountEnabled = $true
+                    },
+                    [PSCustomObject]@{
+                        ObjectId = "987e6543-21ba-12d3-a456-426614174000"
+                        DisplayName = "SMBuser2"
+                        AccountEnabled = $true
+                    },
+                    [PSCustomObject]@{
+                        ObjectId = "abcddcba-98fe-76dc-a456-426614174000"
+                        DisplayName = "SMBuser3"
+                        AccountEnabled = $true
+                    }
+                )
+            #>
+            $users = Get-CISAadOutput -Rec $recnum
+            # Step: Retrieve details of shared mailboxes from Azure AD (Condition B: Pass/Fail)
+            $sharedMailboxDetails = $users | Where-Object {$_.objectid -in $objectids}
+            # Step: Identify enabled mailboxes (Condition B: Pass/Fail)
+            $enabledMailboxes = $sharedMailboxDetails | Where-Object { $_.AccountEnabled } | ForEach-Object { $_.DisplayName }
+            $allBlocked = $enabledMailboxes.Count -eq 0
+            # Step: Determine failure reasons based on enabled mailboxes (Condition A & B: Fail)
+            $failureReasons = if (-not $allBlocked) {
+                "Some mailboxes have sign-in enabled (AccountEnabled:True):`n$($enabledMailboxes -join ', ')"
+            }
+            else {
+                "N/A"
+            }
+            # Step: Prepare details for the audit result (Condition A & B: Pass/Fail)
+            $details = if ($allBlocked) {
+                "All shared mailboxes have sign-in blocked."
+            }
+            else {
+                "AccountEnabled set to True Mailboxes: $($enabledMailboxes -join ', ')"
+            }
+            # Step: Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $allBlocked  # Pass: Condition A, Condition B
+                Status        = if ($allBlocked) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($allBlocked) {
-            "All shared mailboxes have sign-in blocked."
-        }
-        else {
-            "Enabled Mailboxes: $($enabledMailboxes -join ', ')"
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "1.2.2"
-            Result         = $allBlocked
-            Status         = if ($allBlocked) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-CommonAttachmentFilter.ps1

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

source/tests/Test-CustomerLockbox.ps1

@@ -1,5 +1,6 @@
 function Test-CustomerLockbox {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Define your parameters here if needed
@@ -8,42 +9,61 @@ function Test-CustomerLockbox {
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
+
         # Initialization code, if needed
+        $recnum = "1.3.6"
+        Write-Verbose "Running Test-CustomerLockbox for $recnum..."
+        # Conditions for 1.3.6 (L2) Ensure the customer lockbox feature is enabled (Automated)
+        #
+        # Validate test for a pass:
+        # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        # - Specific conditions to check:
+        #   - Condition A: In the Microsoft 365 admin center, the box labeled "Customer Lockbox Requests" is checked.
+        #   - Condition B: Using the SecureScore portal, the Customer Lockbox feature is enabled.
+        #   - Condition C: Using PowerShell, the Customer Lockbox feature is set to `True`.
+        #
+        # Validate test for a fail:
+        # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+        # - Specific conditions to check:
+        #   - Condition A: In the Microsoft 365 admin center, the box labeled "Customer Lockbox Requests" is not checked.
+        #   - Condition B: Using the SecureScore portal, the Customer Lockbox feature is not enabled.
+        #   - Condition C: Using PowerShell, the Customer Lockbox feature is not set to `True`.
     }
-
     process {
-        # 1.3.6 (L2) Ensure the customer lockbox feature is enabled
+        try {
-
+            # Step: Retrieve the organization configuration (Condition C: Pass/Fail)
-        # Retrieve the organization configuration
+            # $customerLockboxEnabled Mock Object
-        $orgConfig = Get-OrganizationConfig | Select-Object CustomerLockBoxEnabled
+            # $customerLockboxEnabled = $true
-        $customerLockboxEnabled = $orgConfig.CustomerLockBoxEnabled
+            $customerLockboxEnabled = Get-CISExoOutput -Rec $recnum
-
+            # Step: Prepare failure reasons and details based on compliance (Condition A, B, & C: Fail)
-        # Prepare failure reasons and details based on compliance
+            $failureReasons = if (-not $customerLockboxEnabled) {
-        $failureReasons = if (-not $customerLockboxEnabled) {
+                "Customer lockbox feature is not enabled."
-            "Customer lockbox feature is not enabled."
+            }
+            else {
+                "N/A"
+            }
+            # Step: Prepare details for the audit result (Condition A, B, & C: Pass/Fail)
+            $details = if ($customerLockboxEnabled) {
+                "Customer Lockbox Enabled: True"
+            }
+            else {
+                "Customer Lockbox Enabled: False"
+            }
+            # Step: Create and populate the CISAuditResult object
+            $params = @{
+                Rec            = $recnum
+                Result         = $customerLockboxEnabled
+                Status         = if ($customerLockboxEnabled) { "Pass" } else { "Fail" }
+                Details        = $details
+                FailureReason  = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($customerLockboxEnabled) {
-            "Customer Lockbox Enabled: True"
-        }
-        else {
-            "Customer Lockbox Enabled: False"
-        }
-
-        # Create and populate the CISAuditResult object #
-        $params = @{
-            Rec            = "1.3.6"
-            Result         = $customerLockboxEnabled
-            Status         = if ($customerLockboxEnabled) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-DialInBypassLobby.ps1

@@ -1,49 +1,71 @@
 function Test-DialInBypassLobby {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be defined here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "8.5.4"
+        Write-Verbose "Running Test-DialInBypassLobby for $recnum..."
     }
-
     process {
-        # 8.5.4 (L1) Ensure users dialing in can't bypass the lobby
+        try {
-
+            # 8.5.4 (L1) Ensure users dialing in can't bypass the lobby
-        # Retrieve Teams meeting policy for PSTN users
+            #
-        $CsTeamsMeetingPolicyPSTN = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowPSTNUsersToBypassLobby
+            # Validate test for a pass:
-        $PSTNBypassDisabled = -not $CsTeamsMeetingPolicyPSTN.AllowPSTNUsersToBypassLobby
+            # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-
+            # - Specific conditions to check:
-        # Prepare failure reasons and details based on compliance
+            #   - Condition A: The `AllowPSTNUsersToBypassLobby` setting in the Global Teams meeting policy is set to `False`.
-        $failureReasons = if (-not $PSTNBypassDisabled) {
+            #   - 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`.
-            "Users dialing in can bypass the lobby"
+            #   - 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-CISMSTeamsOutput -Rec $recnum
+            $PSTNBypassDisabled = -not $CsTeamsMeetingPolicyPSTN.AllowPSTNUsersToBypassLobby
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = if (-not $PSTNBypassDisabled) {
+                "Users dialing in can bypass the lobby"
+            }
+            else {
+                "N/A"
+            }
+            $details = if ($PSTNBypassDisabled) {
+                "AllowPSTNUsersToBypassLobby is set to False"
+            }
+            else {
+                "AllowPSTNUsersToBypassLobby is set to True"
+            }
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $PSTNBypassDisabled
+                Status        = if ($PSTNBypassDisabled) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($PSTNBypassDisabled) {
-            "AllowPSTNUsersToBypassLobby is set to False"
-        }
-        else {
-            "AllowPSTNUsersToBypassLobby is set to True"
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "8.5.4"
-            Result         = $PSTNBypassDisabled
-            Status         = if ($PSTNBypassDisabled) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-DisallowInfectedFilesDownload.ps1

@@ -1,5 +1,6 @@
 function Test-DisallowInfectedFilesDownload {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Define your parameters here if needed
@@ -10,40 +11,63 @@ function Test-DisallowInfectedFilesDownload {
         #. .\source\Classes\CISAuditResult.ps1
 
         # Initialization code, if needed
+        $recnum = "7.3.1"
     }
 
     process {
-        # 7.3.1 (L2) Ensure Office 365 SharePoint infected files are disallowed for download
 
-        # Retrieve the SharePoint tenant configuration
+        try {
-        $SPOTenantDisallowInfectedFileDownload = Get-SPOTenant | Select-Object DisallowInfectedFileDownload
+            # 7.3.1 (L2) Ensure Office 365 SharePoint infected files are disallowed for download
-        $isDisallowInfectedFileDownloadEnabled = $SPOTenantDisallowInfectedFileDownload.DisallowInfectedFileDownload
+            #
+            # 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 `DisallowInfectedFileDownload` setting is set to `True`.
+            #   - Condition B: The setting prevents users from downloading infected files as detected by Defender for Office 365.
+            #   - Condition C: Verification using the PowerShell command confirms that the setting is correctly configured.
+            #
+            # 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 `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.
 
-        # Prepare failure reasons and details based on compliance
+            # Retrieve the SharePoint tenant configuration
-        $failureReasons = if (-not $isDisallowInfectedFileDownloadEnabled) {
+            $SPOTenantDisallowInfectedFileDownload = Get-CISSpoOutput -Rec $recnum
-            "Downloading infected files is not disallowed."
-        }
-        else {
-            "N/A"
-        }
 
-        $details = if ($isDisallowInfectedFileDownloadEnabled) {
+            # Condition A: The `DisallowInfectedFileDownload` setting is set to `True`
-            "DisallowInfectedFileDownload: True"
+            $isDisallowInfectedFileDownloadEnabled = $SPOTenantDisallowInfectedFileDownload.DisallowInfectedFileDownload
-        }
-        else {
-            "DisallowInfectedFileDownload: False"
-        }
 
-        # Create and populate the CISAuditResult object
+            # Prepare failure reasons and details based on compliance
-        $params = @{
+            $failureReasons = if (-not $isDisallowInfectedFileDownloadEnabled) {
-            Rec            = "7.3.1"
+                "Downloading infected files is not disallowed."  # Condition B: The setting does not prevent users from downloading infected files
-            Result         = $isDisallowInfectedFileDownloadEnabled
+            }
-            Status         = if ($isDisallowInfectedFileDownloadEnabled) { "Pass" } else { "Fail" }
+            else {
-            Details        = $details
+                "N/A"
-            FailureReason  = $failureReasons
+            }
-        }
-        $auditResult = Initialize-CISAuditResult @params
 
+            $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
+                Result        = $isDisallowInfectedFileDownloadEnabled
+                Status        = if ($isDisallowInfectedFileDownloadEnabled) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
+        }
+        catch {
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
+        }
     }
 
     end {

source/tests/Test-EnableDKIM.ps1

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

source/tests/Test-ExternalNoControl.ps1

@@ -1,50 +1,72 @@
 function Test-ExternalNoControl {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be defined here if needed
     )
-
     begin {
         # Dot source the class script if necessary
-        #. .\source\Classes\CISAuditResult.ps1
+        # . .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
+        $recnum = "8.5.7"
+        Write-Verbose "Running Test-ExternalNoControl for $recnum..."
     }
-
     process {
-        # 8.5.7 (L1) Ensure external participants can't give or request control
+        try {
-
+            # 8.5.7 (L1) Ensure external participants can't give or request control
-        # Retrieve Teams meeting policy for external participant control
+            #
-        $CsTeamsMeetingPolicyControl = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowExternalParticipantGiveRequestControl
+            # Validate test for a pass:
-        $externalControlRestricted = -not $CsTeamsMeetingPolicyControl.AllowExternalParticipantGiveRequestControl
+            # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-
+            # - Specific conditions to check:
-        # Prepare failure reasons and details based on compliance
+            #   - Condition A: Ensure the `AllowExternalParticipantGiveRequestControl` setting in Teams is set to `False`.
-        $failureReasons = if (-not $externalControlRestricted) {
+            #   - Condition B: The setting is verified through the Microsoft Teams admin center or via PowerShell command.
-            "External participants can give or request control"
+            #   - 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-CISMSTeamsOutput -Rec $recnum
+            # Check if external participants can give or request control
+            $externalControlRestricted = -not $CsTeamsMeetingPolicyControl.AllowExternalParticipantGiveRequestControl
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = if (-not $externalControlRestricted) {
+                "External participants can give or request control"
+            }
+            else {
+                "N/A"
+            }
+            $details = if ($externalControlRestricted) {
+                "AllowExternalParticipantGiveRequestControl is set to False"
+            }
+            else {
+                "AllowExternalParticipantGiveRequestControl is set to True"
+            }
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec            = $recnum
+                Result         = $externalControlRestricted
+                Status         = if ($externalControlRestricted) { "Pass" } else { "Fail" }
+                Details        = $details
+                FailureReason  = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($externalControlRestricted) {
-            "AllowExternalParticipantGiveRequestControl is set to False"
-        }
-        else {
-            "AllowExternalParticipantGiveRequestControl is set to True"
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "8.5.7"
-            Result         = $externalControlRestricted
-            Status         = if ($externalControlRestricted) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-ExternalSharingCalendars.ps1

@@ -1,59 +1,104 @@
 function Test-ExternalSharingCalendars {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
+        $recnum = "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:
+        # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        # - Specific conditions to check:
+        #   - Condition A: In the Microsoft 365 admin center, external calendar sharing is disabled.
+        #   - Condition B: Using the Exchange Online PowerShell Module, the `OrganizationConfig` property `ExternalSharingEnabled` is set to `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:
+        #   - 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 {
-        # 1.3.3 (L2) Ensure 'External sharing' of calendars is not available (Automated)
+        try {
-
+            # Step: Retrieve sharing policies related to calendar sharing
-        # Retrieve sharing policies related to calendar sharing
+            # $sharingPolicies Mock Object
-        $sharingPolicies = Get-SharingPolicy | Where-Object { $_.Domains -like '*CalendarSharing*' }
+            <#
-
+                $sharingPolicies = [PSCustomObject]@{
-        # Check if calendar sharing is disabled in all applicable policies
+                    Name = "Default Sharing Policy"
-        $isExternalSharingDisabled = $true
+                    Domains = @("Anonymous:CalendarSharingFreeBusySimple")
-        $sharingPolicyDetails = @()
+                    Enabled = $true
-        foreach ($policy in $sharingPolicies) {
+                    Default = $true
-            if ($policy.Enabled -eq $true) {
+                }
-                $isExternalSharingDisabled = $false
+            #>
-                $sharingPolicyDetails += "$($policy.Name): Enabled"
+            $sharingPolicies = Get-CISExoOutput -Rec $recnum
+            # Step (Condition A & B: Pass/Fail): Check if calendar sharing is disabled in all applicable policies
+            $isExternalSharingDisabled = $true
+            $sharingPolicyDetails = @()
+            foreach ($policy in $sharingPolicies) {
+                if ($policy.Enabled -eq $true) {
+                    $isExternalSharingDisabled = $false
+                    $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
+            $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
+            }
+            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 ', ')"
+            }
+            # Step: Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $isExternalSharingDisabled
+                Status        = if ($isExternalSharingDisabled) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-
+        catch {
-        # Prepare failure reasons and details based on compliance
+            $LastError = $_
-        $failureReasons = if (-not $isExternalSharingDisabled) {
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
-            "Calendar sharing with external users is enabled in one or more policies."
         }
-        else {
-            "N/A"
-        }
-
-        $details = if ($isExternalSharingDisabled) {
-            "Calendar sharing with external users is disabled."
-        }
-        else {
-            "Enabled Sharing Policies: $($sharingPolicyDetails -join ', ')"
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "1.3.3"
-            Result         = $isExternalSharingDisabled
-            Status         = if ($isExternalSharingDisabled) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-GlobalAdminsCount.ps1

@@ -1,48 +1,73 @@
 function Test-GlobalAdminsCount {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
-        # Aligned
         # Define your parameters here if needed
     )
 
     begin {
-        # Dot source the class script if necessary
+                # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
+        # Conditions for 1.1.3 (L1) Ensure that between two and four global admins are designated
+        #
+        # 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 number of global admins is at least 2.
+        #   - Condition B: The number of global admins is at most 4.
+        #   - Condition C: The list of global admin usernames is accurately retrieved and displayed.
+        #
+        # 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 number of global admins is less than 2.
+        #   - Condition B: The number of global admins is more than 4.
+        #   - Condition C: Any discrepancies or errors in retrieving the list of global admin usernames.
 
         # Initialization code, if needed
+        $recnum = "1.1.3"
     }
 
     process {
-        # 1.1.3 (L1) Ensure that between two and four global admins are designated
+        try {
+            $globalAdmins = Get-CISMgOutput -Rec $recnum
 
-        # Retrieve global admin role and members
+            # Step: Count the number of global admins
-        $globalAdminRole = Get-MgDirectoryRole -Filter "RoleTemplateId eq '62e90394-69f5-4237-9190-012177145e10'"
+            $globalAdminCount = $globalAdmins.Count
-        $globalAdmins = Get-MgDirectoryRoleMember -DirectoryRoleId $globalAdminRole.Id
-        $globalAdminCount = $globalAdmins.AdditionalProperties.Count
-        $globalAdminUsernames = ($globalAdmins | ForEach-Object { $_.AdditionalProperties["displayName"] }) -join ', '
 
-        # Prepare failure reasons and details based on compliance
+            # Step: Retrieve and format the usernames of global admins
-        $failureReasons = if ($globalAdminCount -lt 2) {
+            $globalAdminUsernames = ($globalAdmins | ForEach-Object {
-            "Less than 2 global admins: $globalAdminUsernames"
+                "$($_.AdditionalProperties["displayName"]) ($($_.AdditionalProperties["userPrincipalName"]))"
-        }
+            }) -join ', '
-        elseif ($globalAdminCount -gt 4) {
-            "More than 4 global admins: $globalAdminUsernames"
-        }
-        else {
-            "N/A"
-        }
 
-        $details = "Count: $globalAdminCount; Users: $globalAdminUsernames"
+            # Step: Determine failure reasons based on global admin count
+            $failureReasons = if ($globalAdminCount -lt 2) {
+                "Less than 2 global admins: $globalAdminUsernames"
+            }
+            elseif ($globalAdminCount -gt 4) {
+                "More than 4 global admins: $globalAdminUsernames"
+            }
+            else {
+                "N/A"
+            }
 
-        # Create and populate the CISAuditResult object
+            # Step: Prepare details for the audit result
-        $params = @{
+            $details = "Count: $globalAdminCount; Users: $globalAdminUsernames"
-            Rec            = "1.1.3"
+
-            Result         = $globalAdminCount -ge 2 -and $globalAdminCount -le 4
+            # Step: Create and populate the CISAuditResult object
-            Status         = if ($globalAdminCount -ge 2 -and $globalAdminCount -le 4) { "Pass" } else { "Fail" }
+            $params = @{
-            Details        = $details
+                Rec           = $recnum
-            FailureReason  = $failureReasons
+                Result        = $globalAdminCount -ge 2 -and $globalAdminCount -le 4
+                Status        = if ($globalAdminCount -ge 2 -and $globalAdminCount -le 4) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
+        }
+        catch {
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-GuestAccessExpiration.ps1

@@ -1,5 +1,6 @@
 function Test-GuestAccessExpiration {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Define your parameters here if needed
@@ -10,34 +11,56 @@ function Test-GuestAccessExpiration {
         #. .\source\Classes\CISAuditResult.ps1
 
         # Initialization code, if needed
+        $recnum = "7.2.9"
     }
 
     process {
-        # 7.2.9 (L1) Ensure guest access to a site or OneDrive will expire automatically
 
-        # Retrieve SharePoint tenant settings related to guest access expiration
+        try {
-        $SPOTenantGuestAccess = Get-SPOTenant | Select-Object ExternalUserExpirationRequired, ExternalUserExpireInDays
+            # 7.2.9 (L1) Ensure guest access to a site or OneDrive will expire automatically
-        $isGuestAccessExpirationConfiguredCorrectly = $SPOTenantGuestAccess.ExternalUserExpirationRequired -and $SPOTenantGuestAccess.ExternalUserExpireInDays -le 30
+            #
+            # 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 ExternalUserExpirationRequired setting in SharePoint is set to True.
+            #   - Condition B: The ExternalUserExpireInDays setting in SharePoint is configured to 30 or less.
+            #   - Condition C: Verification using the SharePoint Admin Center confirms that guest access will expire automatically after the specified number of days.
+            #
+            # Validate test for a fail:
+            # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+            # - Specific conditions to check:
+            #   - 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.
 
-        # Prepare failure reasons and details based on compliance
+            # Retrieve SharePoint tenant settings related to guest access expiration
-        $failureReasons = if (-not $isGuestAccessExpirationConfiguredCorrectly) {
+            $SPOTenantGuestAccess = Get-CISSpoOutput -Rec $recnum
-            "Guest access expiration is not configured to automatically expire within 30 days or less."
+            $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."
+            }
+            else {
+                "N/A"
+            }
+
+            $details = "ExternalUserExpirationRequired: $($SPOTenantGuestAccess.ExternalUserExpirationRequired); ExternalUserExpireInDays: $($SPOTenantGuestAccess.ExternalUserExpireInDays)"
+
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec            = $recnum
+                Result         = $isGuestAccessExpirationConfiguredCorrectly
+                Status         = if ($isGuestAccessExpirationConfiguredCorrectly) { "Pass" } else { "Fail" }
+                Details        = $details
+                FailureReason  = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "ExternalUserExpirationRequired: $($SPOTenantGuestAccess.ExternalUserExpirationRequired); ExternalUserExpireInDays: $($SPOTenantGuestAccess.ExternalUserExpireInDays)"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "7.2.9"
-            Result         = $isGuestAccessExpirationConfiguredCorrectly
-            Status         = if ($isGuestAccessExpirationConfiguredCorrectly) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-GuestUsersBiweeklyReview.ps1

@@ -1,5 +1,6 @@
 function Test-GuestUsersBiweeklyReview {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Define your parameters here if needed
@@ -10,41 +11,48 @@ function Test-GuestUsersBiweeklyReview {
         #. .\source\Classes\CISAuditResult.ps1
 
         # Initialization code, if needed
+        $recnum = "1.1.4"
     }
 
     process {
-        # 1.1.4 (L1) Ensure Guest Users are reviewed at least biweekly
+        try {
+            # 1.1.4 (L1) Ensure Guest Users are reviewed at least biweekly
 
 
-        # Retrieve guest users from Microsoft Graph
+            # Retrieve guest users from Microsoft Graph
-        # Connect-MgGraph -Scopes "User.Read.All"
+            # Connect-MgGraph -Scopes "User.Read.All"
-        $guestUsers = Get-MgUser -All -Filter "UserType eq 'Guest'"
+            $guestUsers = Get-MgUser -All -Filter "UserType eq 'Guest'"
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if ($guestUsers) {
+            $failureReasons = if ($guestUsers) {
-            "Guest users present: $($guestUsers.Count)"
+                "Guest users present: $($guestUsers.Count)"
-        }
+            }
-        else {
+            else {
-            "N/A"
+                "N/A"
-        }
+            }
 
-        $details = if ($guestUsers) {
+            $details = if ($guestUsers) {
-            $auditCommand = "Get-MgUser -All -Property UserType,UserPrincipalName | Where {`$_.UserType -ne 'Member'} | Format-Table UserPrincipalName, UserType"
+                $auditCommand = "Get-MgUser -All -Property UserType,UserPrincipalName | Where {`$_.UserType -ne 'Member'} | Format-Table UserPrincipalName, UserType"
-            "Manual review required. To list guest users, run: `"$auditCommand`"."
+                "Manual review required. To list guest users, run: `"$auditCommand`"."
-        }
+            }
-        else {
+            else {
-            "No guest users found."
+                "No guest users found."
-        }
+            }
 
-        # Create and populate the CISAuditResult object
+            # Create and populate the CISAuditResult object
-        $params = @{
+            $params = @{
-            Rec            = "1.1.4"
+                Rec           = $recnum
-            Result         = -not $guestUsers
+                Result        = -not $guestUsers
-            Status         = if ($guestUsers) { "Fail" } else { "Pass" }
+                Status        = if ($guestUsers) { "Fail" } else { "Pass" }
-            Details        = $details
+                Details       = $details
-            FailureReason  = $failureReasons
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
+        }
+        catch {
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-IdentifyExternalEmail.ps1

@@ -1,5 +1,6 @@
 function Test-IdentifyExternalEmail {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be defined here if needed
@@ -8,38 +9,56 @@ function Test-IdentifyExternalEmail {
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
         # Initialization code, if needed
+        $recnum = "6.2.3"
+        Write-Verbose "Running Test-IdentifyExternalEmail for $recnum..."
+        # Conditions for 6.2.3 (L1) Ensure email from external senders is identified
+        #
+        # Validate test for a pass:
+        # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        # - Specific conditions to check:
+        #   - Condition A: External tagging is enabled using PowerShell for all identities.
+        #   - Condition B: The BypassAllowList only contains email addresses the organization has permitted to bypass external tagging.
+        #   - Condition C: External sender tag appears in email messages received from external sources.
+        #
+        # 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: External tagging is not enabled using PowerShell for all identities.
+        #   - Condition B: The BypassAllowList contains unauthorized email addresses.
+        #   - Condition C: External sender tag does not appear in email messages received from external sources.
     }
-
     process {
-        # 6.2.3 (L1) Ensure email from external senders is identified
+        try {
-
+            # 6.2.3 (L1) Ensure email from external senders is identified
-        # Retrieve external sender tagging configuration
+            # Retrieve external sender tagging configuration
-        $externalInOutlook = Get-ExternalInOutlook
+            $externalInOutlook = Get-CISExoOutput -Rec $recnum
-        $externalTaggingEnabled = ($externalInOutlook | ForEach-Object { $_.Enabled }) -contains $true
+            $externalTaggingEnabled = ($externalInOutlook | ForEach-Object { $_.Enabled }) -contains $true
-
+            # Prepare failure reasons and details based on compliance
-        # Prepare failure reasons and details based on compliance
+            $failureReasons = if (-not $externalTaggingEnabled) {
-        $failureReasons = if (-not $externalTaggingEnabled) {
+                # Condition A: External tagging is not enabled using PowerShell for all identities.
-            "External sender tagging is disabled"
+                "External sender tagging is disabled"
+            }
+            else {
+                "N/A"
+            }
+            # Details for external tagging configuration
+            $details = "Enabled: $($externalTaggingEnabled); AllowList: $($externalInOutlook.AllowList)"
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $externalTaggingEnabled
+                Status        = if ($externalTaggingEnabled) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "Enabled: $($externalTaggingEnabled); AllowList: $($externalInOutlook.AllowList)"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "6.2.3"
-            Result         = $externalTaggingEnabled
-            Status         = if ($externalTaggingEnabled) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-LinkSharingRestrictions.ps1

@@ -1,5 +1,6 @@
 function Test-LinkSharingRestrictions {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Define your parameters here
@@ -10,34 +11,56 @@ function Test-LinkSharingRestrictions {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "7.2.7"
     }
 
     process {
-        # 7.2.7 (L1) Ensure link sharing is restricted in SharePoint and OneDrive
+        try {
+            # 7.2.7 (L1) Ensure link sharing is restricted in SharePoint and OneDrive
+            #
+            # 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 `DefaultSharingLinkType` setting in SharePoint and OneDrive is 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 set to `Specific people (only the people the user specifies)`.
+            #   - Condition C: Verification using the UI confirms that the link sharing 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 `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
+            # Retrieve link sharing configuration for SharePoint and OneDrive
-        $SPOTenantLinkSharing = Get-SPOTenant | Select-Object DefaultSharingLinkType
+            $SPOTenantLinkSharing = Get-CISSpoOutput -Rec $recnum
-        $isLinkSharingRestricted = $SPOTenantLinkSharing.DefaultSharingLinkType -eq 'Direct'  # Or 'SpecificPeople' as per the recommendation
+            $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)"
+            }
+            else {
+                "N/A"
+            }
+
+            $details = "DefaultSharingLinkType: $($SPOTenantLinkSharing.DefaultSharingLinkType)"
+
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $isLinkSharingRestricted
+                Status        = if ($isLinkSharingRestricted) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
 
-        # Prepare failure reasons and details based on compliance
-        $failureReasons = if (-not $isLinkSharingRestricted) {
-            "Link sharing is not restricted to 'Specific people'. Current setting: $($SPOTenantLinkSharing.DefaultSharingLinkType)"
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "DefaultSharingLinkType: $($SPOTenantLinkSharing.DefaultSharingLinkType)"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "7.2.7"
-            Result         = $isLinkSharingRestricted
-            Status         = if ($isLinkSharingRestricted) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-MailTipsEnabled.ps1

@@ -1,52 +1,70 @@
 function Test-MailTipsEnabled {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
-
+        $recnum = "6.5.2"
-        $auditResult = [CISAuditResult]::new()
+        Write-Verbose "Running Test-MailTipsEnabled for $recnum..."
+        # Conditions for 6.5.2 (L2) Ensure MailTips are enabled for end users
+        #
+        # Validate test for a pass:
+        # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        # - Specific conditions to check:
+        #   - Condition A: MailTipsAllTipsEnabled is set to True.
+        #   - Condition B: MailTipsExternalRecipientsTipsEnabled is set to True.
+        #   - Condition C: MailTipsGroupMetricsEnabled is set to True.
+        #   - Condition D: MailTipsLargeAudienceThreshold is set to an acceptable value (default is 25).
+        #
+        # 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: MailTipsAllTipsEnabled is not set to True.
+        #   - Condition B: MailTipsExternalRecipientsTipsEnabled is not set to True.
+        #   - Condition C: MailTipsGroupMetricsEnabled is not set to True.
+        #   - Condition D: MailTipsLargeAudienceThreshold is not set to an acceptable value (default is 25).
     }
-
     process {
-        # 6.5.2 (L2) Ensure MailTips are enabled for end users
+        try {
-
+            # 6.5.2 (L2) Ensure MailTips are enabled for end users
-        # Retrieve organization configuration for MailTips settings
+            # Retrieve organization configuration for MailTips settings
-        $orgConfig = Get-OrganizationConfig | Select-Object MailTipsAllTipsEnabled, MailTipsExternalRecipientsTipsEnabled, MailTipsGroupMetricsEnabled, MailTipsLargeAudienceThreshold
+            $orgConfig = Get-CISExoOutput -Rec $recnum
-        $allTipsEnabled = $orgConfig.MailTipsAllTipsEnabled -and $orgConfig.MailTipsGroupMetricsEnabled -and $orgConfig.MailTipsLargeAudienceThreshold -eq 25
+            # Check the MailTips settings (Conditions A, B, C, D)
-        $externalRecipientsTipsEnabled = $orgConfig.MailTipsExternalRecipientsTipsEnabled
+            $allTipsEnabled = $orgConfig.MailTipsAllTipsEnabled -and $orgConfig.MailTipsGroupMetricsEnabled -and $orgConfig.MailTipsLargeAudienceThreshold -eq 25
-
+            $externalRecipientsTipsEnabled = $orgConfig.MailTipsExternalRecipientsTipsEnabled
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if (-not ($allTipsEnabled -and $externalRecipientsTipsEnabled)) {
+            $failureReasons = if (-not ($allTipsEnabled -and $externalRecipientsTipsEnabled)) {
-            "One or more MailTips settings are not configured as required."
+                "One or more MailTips settings are not configured as required."
+            }
+            else {
+                "N/A"
+            }
+            $details = if ($allTipsEnabled -and $externalRecipientsTipsEnabled) {
+                "MailTipsAllTipsEnabled: $($orgConfig.MailTipsAllTipsEnabled); MailTipsExternalRecipientsTipsEnabled: $($orgConfig.MailTipsExternalRecipientsTipsEnabled); MailTipsGroupMetricsEnabled: $($orgConfig.MailTipsGroupMetricsEnabled); MailTipsLargeAudienceThreshold: $($orgConfig.MailTipsLargeAudienceThreshold)"
+            }
+            else {
+                "One or more MailTips settings are not configured as required."
+            }
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $allTipsEnabled -and $externalRecipientsTipsEnabled
+                Status        = if ($allTipsEnabled -and $externalRecipientsTipsEnabled) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($allTipsEnabled -and $externalRecipientsTipsEnabled) {
-            "MailTipsAllTipsEnabled: $($orgConfig.MailTipsAllTipsEnabled); MailTipsExternalRecipientsTipsEnabled: $($orgConfig.MailTipsExternalRecipientsTipsEnabled); MailTipsGroupMetricsEnabled: $($orgConfig.MailTipsGroupMetricsEnabled); MailTipsLargeAudienceThreshold: $($orgConfig.MailTipsLargeAudienceThreshold)"
-        }
-        else {
-            "One or more MailTips settings are not configured as required."
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "6.5.2"
-            Result         = $allTipsEnabled -and $externalRecipientsTipsEnabled
-            Status         = if ($allTipsEnabled -and $externalRecipientsTipsEnabled) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-MailboxAuditingE3.ps1

@@ -1,114 +1,130 @@
 function Test-MailboxAuditingE3 {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
-        # Aligned
-        # Create Table for Details
         # Parameters can be added if needed
     )
-
     begin {
+        <#
+        Conditions for 6.1.2 (L1) Ensure mailbox auditing for E3 users is Enabled
+        Validate test for a pass:
+        - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        - Specific conditions to check:
+          - Condition A: Mailbox audit logging is enabled for all user mailboxes.
+          - Condition B: The `AuditAdmin` actions include `ApplyRecord`, `Create`, `HardDelete`, `MoveToDeletedItems`, `SendAs`, `SendOnBehalf`, `SoftDelete`, `Update`, `UpdateCalendarDelegation`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
+          - Condition C: The `AuditDelegate` actions include `ApplyRecord`, `Create`, `HardDelete`, `MoveToDeletedItems`, `SendAs`, `SendOnBehalf`, `SoftDelete`, `Update`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
+          - Condition D: The `AuditOwner` actions include `ApplyRecord`, `HardDelete`, `MoveToDeletedItems`, `SoftDelete`, `Update`, `UpdateCalendarDelegation`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
+        Validate test for a fail:
+        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+        - Specific conditions to check:
+          - Condition A: Mailbox audit logging is not enabled for all user mailboxes.
+          - Condition B: The `AuditAdmin` actions do not include `ApplyRecord`, `Create`, `HardDelete`, `MoveToDeletedItems`, `SendAs`, `SendOnBehalf`, `SoftDelete`, `Update`, `UpdateCalendarDelegation`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
+          - Condition C: The `AuditDelegate` actions do not include `ApplyRecord`, `Create`, `HardDelete`, `MoveToDeletedItems`, `SendAs`, `SendOnBehalf`, `SoftDelete`, `Update`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
+          - Condition D: The `AuditOwner` actions do not include `ApplyRecord`, `HardDelete`, `MoveToDeletedItems`, `SoftDelete`, `Update`, `UpdateCalendarDelegation`, `UpdateFolderPermissions`, and `UpdateInboxRules`.
+        #>
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
+        $actionDictionaries = Get-Action -Dictionaries
-        $e3SkuPartNumbers = @("ENTERPRISEPACK", "OFFICESUBSCRIPTION")
+        # E3 specific actions
-        $AdminActions = @("ApplyRecord", "Copy", "Create", "FolderBind", "HardDelete", "Move", "MoveToDeletedItems", "SendAs", "SendOnBehalf", "SoftDelete", "Update", "UpdateCalendarDelegation", "UpdateFolderPermissions", "UpdateInboxRules")
+        $AdminActions = $actionDictionaries.AdminActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }
-        $DelegateActions = @("ApplyRecord", "Create", "FolderBind", "HardDelete", "Move", "MoveToDeletedItems", "SendAs", "SendOnBehalf", "SoftDelete", "Update", "UpdateFolderPermissions", "UpdateInboxRules")
+        $DelegateActions = $actionDictionaries.DelegateActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed") }
-        $OwnerActions = @("ApplyRecord", "Create", "HardDelete", "MailboxLogin", "Move", "MoveToDeletedItems", "SoftDelete", "Update", "UpdateCalendarDelegation", "UpdateFolderPermissions", "UpdateInboxRules")
+        $OwnerActions = $actionDictionaries.OwnerActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }
-
-
         $allFailures = @()
-        $allUsers = Get-AzureADUser -All $true
+        $recnum = "6.1.2"
+        Write-Verbose "Running Test-MailboxAuditingE3 for $recnum..."
+        $allUsers = Get-CISMgOutput -Rec $recnum
         $processedUsers = @{}  # Dictionary to track processed users
     }
-
     process {
-        foreach ($user in $allUsers) {
+        if ($null -ne $allUsers) {
-            if ($processedUsers.ContainsKey($user.UserPrincipalName)) {
+            $mailboxes = Get-CISExoOutput -Rec $recnum
-                Write-Verbose "Skipping already processed user: $($user.UserPrincipalName)"
-                continue
-            }
             try {
-                $licenseDetails = Get-MgUserLicenseDetail -UserId $user.UserPrincipalName
+                foreach ($user in $allUsers) {
-                $hasOfficeE3 = ($licenseDetails | Where-Object { $_.SkuPartNumber -in $e3SkuPartNumbers }).Count -gt 0
+                    if ($processedUsers.ContainsKey($user.UserPrincipalName)) {
-                Write-Verbose "Evaluating user $($user.UserPrincipalName) for Office E3 license."
+                        Write-Verbose "Skipping already processed user: $($user.UserPrincipalName)"
-
+                        continue
-                if ($hasOfficeE3) {
+                    }
                     $userUPN = $user.UserPrincipalName
-                    $mailbox = Get-EXOMailbox -Identity $userUPN -PropertySets Audit
+                    $mailbox = $mailboxes | Where-Object { $_.UserPrincipalName -eq $user.UserPrincipalName }
-
+                    $missingAdminActions = @()
-                    $missingActions = @()
+                    $missingDelegateActions = @()
+                    $missingOwnerActions = @()
                     if ($mailbox.AuditEnabled) {
                         foreach ($action in $AdminActions) {
-                            if ($mailbox.AuditAdmin -notcontains $action) { $missingActions += "Admin action '$action' missing" }
+                            if ($mailbox.AuditAdmin -notcontains $action) {
+                                $missingAdminActions += (Get-Action -Actions $action -ActionType "Admin")
+                            }
                         }
                         foreach ($action in $DelegateActions) {
-                            if ($mailbox.AuditDelegate -notcontains $action) { $missingActions += "Delegate action '$action' missing" }
+                            if ($mailbox.AuditDelegate -notcontains $action) {
+                                $missingDelegateActions += (Get-Action -Actions $action -ActionType "Delegate")
+                            }
                         }
                         foreach ($action in $OwnerActions) {
-                            if ($mailbox.AuditOwner -notcontains $action) { $missingActions += "Owner action '$action' missing" }
+                            if ($mailbox.AuditOwner -notcontains $action) {
+                                $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner")
+                            }
+                        }
+                        if ($missingAdminActions.Count -gt 0 -or $missingDelegateActions.Count -gt 0 -or $missingOwnerActions.Count -gt 0) {
+                            $allFailures += "$userUPN|True|$($missingAdminActions -join ',')|$($missingDelegateActions -join ',')|$($missingOwnerActions -join ',')"
                         }
                     }
                     else {
-                        $allFailures += "$userUPN`: AuditEnabled - False"
+                        $allFailures += "$userUPN|False|||" # Condition A for fail
-                        continue
-                    }
-
-                    if ($missingActions) {
-                        $formattedActions = Format-MissingActions $missingActions
-                        $allFailures += "$userUPN`: AuditEnabled - True; $formattedActions"
                     }
                     # Mark the user as processed
                     $processedUsers[$user.UserPrincipalName] = $true
                 }
+                # Prepare failure reasons and details based on compliance
+                if ($allFailures.Count -eq 0) {
+                    $failureReasons = "N/A"
+                }
+                else {
+                    $failureReasons = "Audit issues detected."
+                }
+                $details = if ($allFailures.Count -eq 0) {
+                    "All Office E3 users have correct mailbox audit settings."
+                }
+                else {
+                    "UserPrincipalName|AuditEnabled|AdminActionsMissing|DelegateActionsMissing|OwnerActionsMissing`n" + ($allFailures -join "`n")
+                }
+                # Populate the audit result
+                $params = @{
+                    Rec           = $recnum
+                    Result        = $allFailures.Count -eq 0
+                    Status        = if ($allFailures.Count -eq 0) { "Pass" } else { "Fail" }
+                    Details       = $details
+                    FailureReason = $failureReasons
+                }
+                $auditResult = Initialize-CISAuditResult @params
             }
             catch {
-                Write-Warning "Could not retrieve license details for user $($user.UserPrincipalName): $_"
+                Write-Error "An error occurred during the test: $_"
+                # Retrieve the description from the test definitions
+                $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
+                $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
+                $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
+                # Call Initialize-CISAuditResult with error parameters
+                $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
         }
-
+        else {
-        # Prepare failure reasons and details based on compliance
+            $params = @{
-        $failureReasons = if ($allFailures.Count -eq 0) { "N/A" } else { "Audit issues detected." }
+                Rec           = $recnum
-        $details = if ($allFailures.Count -eq 0) { "All Office E3 users have correct mailbox audit settings." } else { $allFailures -join " | " }
+                Result        = $false
-
+                Status        = "Fail"
-        # Populate the audit result
+                Details       = "No M365 E3 licenses found."
-        $params = @{
+                FailureReason = "The audit is for M365 E3 licenses, but no such licenses were found."
-            Rec           = "6.1.2"
+            }
-            Result        = $allFailures.Count -eq 0
+            $auditResult = Initialize-CISAuditResult @params
-            Status        = if ($allFailures.Count -eq 0) { "Pass" } else { "Fail" }
-            Details       = $details
-            FailureReason = $failureReasons
         }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
+        $detailsLength = $details.Length
+        Write-Verbose "Character count of the details: $detailsLength"
+        if ($detailsLength -gt 32767) {
+            Write-Verbose "Warning: The character count exceeds the limit for Excel cells."
+        }
         return $auditResult
     }
 }
-
-function Format-MissingActions {
-    param ([array]$missingActions)
-
-    $actionGroups = @{
-        "Admin"    = @()
-        "Delegate" = @()
-        "Owner"    = @()
-    }
-
-    foreach ($action in $missingActions) {
-        if ($action -match "(Admin|Delegate|Owner) action '([^']+)' missing") {
-            $type = $matches[1]
-            $actionName = $matches[2]
-            $actionGroups[$type] += $actionName
-        }
-    }
-
-    $formattedResults = @()
-    foreach ($type in $actionGroups.Keys) {
-        if ($actionGroups[$type].Count -gt 0) {
-            $formattedResults += "$($type) actions missing: $($actionGroups[$type] -join ', ')"
-        }
-    }
-
-    return $formattedResults -join '; '
-}

source/tests/Test-MailboxAuditingE5.ps1

@@ -1,120 +1,133 @@
 function Test-MailboxAuditingE5 {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
-        # Aligned
-        # Create Table for Details
         # Parameters can be added if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-
+        # Conditions for 6.1.3 (L1) Ensure mailbox auditing for E5 users is Enabled
-        $e5SkuPartNumbers = @("SPE_E5", "ENTERPRISEPREMIUM", "OFFICEE5")
+        #
-        $AdminActions = @("ApplyRecord", "Copy", "Create", "FolderBind", "HardDelete", "MailItemsAccessed", "Move", "MoveToDeletedItems", "SendAs", "SendOnBehalf", "Send", "SoftDelete", "Update", "UpdateCalendarDelegation", "UpdateFolderPermissions", "UpdateInboxRules")
+        # Validate test for a pass:
-        $DelegateActions = @("ApplyRecord", "Create", "FolderBind", "HardDelete", "MailItemsAccessed", "Move", "MoveToDeletedItems", "SendAs", "SendOnBehalf", "SoftDelete", "Update", "UpdateFolderPermissions", "UpdateInboxRules")
+        # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        $OwnerActions = @("ApplyRecord", "Create", "HardDelete", "MailboxLogin", "Move", "MailItemsAccessed", "MoveToDeletedItems", "Send", "SoftDelete", "Update", "UpdateCalendarDelegation", "UpdateFolderPermissions", "UpdateInboxRules")
+        # - Specific conditions to check:
-
+        #   - Condition A: Mailbox auditing is enabled for E5 users.
-
+        #   - Condition B: AuditAdmin actions include ApplyRecord, Create, HardDelete, MailItemsAccessed, MoveToDeletedItems, Send, SendAs, SendOnBehalf, SoftDelete, Update, UpdateCalendarDelegation, UpdateFolderPermissions, UpdateInboxRules.
-
+        #   - Condition C: AuditDelegate actions include ApplyRecord, Create, HardDelete, MailItemsAccessed, MoveToDeletedItems, SendAs, SendOnBehalf, SoftDelete, Update, UpdateFolderPermissions, UpdateInboxRules.
+        #   - Condition D: AuditOwner actions include ApplyRecord, HardDelete, MailItemsAccessed, MoveToDeletedItems, Send, SoftDelete, Update, UpdateCalendarDelegation, UpdateFolderPermissions, UpdateInboxRules.
+        #
+        # Validate test for a fail:
+        # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+        # - Specific conditions to check:
+        #   - Condition A: Mailbox auditing is not enabled for E5 users.
+        #   - Condition B: AuditAdmin actions do not include all of the following: ApplyRecord, Create, HardDelete, MailItemsAccessed, MoveToDeletedItems, Send, SendAs, SendOnBehalf, SoftDelete, Update, UpdateCalendarDelegation, UpdateFolderPermissions, UpdateInboxRules.
+        #   - Condition C: AuditDelegate actions do not include all of the following: ApplyRecord, Create, HardDelete, MailItemsAccessed, MoveToDeletedItems, SendAs, SendOnBehalf, SoftDelete, Update, UpdateFolderPermissions, UpdateInboxRules.
+        #   - Condition D: AuditOwner actions do not include all of the following: ApplyRecord, HardDelete, MailItemsAccessed, MoveToDeletedItems, Send, SoftDelete, Update, UpdateCalendarDelegation, UpdateFolderPermissions, UpdateInboxRules.
+        $actionDictionaries = Get-Action -Dictionaries
+        $AdminActions = $actionDictionaries.AdminActions.Keys
+        $DelegateActions = $actionDictionaries.DelegateActions.Keys
+        $OwnerActions = $actionDictionaries.OwnerActions.Keys
         $allFailures = @()
-        $allUsers = Get-AzureADUser -All $true
+        $processedUsers = @{}
-        $processedUsers = @{}  # Dictionary to track processed users
+        $recnum = "6.1.3"
+        Write-Verbose "Running Test-MailboxAuditingE5 for $recnum..."
+        $allUsers = Get-CISMgOutput -Rec $recnum
     }
-
     process {
-        foreach ($user in $allUsers) {
+        if ($null -ne $allUsers) {
-            if ($processedUsers.ContainsKey($user.UserPrincipalName)) {
+            $mailboxes = Get-CISExoOutput -Rec $recnum
-                continue
-            }
-
             try {
-                $licenseDetails = Get-MgUserLicenseDetail -UserId $user.UserPrincipalName
+                foreach ($user in $allUsers) {
-                $hasOfficeE5 = ($licenseDetails | Where-Object { $_.SkuPartNumber -in $e5SkuPartNumbers }).Count -gt 0
+                    if ($processedUsers.ContainsKey($user.UserPrincipalName)) {
-                Write-Verbose "Evaluating user $($user.UserPrincipalName) for Office E5 license."
+                        Write-Verbose "Skipping already processed user: $($user.UserPrincipalName)"
-                if ($hasOfficeE5) {
-                    $userUPN = $user.UserPrincipalName
-                    $mailbox = Get-EXOMailbox -Identity $userUPN -PropertySets Audit
-
-                    $missingActions = @()
-                    if ($mailbox.AuditEnabled) {
-                        foreach ($action in $AdminActions) {
-                            if ($mailbox.AuditAdmin -notcontains $action) { $missingActions += "Admin action '$action' missing" }
-                        }
-                        foreach ($action in $DelegateActions) {
-                            if ($mailbox.AuditDelegate -notcontains $action) { $missingActions += "Delegate action '$action' missing" }
-                        }
-                        foreach ($action in $OwnerActions) {
-                            if ($mailbox.AuditOwner -notcontains $action) { $missingActions += "Owner action '$action' missing" }
-                        }
-                    }
-                    else {
-                        $allFailures += "$userUPN`: AuditEnabled - False"
                         continue
                     }
-
+                    $mailbox = $mailboxes | Where-Object { $_.UserPrincipalName -eq $user.UserPrincipalName }
-                    if ($missingActions) {
+                    $userUPN = $user.UserPrincipalName
-                        $formattedActions = Format-MissingActions $missingActions
+                    $missingAdminActions = @()
-                        $allFailures += "$userUPN`: AuditEnabled - True; $formattedActions"
+                    $missingDelegateActions = @()
+                    $missingOwnerActions = @()
+                    if ($mailbox.AuditEnabled) {
+                        # Validate Admin actions
+                        foreach ($action in $AdminActions) {
+                            if ($mailbox.AuditAdmin -notcontains $action) {
+                                $missingAdminActions += (Get-Action -Actions $action -ActionType "Admin") # Condition B
+                            }
+                        }
+                        # Validate Delegate actions
+                        foreach ($action in $DelegateActions) {
+                            if ($mailbox.AuditDelegate -notcontains $action) {
+                                $missingDelegateActions += (Get-Action -Actions $action -ActionType "Delegate") # Condition C
+                            }
+                        }
+                        # Validate Owner actions
+                        foreach ($action in $OwnerActions) {
+                            if ($mailbox.AuditOwner -notcontains $action) {
+                                $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner") # Condition D
+                            }
+                        }
+                        if ($missingAdminActions.Count -gt 0 -or $missingDelegateActions.Count -gt 0 -or $missingOwnerActions.Count -gt 0) {
+                            $allFailures += "$userUPN|True|$($missingAdminActions -join ',')|$($missingDelegateActions -join ',')|$($missingOwnerActions -join ',')"
+                        }
                     }
                     else {
-                        Write-Verbose "User $($user.UserPrincipalName) passed the mailbox audit checks."
+                        $allFailures += "$userUPN|False|||" # Condition A for fail
                     }
+                    # Mark the user as processed
                     $processedUsers[$user.UserPrincipalName] = $true
                 }
-                else {
+                # Prepare failure reasons and details based on compliance
-                    # Adding verbose output to indicate the user does not have an E5 license
+                if ($allFailures.Count -eq 0) {
-                    Write-Verbose "User $($user.UserPrincipalName) does not have an Office E5 license."
+                    $failureReasons = "N/A"
                 }
+                else {
+                    $failureReasons = "Audit issues detected."
+                }
+                $details = if ($allFailures.Count -eq 0) {
+                    "All Office E5 users have correct mailbox audit settings." # Condition A for pass
+                }
+                else {
+                    "UserPrincipalName|AuditEnabled|AdminActionsMissing|DelegateActionsMissing|OwnerActionsMissing`n" + ($allFailures -join "`n") # Condition A for fail
+                }
+                # $details = Initialize-LargeTestTable -lineCount 3000 # Adjust the lineCount to exceed 32,000 characters
+                # Populate the audit result
+                $params = @{
+                    Rec           = $recnum
+                    Result        = $allFailures.Count -eq 0
+                    Status        = if ($allFailures.Count -eq 0) { "Pass" } else { "Fail" }
+                    Details       = $details
+                    FailureReason = $failureReasons
+                }
+                $auditResult = Initialize-CISAuditResult @params
             }
             catch {
-                Write-Warning "Could not retrieve license details for user $($user.UserPrincipalName): $_"
+                Write-Error "An error occurred during the test: $_"
+                # Retrieve the description from the test definitions
+                $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
+                $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
+                $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
+                # Call Initialize-CISAuditResult with error parameters
+                $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
             }
         }
-
+        else {
-        # Prepare failure reasons and details based on compliance
+            $params = @{
-        $failureReasons = if ($allFailures.Count -eq 0) { "N/A" } else { "Audit issues detected." }
+                Rec           = $recnum
-        $details = if ($allFailures.Count -eq 0) { "All Office E5 users have correct mailbox audit settings." } else { $allFailures -join " | " }
+                Result        = $false
-
+                Status        = "Fail"
-        # Populate the audit result
+                Details       = "No M365 E5 licenses found."
-        $params = @{
+                FailureReason = "The audit is for M365 E5 licenses, but no such licenses were found."
-            Rec            = "6.1.3"
+            }
-            Result         = $allFailures.Count -eq 0
+            $auditResult = Initialize-CISAuditResult @params
-            Status         = if ($allFailures.Count -eq 0) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
         }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
+        $detailsLength = $details.Length
+        Write-Verbose "Character count of the details: $detailsLength"
+        if ($detailsLength -gt 32767) {
+            Write-Verbose "Warning: The character count exceeds the limit for Excel cells."
+        }
         return $auditResult
     }
 }
-
-function Format-MissingActions {
-    param ([array]$missingActions)
-
-    $actionGroups = @{
-        "Admin"    = @()
-        "Delegate" = @()
-        "Owner"    = @()
-    }
-
-    foreach ($action in $missingActions) {
-        if ($action -match "(Admin|Delegate|Owner) action '([^']+)' missing") {
-            $type = $matches[1]
-            $actionName = $matches[2]
-            $actionGroups[$type] += $actionName
-        }
-    }
-
-    $formattedResults = @()
-    foreach ($type in $actionGroups.Keys) {
-        if ($actionGroups[$type].Count -gt 0) {
-            $formattedResults += "$($type) actions missing: $($actionGroups[$type] -join ', ')"
-        }
-    }
-
-    return $formattedResults -join '; '
-}

source/tests/Test-ManagedApprovedPublicGroups.ps1

@@ -1,52 +1,72 @@
 function Test-ManagedApprovedPublicGroups {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
-        # Aligned
         # Parameters can be added if needed
     )
 
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-        # Initialization code, if needed
 
+        # Initialization code, if needed
+        $recnum = "1.2.1"
+
+        # Conditions for 1.2.1 (L2) Ensure that only organizationally managed/approved public groups exist (Automated)
+        #
+        # Validate test for a pass:
+        # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        # - Specific conditions to check:
+        #   - Condition A: No groups have the status 'Public' in the privacy column on the Active teams and groups page.
+        #   - Condition B: Using Microsoft Graph PowerShell, all groups return a status other than 'Public' when checked.
+        #
+        # 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: One or more groups have the status 'Public' in the privacy column on the Active teams and groups page.
+        #   - Condition B: Using Microsoft Graph PowerShell, one or more groups return a status of 'Public' when checked.
     }
 
     process {
-        # 1.2.1 (L2) Ensure that only organizationally managed/approved public groups exist (Automated)
+        try {
+            # Step: Retrieve all groups with visibility set to 'Public'
+            $allGroups = Get-CISMgOutput -Rec $recnum
 
-        # Retrieve all public groups
+            # Step: Determine failure reasons based on the presence of public groups
-        $allGroups = Get-MgGroup -All | Where-Object { $_.Visibility -eq "Public" } | Select-Object DisplayName, Visibility
+            $failureReasons = if ($null -ne $allGroups -and $allGroups.Count -gt 0) {
+                "There are public groups present that are not organizationally managed/approved."
+            }
+            else {
+                "N/A"
+            }
 
-        # Prepare failure reasons and details based on compliance
+            # Step: Prepare details for the audit result
-        $failureReasons = if ($null -ne $allGroups -and $allGroups.Count -gt 0) {
+            $details = if ($null -eq $allGroups -or $allGroups.Count -eq 0) {
-            "There are public groups present that are not organizationally managed/approved."
+                "No public groups found."
-        }
+            }
-        else {
+            else {
-            "N/A"
+                $groupDetails = $allGroups | ForEach-Object { $_.DisplayName + " (" + $_.Visibility + ")" }
-        }
+                "Public groups found: $($groupDetails -join ', ')"
+            }
 
-        $details = if ($null -eq $allGroups -or $allGroups.Count -eq 0) {
+            # Step: Create and populate the CISAuditResult object
-            "No public groups found."
+            $params = @{
+                Rec           = $recnum
+                Result        = $null -eq $allGroups -or $allGroups.Count -eq 0
+                Status        = if ($null -eq $allGroups -or $allGroups.Count -eq 0) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            $groupDetails = $allGroups | ForEach-Object { $_.DisplayName + " (" + $_.Visibility + ")" }
+            $LastError = $_
-            "Public groups found: $($groupDetails -join ', ')"
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "1.2.1"
-            Result         = $null -eq $allGroups -or $allGroups.Count -eq 0
-            Status         = if ($null -eq $allGroups -or $allGroups.Count -eq 0) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {
-        # Return auditResults
+        # Return the audit result
         return $auditResult
     }
 }

source/tests/Test-MeetingChatNoAnonymous.ps1

@@ -1,46 +1,67 @@
 function Test-MeetingChatNoAnonymous {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be defined here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "8.5.5"
+        Write-Verbose "Running Test-MeetingChatNoAnonymous for $recnum..."
     }
-
     process {
-        # 8.5.5 (L2) Ensure meeting chat does not allow anonymous users
+        try {
-
+            # 8.5.5 (L2) Ensure meeting chat does not allow anonymous users
-        # Connect to Teams PowerShell using Connect-MicrosoftTeams
+            #
-
+            # Validate test for a pass:
-        # Retrieve the Teams meeting policy for meeting chat
+            # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        $CsTeamsMeetingPolicyChat = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property MeetingChatEnabledType
+            # - Specific conditions to check:
-        $chatAnonDisabled = $CsTeamsMeetingPolicyChat.MeetingChatEnabledType -eq 'EnabledExceptAnonymous'
+            #   - 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.
-        # Prepare failure reasons and details based on compliance
+            #   - Condition C: Verification using the Teams Admin Center confirms that the meeting chat settings are configured as recommended.
-        $failureReasons = if ($chatAnonDisabled) {
+            #
-            "N/A"
+            # 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-CISMSTeamsOutput -Rec $recnum
+            # Condition A: Check if the MeetingChatEnabledType is set to 'EnabledExceptAnonymous'
+            $chatAnonDisabled = $CsTeamsMeetingPolicyChat.MeetingChatEnabledType -eq 'EnabledExceptAnonymous'
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = if ($chatAnonDisabled) {
+                "N/A"
+            }
+            else {
+                "Meeting chat allows anonymous users. User the following command to remediate:`nSet-CsTeamsMeetingPolicy -Identity Global -MeetingChatEnabledType `"EnabledExceptAnonymous`""
+            }
+            $details = "MeetingChatEnabledType is set to $($CsTeamsMeetingPolicyChat.MeetingChatEnabledType)"
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $chatAnonDisabled
+                Status        = if ($chatAnonDisabled) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "Meeting chat allows anonymous users"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "MeetingChatEnabledType is set to $($CsTeamsMeetingPolicyChat.MeetingChatEnabledType)"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "8.5.5"
-            Result         = $chatAnonDisabled
-            Status         = if ($chatAnonDisabled) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-ModernAuthExchangeOnline.ps1

@@ -1,23 +1,36 @@
 function Test-ModernAuthExchangeOnline {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Define your parameters here
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-        # Initialization code, if needed
+        # Conditions for 6.5.1 (L1) Ensure modern authentication for Exchange Online is enabled
+        #
+        # Validate test for a pass:
+        # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        # - Specific conditions to check:
+        #   - Condition A: Modern authentication for Exchange Online is enabled.
+        #   - Condition B: Exchange Online clients use modern authentication to log in to Microsoft 365 mailboxes.
+        #   - Condition C: Users of older email clients, such as Outlook 2013 and Outlook 2016, are no longer able to authenticate to Exchange using Basic Authentication.
+        #
+        # 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: Modern authentication for Exchange Online is not enabled.
+        #   - Condition B: Exchange Online clients do not use modern authentication to log in to Microsoft 365 mailboxes.
+        #   - Condition C: Users of older email clients, such as Outlook 2013 and Outlook 2016, are still able to authenticate to Exchange using Basic Authentication.
+        $recnum = "6.5.1"
+        Write-Verbose "Running Test-ModernAuthExchangeOnline for $recnum..."
     }
-
     process {
         try {
-            # Ensuring the ExchangeOnlineManagement module is available
-
             # 6.5.1 (L1) Ensure modern authentication for Exchange Online is enabled
-            $orgConfig = Get-OrganizationConfig | Select-Object -Property Name, OAuth2ClientProfileEnabled
+            # Check modern authentication setting in Exchange Online configuration (Condition A and B)
-
+            $orgConfig = Get-CISExoOutput -Rec $recnum
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $orgConfig.OAuth2ClientProfileEnabled) {
                 "Modern authentication is disabled"
@@ -25,25 +38,23 @@ function Test-ModernAuthExchangeOnline {
             else {
                 "N/A"
             }
-
+            # Details include the current setting (Condition A and B)
             $details = "OAuth2ClientProfileEnabled: $($orgConfig.OAuth2ClientProfileEnabled) for Organization: $($orgConfig.Name)"
-
             # Create and populate the CISAuditResult object
             $params = @{
-                Rec            = "6.5.1"
+                Rec           = $recnum
-                Result         = $orgConfig.OAuth2ClientProfileEnabled
+                Result        = $orgConfig.OAuth2ClientProfileEnabled
-                Status         = if ($orgConfig.OAuth2ClientProfileEnabled) { "Pass" } else { "Fail" }
+                Status        = if ($orgConfig.OAuth2ClientProfileEnabled) { "Pass" } else { "Fail" }
-                Details        = $details
+                Details       = $details
-                FailureReason  = $failureReasons
+                FailureReason = $failureReasons
             }
             $auditResult = Initialize-CISAuditResult @params
-
         }
         catch {
-            Write-Error "An error occurred while testing modern authentication for Exchange Online: $_"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-ModernAuthSharePoint.ps1

@@ -1,5 +1,6 @@
 function Test-ModernAuthSharePoint {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Define your parameters here
@@ -8,33 +9,57 @@ function Test-ModernAuthSharePoint {
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
+
         # Initialization code, if needed
+        $recnum = "7.2.1"
+
+        <#
+        # 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:
+        #   - Condition A: The setting "Apps that don't use modern authentication" is not set to "Block access" in the SharePoint admin center.
+        #   - Condition B: The PowerShell command `Get-SPOTenant | ft LegacyAuthProtocolsEnabled` returns `True`.
+        #>
     }
 
     process {
-        # 7.2.1 (L1) Ensure modern authentication for SharePoint applications is required
+        try {
-        $SPOTenant = Get-SPOTenant | Select-Object -Property LegacyAuthProtocolsEnabled
+            # 7.2.1 (L1) Ensure modern authentication for SharePoint applications is required
-        $modernAuthForSPRequired = -not $SPOTenant.LegacyAuthProtocolsEnabled
+            $SPOTenant = Get-CISSpoOutput -Rec $recnum
+            $modernAuthForSPRequired = -not $SPOTenant.LegacyAuthProtocolsEnabled
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if (-not $modernAuthForSPRequired) {
+            $failureReasons = if (-not $modernAuthForSPRequired) {
-            "Legacy authentication protocols are enabled"
+                "Legacy authentication protocols are enabled" # Fail Condition B
-        }
+            }
-        else {
+            else {
-            "N/A"
+                "N/A"
-        }
+            }
 
-        $details = "LegacyAuthProtocolsEnabled: $($SPOTenant.LegacyAuthProtocolsEnabled)"
+            $details = "LegacyAuthProtocolsEnabled: $($SPOTenant.LegacyAuthProtocolsEnabled)" # Details for Condition B
 
-        # Create and populate the CISAuditResult object
+            # Create and populate the CISAuditResult object
-        $params = @{
+            $params = @{
-            Rec            = "7.2.1"
+                Rec           = $recnum
-            Result         = $modernAuthForSPRequired
+                Result        = $modernAuthForSPRequired
-            Status         = if ($modernAuthForSPRequired) { "Pass" } else { "Fail" }
+                Status        = if ($modernAuthForSPRequired) { "Pass" } else { "Fail" }
-            Details        = $details
+                Details       = $details
-            FailureReason  = $failureReasons
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
+        }
+        catch {
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-NoAnonymousMeetingJoin.ps1

@@ -1,45 +1,66 @@
 function Test-NoAnonymousMeetingJoin {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be defined here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "8.5.1"
+        Write-Verbose "Running Test-NoAnonymousMeetingJoin for $recnum..."
     }
-
     process {
-        # 8.5.1 (L2) Ensure anonymous users can't join a meeting
+        try {
-
+            # 8.5.1 (L2) Ensure anonymous users can't join a meeting
-        # Connect to Teams PowerShell using Connect-MicrosoftTeams
+            #
-
+            # Validate test for a pass:
-        $teamsMeetingPolicy = Get-CsTeamsMeetingPolicy -Identity Global
+            # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        $allowAnonymousUsersToJoinMeeting = $teamsMeetingPolicy.AllowAnonymousUsersToJoinMeeting
+            # - Specific conditions to check:
-
+            #   - Condition A: `AllowAnonymousUsersToJoinMeeting` is set to `False`.
-        # Prepare failure reasons and details based on compliance
+            #   - Condition B: Verification using the UI confirms that `Anonymous users can join a meeting` is set to `Off` in the Global meeting policy.
-        $failureReasons = if ($allowAnonymousUsersToJoinMeeting) {
+            #   - Condition C: PowerShell command output indicates that anonymous users are not allowed to join meetings.
-            "Anonymous users are 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-CISMSTeamsOutput -Rec $recnum
+            $allowAnonymousUsersToJoinMeeting = $teamsMeetingPolicy.AllowAnonymousUsersToJoinMeeting
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = if ($allowAnonymousUsersToJoinMeeting) {
+                "Anonymous users are allowed to join meetings, remediate with the following command if needed:`nSet-CsTeamsMeetingPolicy -Identity Global -AllowAnonymousUsersToJoinMeeting `$false"
+            }
+            else {
+                "N/A"
+            }
+            $details = "AllowAnonymousUsersToJoinMeeting is set to $allowAnonymousUsersToJoinMeeting"
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = -not $allowAnonymousUsersToJoinMeeting
+                Status        = if (-not $allowAnonymousUsersToJoinMeeting) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "AllowAnonymousUsersToJoinMeeting is set to $allowAnonymousUsersToJoinMeeting"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "8.5.1"
-            Result         = -not $allowAnonymousUsersToJoinMeeting
-            Status         = if (-not $allowAnonymousUsersToJoinMeeting) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-NoAnonymousMeetingStart.ps1

@@ -1,45 +1,61 @@
 function Test-NoAnonymousMeetingStart {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be defined here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "8.5.2"
+        Write-Verbose "Running Test-NoAnonymousMeetingStart for $recnum..."
     }
-
     process {
-        # 8.5.2 (L1) Ensure anonymous users and dial-in callers can't start a meeting
+        try {
-
+            # 8.5.2 (L1) Ensure anonymous users and dial-in callers can't start a meeting
-        # Connect to Teams PowerShell using Connect-MicrosoftTeams
+            #
-
+            # Validate test for a pass:
-        $CsTeamsMeetingPolicyAnonymous = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowAnonymousUsersToStartMeeting
+            # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        $anonymousStartDisabled = -not $CsTeamsMeetingPolicyAnonymous.AllowAnonymousUsersToStartMeeting
+            # - Specific conditions to check:
-
+            #   - Condition A: The `AllowAnonymousUsersToStartMeeting` setting in the Teams admin center is set to `False`.
-        # Prepare failure reasons and details based on compliance
+            #   - Condition B: The setting for anonymous users and dial-in callers starting a meeting is configured to ensure they must wait in the lobby.
-        $failureReasons = if ($anonymousStartDisabled) {
+            #   - Condition C: Verification using the UI confirms that the setting `Anonymous users and dial-in callers can start a meeting` is set to `Off`.
-            "N/A"
+            #
+            # 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
+            # Retrieve the Teams meeting policy for the global scope and check if anonymous users can start meetings
+            $CsTeamsMeetingPolicyAnonymous = Get-CISMSTeamsOutput -Rec $recnum
+            $anonymousStartDisabled = -not $CsTeamsMeetingPolicyAnonymous.AllowAnonymousUsersToStartMeeting
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = if ($anonymousStartDisabled) {
+                "N/A"
+            }
+            else {
+                "Anonymous users and dial-in callers can start a meeting" # Condition A and B
+            }
+            $details = "AllowAnonymousUsersToStartMeeting is set to $($CsTeamsMeetingPolicyAnonymous.AllowAnonymousUsersToStartMeeting)" # Condition C
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $anonymousStartDisabled
+                Status        = if ($anonymousStartDisabled) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "Anonymous users and dial-in callers can start a meeting"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "AllowAnonymousUsersToStartMeeting is set to $($CsTeamsMeetingPolicyAnonymous.AllowAnonymousUsersToStartMeeting)"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "8.5.2"
-            Result         = $anonymousStartDisabled
-            Status         = if ($anonymousStartDisabled) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-NoWhitelistDomains.ps1

@@ -1,49 +1,69 @@
 function Test-NoWhitelistDomains {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Define your parameters here
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "6.2.2"
+        Write-Verbose "Running Test-NoWhitelistDomains for $recnum..."
+        <#
+        Conditions for 6.2.2 (L1) Ensure mail transport rules do not whitelist specific domains (Automated)
+        Validate test for a pass:
+        - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        - Specific conditions to check:
+          - Condition A: No mail transport rules whitelist any specific domains.
+          - Condition B: Verification of mail transport rules using PowerShell shows no domains are whitelisted.
+          - Condition C: Manual review in Exchange Online admin center confirms no whitelisted domains in transport rules.
+        Validate test for a fail:
+        - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+        - Specific conditions to check:
+          - Condition A: One or more mail transport rules whitelist specific domains.
+          - Condition B: Verification of mail transport rules using PowerShell shows one or more domains are whitelisted.
+          - Condition C: Manual review in Exchange Online admin center shows whitelisted domains in transport rules.
+        #>
     }
-
     process {
-        # 6.2.2 (L1) Ensure mail transport rules do not whitelist specific domains
+        try {
-
+            # 6.2.2 (L1) Ensure mail transport rules do not whitelist specific domains
-        # Retrieve transport rules that whitelist specific domains
+            # Retrieve transport rules that whitelist specific domains
-        $whitelistedRules = Get-TransportRule | Where-Object { $_.SetSCL -eq -1 -and $null -ne $_.SenderDomainIs }
+            # Condition A: Checking for transport rules that whitelist specific domains
-
+            $whitelistedRules = Get-CISExoOutput -Rec $recnum
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if ($whitelistedRules) {
+            # Condition B: Prepare failure reasons based on the presence of whitelisted rules
-            "There are transport rules whitelisting specific domains."
+            $failureReasons = if ($whitelistedRules) {
+                "There are transport rules whitelisting specific domains."
+            }
+            else {
+                "N/A"
+            }
+            # Condition C: Prepare details about the whitelisted rules if found
+            $details = if ($whitelistedRules) {
+                $ruleDetails = $whitelistedRules | ForEach-Object { "{0}: {1}" -f $_.Name, ($_.SenderDomainIs -join ', ') }
+                "Whitelisted Rules: $($ruleDetails -join '; ')"
+            }
+            else {
+                "No transport rules whitelisting specific domains found."
+            }
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = -not $whitelistedRules
+                Status        = if ($whitelistedRules) { "Fail" } else { "Pass" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($whitelistedRules) {
-            $ruleDetails = $whitelistedRules | ForEach-Object { "{0}: {1}" -f $_.Name, ($_.SenderDomainIs -join ', ') }
-            "Whitelisted Rules: $($ruleDetails -join '; ')"
-        }
-        else {
-            "No transport rules whitelisting specific domains found."
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "6.2.2"
-            Result         = -not $whitelistedRules
-            Status         = if ($whitelistedRules) { "Fail" } else { "Pass" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return auditResult
         return $auditResult

source/tests/Test-NotifyMalwareInternal.ps1

@@ -1,58 +1,91 @@
 function Test-NotifyMalwareInternal {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be added if needed
     )
-
     begin {
+        <#
+        # Conditions for 2.1.3 (L1) Ensure notifications for internal users sending malware is Enabled
+        #
+        # Validate test for a pass:
+        # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        # - Specific conditions to check:
+        #   - Condition A: Notifications for internal users sending malware are enabled in the Microsoft 365 Security & Compliance Center.
+        #   - Condition B: Using PowerShell, the `NotifyInternal` property in the anti-malware policy is set to `True` and includes at least one valid email address for notifications.
+        #
+        # 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: Notifications for internal users sending malware are not enabled in the Microsoft 365 Security & Compliance Center.
+        #   - Condition B: Using PowerShell, the `NotifyInternal` property in the anti-malware policy is set to `False` or does not include any valid email addresses for notifications.
+        #>
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "2.1.3"
+        Write-Verbose "Running Test-NotifyMalwareInternal for $recnum..."
     }
-
     process {
-        # 2.1.3 Ensure notifications for internal users sending malware is Enabled
+        try {
+            # 2.1.3 Ensure notifications for internal users sending malware is Enabled
 
-        # Retrieve all 'Custom' malware filter policies and check notification settings
+            # Retrieve all 'Custom' malware filter policies and check notification settings
-        $malwareNotifications = Get-MalwareFilterPolicy | Where-Object { $_.RecommendedPolicyType -eq 'Custom' }
+            # $malwareNotifications Mock Object
-        $policiesToReport = @()
+            <#
-
+                $malwareNotifications = @(
-        foreach ($policy in $malwareNotifications) {
+                    [PSCustomObject]@{
-            if ($policy.EnableInternalSenderAdminNotifications -ne $true) {
+                        Identity = "Default"
-                $policiesToReport += "$($policy.Identity): Notifications Disabled"
+                        EnableInternalSenderAdminNotifications = $true
+                        RecommendedPolicyType = "Custom"
+                    },
+                    [PSCustomObject]@{
+                        Identity = "Anti-malware-Policy"
+                        EnableInternalSenderAdminNotifications = $true
+                        RecommendedPolicyType = "Custom"
+                    }
+                )
+            #>
+            $malwareNotifications = Get-CISExoOutput -Rec $recnum
+            # Condition B: Using PowerShell, the `NotifyInternal` property in the anti-malware policy is set to `True` and includes at least one valid email address for notifications.
+            $policiesToReport = @()
+            foreach ($policy in $malwareNotifications) {
+                if ($policy.EnableInternalSenderAdminNotifications -ne $true) {
+                    $policiesToReport += "$($policy.Identity): Notifications Disabled"
+                }
             }
+            # Determine the result based on the presence of custom policies without notifications
+            $result = $policiesToReport.Count -eq 0
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = if ($result) {
+                "N/A"
+            }
+            else {
+                # Condition A: Notifications for internal users sending malware are not enabled in the Microsoft 365 Security & Compliance Center.
+                "Some custom policies do not have notifications for internal users sending malware enabled."
+            }
+            $details = if ($result) {
+                "All custom malware policies have notifications enabled."
+            }
+            else {
+                "Misconfigured Policies: $($policiesToReport -join '`n')"
+            }
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $result
+                Status        = if ($result) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-
+        catch {
-        # Determine the result based on the presence of custom policies without notifications
+            $LastError = $_
-        $result = $policiesToReport.Count -eq 0
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
-
-        # Prepare failure reasons and details based on compliance
-        $failureReasons = if ($result) {
-            "N/A"
         }
-        else {
-            "Some custom policies do not have notifications for internal users sending malware enabled."
-        }
-
-        $details = if ($result) {
-            "All custom malware policies have notifications enabled."
-        }
-        else {
-            "Misconfigured Policies: $($policiesToReport -join ', ')"
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "2.1.3"
-            Result         = $result
-            Status         = if ($result) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-OneDriveContentRestrictions.ps1

@@ -1,47 +1,71 @@
 function Test-OneDriveContentRestrictions {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Define your parameters here
     )
 
     begin {
+        # 7.2.4 (L2) Ensure OneDrive 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 OneDriveSharingCapability setting is configured to "Disabled" using the PowerShell cmdlet `Get-SPOTenant | fl OneDriveSharingCapability`.
+        #   - Condition B: The OneDriveSharingCapability is set to "Only people in your organization" in the SharePoint admin center under Policies > Sharing > OneDrive.
+        #   - Condition C: OneDrive content sharing is not more permissive than SharePoint content sharing.
+        #
+        # 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 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"
     }
 
     process {
-        # 7.2.4 (L2) Ensure OneDrive content sharing is restricted
+        try {
+            # 7.2.4 (L2) Ensure OneDrive content sharing is restricted
 
-        # Retrieve OneDrive sharing capability settings
+            # Retrieve OneDrive sharing capability settings
-        $SPOTenant = Get-SPOTenant | Select-Object OneDriveSharingCapability
+            $SPOTenant = Get-CISSpoOutput -Rec $recnum
-        $isOneDriveSharingRestricted = $SPOTenant.OneDriveSharingCapability -eq 'Disabled'
+            $isOneDriveSharingRestricted = $SPOTenant.OneDriveSharingCapability -eq 'Disabled'
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if (-not $isOneDriveSharingRestricted) {
+            $failureReasons = if (-not $isOneDriveSharingRestricted) {
-            "OneDrive content sharing is not restricted to 'Disabled'. Current setting: $($SPOTenant.OneDriveSharingCapability)"
+                "OneDrive content sharing is not restricted to 'Disabled'. Current setting: $($SPOTenant.OneDriveSharingCapability)"
-        }
+            }
-        else {
+            else {
-            "N/A"
+                "N/A"
-        }
+            }
 
-        $details = if ($isOneDriveSharingRestricted) {
+            $details = if ($isOneDriveSharingRestricted) {
-            "OneDrive content sharing is restricted."
+                "OneDrive content sharing is restricted."
-        }
+            }
-        else {
+            else {
-            "OneDriveSharingCapability: $($SPOTenant.OneDriveSharingCapability)"
+                "OneDriveSharingCapability: $($SPOTenant.OneDriveSharingCapability)"
-        }
+            }
 
-        # Create and populate the CISAuditResult object
+            # Create and populate the CISAuditResult object
-        $params = @{
+            $params = @{
-            Rec            = "7.2.4"
+                Rec           = $recnum
-            Result         = $isOneDriveSharingRestricted
+                Result        = $isOneDriveSharingRestricted
-            Status         = if ($isOneDriveSharingRestricted) { "Pass" } else { "Fail" }
+                Status        = if ($isOneDriveSharingRestricted) { "Pass" } else { "Fail" }
-            Details        = $details
+                Details       = $details
-            FailureReason  = $failureReasons
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
+        }
+        catch {
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-OneDriveSyncRestrictions.ps1

@@ -1,5 +1,6 @@
 function Test-OneDriveSyncRestrictions {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Define your parameters here
@@ -9,39 +10,62 @@ function Test-OneDriveSyncRestrictions {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "7.3.2"
     }
 
     process {
-        # 7.3.2 (L2) Ensure OneDrive sync is restricted for unmanaged devices
+        try {
+            # 7.3.2 (L2) Ensure OneDrive sync is restricted for unmanaged devices
+            #
+            # 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: Verify that "Allow syncing only on computers joined to specific domains" is enabled.
+            #   - Condition B: Check that "TenantRestrictionEnabled" is set to True.
+            #   - Condition C: Ensure that "AllowedDomainList" contains the trusted domain GUIDs from the on-premises environment.
+            #
+            # 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: "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
+            # Retrieve OneDrive sync client restriction settings
-        $SPOTenantSyncClientRestriction = Get-SPOTenantSyncClientRestriction | Select-Object TenantRestrictionEnabled, AllowedDomainList
+            $SPOTenantSyncClientRestriction = Get-CISSpoOutput -Rec $recnum
-        $isSyncRestricted = $SPOTenantSyncClientRestriction.TenantRestrictionEnabled -and $SPOTenantSyncClientRestriction.AllowedDomainList
+            $isSyncRestricted = $SPOTenantSyncClientRestriction.TenantRestrictionEnabled -and $SPOTenantSyncClientRestriction.AllowedDomainList
 
-        # Prepare failure reasons and details based on compliance
+            # Condition A: Check if TenantRestrictionEnabled is True
-        $failureReasons = if (-not $isSyncRestricted) {
+            # Condition B: Ensure AllowedDomainList contains trusted domains GUIDs
-            "OneDrive sync is not restricted to managed devices. TenantRestrictionEnabled should be True and AllowedDomainList should contain 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."
-        else {
+            }
-            "N/A"
+            else {
-        }
+                "N/A"
+            }
 
-        $details = if ($isSyncRestricted) {
+            # Condition C: Prepare details based on whether sync is restricted
-            "OneDrive sync is restricted for unmanaged devices."
+            $details = if ($isSyncRestricted) {
-        }
+                "OneDrive sync is restricted for unmanaged devices."
-        else {
+            }
-            "TenantRestrictionEnabled: $($SPOTenantSyncClientRestriction.TenantRestrictionEnabled); AllowedDomainList: $($SPOTenantSyncClientRestriction.AllowedDomainList -join ', ')"
+            else {
-        }
+                "TenantRestrictionEnabled: $($SPOTenantSyncClientRestriction.TenantRestrictionEnabled); AllowedDomainList: $($SPOTenantSyncClientRestriction.AllowedDomainList -join ', ')"
+            }
 
-        # Create and populate the CISAuditResult object
+            # Create and populate the CISAuditResult object
-        $params = @{
+            $params = @{
-            Rec            = "7.3.2"
+                Rec           = $recnum
-            Result         = $isSyncRestricted
+                Result        = $isSyncRestricted
-            Status         = if ($isSyncRestricted) { "Pass" } else { "Fail" }
+                Status        = if ($isSyncRestricted) { "Pass" } else { "Fail" }
-            Details        = $details
+                Details       = $details
-            FailureReason  = $failureReasons
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
+        }
+        catch {
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-OrgOnlyBypassLobby.ps1

@@ -1,51 +1,67 @@
 function Test-OrgOnlyBypassLobby {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be defined here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "8.5.3"
+        Write-Verbose "Running Test-OrgOnlyBypassLobby for $recnum..."
     }
-
     process {
-        # 8.5.3 (L1) Ensure only people in my org can bypass the lobby
+        try {
-
+            # 8.5.3 (L1) Ensure only people in my org can bypass the lobby
-        # Connect to Teams PowerShell using Connect-MicrosoftTeams
+            #
-
+            # Validate test for a pass:
-        # Retrieve the Teams meeting policy for lobby bypass settings
+            # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        $CsTeamsMeetingPolicyLobby = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AutoAdmittedUsers
+            # - Specific conditions to check:
-        $lobbyBypassRestricted = $CsTeamsMeetingPolicyLobby.AutoAdmittedUsers -eq 'EveryoneInCompanyExcludingGuests'
+            #   - 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.
-        # Prepare failure reasons and details based on compliance
+            #   - Condition C: Verification using the Microsoft Teams admin center confirms that the meeting join & lobby settings are configured as recommended.
-        $failureReasons = if (-not $lobbyBypassRestricted) {
+            #
-            "External participants can bypass the lobby"
+            # 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 = Get-CISMSTeamsOutput -Rec $recnum
+            $lobbyBypassRestricted = $CsTeamsMeetingPolicyLobby.AutoAdmittedUsers -eq 'EveryoneInCompanyExcludingGuests'
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = if (-not $lobbyBypassRestricted) {
+                # Condition C: Verification using the Microsoft Teams admin center indicates that the meeting join & lobby settings are not configured as recommended.
+                "AutoAdmittedUsers is set to $($CsTeamsMeetingPolicyLobby.AutoAdmittedUsers)"
+            }else {
+                "N/A"
+            }
+            $details = if ($lobbyBypassRestricted) {
+                # Condition B: The setting for "Who can bypass the lobby" is configured to "People in my org" using the UI.
+                "Only people in the organization can bypass the lobby."
+            }else {
+                # Condition A: The `AutoAdmittedUsers` setting in the Teams meeting policy is not set to `EveryoneInCompanyExcludingGuests`.
+                "AutoAdmittedUsers is not set to EveryoneInCompanyExcludingGuests"
+            }
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $lobbyBypassRestricted
+                Status        = if ($lobbyBypassRestricted) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($lobbyBypassRestricted) {
-            "Only people in the organization can bypass the lobby."
-        }
-        else {
-            "AutoAdmittedUsers is set to $($CsTeamsMeetingPolicyLobby.AutoAdmittedUsers)"
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "8.5.3"
-            Result         = $lobbyBypassRestricted
-            Status         = if ($lobbyBypassRestricted) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-OrganizersPresent.ps1

@@ -1,51 +1,71 @@
 function Test-OrganizersPresent {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be defined here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "8.5.6"
+        Write-Verbose "Running Test-OrganizersPresent for $recnum..."
     }
-
     process {
-        # 8.5.6 (L2) Ensure only organizers and co-organizers can present
+        try {
-
+            # 8.5.6 (L2) Ensure only organizers and co-organizers can present
-        # Connect to Teams PowerShell using Connect-MicrosoftTeams
+            #
-
+            # Validate test for a pass:
-        # Retrieve the Teams meeting policy for presenters
+            # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
-        $CsTeamsMeetingPolicyPresenters = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property DesignatedPresenterRoleMode
+            # - Specific conditions to check:
-        $presenterRoleRestricted = $CsTeamsMeetingPolicyPresenters.DesignatedPresenterRoleMode -eq 'OrganizerOnlyUserOverride'
+            #   - 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".
-        # Prepare failure reasons and details based on compliance
+            #   - Condition C: Verification using PowerShell confirms that the `DesignatedPresenterRoleMode` is set to `OrganizerOnlyUserOverride`.
-        $failureReasons = if (-not $presenterRoleRestricted) {
+            #
-            "Others besides organizers and co-organizers can present"
+            # 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-CISMSTeamsOutput -Rec $recnum
+            $presenterRoleRestricted = $CsTeamsMeetingPolicyPresenters.DesignatedPresenterRoleMode -eq 'OrganizerOnlyUserOverride'
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = if (-not $presenterRoleRestricted) {
+                "Others besides organizers and co-organizers can present. Use the following command to remediate:`nSet-CsTeamsMeetingPolicy -Identity Global -DesignatedPresenterRoleMode `"OrganizerOnlyUserOverride`""
+            }
+            else {
+                "N/A"
+            }
+            $details = if ($presenterRoleRestricted) {
+                "Only organizers and co-organizers can present."
+            }
+            else {
+                "DesignatedPresenterRoleMode is set to $($CsTeamsMeetingPolicyPresenters.DesignatedPresenterRoleMode)"
+            }
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $presenterRoleRestricted
+                Status        = if ($presenterRoleRestricted) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = if ($presenterRoleRestricted) {
-            "Only organizers and co-organizers can present."
-        }
-        else {
-            "DesignatedPresenterRoleMode is set to $($CsTeamsMeetingPolicyPresenters.DesignatedPresenterRoleMode)"
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "8.5.6"
-            Result         = $presenterRoleRestricted
-            Status         = if ($presenterRoleRestricted) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-PasswordHashSync.ps1

@@ -1,43 +1,66 @@
 function Test-PasswordHashSync {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be added if needed
     )
 
     begin {
+        # Conditions for 5.1.8.1 (L1) Ensure password hash sync is enabled for hybrid deployments
+        #
+        # 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: Password hash sync is enabled in the Azure AD Connect tool on the on-premises server.
+        #   - Condition B: Password hash sync is verified as enabled in the Azure AD Connect Sync section in the Microsoft Entra admin center.
+        #   - Condition C: Using Microsoft Graph PowerShell, the verification command returns the expected result indicating that password sync is enabled for the on-premises AD.
+        #
+        # 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: Password hash sync is not enabled in the Azure AD Connect tool on the on-premises server.
+        #   - Condition B: Password hash sync is not verified as enabled in the Azure AD Connect Sync section in the Microsoft Entra admin center.
+        #   - Condition C: Using Microsoft Graph PowerShell, the verification command returns no result indicating that password sync is not enabled for the on-premises AD.
+
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "5.1.8.1"
     }
 
     process {
-        # 5.1.8.1 (L1) Ensure password hash sync is enabled for hybrid deployments
+        try {
-        # Pass if OnPremisesSyncEnabled is True. Fail otherwise.
+            # 5.1.8.1 (L1) Ensure password hash sync is enabled for hybrid deployments
 
-        # Retrieve password hash sync status
+            # Retrieve password hash sync status (Condition A and C)
-        $passwordHashSync = Get-MgOrganization | Select-Object -ExpandProperty OnPremisesSyncEnabled
+            $passwordHashSync = Get-CISMgOutput -Rec $recnum
-        $hashSyncResult = $passwordHashSync
+            $hashSyncResult = $passwordHashSync
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if (-not $hashSyncResult) {
+            $failureReasons = if (-not $hashSyncResult) {
-            "Password hash sync for hybrid deployments is not enabled"
+                "Password hash sync for hybrid deployments is not enabled"
+            }
+            else {
+                "N/A"
+            }
+
+            $details = "OnPremisesSyncEnabled: $($passwordHashSync)"
+
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $hashSyncResult
+                Status        = if ($hashSyncResult) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "OnPremisesSyncEnabled: $($passwordHashSync)"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "5.1.8.1"
-            Result         = $hashSyncResult
-            Status         = if ($hashSyncResult) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-PasswordNeverExpirePolicy.ps1

@@ -1,43 +1,90 @@
 function Test-PasswordNeverExpirePolicy {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
-        # Aligned
+        [Parameter(Mandatory = $false)]
-        [Parameter(Mandatory)]
+        [string]$DomainName
-        [string]$DomainName # DomainName parameter is now mandatory
     )
 
     begin {
+        # .TODO add supported services to output details. ({Email, OfficeCommunicationsOnline, Intune})
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "1.3.1"
+        $overallResult = $true
+        $detailsList = @()
+        $failureReasonsList = @()
+
+        # Add headers for the details
+        $detailsList += "Domain|Validity Period|Notification Window|IsDefault"
+
+        # Conditions for 1.3.1 (L1) Ensure the 'Password expiration policy' is set to 'Set passwords to never expire (recommended)'
+        #
+        # 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: Password expiration policy is set to "Set passwords to never expire" in the Microsoft 365 admin center.
+        #   - Condition B: Using Microsoft Graph PowerShell, the `PasswordPolicies` property for all users is set to `DisablePasswordExpiration`.
+        #   - Condition C: Notification window for password expiration is set to 30 days.
+        #
+        # Validate test for a fail:
+        # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+        # - Specific conditions to check:
+        #   - Condition A: Password expiration policy is not set to "Set passwords to never expire" in the Microsoft 365 admin center.
+        #   - Condition B: Using Microsoft Graph PowerShell, the `PasswordPolicies` property for one or more users is not set to `DisablePasswordExpiration`.
+        #   - Condition C: Notification window for password expiration is not set to 30 days.
     }
 
     process {
-        # 1.3.1 (L1) Ensure the 'Password expiration policy' is set to 'Set passwords to never expire'
+        try {
-        # Pass if PasswordValidityPeriodInDays is 0. Fail otherwise.
+            # Step: Retrieve all domains or a specific domain
+            $domains = Get-CISMgOutput -Rec $recnum -DomainName $DomainName
+            foreach ($domain in $domains) {
+                $domainName = $domain.Id
+                $isDefault = $domain.IsDefault
+                # Step (Condition C): Determine if the notification window is set to 30 days
+                $notificationWindow = $domain.PasswordNotificationWindowInDays
+                $notificationPolIsCompliant = $notificationWindow -eq 30
+                # 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
 
-        # Retrieve password expiration policy
+                # Step (Condition A & B): Prepare failure reasons and details based on compliance
-        $passwordPolicy = Get-MgDomain -DomainId $DomainName | Select-Object -ExpandProperty PasswordValidityPeriodInDays
+                $failureReasons = if ($notificationPolIsCompliant -and $pwPolIsCompliant) {
+                    "N/A"
+                }
+                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"
+                }
 
-        # Prepare failure reasons and details based on compliance
+                $details = "$domainName|$passwordPolicy days|$notificationWindow days|$isDefault"
-        $failureReasons = if ($passwordPolicy -ne 0) {
+
-            "Password expiration is not set to never expire"
+                # 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
+                Result        = $overallResult
+                Status        = if ($overallResult) { "Pass" } else { "Fail" }
+                Details       = $finalDetails
+                FailureReason = $finalFailureReason
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "Validity Period: $passwordPolicy days"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "1.3.1"
-            Result         = $passwordPolicy -eq 0
-            Status         = if ($passwordPolicy -eq 0) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-ReauthWithCode.ps1

@@ -1,42 +1,66 @@
 function Test-ReauthWithCode {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Define your parameters here
     )
 
     begin {
+        <#
+        Conditions for 7.2.10 (L1) Ensure reauthentication with verification code 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 `EmailAttestationRequired` property is set to `True`.
+        #   - Condition B: The `EmailAttestationReAuthDays` property is set to `15` or less.
+        #
+        # 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 `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"
     }
 
     process {
-        # 7.2.10 (L1) Ensure reauthentication with verification code is restricted
+        try {
+            # 7.2.10 (L1) Ensure reauthentication with verification code is restricted
 
-        # Retrieve reauthentication settings for SharePoint Online
+            # Retrieve reauthentication settings for SharePoint Online
-        $SPOTenantReauthentication = Get-SPOTenant | Select-Object EmailAttestationRequired, EmailAttestationReAuthDays
+            $SPOTenantReauthentication = Get-CISSpoOutput -Rec $recnum
-        $isReauthenticationRestricted = $SPOTenantReauthentication.EmailAttestationRequired -and $SPOTenantReauthentication.EmailAttestationReAuthDays -le 15
+            $isReauthenticationRestricted = $SPOTenantReauthentication.EmailAttestationRequired -and $SPOTenantReauthentication.EmailAttestationReAuthDays -le 15
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if (-not $isReauthenticationRestricted) {
+            $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."
+            }
+            else {
+                "N/A"
+            }
+
+            $details = "EmailAttestationRequired: $($SPOTenantReauthentication.EmailAttestationRequired); EmailAttestationReAuthDays: $($SPOTenantReauthentication.EmailAttestationReAuthDays)"
+
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $isReauthenticationRestricted
+                Status        = if ($isReauthenticationRestricted) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "EmailAttestationRequired: $($SPOTenantReauthentication.EmailAttestationRequired); EmailAttestationReAuthDays: $($SPOTenantReauthentication.EmailAttestationReAuthDays)"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "7.2.10"
-            Result         = $isReauthenticationRestricted
-            Status         = if ($isReauthenticationRestricted) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-ReportSecurityInTeams.ps1

@@ -1,56 +1,112 @@
 function Test-ReportSecurityInTeams {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be defined here if needed
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
+        $recnum = "8.6.1"
+        Write-Verbose "Running Test-ReportSecurityInTeams for $recnum..."
     }
-
     process {
-        # 8.6.1 (L1) Ensure users can report security concerns in Teams
+        try {
+            # Test-ReportSecurityInTeams.ps1
+            # 8.6.1 (L1) Ensure users can report security concerns in Teams
+            # Retrieve the necessary settings for Teams and Exchange Online
+            # Condition A: Ensure the 'Report a security concern' setting in the Teams admin center is set to 'On'.
+            # $CsTeamsMessagingPolicy Mock Object
+            <#
+                $CsTeamsMessagingPolicy = [PSCustomObject]@{
+                    AllowSecurityEndUserReporting           = $true
+                }
+            #>
+            $CsTeamsMessagingPolicy = Get-CISMSTeamsOutput -Rec $recnum
+            # 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-CISExoOutput -Rec $recnum
+            # Check if all the required settings are enabled
+            $securityReportEnabled = $CsTeamsMessagingPolicy.AllowSecurityEndUserReporting -and
+            $ReportSubmissionPolicy.ReportJunkToCustomizedAddress -and
+            $ReportSubmissionPolicy.ReportNotJunkToCustomizedAddress -and
+            $ReportSubmissionPolicy.ReportPhishToCustomizedAddress -and
+            $null -ne $ReportSubmissionPolicy.ReportJunkAddresses -and
+            $null -ne $ReportSubmissionPolicy.ReportNotJunkAddresses -and
+            $null -ne $ReportSubmissionPolicy.ReportPhishAddresses -and
+            $ReportSubmissionPolicy.ReportChatMessageToCustomizedAddressEnabled -and
+            -not $ReportSubmissionPolicy.ReportChatMessageEnabled
+            $detailsString = @"
+The following settings are required for users to report security concerns in Teams:
 
-        # Retrieve the necessary settings for Teams and Exchange Online
+MS Teams:
-        $CsTeamsMessagingPolicy = Get-CsTeamsMessagingPolicy -Identity Global | Select-Object -Property AllowSecurityEndUserReporting
+AllowSecurityEndUserReporting: True
-        $ReportSubmissionPolicy = Get-ReportSubmissionPolicy | Select-Object -Property ReportJunkToCustomizedAddress, ReportNotJunkToCustomizedAddress, ReportPhishToCustomizedAddress, ReportChatMessageToCustomizedAddressEnabled
 
-        $securityReportEnabled = $CsTeamsMessagingPolicy.AllowSecurityEndUserReporting -and
+EXO:
-        $ReportSubmissionPolicy.ReportJunkToCustomizedAddress -and
+ReportJunkToCustomizedAddress: True
-        $ReportSubmissionPolicy.ReportNotJunkToCustomizedAddress -and
+ReportNotJunkToCustomizedAddress: True
-        $ReportSubmissionPolicy.ReportPhishToCustomizedAddress -and
+ReportPhishToCustomizedAddress: True
-        $ReportSubmissionPolicy.ReportChatMessageToCustomizedAddressEnabled
+ReportJunkAddresses: <security@contoso.com>
-
+ReportNotJunkAddresses: <security@contoso.com>
-        # Prepare failure reasons and details based on compliance
+ReportPhishAddresses: <security@contoso.com>
-        $failureReasons = if (-not $securityReportEnabled) {
+ReportChatMessageEnabled: False
-            "Users cannot report security concerns in Teams due to one or more incorrect settings"
+ReportChatMessageToCustomizedAddressEnabled: True
+"@
+            $faildetailstring = "Users cannot report security concerns in Teams due to one or more  of the found incorrect settings:`n`n" +
+            "MSTeams: `nAllowSecurityEndUserReporting: $($CsTeamsMessagingPolicy.AllowSecurityEndUserReporting); `n`n" +
+            "EXO: `nReportJunkToCustomizedAddress: $($ReportSubmissionPolicy.ReportJunkToCustomizedAddress); `n" +
+            "ReportNotJunkToCustomizedAddress: $($ReportSubmissionPolicy.ReportNotJunkToCustomizedAddress); `n" +
+            "ReportPhishToCustomizedAddress: $($ReportSubmissionPolicy.ReportPhishToCustomizedAddress); `n" +
+            "ReportJunkAddresses: $($ReportSubmissionPolicy.ReportJunkAddresses -join ', '); `n" +
+            "ReportNotJunkAddresses: $($ReportSubmissionPolicy.ReportNotJunkAddresses -join ', '); `n" +
+            "ReportPhishAddresses: $($ReportSubmissionPolicy.ReportPhishAddresses -join ', '); `n" +
+            "ReportChatMessageEnabled: $($ReportSubmissionPolicy.ReportChatMessageEnabled); `n" +
+            "ReportChatMessageToCustomizedAddressEnabled: $($ReportSubmissionPolicy.ReportChatMessageToCustomizedAddressEnabled); "
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = if (-not $securityReportEnabled) {
+                $detailsString
+            }
+            else {
+                "N/A"
+            }
+            $details = if ($securityReportEnabled) {
+                "Users can report security concerns in Teams."
+            }
+            else {
+                $faildetailstring
+            }
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $securityReportEnabled
+                Status        = if ($securityReportEnabled) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "AllowSecurityEndUserReporting: $($CsTeamsMessagingPolicy.AllowSecurityEndUserReporting); " +
-        "ReportJunkToCustomizedAddress: $($ReportSubmissionPolicy.ReportJunkToCustomizedAddress); " +
-        "ReportNotJunkToCustomizedAddress: $($ReportSubmissionPolicy.ReportNotJunkToCustomizedAddress); " +
-        "ReportPhishToCustomizedAddress: $($ReportSubmissionPolicy.ReportPhishToCustomizedAddress); " +
-        "ReportChatMessageToCustomizedAddressEnabled: $($ReportSubmissionPolicy.ReportChatMessageToCustomizedAddressEnabled)"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "8.6.1"
-            Result         = $securityReportEnabled
-            Status         = if ($securityReportEnabled) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
-        # Return auditResult
+        # Return the audit result
         return $auditResult
     }
 }

source/tests/Test-RestrictCustomScripts.ps1

@@ -1,60 +1,131 @@
 function Test-RestrictCustomScripts {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
-        # Aligned
         # Define your parameters here if needed
     )
 
     begin {
         # Dot source the class script if necessary
-        #. .\source\Classes\CISAuditResult.ps1
+        # . .\source\Classes\CISAuditResult.ps1
+
         # Initialization code, if needed
+        $recnum = "7.3.4"
     }
 
     process {
-        # 7.3.4 (L1) Ensure custom script execution is restricted on site collections
+        try {
+            # 7.3.4 (L1) Ensure custom script execution is restricted on site collections
+            #
+            # 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 `DenyAddAndCustomizePages` setting is set to `Enabled` for each site collection.
+            #   - Condition B: The setting is validated through PowerShell commands ensuring the correct state.
+            #   - Condition C: Verification using the SharePoint Admin Center confirms the `DenyAddAndCustomizePages` setting is enforced.
+            #
+            # 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 `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
+            # Retrieve all site collections and select necessary properties
-        $SPOSitesCustomScript = Get-SPOSite -Limit All | Select-Object Title, Url, DenyAddAndCustomizePages
+            $SPOSitesCustomScript = Get-CISSpoOutput -Rec $recnum
 
-        # Find sites where custom scripts are allowed (DenyAddAndCustomizePages is not 'Enabled')
+            # Process URLs to replace 'sharepoint.com' with '<SPUrl>'
-        $customScriptAllowedSites = $SPOSitesCustomScript | Where-Object { $_.DenyAddAndCustomizePages -ne 'Enabled' }
+            $processedUrls = $SPOSitesCustomScript | ForEach-Object {
+                $_.Url = $_.Url -replace 'sharepoint\.com', '<SPUrl>'
+                $_
+            }
 
-        # Compliance is true if no sites allow custom scripts
+            # Find sites where custom scripts are allowed
-        $complianceResult = $customScriptAllowedSites.Count -eq 0
+            $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"
 
-        # Gather details for non-compliant sites (where custom scripts are allowed)
+            # Extract hostnames from allowed sites if the total length exceeds the limit
-        $nonCompliantSiteDetails = $customScriptAllowedSites | ForEach-Object {
+            $mostUsedHostname = $null
-            "$($_.Title) ($($_.Url)): Custom Script Allowed"
+            if ($totalUrlLength -gt 20000) {
+                Write-Verbose "Extracting hostnames from URLs..."
+                $hostnames = $customScriptAllowedSites.Url | ForEach-Object {
+                    if ($_ -match '^https://([^\.]+)\.') {
+                        $matches[1]
+                    }
+                }
+                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"
+            }
+            #$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
+                if ($null -ne $mostUsedHostname -and $url -match "^https://$mostUsedHostname\.<SPUrl>") {
+                    $url = $url -replace "^https://$mostUsedHostname\.<SPUrl>", "https://<corp>.<SPUrl>"
+                }
+                "$(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."
+            }
+            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
+                Result        = $complianceResult
+                Status        = if ($complianceResult) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-
+        catch {
-        # Prepare failure reasons and details based on compliance
+            $LastError = $_
-        $failureReasons = if (-not $complianceResult) {
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
-            "The following site collections allow custom script execution: " + ($nonCompliantSiteDetails -join "; ")
         }
-        else {
-            "N/A"
-        }
-
-        $details = if ($complianceResult) {
-            "All site collections have custom script execution restricted"
-        }
-        else {
-            $nonCompliantSiteDetails -join "; "
-        }
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "7.3.4"
-            Result         = $complianceResult
-            Status         = if ($complianceResult) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {
+        # Measure the character count of the details
+        #$verbosePreference = 'Continue'
+        $detailsLength = $details.Length
+        Write-Verbose "Character count of the details: $detailsLength"
+
+        if ($detailsLength -gt 32767) {
+            Write-Verbose "Warning: The character count exceeds the limit for Excel cells."
+        }
+        #$verbosePreference = 'SilentlyContinue'
         # Return auditResult
         return $auditResult
     }

source/tests/Test-RestrictExternalSharing.ps1

@@ -1,42 +1,71 @@
 function Test-RestrictExternalSharing {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # 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:
+        - Condition A: The SharingCapability is set to "Anyone" or "ExternalUserAndGuestSharing" in the SharePoint admin center.
+        - 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"
     }
 
     process {
-        # 7.2.3 (L1) Ensure external content sharing is restricted
+        try {
+            # 7.2.3 (L1) Ensure external content sharing is restricted
 
-        # Retrieve the SharingCapability setting for the SharePoint tenant
+            # Retrieve the SharingCapability setting for the SharePoint tenant
-        $SPOTenantSharingCapability = Get-SPOTenant | Select-Object SharingCapability
+            $SPOTenantSharingCapability = Get-CISSpoOutput -Rec $recnum
-        $isRestricted = $SPOTenantSharingCapability.SharingCapability -in @('ExternalUserSharingOnly', 'ExistingExternalUserSharingOnly', 'Disabled')
+            $isRestricted = $SPOTenantSharingCapability.SharingCapability -in @('ExternalUserSharingOnly', 'ExistingExternalUserSharingOnly', 'Disabled')
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if (-not $isRestricted) {
+            # Condition B: Using PowerShell, the SharingCapability property for the SharePoint tenant is set to "ExternalUserSharingOnly", "ExistingExternalUserSharingOnly", or "Disabled".
-            "External content sharing is not adequately restricted. Current setting: $($SPOTenantSharingCapability.SharingCapability)"
+            $failureReasons = if (-not $isRestricted) {
+                "External content sharing is not adequately restricted. Current setting: $($SPOTenantSharingCapability.SharingCapability)"
+            }
+            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
+                Result        = $isRestricted
+                Status        = if ($isRestricted) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "N/A"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "SharingCapability: $($SPOTenantSharingCapability.SharingCapability)"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "7.2.3"
-            Result         = $isRestricted
-            Status         = if ($isRestricted) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {

source/tests/Test-RestrictOutlookAddins.ps1

@@ -1,76 +1,76 @@
 function Test-RestrictOutlookAddins {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters could include credentials or other necessary data
     )
-
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
         # Initialization code
-        $customPolicyFailures = @()
         $defaultPolicyFailureDetails = @()
         $relevantRoles = @('My Custom Apps', 'My Marketplace Apps', 'My ReadWriteMailbox Apps')
+        $recnum = "6.3.1"
+        Write-Verbose "Running Test-RestrictOutlookAddins for $recnum..."
+        # Conditions for 6.3.1 (L2) Ensure users installing Outlook add-ins is not allowed
+        #
+        # Validate test for a pass:
+        # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+        # - Specific conditions to check:
+        #   - Condition A: Verify that the roles MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are unchecked under Other roles.
+        #   - Condition B: Using PowerShell, verify that MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are not assigned to users.
+        #
+        # 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: One or more of the roles MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are checked under Other roles.
+        #   - Condition B: Using PowerShell, verify that MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are assigned to users.
     }
-
     process {
-        # 6.3.1 (L2) Ensure users installing Outlook add-ins is not allowed
+        try {
-
+            # 6.3.1 (L2) Ensure users installing Outlook add-ins is not allowed
-        # Check all mailboxes for custom policies with unallowed add-ins
+            # Check all mailboxes for custom policies with unallowed add-ins
-        $roleAssignmentPolicies = Get-EXOMailbox | Select-Object -Unique RoleAssignmentPolicy
+            # Check Default Role Assignment Policy
-
+            $customPolicyFailures, $defaultPolicy = Get-CISExoOutput -Rec $recnum
-        if ($roleAssignmentPolicies.RoleAssignmentPolicy) {
+            $defaultPolicyRoles = $defaultPolicy.AssignedRoles | Where-Object { $_ -in $relevantRoles }
-            foreach ($policy in $roleAssignmentPolicies) {
+            # Condition A: Verify that the roles MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are unchecked under Other roles.
-                if ($policy.RoleAssignmentPolicy) {
+            if ($defaultPolicyRoles) {
-                    $rolePolicyDetails = Get-RoleAssignmentPolicy -Identity $policy.RoleAssignmentPolicy
+                $defaultPolicyFailureDetails = $defaultPolicyRoles
-                    $foundRoles = $rolePolicyDetails.AssignedRoles | Where-Object { $_ -in $relevantRoles }
-                    if ($foundRoles) {
-                        $customPolicyFailures += "Policy: $($policy.RoleAssignmentPolicy): Roles: $($foundRoles -join ', ')"
-                    }
-                }
             }
+            # Prepare result details string
+            $detailsString = ""
+            if ($customPolicyFailures) {
+                $detailsString += "Custom Policy Failures: | "
+                $detailsString += ($customPolicyFailures -join " | ")
+            }
+            else {
+                $detailsString += "Custom Policy Failures: None | "
+            }
+            $detailsString += "Default Role Assignment Policy: "
+            if ($defaultPolicyFailureDetails) {
+                $detailsString += ($defaultPolicyFailureDetails -join ', ')
+            }
+            else {
+                $detailsString += "Compliant"
+            }
+            # Determine result based on findings
+            $isCompliant = -not ($customPolicyFailures -or $defaultPolicyFailureDetails)
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $isCompliant
+                Status        = if ($isCompliant) { "Pass" } else { "Fail" }
+                Details       = $detailsString
+                FailureReason = if ($isCompliant) { "N/A" } else { "Unauthorized Outlook add-ins found in custom or default policies." }
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-
+        catch {
-        # Check Default Role Assignment Policy
+            $LastError = $_
-        $defaultPolicy = Get-RoleAssignmentPolicy "Default Role Assignment Policy"
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
-        $defaultPolicyRoles = $defaultPolicy.AssignedRoles | Where-Object { $_ -in $relevantRoles }
-        if ($defaultPolicyRoles) {
-            $defaultPolicyFailureDetails = $defaultPolicyRoles
         }
-
-        # Prepare result details string
-        $detailsString = ""
-        if ($customPolicyFailures) {
-            $detailsString += "Custom Policy Failures: | "
-            $detailsString += ($customPolicyFailures -join " | ")
-        }
-        else {
-            $detailsString += "Custom Policy Failures: None | "
-        }
-
-        $detailsString += "Default Role Assignment Policy: "
-        if ($defaultPolicyFailureDetails) {
-            $detailsString += ($defaultPolicyFailureDetails -join ', ')
-        }
-        else {
-            $detailsString += "Compliant"
-        }
-
-        # Determine result based on findings
-        $isCompliant = -not ($customPolicyFailures -or $defaultPolicyFailureDetails)
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "6.3.1"
-            Result         = $isCompliant
-            Status         = if ($isCompliant) { "Pass" } else { "Fail" }
-            Details        = $detailsString
-            FailureReason  = if ($isCompliant) { "N/A" } else { "Unauthorized Outlook add-ins found in custom or default policies." }
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
-
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-RestrictStorageProvidersOutlook.ps1

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

source/tests/Test-RestrictTenantCreation.ps1

@@ -1,5 +1,6 @@
 function Test-RestrictTenantCreation {
     [CmdletBinding()]
+    [OutputType([CISAuditResult])]
     param (
         # Aligned
         # Parameters can be added if needed
@@ -8,35 +9,59 @@ function Test-RestrictTenantCreation {
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
+
         # Initialization code, if needed
+        $recnum = "5.1.2.3"
+
+        <#
+        Conditions for 5.1.2.3 (L1) Ensure 'Restrict non-admin users from creating tenants' is set to 'Yes'
+
+        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: Restrict non-admin users from creating tenants is set to 'Yes' in the Azure AD and Entra administration portal.
+          - Condition B: Using PowerShell, the setting for restricting non-admin users from creating tenants is set to 'Yes'.
+
+        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: Restrict non-admin users from creating tenants is not set to 'Yes' in the Azure AD and Entra administration portal.
+          - Condition B: Using PowerShell, the setting for restricting non-admin users from creating tenants is not set to 'Yes'.
+        #>
     }
 
     process {
-        # 5.1.2.3 (L1) Ensure 'Restrict non-admin users from creating tenants' is set to 'Yes'
+        try {
+            # 5.1.2.3 (L1) Ensure 'Restrict non-admin users from creating tenants' is set to 'Yes'
 
-        # Retrieve the tenant creation policy
+            # Retrieve the tenant creation policy
-        $tenantCreationPolicy = (Get-MgPolicyAuthorizationPolicy).DefaultUserRolePermissions | Select-Object AllowedToCreateTenants
+            $tenantCreationPolicy = Get-CISMgOutput -Rec $recnum
-        $tenantCreationResult = -not $tenantCreationPolicy.AllowedToCreateTenants
+            $tenantCreationResult = -not $tenantCreationPolicy.AllowedToCreateTenants
 
-        # Prepare failure reasons and details based on compliance
+            # Prepare failure reasons and details based on compliance
-        $failureReasons = if ($tenantCreationResult) {
+            $failureReasons = if ($tenantCreationResult) {
-            "N/A"
+                "N/A"
+            }
+            else {
+                "Non-admin users can create tenants"
+            }
+
+            $details = "AllowedToCreateTenants: $($tenantCreationPolicy.AllowedToCreateTenants)"
+
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $tenantCreationResult
+                Status        = if ($tenantCreationResult) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
-        else {
+        catch {
-            "Non-admin users can create tenants"
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
-
-        $details = "AllowedToCreateTenants: $($tenantCreationPolicy.AllowedToCreateTenants)"
-
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = "5.1.2.3"
-            Result         = $tenantCreationResult
-            Status         = if ($tenantCreationResult) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
     }
 
     end {
@@ -44,5 +69,3 @@ function Test-RestrictTenantCreation {
         return $auditResult
     }
 }
-
-# Additional helper functions (if any)