Merge pull request #146 from CriticalSolutionsNetwork/Fix-pw-notification-test

Fix pw notification test

CHANGELOG.md

@@ -4,6 +4,51 @@ The format is based on and uses the types of changes according to [Keep a Change
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed test 1.3.1 as notification window for password expiration is no longer required.
+
+## [0.1.24] - 2024-07-07
+
+### Added
+
+- New private function `Get-AuditMailboxDetail` for 6.1.2 and 6.1.3 tests to get the action details for the test.
+
+### Changed
+
+- Changed `Get-Action` function to include both dictionaries.
+
+### Fixed
+
+- Fixed Test 1.3.3 to be the simpler version of the test while including output to check for current users sharing calendars.
+- Safe Attachments logic and added `$DomainName` as input to 2.1.4 to test main policy.
+
+### Docs
+
+- Updated `about_M365FoundationsCISReport` help file with new functions and changes.
+- Updated `Invoke-M365SecurityAudit` help file with examples.
+- Updated `Export-M365SecurityAudit` help file with examples.
+
+## [0.1.23] - 2024-07-02
+
+# Fixed
+
+- SPO tests formatting and output.
+
+## [0.1.22] - 2024-07-01
+
+### Added
+
+- Added hash and compress steps to `Export-M365SecurityAuditTable` function.
+
+## [0.1.21] - 2024-07-01
+
+### Fixed
+
+- SPO tests formatting and output.
+
+## [0.1.22] - 2024-07-01
+
 ### Added
 
 - Added hash and compress steps to `Export-M365SecurityAuditTable` function.

README copy.md

@@ -11,83 +11,50 @@ This PowerShell module is based on CIS benchmarks and is distributed under the C
 For full license details, please visit [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en).
 
 [Register for and download CIS Benchmarks](https://www.cisecurity.org/cis-benchmarks)
+# Table of Contents
+1. [Invoke-M365SecurityAudit](#Invoke-M365SecurityAudit)
+2. [Export-M365SecurityAuditTable](#Export-M365SecurityAuditTable)
+3. [Get-AdminRoleUserLicense](#Get-AdminRoleUserLicense)
+4. [Get-MFAStatus](#Get-MFAStatus)
+5. [Grant-M365SecurityAuditConsent](#Grant-M365SecurityAuditConsent)
+6. [Remove-RowsWithEmptyCSVStatus](#Remove-RowsWithEmptyCSVStatus)
+7. [Sync-CISExcelAndCsvData](#Sync-CISExcelAndCsvData)
 
 ## Invoke-M365SecurityAudit
-### Synopsis
+
-Invokes a security audit for Microsoft 365 environments.
+# EXAMPLES
-### Syntax
 ```powershell
+# Example 1: Performing a security audit based on CIS benchmarks
+$auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com"
+$auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -ApprovedCloudStorageProviders "DropBox" -ApprovedFederatedDomains "northwind.com"
 
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
+# Example 2: Exporting a security audit and it's nested tables to zipped CSV files
+Export-M365SecurityAuditTable -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests -ExportAllTests
+    # Output Ex: 2024.07.07_14.55.55_M365FoundationsAudit_368B2E2F.zip
 
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-ELevel <String>] [-ProfileLevel <String>] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
+# Example 3: Retrieving licenses for users in administrative roles
-
+Get-AdminRoleUserLicense
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-IncludeIG1] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
-
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-IncludeIG2] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
-
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-IncludeIG3] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
-
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-IncludeRecommendation <String[]>] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
-
-Invoke-M365SecurityAudit -TenantAdminUrl <String> -DomainName <String> [-SkipRecommendation <String[]>] [-DoNotConnect] [-DoNotDisconnect] [-NoModuleCheck] [-WhatIf] [-Confirm] [<CommonParameters>]
 
+# Example 4: Getting MFA status of users
+Get-MFAStatus -UserId "user@domain.com"
 
+# Example 5: Removing rows with empty status values from a CSV file
+Remove-RowsWithEmptyCSVStatus -FilePath "C:\Reports\Report.xlsx" -WorksheetName "Sheet1"
 
+# Example 6: Synchronizing CIS benchmark data with audit results
+Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -CsvPath "path\to\data.csv" -SheetName "Combined Profiles"
 
+# Example 7: Granting Microsoft Graph permissions to the auditor
+Grant-M365SecurityAuditConsent -UserPrincipalNameForConsent 'user@example.com'
 ```
-### Parameters
-| Name  | Alias  | Description | Required? | Pipeline Input | Default Value |
-| - | - | - | - | - | - |
-| <nobr>TenantAdminUrl</nobr> |  | The URL of the tenant admin. This parameter is mandatory. | true | false |  |
-| <nobr>DomainName</nobr> |  | The domain name of the Microsoft 365 environment. This parameter is mandatory. | true | false |  |
-| <nobr>ELevel</nobr> |  | Specifies the E-Level \(E3 or E5\) for the audit. This parameter is optional and can be combined with the ProfileLevel parameter. | false | false |  |
-| <nobr>ProfileLevel</nobr> |  | Specifies the profile level \(L1 or L2\) for the audit. This parameter is optional and can be combined with the ELevel parameter. | false | false |  |
-| <nobr>IncludeIG1</nobr> |  | If specified, includes tests where IG1 is true. | false | false | False |
-| <nobr>IncludeIG2</nobr> |  | If specified, includes tests where IG2 is true. | false | false | False |
-| <nobr>IncludeIG3</nobr> |  | If specified, includes tests where IG3 is true. | false | false | False |
-| <nobr>IncludeRecommendation</nobr> |  | Specifies specific recommendations to include in the audit. Accepts an array of recommendation numbers. | false | false |  |
-| <nobr>SkipRecommendation</nobr> |  | Specifies specific recommendations to exclude from the audit. Accepts an array of recommendation numbers. | false | false |  |
-| <nobr>DoNotConnect</nobr> |  | If specified, the cmdlet will not establish a connection to Microsoft 365 services. | false | false | False |
-| <nobr>DoNotDisconnect</nobr> |  | If specified, the cmdlet will not disconnect from Microsoft 365 services after execution. | false | false | False |
-| <nobr>NoModuleCheck</nobr> |  | If specified, the cmdlet will not check for the presence of required modules. | false | false | False |
-| <nobr>WhatIf</nobr> | wi |  | false | false |  |
-| <nobr>Confirm</nobr> | cf |  | false | false |  |
-### Inputs
- - None. You cannot pipe objects to Invoke-M365SecurityAudit.
 
-### Outputs
+# NOTE
- - CISAuditResult\\[\] The cmdlet returns an array of CISAuditResult objects representing the results of the security audit.
+Ensure that you have the necessary permissions and administrative roles in your Microsoft 365 environment to run these cmdlets. Proper configuration and setup are required for accurate audit results.
 
-### Note
+# TROUBLESHOOTING NOTE
-This module is based on CIS benchmarks and is governed by the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. For more details, visit: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en
+If you encounter any issues while using the cmdlets, ensure that your environment meets the module prerequisites. Check for any updates or patches that may address known bugs. For issues related to specific cmdlets, refer to the individual help files for troubleshooting tips.
 
-### Examples
+# SEE ALSO
-**EXAMPLE 1**
+- [CIS Benchmarks](https://www.cisecurity.org/cis-benchmarks/)
-```powershell
+- [Microsoft 365 Security Documentation](https://docs.microsoft.com/en-us/microsoft-365/security/)
-Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -ELevel "E5" -ProfileLevel "L1"
+- [PowerShell Documentation](https://docs.microsoft.com/en-us/powershell/)
-```
-Performs a security audit for the E5 level and L1 profile in the specified Microsoft 365 environment.
-
-**EXAMPLE 2**
-```powershell
-Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -IncludeIG1
-```
-Performs an audit including all tests where IG1 is true.
-
-**EXAMPLE 3**
-```powershell
-Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -SkipRecommendation '1.1.3', '2.1.1'
-```
-Performs an audit while excluding specific recommendations 1.1.3 and 2.1.1.
-
-**EXAMPLE 4**
-```powershell
-$auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com"
-PS> $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation
-```
-Captures the audit results into a variable and exports them to a CSV file.
-
-### Links
-
- - [Online Version: [GitHub Repository URL]](#Online Version: [GitHub Repository URL])

help/Export-M365SecurityAuditTable.md

@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Export-M365SecurityAuditTable
@@ -109,22 +109,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -OutputTestNumber
-The test number to output as an object.
-Valid values are "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4".
-
-```yaml
-Type: String
-Parameter Sets: OutputObjectFromAuditResultsSingle, OutputObjectFromCsvSingle
-Aliases:
-
-Required: True
-Position: 2
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -ExportAllTests
 Switch to export all test results.
 
@@ -140,6 +124,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ExportOriginalTests
+Switch to export the original audit results to a CSV file.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: ExportAllResultsFromAuditResults, ExportAllResultsFromCsv
+Aliases:
+
+Required: True
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ExportPath
 The path where the CSV files will be exported.
 
@@ -155,21 +154,6 @@ 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.
 
@@ -185,13 +169,29 @@ 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
+```
+
 ### 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[]] - An array of CISAuditResult objects.
-### [string] - A path to a CSV file.
+###     [string] - A path to a CSV file.
 ## OUTPUTS
 
 ### [PSCustomObject] - A custom object containing the path to the zip file and its hash.

help/Get-AdminRoleUserLicense.md

@@ -63,7 +63,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## OUTPUTS
 
 ### PSCustomObject
-### Returns a custom object for each user with administrative roles that includes the following properties: RoleName, UserName, UserPrincipalName, UserId, HybridUser, and Licenses.
+###     Returns a custom object for each user with administrative roles that includes the following properties: RoleName, UserName, UserPrincipalName, UserId, HybridUser, and Licenses.
 ## NOTES
 Creation Date:  2024-04-15
 Purpose/Change: Initial function development to support Microsoft 365 administrative role auditing.

help/Get-MFAStatus.md

@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Get-MFAStatus
@@ -36,6 +36,21 @@ Retrieves the MFA status for the specified user with the UPN "example@domain.com
 
 ## PARAMETERS
 
+### -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
+```
+
 ### -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.
@@ -52,21 +67,6 @@ 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).
 
@@ -75,14 +75,14 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## OUTPUTS
 
 ### System.Object
-### Returns a sorted list of custom objects containing the following properties:
+###     Returns a sorted list of custom objects containing the following properties:
-### - UserPrincipalName
+###         - UserPrincipalName
-### - DisplayName
+###         - DisplayName
-### - MFAState
+###         - MFAState
-### - MFADefaultMethod
+###         - MFADefaultMethod
-### - MFAPhoneNumber
+###         - MFAPhoneNumber
-### - PrimarySMTP
+###         - PrimarySMTP
-### - Aliases
+###         - 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.

help/Grant-M365SecurityAuditConsent.md

@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Grant-M365SecurityAuditConsent
@@ -40,18 +40,18 @@ Grants Microsoft Graph permissions to user@example.com, skipping the connection
 
 ## PARAMETERS
 
-### -UserPrincipalNameForConsent
+### -DoNotDisconnect
-Specify the UPN of the user to grant consent for.
+If specified, does not disconnect from Microsoft Graph after granting consent.
 
 ```yaml
-Type: String
+Type: SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
-Position: 1
+Position: Named
-Default value: None
+Default value: False
-Accept pipeline input: True (ByPropertyName, ByValue)
+Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
@@ -100,17 +100,32 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -DoNotDisconnect
+### -UserPrincipalNameForConsent
-If specified, does not disconnect from Microsoft Graph after granting consent.
+Specify the UPN of the user to grant consent for.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: 1
+Default value: None
+Accept pipeline input: True (ByPropertyName, ByValue)
+Accept wildcard characters: False
+```
+
+### -Confirm
+Prompts you for confirmation before running the cmdlet.
 
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)
-Aliases:
+Aliases: cf
 
 Required: False
 Position: Named
-Default value: False
+Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -131,21 +146,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Confirm
-Prompts you for confirmation before running the cmdlet.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases: cf
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 

help/Invoke-M365SecurityAudit.md

@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit
@@ -165,12 +165,26 @@ What if: Performing the operation "Invoke-M365SecurityAudit" on target "Microsof
 
 ## PARAMETERS
 
-### -TenantAdminUrl
+### -ApprovedCloudStorageProviders
-The URL of the tenant admin.
+Specifies the approved cloud storage providers for the audit. Accepts an array of cloud storage provider names.
-If not specified, none of the SharePoint Online tests will run.
 
 ```yaml
-Type: String
+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:
 
@@ -196,25 +210,54 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ELevel
+### -DoNotConfirmConnections
-Specifies the E-Level (E3 or E5) for the audit.
+If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.
-This parameter is optional and can be combined with the ProfileLevel parameter.
 
 ```yaml
-Type: String
+Type: SwitchParameter
-Parameter Sets: ELevelFilter
+Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
 Position: Named
-Default value: None
+Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ProfileLevel
+### -DoNotConnect
-Specifies the profile level (L1 or L2) for the audit.
+If specified, the cmdlet will not establish a connection to Microsoft 365 services.
-This parameter is optional and can be combined with the ELevel parameter.
+
+```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
+```
+
+### -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
@@ -289,6 +332,37 @@ 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
+```
+
+### -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
+```
+
 ### -SkipRecommendation
 Specifies specific recommendations to exclude from the audit.
 Accepts an array of recommendation numbers.
@@ -305,105 +379,15 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ApprovedCloudStorageProviders
+### -TenantAdminUrl
-Specifies the approved cloud storage providers for the audit. Accepts an array of cloud storage provider names.
+The URL of the tenant admin.
+If not specified, none of the SharePoint Online tests will run.
 
 ```yaml
-Type: String[]
+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
@@ -426,6 +410,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -WhatIf
+Shows what would happen if the cmdlet runs.
+The cmdlet is not run.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: wi
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 
@@ -435,7 +435,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## OUTPUTS
 
 ### CISAuditResult[]
-### The cmdlet returns an array of CISAuditResult objects representing the results of the security audit.
+###     The cmdlet returns an array of CISAuditResult objects representing the results of the security audit.
 ## NOTES
 - This module is based on CIS benchmarks.
 - Governed by the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.

help/Sync-CISExcelAndCsvData.md

@@ -1,4 +1,4 @@
----
+---
 external help file: M365FoundationsCISReport-help.xml
 Module Name: M365FoundationsCISReport
 online version: https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Sync-CISExcelAndCsvData
@@ -32,22 +32,6 @@ Updates the 'AuditData' worksheet in 'excel.xlsx' with data from 'data.csv', add
 
 ## 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.
@@ -64,6 +48,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -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
+```
+
 ### -SheetName
 Specifies the name of the worksheet in the Excel file where data will be merged and updated.
 This parameter is mandatory.
@@ -86,7 +86,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## INPUTS
 
 ### System.String
-### The function accepts strings for file paths and worksheet names.
+###     The function accepts strings for file paths and worksheet names.
 ## OUTPUTS
 
 ### None

help/about_M365FoundationsCISReport.md

@@ -18,9 +18,11 @@ The module includes functionality to synchronize audit results with CIS benchmar
 ```powershell
 # Example 1: Performing a security audit based on CIS benchmarks
 $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com"
+$auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -ApprovedCloudStorageProviders "DropBox" -ApprovedFederatedDomains "northwind.com"
 
-# Example 2: Exporting a security audit table to a CSV file
+# Example 2: Exporting a security audit and it's nested tables to zipped CSV files
-Export-M365SecurityAuditTable -ExportAllTests -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests
+Export-M365SecurityAuditTable -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests -ExportAllTests
+    # Output Ex: 2024.07.07_14.55.55_M365FoundationsAudit_368B2E2F.zip
 
 # Example 3: Retrieving licenses for users in administrative roles
 Get-AdminRoleUserLicense

helpers/Build-Help.ps1

@@ -1,10 +1,11 @@
 Import-Module .\output\module\M365FoundationsCISReport\*\*.psd1
+. .\source\Classes\CISAuditResult.ps1
 .\helpers\psDoc-master\src\psDoc.ps1 -moduleName M365FoundationsCISReport -outputDir docs -template ".\helpers\psDoc-master\src\out-html-template.ps1"
-.\helpers\psDoc-master\src\psDoc.ps1 -moduleName M365FoundationsCISReport -outputDir ".\" -template ".\helpers\psDoc-master\src\out-markdown-template.ps1" -fileName ".\README.md"
+.\helpers\psDoc-master\src\psDoc.ps1 -moduleName M365FoundationsCISReport -outputDir ".\" -template ".\helpers\psDoc-master\src\out-markdown-template.ps1" -fileName ".\README.md" -
 
 
 <#
-    $ver = "v0.1.22"
+    $ver = "v0.1.24"
     git checkout main
     git pull origin main
     git tag -a $ver -m "Release version $ver refactor Update"

source/Private/Get-Action.ps1

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

source/Private/Get-AuditMailboxDetail.ps1

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

source/Private/Get-CISExoOutput.ps1

@@ -87,60 +87,6 @@ function Get-CISExoOutput {
                 # [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)
@@ -274,10 +220,11 @@ function Get-CISExoOutput {
                         )
                     #>
                     $safeAttachmentPolicies = Get-SafeAttachmentPolicy -ErrorAction SilentlyContinue | Where-Object { $_.Enable -eq $true }
+                    $safeAttachmentRules = Get-SafeAttachmentRule
                     # [object[]]
-                    return $safeAttachmentPolicies
+                    return $safeAttachmentPolicies, $safeAttachmentRules
                     else {
-                        return 1
+                        return 1,1
                     }
                 }
             }

source/Private/Get-CISSpoOutput.ps1

@@ -40,12 +40,24 @@ function Get-CISSpoOutput {
         switch ($Rec) {
             '7.2.1' {
                 # Test-ModernAuthSharePoint.ps1
+                # $SPOTenant Mock Object
+                <#
+                    $SPOTenant = [PSCustomObject]@{
+                        LegacyAuthProtocolsEnabled           = $true
+                    }
+                #>
                 $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 Mock Object
+                <#
+                    $SPOTenantAzureADB2B = [PSCustomObject]@{
+                        EnableAzureADB2BIntegration           = $false
+                    }
+                #>
                 $SPOTenantAzureADB2B = Get-SPOTenant | Select-Object EnableAzureADB2BIntegration
                 return $SPOTenantAzureADB2B
             }
@@ -53,35 +65,75 @@ function Get-CISSpoOutput {
                 # Test-RestrictExternalSharing.ps1
                 # 7.2.3 (L1) Ensure external content sharing is restricted
                 # Retrieve the SharingCapability setting for the SharePoint tenant
+                # $SPOTenantSharingCapability Mock Object
+                <#
+                    $SPOTenantSharingCapability = [PSCustomObject]@{
+                        SharingCapability           = "ExternalUserAndGuestSharing"
+                    }
+                #>
                 $SPOTenantSharingCapability = Get-SPOTenant | Select-Object SharingCapability
                 return $SPOTenantSharingCapability
             }
             '7.2.4' {
                 # Test-OneDriveContentRestrictions.ps1
+                # 7.2.4 (L2) Ensure OneDrive content sharing is restricted
+                # $SPOTenant Mock Object
+                <#
+                    $SPOTenant = [PSCustomObject]@{
+                        OneDriveSharingCapability           = "ExternalUserAndGuestSharing"
+                    }
+                #>
                 $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 Mock Object
+                <#
+                    $SPOTenant = [PSCustomObject]@{
+                        PreventExternalUsersFromResharing           = $false
+                    }
+                #>
                 $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
+                # Add Authorized Domains?
+                # $SPOTenant Mock Object
+                <#
+                    $SPOTenant = [PSCustomObject]@{
+                        SharingDomainRestrictionMode           = "AllowList"
+                        SharingAllowedDomainList                = "domain1.com", "domain2.com"
+                    }
+                #>
                 $SPOTenant = Get-SPOTenant | Select-Object SharingDomainRestrictionMode, SharingAllowedDomainList
                 return $SPOTenant
             }
             '7.2.7' {
                 # Test-LinkSharingRestrictions.ps1
                 # Retrieve link sharing configuration for SharePoint and OneDrive
+                # $SPOTenantLinkSharing Mock Object
+                <#
+                    $$SPOTenantLinkSharing = [PSCustomObject]@{
+                        DefaultSharingLinkType           = "Direct"
+                    }
+                #>
                 $SPOTenantLinkSharing = Get-SPOTenant | Select-Object DefaultSharingLinkType
                 return $SPOTenantLinkSharing
             }
             '7.2.9' {
                 # Test-GuestAccessExpiration.ps1
                 # Retrieve SharePoint tenant settings related to guest access expiration
+                # $SPOTenantGuestAccess Mock Object
+                <#
+                    $SPOTenantGuestAccess = [PSCustomObject]@{
+                        ExternalUserExpirationRequired           = "$false"
+                        ExternalUserExpireInDays                 = "60"
+                    }
+                #>
                 $SPOTenantGuestAccess = Get-SPOTenant | Select-Object ExternalUserExpirationRequired, ExternalUserExpireInDays
                 return $SPOTenantGuestAccess
             }
@@ -89,24 +141,53 @@ function Get-CISSpoOutput {
                 # Test-ReauthWithCode.ps1
                 # 7.2.10 (L1) Ensure reauthentication with verification code is restricted
                 # Retrieve reauthentication settings for SharePoint Online
+                # $SPOTenantReauthentication Mock Object
+                <#
+                    $SPOTenantReauthentication = [PSCustomObject]@{
+                        EmailAttestationRequired                    = "$false"
+                        EmailAttestationReAuthDays                  = "30"
+                    }
+                #>
                 $SPOTenantReauthentication = Get-SPOTenant | Select-Object EmailAttestationRequired, EmailAttestationReAuthDays
                 return $SPOTenantReauthentication
             }
             '7.3.1' {
                 # Test-DisallowInfectedFilesDownload.ps1
                 # Retrieve the SharePoint tenant configuration
+                # $SPOTenantDisallowInfectedFileDownload Mock Object
+                <#
+                    $SPOTenantDisallowInfectedFileDownload = [PSCustomObject]@{
+                        DisallowInfectedFileDownload           = $false
+                    }
+                #>
                 $SPOTenantDisallowInfectedFileDownload = Get-SPOTenant | Select-Object DisallowInfectedFileDownload
                 return $SPOTenantDisallowInfectedFileDownload
             }
             '7.3.2' {
                 # Test-OneDriveSyncRestrictions.ps1
                 # Retrieve OneDrive sync client restriction settings
+                # Add isHybrid paramter?
+                # $SPOTenantSyncClientRestriction Mock Object
+                <#
+                    $SPOTenantSyncClientRestriction = [PSCustomObject]@{
+                        TenantRestrictionEnabled           = $true
+                        AllowedDomainList                  = "786548DD-877B-4760-A749-6B1EFBC1190A", "877564FF-877B-4760-A749-6B1EFBC1190A"
+                    }
+                #>
                 $SPOTenantSyncClientRestriction = Get-SPOTenantSyncClientRestriction | Select-Object TenantRestrictionEnabled, AllowedDomainList
                 return $SPOTenantSyncClientRestriction
             }
             '7.3.4' {
                 # Test-RestrictCustomScripts.ps1
                 # Retrieve all site collections and select necessary properties
+                # $SPOSitesCustomScript Mock Object
+                <#
+                    $SPOSitesCustomScript = [PSCustomObject]@{
+                        Title           = "Site Collection 1"
+                        Url             = "https://contoso.sharepoint.com/sites/site1"
+                        DenyAddAndCustomizePages = "Enabled"
+                    }
+                #>
                 $SPOSitesCustomScript = Get-SPOSite -Limit All | Select-Object Title, Url, DenyAddAndCustomizePages
                 return $SPOSitesCustomScript
             }

source/Public/Export-M365SecurityAuditTable.ps1

@@ -21,30 +21,30 @@
         Switch to export the results to an Excel file. When specified, results are exported in Excel format.
     .INPUTS
         [CISAuditResult[]] - An array of CISAuditResult objects.
-        [string] - A path to a CSV file.
+            [string] - A path to a CSV file.
     .OUTPUTS
         [PSCustomObject] - A custom object containing the path to the zip file and its hash.
     .EXAMPLE
         Export-M365SecurityAuditTable -AuditResults $object -OutputTestNumber 6.1.2
-        # Outputs the result of test number 6.1.2 from the provided audit results as an object.
+            # Outputs the result of test number 6.1.2 from the provided audit results as an object.
     .EXAMPLE
         Export-M365SecurityAuditTable -ExportAllTests -AuditResults $object -ExportPath "C:\temp"
-        # Exports all audit results to the specified path in CSV format.
+            # Exports all audit results to the specified path in CSV format.
     .EXAMPLE
         Export-M365SecurityAuditTable -CsvPath "C:\temp\auditresultstoday1.csv" -OutputTestNumber 6.1.2
-        # Outputs the result of test number 6.1.2 from the CSV file as an object.
+            # Outputs the result of test number 6.1.2 from the CSV file as an object.
     .EXAMPLE
         Export-M365SecurityAuditTable -ExportAllTests -CsvPath "C:\temp\auditresultstoday1.csv" -ExportPath "C:\temp"
-        # Exports all audit results from the CSV file to the specified path in CSV format.
+            # Exports all audit results from the CSV file to the specified path in CSV format.
     .EXAMPLE
         Export-M365SecurityAuditTable -ExportAllTests -AuditResults $object -ExportPath "C:\temp" -ExportOriginalTests
-        # Exports all audit results along with the original test results to the specified path in CSV format.
+            # Exports all audit results along with the original test results to the specified path in CSV format.
     .EXAMPLE
         Export-M365SecurityAuditTable -ExportAllTests -CsvPath "C:\temp\auditresultstoday1.csv" -ExportPath "C:\temp" -ExportOriginalTests
-        # Exports all audit results from the CSV file along with the original test results to the specified path in CSV format.
+            # Exports all audit results from the CSV file along with the original test results to the specified path in CSV format.
     .EXAMPLE
         Export-M365SecurityAuditTable -ExportAllTests -AuditResults $object -ExportPath "C:\temp" -ExportToExcel
-        # Exports all audit results to the specified path in Excel format.
+            # Exports all audit results to the specified path in Excel format.
     .LINK
         https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Export-M365SecurityAuditTable
 #>
@@ -109,44 +109,12 @@ function Export-M365SecurityAuditTable {
             switch ($test) {
                 "6.1.2" {
                     $details = $auditResult.Details
-                    if ($details -ne "No M365 E3 licenses found.") {
+                    $newObjectDetails = Get-AuditMailboxDetail -Details $details -Version '6.1.2'
-                        $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.") {
+                    $newObjectDetails = Get-AuditMailboxDetail -Details $details -Version '6.1.3'
-                        $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 {
@@ -257,4 +225,4 @@ function Export-M365SecurityAuditTable {
         ###########    $createdFiles
         #}
     }
-}
+}

source/Public/Get-AdminRoleUserLicense.ps1

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

source/Public/Get-MFAStatus.ps1

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

source/Public/Grant-M365SecurityAuditConsent.ps1

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

source/Public/Invoke-M365SecurityAudit.ps1

@@ -2,15 +2,17 @@
     .SYNOPSIS
         Invokes a security audit for Microsoft 365 environments.
     .DESCRIPTION
-        The Invoke-M365SecurityAudit cmdlet performs a comprehensive security audit based on the specified parameters. It allows auditing of various configurations and settings within a Microsoft 365 environment, such as compliance with CIS benchmarks.
+        The Invoke-M365SecurityAudit cmdlet performs a comprehensive security audit based on the specified parameters.
+        It allows auditing of various configurations and settings within a Microsoft 365 environment in alignment with CIS benchmarks designated "Automatic".
     .PARAMETER TenantAdminUrl
         The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.
     .PARAMETER DomainName
-        The domain name of the Microsoft 365 environment to test. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.
+        The domain name of the Microsoft 365 environment to test. It is optional and will trigger various tests to run only for the specified domain.
+            Tests Affected: 2.1.9/Test-EnableDKIM, 1.3.1/Test-PasswordNeverExpirePolicy, 2.1.4/Test-SafeAttachmentsPolicy
     .PARAMETER ELevel
         Specifies the E-Level (E3 or E5) for the audit. This parameter is optional and can be combined with the ProfileLevel parameter.
     .PARAMETER ProfileLevel
-        Specifies the profile level (L1 or L2) for the audit. This parameter is optional and can be combined with the ELevel parameter.
+        Specifies the profile level (L1 or L2) for the audit. This parameter is mandatory, but only when ELevel is selected. Otherwise it is not required.
     .PARAMETER IncludeIG1
         If specified, includes tests where IG1 is true.
     .PARAMETER IncludeIG2
@@ -22,9 +24,11 @@
     .PARAMETER SkipRecommendation
         Specifies specific recommendations to exclude from the audit. Accepts an array of recommendation numbers.
     .PARAMETER ApprovedCloudStorageProviders
-        Specifies the approved cloud storage providers for the audit. Accepts an array of cloud storage provider names.
+        Specifies the approved cloud storage providers for the audit. Accepts an array of cloud storage provider names for test 8.1.1/Test-TeamsExternalFileSharing.
+            Acceptable values: 'GoogleDrive', 'ShareFile', 'Box', 'DropBox', 'Egnyte'
     .PARAMETER ApprovedFederatedDomains
-        Specifies the approved federated domains for the audit test 8.2.1. Accepts an array of allowed domain names.
+        Specifies the approved federated domains for the audit test 8.2.1/Test-TeamsExternalAccess. Accepts an array of allowed domain names.
+            Additional Tests may include this parameter in the future.
     .PARAMETER DoNotConnect
         If specified, the cmdlet will not establish a connection to Microsoft 365 services.
     .PARAMETER DoNotDisconnect
@@ -36,85 +40,94 @@
     .EXAMPLE
         PS> Invoke-M365SecurityAudit
 
-        Performs a security audit using default parameters.
+            Performs a security audit using default parameters.
-        Output:
+                Output:
-        Status      : Fail
+
-        ELevel      : E3
+                    Status      : Fail
-        ProfileLevel: L1
+                    ELevel      : E3
-        Connection  : Microsoft Graph
+                    ProfileLevel: L1
-        Rec         : 1.1.1
+                    Connection  : Microsoft Graph
-        Result      : False
+                    Rec         : 1.1.1
-        Details     : Non-compliant accounts:
+                    Result      : False
-                        Username        | Roles                  | HybridStatus | Missing Licence
+                    Details     : Non-compliant accounts:
-                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
+                                    Username        | Roles                  | HybridStatus | Missing Licence
-                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
+                                    user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
-        FailureReason: Non-Compliant Accounts: 2
+                                    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" -ELevel "E5" -ProfileLevel "L1"
 
-        Performs a security audit for the E5 level and L1 profile in the specified Microsoft 365 environment.
+            Performs a security audit for the E5 level and L1 profile in the specified Microsoft 365 environment.
-        Output:
+                Output:
-        Status      : Fail
+
-        ELevel      : E5
+                    Status      : Fail
-        ProfileLevel: L1
+                    ELevel      : E5
-        Connection  : Microsoft Graph
+                    ProfileLevel: L1
-        Rec         : 1.1.1
+                    Connection  : Microsoft Graph
-        Result      : False
+                    Rec         : 1.1.1
-        Details     : Non-compliant accounts:
+                    Result      : False
-                        Username        | Roles                  | HybridStatus | Missing Licence
+                    Details     : Non-compliant accounts:
-                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
+                                    Username        | Roles                  | HybridStatus | Missing Licence
-                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
+                                    user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
-        FailureReason: Non-Compliant Accounts: 2
+                                    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
 
-        Performs an audit including all tests where IG1 is true.
+            Performs an audit including all tests where IG1 is true.
-        Output:
+                Output:
-        Status      : Fail
+
-        ELevel      : E3
+                    Status      : Fail
-        ProfileLevel: L1
+                    ELevel      : E3
-        Connection  : Microsoft Graph
+                    ProfileLevel: L1
-        Rec         : 1.1.1
+                    Connection  : Microsoft Graph
-        Result      : False
+                    Rec         : 1.1.1
-        Details     : Non-compliant accounts:
+                    Result      : False
-                        Username        | Roles                  | HybridStatus | Missing Licence
+                    Details     : Non-compliant accounts:
-                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
+                                    Username        | Roles                  | HybridStatus | Missing Licence
-                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
+                                    user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
-        FailureReason: Non-Compliant Accounts: 2
+                                    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'
-        Performs an audit while excluding specific recommendations 1.1.3 and 2.1.1.
+
-        Output:
+            Performs an audit while excluding specific recommendations 1.1.3 and 2.1.1.
-        Status      : Fail
+                Output:
-        ELevel      : E3
+
-        ProfileLevel: L1
+                    Status      : Fail
-        Connection  : Microsoft Graph
+                    ELevel      : E3
-        Rec         : 1.1.1
+                    ProfileLevel: L1
-        Result      : False
+                    Connection  : Microsoft Graph
-        Details     : Non-compliant accounts:
+                    Rec         : 1.1.1
-                        Username        | Roles                  | HybridStatus | Missing Licence
+                    Result      : False
-                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
+                    Details     : Non-compliant accounts:
-                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
+                                    Username        | Roles                  | HybridStatus | Missing Licence
-        FailureReason: Non-Compliant Accounts: 2
+                                    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> Export-M365SecurityAuditTable -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests -ExportAllTests
+
+        Or:
         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 (Nested tables will be truncated).
-        Output:
+                Output:
-        CISAuditResult[]
+                    CISAuditResult[]
-        auditResults.csv
+                    auditResults.csv
     .EXAMPLE
         PS> Invoke-M365SecurityAudit -WhatIf
 
-        Displays what would happen if the cmdlet is run without actually performing the audit.
+            Displays what would happen if the cmdlet is run without actually performing the audit.
-        Output:
+                Output:
-        What if: Performing the operation "Invoke-M365SecurityAudit" on target "Microsoft 365 environment".
+
+                    What if: Performing the operation "Invoke-M365SecurityAudit" on target "Microsoft 365 environment".
     .INPUTS
         None. You cannot pipe objects to Invoke-M365SecurityAudit.
     .OUTPUTS
         CISAuditResult[]
-        The cmdlet returns an array of CISAuditResult objects representing the results of the security audit.
+            The cmdlet returns an array of CISAuditResult objects representing the results of the security audit.
     .NOTES
         - This module is based on CIS benchmarks.
         - Governed by the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
@@ -193,6 +206,7 @@ function Invoke-M365SecurityAudit {
     )
     Begin {
         if ($script:MaximumFunctionCount -lt 8192) {
+            Write-Verbose "Setting the `$script:MaximumFunctionCount to 8192 for the test run." -Verbose
             $script:MaximumFunctionCount = 8192
         }
         # Ensure required modules are installed

source/Public/Remove-RowsWithEmptyCSVStatus.ps1

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

source/Public/Sync-CISExcelAndCsvData.ps1

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

source/en-US/about_M365FoundationsCISReport.help.txt

@@ -30,9 +30,11 @@ Optional Subtopics
 EXAMPLES
     # Example 1: Performing a security audit based on CIS benchmarks
     $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com"
+    $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -DomainName "contoso.com" -ApprovedCloudStorageProviders "DropBox" -ApprovedFederatedDomains "northwind.com"
     
-    # Example 2: Exporting a security audit table to a CSV file
+    # Example 2: Exporting a security audit and it's nested tables to zipped CSV files
-    Export-M365SecurityAuditTable -ExportAllTests -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests
+    Export-M365SecurityAuditTable -AuditResults $auditResults -ExportPath "C:\temp" -ExportOriginalTests -ExportAllTests
+        # Output Ex: 2024.07.07_14.55.55_M365FoundationsAudit_368B2E2F.zip
     
     # Example 3: Retrieving licenses for users in administrative roles
     Get-AdminRoleUserLicense

source/tests/Test-DisallowInfectedFilesDownload.ps1

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

source/tests/Test-ExternalSharingCalendars.ps1

@@ -5,12 +5,14 @@ function Test-ExternalSharingCalendars {
         # Aligned
         # Parameters can be added if needed
     )
+
     begin {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
+
         # Initialization code, if needed
         $recnum = "1.3.3"
-        Write-Verbose "Running Test-ExternalSharingCalendars for $recnum..."
+
         # Conditions for 1.3.3 (L2) Ensure 'External sharing' of calendars is not available (Automated)
         #
         # Validate test for a pass:
@@ -25,19 +27,12 @@ function Test-ExternalSharingCalendars {
         #   - Condition A: In the Microsoft 365 admin center, external calendar sharing is enabled.
         #   - Condition B: Using the Exchange Online PowerShell Module, the `OrganizationConfig` property `ExternalSharingEnabled` is set to `True`.
     }
+
     process {
         try {
             # Step: Retrieve sharing policies related to calendar sharing
-            # $sharingPolicies Mock Object
-            <#
-                $sharingPolicies = [PSCustomObject]@{
-                    Name = "Default Sharing Policy"
-                    Domains = @("Anonymous:CalendarSharingFreeBusySimple")
-                    Enabled = $true
-                    Default = $true
-                }
-            #>
             $sharingPolicies = Get-CISExoOutput -Rec $recnum
+
             # Step (Condition A & B: Pass/Fail): Check if calendar sharing is disabled in all applicable policies
             $isExternalSharingDisabled = $true
             $sharingPolicyDetails = @()
@@ -47,43 +42,47 @@ function Test-ExternalSharingCalendars {
                     $sharingPolicyDetails += "$($policy.Name): Enabled"
                 }
             }
-            # Retrieve calendars with publishing enabled (from 1.3.3b)
+            $failureRemediation = @'
-            # $calendarDetails Mock Object
+# Get all mailboxes
-            <#
+$mailboxes = Get-Mailbox -ResultSize Unlimited
-                $calendarDetails = @(
+
-                    [PSCustomObject]@{
+# Initialize a hashtable to store calendar folder names
-                        Calendar = "SMBuser1@domain.com"
+$calendarFolders = @{}
-                        URL = "https://example.com/calendar/smbuser1"
+# Get the default calendar folder names for all mailboxes
-                    },
+$mailboxes | ForEach-Object {
-                    [PSCustomObject]@{
+    $calendarFolderName = [string](Get-EXOMailboxFolderStatistics $_.PrimarySmtpAddress -FolderScope Calendar | Where-Object { $_.FolderType -eq 'Calendar' }).Name
-                        Calendar = "SMBuser2@domain.com"
+    $calendarFolders[$_.PrimarySmtpAddress] = $calendarFolderName
-                        URL = "https://example.com/calendar/smbuser2"
+}
-                    },
+# Get the calendar folder settings for each mailbox
-                    [PSCustomObject]@{
+foreach ($mailbox in $mailboxes) {
-                        Calendar = "SMBuser4@domain.com"
+    $primarySmtpAddress = $mailbox.PrimarySmtpAddress
-                        URL = "https://example.com/calendar/smbuser3"
+    $calendarFolder = $calendarFolders[$primarySmtpAddress]
-                    }
+    # Get users calendar folder settings for their default Calendar folder
-                )
+    $calendar = Get-MailboxCalendarFolder -Identity "$primarySmtpAddress:\$calendarFolder"
-            #>
+    # Check if calendar publishing is enabled and display a message
-            $calendarDetails = Get-CISExoOutput -Rec "$("$recnum" + "b")"
+    if ($calendar.PublishEnabled) {
-            # Build the failure reason string
+        Write-Host -ForegroundColor Yellow "Calendar publishing is enabled for $primarySmtpAddress on $($calendar.PublishedCalendarUrl)"
+    }
+}
+'@
+            # Step: Prepare failure reasons and details based on compliance (Condition A & B: Fail)
             $failureReasons = if (-not $isExternalSharingDisabled) {
-                $baseMessage = "Calendar sharing with external users is enabled in one or more policies."
+                "Calendar sharing with external users is enabled in one or more policies.`n`n" + `
-                if ($calendarDetails.Count -gt 0) {
+                "Use the following command to verify which users are sharing calendars prior to disabling:`n`n" + `
-                    $baseMessage += "`nPrior to remediating, check the following mailboxes that have calendar publishing enabled: `n$($calendarDetails -join '`n')"
+                $failureRemediation
-                }
-                $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 ', ')"
+                "Enabled Sharing Policies: $($sharingPolicyDetails -join ', ')"
             }
+
             # Step: Create and populate the CISAuditResult object
             $params = @{
                 Rec           = $recnum
@@ -99,6 +98,7 @@ function Test-ExternalSharingCalendars {
             $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
+
     end {
         # Return the audit result
         return $auditResult

source/tests/Test-GuestAccessExpiration.ps1

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

source/tests/Test-LinkSharingRestrictions.ps1

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

source/tests/Test-MailboxAuditingE3.ps1

@@ -24,13 +24,15 @@ function Test-MailboxAuditingE3 {
         #>
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
-        $actionDictionaries = Get-Action -Dictionaries
-        # E3 specific actions
-        $AdminActions = $actionDictionaries.AdminActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }
-        $DelegateActions = $actionDictionaries.DelegateActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed") }
-        $OwnerActions = $actionDictionaries.OwnerActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }
-        $allFailures = @()
         $recnum = "6.1.2"
+        $version = $recnum
+        $actionDictionaries = Get-Action -Dictionaries -Version $version
+        # E3 specific actions
+        $AdminActions = $actionDictionaries.AdminActions.Keys
+        $DelegateActions = $actionDictionaries.DelegateActions.Keys
+        $OwnerActions = $actionDictionaries.OwnerActions.Keys
+        $allFailures = @()
+
         Write-Verbose "Running Test-MailboxAuditingE3 for $recnum..."
         $allUsers = Get-CISMgOutput -Rec $recnum
         $processedUsers = @{}  # Dictionary to track processed users
@@ -52,17 +54,17 @@ function Test-MailboxAuditingE3 {
                     if ($mailbox.AuditEnabled) {
                         foreach ($action in $AdminActions) {
                             if ($mailbox.AuditAdmin -notcontains $action) {
-                                $missingAdminActions += (Get-Action -Actions $action -ActionType "Admin")
+                                $missingAdminActions += (Get-Action -Actions $action -ActionType "Admin" -Version $version)
                             }
                         }
                         foreach ($action in $DelegateActions) {
                             if ($mailbox.AuditDelegate -notcontains $action) {
-                                $missingDelegateActions += (Get-Action -Actions $action -ActionType "Delegate")
+                                $missingDelegateActions += (Get-Action -Actions $action -ActionType "Delegate" -Version $version)
                             }
                         }
                         foreach ($action in $OwnerActions) {
                             if ($mailbox.AuditOwner -notcontains $action) {
-                                $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner")
+                                $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner" -Version $version)
                             }
                         }
                         if ($missingAdminActions.Count -gt 0 -or $missingDelegateActions.Count -gt 0 -or $missingOwnerActions.Count -gt 0) {

source/tests/Test-MailboxAuditingE5.ps1

@@ -24,13 +24,14 @@ function Test-MailboxAuditingE5 {
         #   - Condition B: AuditAdmin actions do not include all of the following: ApplyRecord, Create, HardDelete, MailItemsAccessed, MoveToDeletedItems, Send, SendAs, SendOnBehalf, SoftDelete, Update, UpdateCalendarDelegation, UpdateFolderPermissions, UpdateInboxRules.
         #   - Condition C: AuditDelegate actions do not include all of the following: ApplyRecord, Create, HardDelete, MailItemsAccessed, MoveToDeletedItems, SendAs, SendOnBehalf, SoftDelete, Update, UpdateFolderPermissions, UpdateInboxRules.
         #   - Condition D: AuditOwner actions do not include all of the following: ApplyRecord, HardDelete, MailItemsAccessed, MoveToDeletedItems, Send, SoftDelete, Update, UpdateCalendarDelegation, UpdateFolderPermissions, UpdateInboxRules.
-        $actionDictionaries = Get-Action -Dictionaries
+        $recnum = "6.1.3"
+        $version = $recnum
+        $actionDictionaries = Get-Action -Dictionaries -Version $version
         $AdminActions = $actionDictionaries.AdminActions.Keys
         $DelegateActions = $actionDictionaries.DelegateActions.Keys
         $OwnerActions = $actionDictionaries.OwnerActions.Keys
         $allFailures = @()
         $processedUsers = @{}
-        $recnum = "6.1.3"
         Write-Verbose "Running Test-MailboxAuditingE5 for $recnum..."
         $allUsers = Get-CISMgOutput -Rec $recnum
     }
@@ -52,19 +53,19 @@ function Test-MailboxAuditingE5 {
                         # Validate Admin actions
                         foreach ($action in $AdminActions) {
                             if ($mailbox.AuditAdmin -notcontains $action) {
-                                $missingAdminActions += (Get-Action -Actions $action -ActionType "Admin") # Condition B
+                                $missingAdminActions += (Get-Action -Actions $action -ActionType "Admin" -Version $version) # Condition B
                             }
                         }
                         # Validate Delegate actions
                         foreach ($action in $DelegateActions) {
                             if ($mailbox.AuditDelegate -notcontains $action) {
-                                $missingDelegateActions += (Get-Action -Actions $action -ActionType "Delegate") # Condition C
+                                $missingDelegateActions += (Get-Action -Actions $action -ActionType "Delegate" -Version $version) # Condition C
                             }
                         }
                         # Validate Owner actions
                         foreach ($action in $OwnerActions) {
                             if ($mailbox.AuditOwner -notcontains $action) {
-                                $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner") # Condition D
+                                $missingOwnerActions += (Get-Action -Actions $action -ActionType "Owner" -Version $version) # Condition D
                             }
                         }
                         if ($missingAdminActions.Count -gt 0 -or $missingDelegateActions.Count -gt 0 -or $missingOwnerActions.Count -gt 0) {
@@ -130,4 +131,4 @@ function Test-MailboxAuditingE5 {
         }
         return $auditResult
     }
-}
+}

source/tests/Test-ModernAuthSharePoint.ps1

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

source/tests/Test-OneDriveContentRestrictions.ps1

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

source/tests/Test-OneDriveSyncRestrictions.ps1

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

source/tests/Test-PasswordNeverExpirePolicy.ps1

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

source/tests/Test-ReauthWithCode.ps1

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

source/tests/Test-RestrictCustomScripts.ps1

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

source/tests/Test-RestrictExternalSharing.ps1

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

source/tests/Test-SafeAttachmentsPolicy.ps1

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

source/tests/Test-SharePointAADB2B.ps1

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

source/tests/Test-SharePointExternalSharingDomains.ps1

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

source/tests/Test-SharePointGuestsItemSharing.ps1

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

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

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