Merge pull request #119 from CriticalSolutionsNetwork/MFA-Status-Enhancement

Gereral testing enhancements.

CHANGELOG.md

@@ -4,6 +4,46 @@ The format is based on and uses the types of changes according to [Keep a Change
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed test 1.3.1 to include notification window for password expiration.
+- Fixed 6.1.1 test definition to include the correct connection.
+- Removed banner and warning from EXO and AzureAD connection step.
+- Fixed missing CommentBlock for `Remove-RowsWithEmptyCSVStatus` function.
+- Fixed formatting and color for various Write-Host messages.
+
+### Added
+
+- Added export to excel to `Export-M365SecurityAuditTable` function.
+- `Get-AdminRoleUserLicense` function to get the license of a user with admin roles for 1.1.1.
+- Skip MSOL connection confirmation to `Get-MFAStatus` function.
+- Added `Get-CISMgOutput` function to get the output of the Microsoft Graph API per test.
+- Added `Get-CISExoOutput` function to get the output of the Exchange Online API per test.
+- Added `Get-CISMSTeamsOutput` function to get the output of the Microsoft Teams API per test.
+- Added `Get-CISSPOOutput` function to get the output of the SharePoint Online API per test.
+- Added `Get-TestError` function to get the error output of a test.
+- Updated Microsoft Graph tests to utilize the new output functions ('1.1.1', '1.1.3', '1.2.1', '1.3.1', '5.1.2.3', '5.1.8.1', '6.1.2', '6.1.3')
+- Updated EXO tests to utilize the new output functions ('1.2.2', '1.3.3', '1.3.6', '2.1.1', '2.1.2', '2.1.3', '2.1.4', '2.1.5', '2.1.6', '2.1.7', '2.1.9', '3.1.1', '6.1.1', '6.1.2', '6.1.3', '6.2.1', '6.2.2', '6.2.3', '6.3.1', '6.5.1', '6.5.2', '6.5.3', '8.6.1').
+- Updated MSTeams tests to utilize the new output functions ('8.1.1', '8.1.2', '8.2.1', '8.5.1', '8.5.2', '8.5.3', '8.5.4', '8.5.5', '8.5.6', '8.5.7', '8.6.1')
+- Updated SPO tests to utilize the new output functions ('7.2.1', '7.2.2', '7.2.3', '7.2.4', '7.2.5', '7.2.6', '7.2.7', '7.2.9', '7.2.10', '7.3.1', '7.3.2', '7.3.4')
+
+## [0.1.13] - 2024-06-18
+
+### Added
+
+- Added tenant output to connect function.
+- Added skip tenant connection confirmation to main function.
+
+### Fixed
+
+- Fixed comment examples for `Export-M365SecurityAuditTable`.
+
+### Changed
+
+- Updated `Sync-CISExcelAndCsvData` to be one function.
+
+## [0.1.12] - 2024-06-17
+
 ### Added
 
 - Added `Export-M365SecurityAuditTable` public function to export applicable audit results to a table format.

helpers/Build-Help.ps1

@@ -4,7 +4,7 @@ Import-Module .\output\module\M365FoundationsCISReport\*\*.psd1
 
 
 <#
-    $ver = "v0.1.11"
+    $ver = "v0.1.12"
     git checkout main
     git pull origin main
     git tag -a $ver -m "Release version $ver refactor Update"

source/Private/Assert-ModuleAvailability.ps1

@@ -10,25 +10,25 @@ function Assert-ModuleAvailability {
         $module = Get-Module -ListAvailable -Name $ModuleName | Where-Object { $_.Version -ge [version]$RequiredVersion }
 
         if ($null -eq $module) {
-            Write-Information "Installing $ModuleName module..." -InformationAction Continue
+            Write-Host "Installing $ModuleName module..." -ForegroundColor Yellow
             Install-Module -Name $ModuleName -RequiredVersion $RequiredVersion -Force -AllowClobber -Scope CurrentUser | Out-Null
         }
         elseif ($module.Version -lt [version]$RequiredVersion) {
-            Write-Information "Updating $ModuleName module to required version..." -InformationAction Continue
+            Write-Host "Updating $ModuleName module to required version..." -ForegroundColor Yellow
             Update-Module -Name $ModuleName -RequiredVersion $RequiredVersion -Force | Out-Null
         }
         else {
-            Write-Information "$ModuleName module is already at required version or newer." -InformationAction Continue
+            Write-Host "$ModuleName module is already at required version or newer." -ForegroundColor Gray
         }
 
         if ($SubModules.Count -gt 0) {
             foreach ($subModule in $SubModules) {
-                Write-Information "Importing submodule $ModuleName.$subModule..." -InformationAction Continue
+                Write-Host "Importing submodule $ModuleName.$subModule..." -ForegroundColor DarkGray
                 Import-Module -Name "$ModuleName.$subModule" -RequiredVersion $RequiredVersion -ErrorAction Stop | Out-Null
             }
         } else {
-            Write-Information "Importing module $ModuleName..." -InformationAction Continue
-            Import-Module -Name $ModuleName -RequiredVersion $RequiredVersion -ErrorAction Stop | Out-Null
+            Write-Host "Importing module $ModuleName..." -ForegroundColor DarkGray
+            Import-Module -Name $ModuleName -RequiredVersion $RequiredVersion -ErrorAction Stop -WarningAction SilentlyContinue | Out-Null
         }
     }
     catch {

source/Private/Connect-M365Suite.ps1

@@ -2,52 +2,115 @@ function Connect-M365Suite {
     [OutputType([void])]
     [CmdletBinding()]
     param (
-        [Parameter(Mandatory=$false)]
+        [Parameter(Mandatory = $false)]
         [string]$TenantAdminUrl,
 
         [Parameter(Mandatory)]
-        [string[]]$RequiredConnections
+        [string[]]$RequiredConnections,
+
+        [Parameter(Mandatory = $false)]
+        [switch]$SkipConfirmation
     )
 
     $VerbosePreference = "SilentlyContinue"
+    $tenantInfo = @()
+    $connectedServices = @()
 
     try {
         if ($RequiredConnections -contains "AzureAD" -or $RequiredConnections -contains "AzureAD | EXO" -or $RequiredConnections -contains "AzureAD | EXO | Microsoft Graph") {
-            Write-Host "Connecting to Azure Active Directory..." -ForegroundColor Cyan
-            Connect-AzureAD | Out-Null
+            Write-Host "Connecting to Azure Active Directory..." -ForegroundColor Yellow
+            Connect-AzureAD -WarningAction SilentlyContinue | Out-Null
+            $tenantDetails = Get-AzureADTenantDetail -WarningAction SilentlyContinue
+            $tenantInfo += [PSCustomObject]@{
+                Service = "Azure Active Directory"
+                TenantName = $tenantDetails.DisplayName
+                TenantID = $tenantDetails.ObjectId
+            }
+            $connectedServices += "AzureAD"
             Write-Host "Successfully connected to Azure Active Directory." -ForegroundColor Green
         }
 
         if ($RequiredConnections -contains "Microsoft Graph" -or $RequiredConnections -contains "EXO | Microsoft Graph") {
-            Write-Host "Connecting to Microsoft Graph with scopes: Directory.Read.All, Domain.Read.All, Policy.Read.All, Organization.Read.All" -ForegroundColor Cyan
+            Write-Host "Connecting to Microsoft Graph with scopes: Directory.Read.All, Domain.Read.All, Policy.Read.All, Organization.Read.All" -ForegroundColor Yellow
             try {
                 Connect-MgGraph -Scopes "Directory.Read.All", "Domain.Read.All", "Policy.Read.All", "Organization.Read.All" -NoWelcome | Out-Null
+                $graphOrgDetails = Get-MgOrganization
+                $tenantInfo += [PSCustomObject]@{
+                    Service = "Microsoft Graph"
+                    TenantName = $graphOrgDetails.DisplayName
+                    TenantID = $graphOrgDetails.Id
+                }
+                $connectedServices += "Microsoft Graph"
                 Write-Host "Successfully connected to Microsoft Graph with specified scopes." -ForegroundColor Green
             }
             catch {
                 Write-Host "Failed to connect to MgGraph, attempting device auth." -ForegroundColor Yellow
                 Connect-MgGraph -Scopes "Directory.Read.All", "Domain.Read.All", "Policy.Read.All", "Organization.Read.All" -UseDeviceCode -NoWelcome | Out-Null
+                $graphOrgDetails = Get-MgOrganization
+                $tenantInfo += [PSCustomObject]@{
+                    Service = "Microsoft Graph"
+                    TenantName = $graphOrgDetails.DisplayName
+                    TenantID = $graphOrgDetails.Id
+                }
+                $connectedServices += "Microsoft Graph"
                 Write-Host "Successfully connected to Microsoft Graph with specified scopes." -ForegroundColor Green
             }
         }
 
         if ($RequiredConnections -contains "EXO" -or $RequiredConnections -contains "AzureAD | EXO" -or $RequiredConnections -contains "Microsoft Teams | EXO" -or $RequiredConnections -contains "EXO | Microsoft Graph") {
-            Write-Host "Connecting to Exchange Online..." -ForegroundColor Cyan
-            Connect-ExchangeOnline | Out-Null
+            Write-Host "Connecting to Exchange Online..." -ForegroundColor Yellow
+            Connect-ExchangeOnline -ShowBanner:$false | Out-Null
+            $exoTenant = (Get-OrganizationConfig).Identity
+            $tenantInfo += [PSCustomObject]@{
+                Service = "Exchange Online"
+                TenantName = $exoTenant
+                TenantID = "N/A"
+            }
+            $connectedServices += "EXO"
             Write-Host "Successfully connected to Exchange Online." -ForegroundColor Green
         }
 
         if ($RequiredConnections -contains "SPO") {
-            Write-Host "Connecting to SharePoint Online..." -ForegroundColor Cyan
+            Write-Host "Connecting to SharePoint Online..." -ForegroundColor Yellow
             Connect-SPOService -Url $TenantAdminUrl | Out-Null
+            $spoContext = Get-SPOCrossTenantHostUrl
+            $tenantName = Get-UrlLine -Output $spoContext
+            $tenantInfo += [PSCustomObject]@{
+                Service = "SharePoint Online"
+                TenantName = $tenantName
+            }
+            $connectedServices += "SPO"
             Write-Host "Successfully connected to SharePoint Online." -ForegroundColor Green
         }
 
         if ($RequiredConnections -contains "Microsoft Teams" -or $RequiredConnections -contains "Microsoft Teams | EXO") {
-            Write-Host "Connecting to Microsoft Teams..." -ForegroundColor Cyan
+            Write-Host "Connecting to Microsoft Teams..." -ForegroundColor Yellow
             Connect-MicrosoftTeams | Out-Null
+            $teamsTenantDetails = Get-CsTenant
+            $tenantInfo += [PSCustomObject]@{
+                Service = "Microsoft Teams"
+                TenantName = $teamsTenantDetails.DisplayName
+                TenantID = $teamsTenantDetails.TenantId
+            }
+            $connectedServices += "Microsoft Teams"
             Write-Host "Successfully connected to Microsoft Teams." -ForegroundColor Green
         }
+
+        # Display tenant information and confirm with the user
+        if (-not $SkipConfirmation) {
+            Write-Host "Connected to the following tenants:" -ForegroundColor Yellow
+            foreach ($tenant in $tenantInfo) {
+                Write-Host "Service: $($tenant.Service)" -ForegroundColor Cyan
+                Write-Host "Tenant Context: $($tenant.TenantName)`n" -ForegroundColor Green
+                #Write-Host "Tenant ID: $($tenant.TenantID)"
+            }
+            $confirmation = Read-Host "Do you want to proceed with these connections? (Y/N)"
+            if ($confirmation -notlike 'Y') {
+                Write-Host "Connection setup aborted by user." -ForegroundColor Red
+                Disconnect-M365Suite -RequiredConnections $connectedServices
+                throw "User aborted connection setup."
+            }
+        }
     }
     catch {
         $VerbosePreference = "Continue"

source/Private/Get-AdminRoleUserAndAssignment.ps1

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

source/Private/Get-CISAadOutput.ps1

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

source/Private/Get-CISExoOutput.ps1

@@ -0,0 +1,297 @@
+<#
+    .SYNOPSIS
+        This is a sample Private function only visible within the module.
+    .DESCRIPTION
+        This sample function is not exported to the module and only return the data passed as parameter.
+    .EXAMPLE
+        $null = Get-CISExoOutput -PrivateData 'NOTHING TO SEE HERE'
+    .PARAMETER PrivateData
+        The PrivateData parameter is what will be returned without transformation.
+#>
+function Get-CISExoOutput {
+    [cmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [String]$Rec
+    )
+    begin {
+        # Begin Block #
+        <#
+        # Tests
+        1.2.2
+        1.3.3
+        1.3.6
+        2.1.1
+        2.1.2
+        2.1.3
+        2.1.4
+        2.1.5
+        2.1.6
+        2.1.7
+        2.1.9
+        3.1.1
+        6.1.1
+        6.1.2
+        6.1.3
+        6.2.1
+        6.2.2
+        6.2.3
+        6.3.1
+        6.5.1
+        6.5.2
+        6.5.3
+        8.6.1
+        # Test number array
+        $testNumbers = @('1.2.2', '1.3.3', '1.3.6', '2.1.1', '2.1.2', '2.1.3', '2.1.4', '2.1.5', '2.1.6', '2.1.7', '2.1.9', '3.1.1', '6.1.1', '6.1.2', '6.1.3', '6.2.1', '6.2.2', '6.2.3', '6.3.1', '6.5.1', '6.5.2', '6.5.3', '8.6.1')
+    #>
+    }
+    process {
+        Write-Verbose "Get-CISExoOutput: Retuning data for Rec: $Rec"
+        switch ($Rec) {
+            '1.2.2' {
+                # Test-BlockSharedMailboxSignIn.ps1
+                $MBX = Get-EXOMailbox -RecipientTypeDetails SharedMailbox
+                # [object[]]
+                return $MBX
+            }
+            '1.3.3' {
+                # Test-ExternalSharingCalendars.ps1
+                # Step: Retrieve sharing policies related to calendar sharing
+                $sharingPolicies = Get-SharingPolicy | Where-Object { $_.Domains -like '*CalendarSharing*' }
+                # [psobject[]]
+                return $sharingPolicies
+            }
+            '1.3.6' {
+                # Test-CustomerLockbox.ps1
+                # Step: Retrieve the organization configuration (Condition C: Pass/Fail)
+                $orgConfig = Get-OrganizationConfig | Select-Object CustomerLockBoxEnabled
+                $customerLockboxEnabled = $orgConfig.CustomerLockBoxEnabled
+                # [bool]
+                return $customerLockboxEnabled
+            }
+            '2.1.1' {
+                # Test-SafeLinksOfficeApps.ps1
+                if (Get-Command Get-SafeLinksPolicy -ErrorAction SilentlyContinue) {
+                    # 2.1.1 (L2) Ensure Safe Links for Office Applications is Enabled
+                    # Retrieve all Safe Links policies
+                    $policies = Get-SafeLinksPolicy
+                    # Initialize the details collection
+                    $misconfiguredDetails = @()
+                    foreach ($policy in $policies) {
+                        # Get the detailed configuration of each policy
+                        $policyDetails = Get-SafeLinksPolicy -Identity $policy.Name
+                        # Check each required property and record failures
+                        # Condition A: Checking policy settings
+                        $failures = @()
+                        if ($policyDetails.EnableSafeLinksForEmail -ne $true) { $failures += "EnableSafeLinksForEmail: False" } # Email: On
+                        if ($policyDetails.EnableSafeLinksForTeams -ne $true) { $failures += "EnableSafeLinksForTeams: False" } # Teams: On
+                        if ($policyDetails.EnableSafeLinksForOffice -ne $true) { $failures += "EnableSafeLinksForOffice: False" } # Office 365 Apps: On
+                        if ($policyDetails.TrackClicks -ne $true) { $failures += "TrackClicks: False" } # Click protection settings: On
+                        if ($policyDetails.AllowClickThrough -ne $false) { $failures += "AllowClickThrough: True" } # Do not track when users click safe links: Off
+                        # Only add details for policies that have misconfigurations
+                        if ($failures.Count -gt 0) {
+                            $misconfiguredDetails += "Policy: $($policy.Name); Failures: $($failures -join ', ')"
+                        }
+                    }
+                    # [object[]]
+                    return $misconfiguredDetails
+                }
+                else {
+                    return 1
+                }
+            }
+            '2.1.2' {
+                # Test-CommonAttachmentFilter.ps1
+                # 2.1.2 (L1) Ensure the Common Attachment Types Filter is enabled
+                # Condition A: The Common Attachment Types Filter is enabled in the Microsoft 365 Security & Compliance Center.
+                # Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `True`.
+                # Retrieve the attachment filter policy
+                $attachmentFilter = Get-MalwareFilterPolicy -Identity Default | Select-Object EnableFileFilter
+                $result = $attachmentFilter.EnableFileFilter
+                # [bool]
+                return $result
+            }
+            '2.1.3' {
+                # Test-NotifyMalwareInternal.ps1
+                # 2.1.3 Ensure notifications for internal users sending malware is Enabled
+                # Retrieve all 'Custom' malware filter policies and check notification settings
+                $malwareNotifications = Get-MalwareFilterPolicy | Where-Object { $_.RecommendedPolicyType -eq 'Custom' }
+                # [object[]]
+                return $malwareNotifications
+            }
+            '2.1.4' {
+                # Test-SafeAttachmentsPolicy.ps1
+                if (Get-Command Get-SafeAttachmentPolicy -ErrorAction SilentlyContinue) {
+                    # Retrieve all Safe Attachment policies where Enable is set to True
+                    # Check if ErrorAction needed below
+                    $safeAttachmentPolicies = Get-SafeAttachmentPolicy -ErrorAction SilentlyContinue | Where-Object { $_.Enable -eq $true }
+                    # [object[]]
+                    return $safeAttachmentPolicies
+                    else {
+                        return 1
+                    }
+                }
+            }
+            '2.1.5' {
+                # Test-SafeAttachmentsTeams.ps1
+                if (Get-Command Get-AtpPolicyForO365 -ErrorAction SilentlyContinue) {
+                    # 2.1.5 (L2) Ensure Safe Attachments for SharePoint, OneDrive, and Microsoft Teams is Enabled
+                    # Retrieve the ATP policies for Office 365 and check Safe Attachments settings
+                    $atpPolicies = Get-AtpPolicyForO365
+                    # Check if the required ATP policies are enabled
+                    $atpPolicyResult = $atpPolicies | Where-Object {
+                        $_.EnableATPForSPOTeamsODB -eq $true -and
+                        $_.EnableSafeDocs -eq $true -and
+                        $_.AllowSafeDocsOpen -eq $false
+                    }
+                    # [psobject[]]
+                    return $atpPolicyResult
+                }
+                else {
+                    return 1
+                }
+            }
+            '2.1.6' {
+                # Test-SpamPolicyAdminNotify.ps1
+                # Retrieve the default hosted outbound spam filter policy
+                $hostedOutboundSpamFilterPolicy = Get-HostedOutboundSpamFilterPolicy | Where-Object { $_.IsDefault -eq $true }
+                return $hostedOutboundSpamFilterPolicy
+            }
+            '2.1.7' {
+                # Test-AntiPhishingPolicy.ps1
+                # Condition A: Ensure that an anti-phishing policy has been created
+                $antiPhishPolicies = Get-AntiPhishPolicy
+                return $antiPhishPolicies
+            }
+            '2.1.9' {
+                # Test-EnableDKIM.ps1
+                # 2.1.9 (L1) Ensure DKIM is enabled for all Exchange Online Domains
+                # Retrieve DKIM configuration for all domains
+                $dkimConfig = Get-DkimSigningConfig | Select-Object Domain, Enabled
+                # [object[]]
+                return $dkimConfig
+            }
+            '3.1.1' {
+                # Test-AuditLogSearch.ps1
+                # 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled
+                # Retrieve the audit log configuration
+                $auditLogConfig = Get-AdminAuditLogConfig | Select-Object UnifiedAuditLogIngestionEnabled
+                #
+                $auditLogResult = $auditLogConfig.UnifiedAuditLogIngestionEnabled
+                # [bool]
+                return $auditLogResult
+            }
+            '6.1.1' {
+                # Test-AuditDisabledFalse.ps1
+                # 6.1.1 (L1) Ensure 'AuditDisabled' organizationally is set to 'False'
+                # Retrieve the AuditDisabled configuration (Condition B)
+                $auditDisabledConfig = Get-OrganizationConfig | Select-Object AuditDisabled
+                # [bool]
+                $auditNotDisabled = -not $auditDisabledConfig.AuditDisabled
+                return $auditNotDisabled
+            }
+            '6.1.2' {
+                # Test-MailboxAuditingE3.ps1
+                $mailboxes = Get-EXOMailbox -PropertySets Audit
+                # [object[]]
+                return $mailboxes
+            }
+            '6.1.3' {
+                # Test-MailboxAuditingE5.ps1
+                $mailboxes = Get-EXOMailbox -PropertySets Audit
+                # [object[]]
+                return $mailboxes
+            }
+            '6.2.1' {
+                # Test-BlockMailForwarding.ps1
+                # 6.2.1 (L1) Ensure all forms of mail forwarding are blocked and/or disabled
+                # Step 1: Retrieve the transport rules that redirect messages
+                $transportRules = Get-TransportRule | Where-Object { $null -ne $_.RedirectMessageTo }
+                if ($null -eq $transportRules) {
+                    $transportRules = 1
+                }
+                # Step 2: Check all anti-spam outbound policies
+                $outboundSpamPolicies = Get-HostedOutboundSpamFilterPolicy
+                $nonCompliantSpamPolicies = $outboundSpamPolicies | Where-Object { $_.AutoForwardingMode -ne 'Off' }
+                return $transportRules, $nonCompliantSpamPolicies
+            }
+            '6.2.2' {
+                # Test-NoWhitelistDomains.ps1
+                # 6.2.2 (L1) Ensure mail transport rules do not whitelist specific domains
+                # Retrieve transport rules that whitelist specific domains
+                # Condition A: Checking for transport rules that whitelist specific domains
+                # [object[]]
+                $whitelistedRules = Get-TransportRule | Where-Object { $_.SetSCL -eq -1 -and $null -ne $_.SenderDomainIs }
+                return $whitelistedRules
+            }
+            '6.2.3' {
+                # Test-IdentifyExternalEmail.ps1
+                # 6.2.3 (L1) Ensure email from external senders is identified
+                # Retrieve external sender tagging configuration
+                # [object[]]
+                $externalInOutlook = Get-ExternalInOutlook
+                return $externalInOutlook
+            }
+            '6.3.1' {
+                # Test-RestrictOutlookAddins.ps1
+                # 6.3.1 (L2) Ensure users installing Outlook add-ins is not allowed
+                $customPolicyFailures = @()
+                # Check all mailboxes for custom policies with unallowed add-ins
+                $roleAssignmentPolicies = Get-EXOMailbox | Select-Object -Unique RoleAssignmentPolicy
+                if ($roleAssignmentPolicies.RoleAssignmentPolicy) {
+                    foreach ($policy in $roleAssignmentPolicies) {
+                        if ($policy.RoleAssignmentPolicy) {
+                            $rolePolicyDetails = Get-RoleAssignmentPolicy -Identity $policy.RoleAssignmentPolicy
+                            $foundRoles = $rolePolicyDetails.AssignedRoles | Where-Object { $_ -in $relevantRoles }
+                            # Condition B: Using PowerShell, verify that MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are not assigned to users.
+                            if ($foundRoles) {
+                                $customPolicyFailures += "Policy: $($policy.RoleAssignmentPolicy): Roles: $($foundRoles -join ', ')"
+                            }
+                        }
+                    }
+                }
+                # Check Default Role Assignment Policy
+                $defaultPolicy = Get-RoleAssignmentPolicy "Default Role Assignment Policy"
+                return $customPolicyFailures, $defaultPolicy
+            }
+            '6.5.1' {
+                # Test-ModernAuthExchangeOnline.ps1
+                # Ensuring the ExchangeOnlineManagement module is available
+                # 6.5.1 (L1) Ensure modern authentication for Exchange Online is enabled
+                # Check modern authentication setting in Exchange Online configuration (Condition A and B)
+                $orgConfig = Get-OrganizationConfig | Select-Object -Property Name, OAuth2ClientProfileEnabled
+                return $orgConfig
+            }
+            '6.5.2' {
+                # Test-MailTipsEnabled.ps1
+                # 6.5.2 (L2) Ensure MailTips are enabled for end users
+                # Retrieve organization configuration for MailTips settings
+                # [object]
+                $orgConfig = Get-OrganizationConfig | Select-Object MailTipsAllTipsEnabled, MailTipsExternalRecipientsTipsEnabled, MailTipsGroupMetricsEnabled, MailTipsLargeAudienceThreshold
+                return $orgConfig
+            }
+            '6.5.3' {
+                # Test-RestrictStorageProvidersOutlook.ps1
+                # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
+                # Retrieve all OwaMailbox policies
+                # [object[]]
+                $owaPolicies = Get-OwaMailboxPolicy
+                return $owaPolicies
+            }
+            '8.6.1' {
+                # Test-ReportSecurityInTeams.ps1
+                # 8.6.1 (L1) Ensure users can report security concerns in Teams
+                # Retrieve the necessary settings for Teams and Exchange Online
+                # Condition B: Verify that 'Monitor reported messages in Microsoft Teams' is checked in the Microsoft 365 Defender portal.
+                # Condition C: Ensure the 'Send reported messages to' setting in the Microsoft 365 Defender portal is set to 'My reporting mailbox only' with the correct report email addresses.
+                $ReportSubmissionPolicy = Get-ReportSubmissionPolicy | Select-Object -Property ReportJunkToCustomizedAddress, ReportNotJunkToCustomizedAddress, ReportPhishToCustomizedAddress, ReportChatMessageToCustomizedAddressEnabled
+                return $ReportSubmissionPolicy
+            }
+            default { throw "No match found for test: $Rec" }
+        }
+    }
+    end {
+        Write-Verbose "Retuning data for Rec: $Rec"
+    }
+} # end function Get-CISExoOutput
+

source/Private/Get-CISMSTeamsOutput.ps1

@@ -0,0 +1,275 @@
+<#
+    .SYNOPSIS
+        This is a sample Private function only visible within the module.
+    .DESCRIPTION
+        This sample function is not exported to the module and only return the data passed as parameter.
+    .EXAMPLE
+        $null = Get-CISMSTeamsOutput -PrivateData 'NOTHING TO SEE HERE'
+    .PARAMETER PrivateData
+        The PrivateData parameter is what will be returned without transformation.
+#>
+function Get-CISMSTeamsOutput {
+    [cmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [String]$Rec
+    )
+    begin {
+        # Begin Block #
+        <#
+            # Tests
+            8.1.1
+            8.1.2
+            8.2.1
+            8.5.1
+            8.5.2
+            8.5.3
+            8.5.4
+            8.5.5
+            8.5.6
+            8.5.7
+            8.6.1
+            # Test number array
+            $testNumbers = @('8.1.1', '8.1.2', '8.2.1', '8.5.1', '8.5.2', '8.5.3', '8.5.4', '8.5.5', '8.5.6', '8.5.7', '8.6.1')
+        #>
+    }
+    process {
+        Write-Verbose "Get-CISMSTeamsOutput: Retuning data for Rec: $Rec"
+        switch ($Rec) {
+            '8.1.1' {
+                # Test-TeamsExternalFileSharing.ps1
+                # 8.1.1 (L2) Ensure external file sharing in Teams is enabled for only approved cloud storage services
+                # Connect to Teams PowerShell using Connect-MicrosoftTeams
+
+                # Condition A: The `AllowDropbox` setting is set to `False`.
+                # Condition B: The `AllowBox` setting is set to `False`.
+                # Condition C: The `AllowGoogleDrive` setting is set to `False`.
+                # Condition D: The `AllowShareFile` setting is set to `False`.
+                # Condition E: The `AllowEgnyte` setting is set to `False`.
+
+                # Assuming that 'approvedProviders' is a list of approved cloud storage service names
+                # This list must be defined according to your organization's approved cloud storage services
+                $clientConfig = Get-CsTeamsClientConfiguration
+                return $clientConfig
+            }
+            '8.1.2' {
+                # Test-BlockChannelEmails.ps1
+                # 8.1.2 (L1) Ensure users can't send emails to a channel email address
+                #
+                # Validate test for a pass:
+                # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+                # - Specific conditions to check:
+                #   - Condition A: The `AllowEmailIntoChannel` setting in Teams is set to `False`.
+                #   - Condition B: The setting `Users can send emails to a channel email address` is set to `Off` in the Teams admin center.
+                #   - Condition C: Verification using PowerShell confirms that the `AllowEmailIntoChannel` setting is disabled.
+                #
+                # Validate test for a fail:
+                # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+                # - Specific conditions to check:
+                #   - Condition A: The `AllowEmailIntoChannel` setting in Teams is not set to `False`.
+                #   - Condition B: The setting `Users can send emails to a channel email address` is not set to `Off` in the Teams admin center.
+                #   - Condition C: Verification using PowerShell indicates that the `AllowEmailIntoChannel` setting is enabled.
+
+                # Retrieve Teams client configuration
+                $teamsClientConfig = Get-CsTeamsClientConfiguration -Identity Global
+                return $teamsClientConfig
+            }
+            '8.2.1' {
+                # Test-TeamsExternalAccess.ps1
+                # 8.2.1 (L1) Ensure 'external access' is restricted in the Teams admin center
+                #
+                # Validate test for a pass:
+                # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+                # - Specific conditions to check:
+                #   - Condition A: The `AllowTeamsConsumer` setting is `False`.
+                #   - Condition B: The `AllowPublicUsers` setting is `False`.
+                #   - Condition C: The `AllowFederatedUsers` setting is `False` or, if `True`, the `AllowedDomains` contains only authorized domain names.
+                #
+                # Validate test for a fail:
+                # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+                # - Specific conditions to check:
+                #   - Condition A: The `AllowTeamsConsumer` setting is not `False`.
+                #   - Condition B: The `AllowPublicUsers` setting is not `False`.
+                #   - Condition C: The `AllowFederatedUsers` setting is `True` and the `AllowedDomains` contains unauthorized domain names or is not configured correctly.
+
+                # Connect to Teams PowerShell using Connect-MicrosoftTeams
+
+                $externalAccessConfig = Get-CsTenantFederationConfiguration
+                return $externalAccessConfig
+            }
+            '8.5.1' {
+                # Test-NoAnonymousMeetingJoin.ps1
+                # 8.5.1 (L2) Ensure anonymous users can't join a meeting
+                #
+                # Validate test for a pass:
+                # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+                # - Specific conditions to check:
+                #   - Condition A: `AllowAnonymousUsersToJoinMeeting` is set to `False`.
+                #   - Condition B: Verification using the UI confirms that `Anonymous users can join a meeting` is set to `Off` in the Global meeting policy.
+                #   - Condition C: PowerShell command output indicates that anonymous users are not allowed to join meetings.
+                #
+                # Validate test for a fail:
+                # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+                # - Specific conditions to check:
+                #   - Condition A: `AllowAnonymousUsersToJoinMeeting` is not set to `False`.
+                #   - Condition B: Verification using the UI shows that `Anonymous users can join a meeting` is not set to `Off` in the Global meeting policy.
+                #   - Condition C: PowerShell command output indicates that anonymous users are allowed to join meetings.
+
+                # Connect to Teams PowerShell using Connect-MicrosoftTeams
+
+                $teamsMeetingPolicy = Get-CsTeamsMeetingPolicy -Identity Global
+                return $teamsMeetingPolicy
+            }
+            '8.5.2' {
+                # Test-NoAnonymousMeetingStart.ps1
+                # 8.5.2 (L1) Ensure anonymous users and dial-in callers can't start a meeting
+                #
+                # Validate test for a pass:
+                # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+                # - Specific conditions to check:
+                #   - Condition A: The `AllowAnonymousUsersToStartMeeting` setting in the Teams admin center is set to `False`.
+                #   - Condition B: The setting for anonymous users and dial-in callers starting a meeting is configured to ensure they must wait in the lobby.
+                #   - Condition C: Verification using the UI confirms that the setting `Anonymous users and dial-in callers can start a meeting` is set to `Off`.
+                #
+                # Validate test for a fail:
+                # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+                # - Specific conditions to check:
+                #   - Condition A: The `AllowAnonymousUsersToStartMeeting` setting in the Teams admin center is not set to `False`.
+                #   - Condition B: The setting for anonymous users and dial-in callers starting a meeting allows them to bypass the lobby.
+                #   - Condition C: Verification using the UI indicates that the setting `Anonymous users and dial-in callers can start a meeting` is not set to `Off`.
+
+                # Connect to Teams PowerShell using Connect-MicrosoftTeams
+
+                # Retrieve the Teams meeting policy for the global scope and check if anonymous users can start meetings
+                $CsTeamsMeetingPolicyAnonymous = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowAnonymousUsersToStartMeeting
+                return $CsTeamsMeetingPolicyAnonymous
+            }
+            '8.5.3' {
+                # Test-OrgOnlyBypassLobby.ps1
+                # 8.5.3 (L1) Ensure only people in my org can bypass the lobby
+                #
+                # Validate test for a pass:
+                # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+                # - Specific conditions to check:
+                #   - Condition A: The `AutoAdmittedUsers` setting in the Teams meeting policy is set to `EveryoneInCompanyExcludingGuests`.
+                #   - Condition B: The setting for "Who can bypass the lobby" is configured to "People in my org" using the UI.
+                #   - Condition C: Verification using the Microsoft Teams admin center confirms that the meeting join & lobby settings are configured as recommended.
+                #
+                # Validate test for a fail:
+                # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+                # - Specific conditions to check:
+                #   - Condition A: The `AutoAdmittedUsers` setting in the Teams meeting policy is not set to `EveryoneInCompanyExcludingGuests`.
+                #   - Condition B: The setting for "Who can bypass the lobby" is not configured to "People in my org" using the UI.
+                #   - Condition C: Verification using the Microsoft Teams admin center indicates that the meeting join & lobby settings are not configured as recommended.
+
+                # Connect to Teams PowerShell using Connect-MicrosoftTeams
+
+                # Retrieve the Teams meeting policy for lobby bypass settings
+                $CsTeamsMeetingPolicyLobby = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AutoAdmittedUsers
+                return $CsTeamsMeetingPolicyLobby
+            }
+            '8.5.4' {
+                # Test-DialInBypassLobby.ps1
+                # 8.5.4 (L1) Ensure users dialing in can't bypass the lobby
+                #
+                # Validate test for a pass:
+                # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+                # - Specific conditions to check:
+                #   - Condition A: The `AllowPSTNUsersToBypassLobby` setting in the Global Teams meeting policy is set to `False`.
+                #   - Condition B: Verification using the UI in the Microsoft Teams admin center confirms that "People dialing in can't bypass the lobby" is set to `Off`.
+                #   - Condition C: Ensure that individuals who dial in by phone must wait in the lobby until admitted by a meeting organizer, co-organizer, or presenter.
+                #
+                # Validate test for a fail:
+                # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+                # - Specific conditions to check:
+                #   - Condition A: The `AllowPSTNUsersToBypassLobby` setting in the Global Teams meeting policy is not set to `False`.
+                #   - Condition B: Verification using the UI in the Microsoft Teams admin center shows that "People dialing in can't bypass the lobby" is not set to `Off`.
+                #   - Condition C: Individuals who dial in by phone are able to join the meeting directly without waiting in the lobby.
+
+                # Retrieve Teams meeting policy for PSTN users
+                $CsTeamsMeetingPolicyPSTN = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowPSTNUsersToBypassLobby
+                return $CsTeamsMeetingPolicyPSTN
+            }
+            '8.5.5' {
+                # Test-MeetingChatNoAnonymous.ps1
+                # 8.5.5 (L2) Ensure meeting chat does not allow anonymous users
+                #
+                # Validate test for a pass:
+                # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+                # - Specific conditions to check:
+                #   - Condition A: The `MeetingChatEnabledType` setting in Teams is set to `EnabledExceptAnonymous`.
+                #   - Condition B: The setting for meeting chat is configured to allow chat for everyone except anonymous users.
+                #   - Condition C: Verification using the Teams Admin Center confirms that the meeting chat settings are configured as recommended.
+                #
+                # Validate test for a fail:
+                # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+                # - Specific conditions to check:
+                #   - Condition A: The `MeetingChatEnabledType` setting in Teams is not set to `EnabledExceptAnonymous`.
+                #   - Condition B: The setting for meeting chat allows chat for anonymous users.
+                #   - Condition C: Verification using the Teams Admin Center indicates that the meeting chat settings are not configured as recommended.
+
+                # Retrieve the Teams meeting policy for meeting chat
+                $CsTeamsMeetingPolicyChat = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property MeetingChatEnabledType
+                return $CsTeamsMeetingPolicyChat
+            }
+            '8.5.6' {
+                # Test-OrganizersPresent.ps1
+                # 8.5.6 (L2) Ensure only organizers and co-organizers can present
+                #
+                # Validate test for a pass:
+                # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+                # - Specific conditions to check:
+                #   - Condition A: The `DesignatedPresenterRoleMode` setting in the Teams meeting policy is set to `OrganizerOnlyUserOverride`.
+                #   - Condition B: Verification using the Teams admin center confirms that the setting "Who can present" is configured to "Only organizers and co-organizers".
+                #   - Condition C: Verification using PowerShell confirms that the `DesignatedPresenterRoleMode` is set to `OrganizerOnlyUserOverride`.
+                #
+                # Validate test for a fail:
+                # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+                # - Specific conditions to check:
+                #   - Condition A: The `DesignatedPresenterRoleMode` setting in the Teams meeting policy is not set to `OrganizerOnlyUserOverride`.
+                #   - Condition B: Verification using the Teams admin center indicates that the setting "Who can present" is not configured to "Only organizers and co-organizers".
+                #   - Condition C: Verification using PowerShell indicates that the `DesignatedPresenterRoleMode` is not set to `OrganizerOnlyUserOverride`.
+
+                # Retrieve the Teams meeting policy for presenters
+                $CsTeamsMeetingPolicyPresenters = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property DesignatedPresenterRoleMode
+                return $CsTeamsMeetingPolicyPresenters
+            }
+            '8.5.7' {
+                # Test-ExternalNoControl.ps1
+                # 8.5.7 (L1) Ensure external participants can't give or request control
+                #
+                # Validate test for a pass:
+                # - Confirm that the automated test results align with the manual audit steps outlined in the CIS benchmark.
+                # - Specific conditions to check:
+                #   - Condition A: Ensure the `AllowExternalParticipantGiveRequestControl` setting in Teams is set to `False`.
+                #   - Condition B: The setting is verified through the Microsoft Teams admin center or via PowerShell command.
+                #   - Condition C: Verification using the UI confirms that external participants are unable to give or request control.
+                #
+                # Validate test for a fail:
+                # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
+                # - Specific conditions to check:
+                #   - Condition A: The `AllowExternalParticipantGiveRequestControl` setting in Teams is not set to `False`.
+                #   - Condition B: The setting is verified through the Microsoft Teams admin center or via PowerShell command.
+                #   - Condition C: Verification using the UI indicates that external participants can give or request control.
+
+                # Retrieve Teams meeting policy for external participant control
+                $CsTeamsMeetingPolicyControl = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowExternalParticipantGiveRequestControl
+                return $CsTeamsMeetingPolicyControl
+            }
+            '8.6.1' {
+                # Test-ReportSecurityInTeams.ps1
+                # 8.6.1 (L1) Ensure users can report security concerns in Teams
+
+                # Retrieve the necessary settings for Teams and Exchange Online
+                # Condition A: Ensure the 'Report a security concern' setting in the Teams admin center is set to 'On'.
+                $CsTeamsMessagingPolicy = Get-CsTeamsMessagingPolicy -Identity Global | Select-Object -Property AllowSecurityEndUserReporting
+                return $CsTeamsMessagingPolicy
+            }
+            default { throw "No match found for test: $Rec" }
+        }
+    }
+    end {
+        Write-Verbose "Retuning data for Rec: $Rec"
+    }
+} # end function Get-CISMSTeamsOutput
+

source/Private/Get-CISMgOutput.ps1

@@ -0,0 +1,110 @@
+function Get-CISMgOutput {
+    <#
+    .SYNOPSIS
+    This is a sample Private function only visible within the module.
+
+    .DESCRIPTION
+    This sample function is not exported to the module and only return the data passed as parameter.
+
+    .EXAMPLE
+    $null = Get-CISMgOutput -PrivateData 'NOTHING TO SEE HERE'
+
+    .PARAMETER PrivateData
+    The PrivateData parameter is what will be returned without transformation.
+
+#>
+    [cmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [String]$Rec,
+        [Parameter(Mandatory = $false)]
+        [String]$DomainName
+    )
+
+    begin {
+        # Begin Block #
+        # Tests
+        <#
+            1.1.1
+            1.1.3
+            1.2.1
+            1.3.1
+            5.1.2.3
+            5.1.8.1
+            6.1.2
+            6.1.3
+            # Test number array
+            $testNumbers = @('1.1.1', '1.1.3', '1.2.1', '1.3.1', '5.1.2.3', '5.1.8.1', '6.1.2', '6.1.3')
+        #>
+    }
+    process {
+        Write-Verbose "Get-CISMgOutput: Retuning data for Rec: $Rec"
+        switch ($rec) {
+            '1.1.1' {
+                # 1.1.1
+                $AdminRoleAssignmentsAndUsers = Get-AdminRoleUserAndAssignment
+                return $AdminRoleAssignmentsAndUsers
+            }
+            '1.1.3' {
+                # Step: Retrieve global admin role
+                $globalAdminRole = Get-MgDirectoryRole -Filter "RoleTemplateId eq '62e90394-69f5-4237-9190-012177145e10'"
+                # Step: Retrieve global admin members
+                $globalAdmins = Get-MgDirectoryRoleMember -DirectoryRoleId $globalAdminRole.Id
+                return $globalAdmins
+            }
+            '1.2.1' {
+                $allGroups = Get-MgGroup -All | Where-Object { $_.Visibility -eq "Public" } | Select-Object DisplayName, Visibility
+                return $allGroups
+            }
+            '1.3.1' {
+                # Test-PasswordNeverExpirePolicy.ps1
+                $domains = if ($DomainName) {
+                    Get-MgDomain -DomainId $DomainName
+                }
+                else {
+                    Get-MgDomain
+                }
+                return $domains
+            }
+            '5.1.2.3' {
+                # Retrieve the tenant creation policy
+                $tenantCreationPolicy = (Get-MgPolicyAuthorizationPolicy).DefaultUserRolePermissions | Select-Object AllowedToCreateTenants
+                return $tenantCreationPolicy
+            }
+            '5.1.8.1' {
+                # Retrieve password hash sync status (Condition A and C)
+                $passwordHashSync = Get-MgOrganization | Select-Object -ExpandProperty OnPremisesSyncEnabled
+                return $passwordHashSync
+            }
+            '6.1.2' {
+                $tenantSkus = Get-MgSubscribedSku -All
+                $e3SkuPartNumber = "SPE_E3"
+                $founde3Sku = $tenantSkus | Where-Object { $_.SkuPartNumber -eq $e3SkuPartNumber }
+                if ($founde3Sku.Count -ne 0) {
+                    $allE3Users = Get-MgUser -Filter "assignedLicenses/any(x:x/skuId eq $($founde3Sku.SkuId) )" -All
+                    return $allE3Users
+                }
+                else {
+                    return $null
+                }
+            }
+            '6.1.3' {
+                $tenantSkus = Get-MgSubscribedSku -All
+                $e5SkuPartNumber = "SPE_E5"
+                $founde5Sku = $tenantSkus | Where-Object { $_.SkuPartNumber -eq $e5SkuPartNumber }
+                if ($founde5Sku.Count -ne 0) {
+                    $allE5Users = Get-MgUser -Filter "assignedLicenses/any(x:x/skuId eq $($founde5Sku.SkuId) )" -All
+                    return $allE5Users
+                }
+                else {
+                    return $null
+                }
+            }
+            default { throw "No match found for test: $Rec" }
+        }
+    }
+    end {
+        Write-Verbose "Retuning data for Rec: $Rec"
+    }
+} # end function Get-CISMgOutput
+

source/Private/Get-CISSpoOutput.ps1

@@ -0,0 +1,119 @@
+<#
+    .SYNOPSIS
+        This is a sample Private function only visible within the module.
+    .DESCRIPTION
+        This sample function is not exported to the module and only return the data passed as parameter.
+    .EXAMPLE
+        $null = Get-CISSpoOutput -PrivateData 'NOTHING TO SEE HERE'
+    .PARAMETER PrivateData
+        The PrivateData parameter is what will be returned without transformation.
+#>
+function Get-CISSpoOutput {
+    [cmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [String]$Rec
+    )
+    begin {
+        # Begin Block #
+        <#
+            # Tests
+            7.2.1
+            7.2.2
+            7.2.3
+            7.2.4
+            7.2.5
+            7.2.6
+            7.2.7
+            7.2.9
+            7.2.10
+            7.3.1
+            7.3.2
+            7.3.4
+
+            # Test number array
+            $testNumbers = @('7.2.1', '7.2.2', '7.2.3', '7.2.4', '7.2.5', '7.2.6', '7.2.7', '7.2.9', '7.2.10', '7.3.1', '7.3.2', '7.3.4')
+        #>
+    }
+    process {
+        Write-Verbose "Retuning data for Rec: $Rec"
+        switch ($Rec) {
+            '7.2.1' {
+                # Test-ModernAuthSharePoint.ps1
+                $SPOTenant = Get-SPOTenant | Select-Object -Property LegacyAuthProtocolsEnabled
+                return $SPOTenant
+            }
+            '7.2.2' {
+                # Test-SharePointAADB2B.ps1
+                # 7.2.2 (L1) Ensure SharePoint and OneDrive integration with Azure AD B2B is enabled
+                $SPOTenantAzureADB2B = Get-SPOTenant | Select-Object EnableAzureADB2BIntegration
+                return $SPOTenantAzureADB2B
+            }
+            '7.2.3' {
+                # Test-RestrictExternalSharing.ps1
+                # 7.2.3 (L1) Ensure external content sharing is restricted
+                # Retrieve the SharingCapability setting for the SharePoint tenant
+                $SPOTenantSharingCapability = Get-SPOTenant | Select-Object SharingCapability
+                return $SPOTenantSharingCapability
+            }
+            '7.2.4' {
+                # Test-OneDriveContentRestrictions.ps1
+                $SPOTenant = Get-SPOTenant | Select-Object OneDriveSharingCapability
+                return $SPOTenant
+            }
+            '7.2.5' {
+                # Test-SharePointGuestsItemSharing.ps1
+                # 7.2.5 (L2) Ensure that SharePoint guest users cannot share items they don't own
+                $SPOTenant = Get-SPOTenant | Select-Object PreventExternalUsersFromResharing
+                return $SPOTenant
+            }
+            '7.2.6' {
+                # Test-SharePointExternalSharingDomains.ps1
+                # 7.2.6 (L2) Ensure SharePoint external sharing is managed through domain whitelist/blacklists
+                $SPOTenant = Get-SPOTenant | Select-Object SharingDomainRestrictionMode, SharingAllowedDomainList
+                return $SPOTenant
+            }
+            '7.2.7' {
+                # Test-LinkSharingRestrictions.ps1
+                # Retrieve link sharing configuration for SharePoint and OneDrive
+                $SPOTenantLinkSharing = Get-SPOTenant | Select-Object DefaultSharingLinkType
+                return $SPOTenantLinkSharing
+            }
+            '7.2.9' {
+                # Test-GuestAccessExpiration.ps1
+                # Retrieve SharePoint tenant settings related to guest access expiration
+                $SPOTenantGuestAccess = Get-SPOTenant | Select-Object ExternalUserExpirationRequired, ExternalUserExpireInDays
+                return $SPOTenantGuestAccess
+            }
+            '7.2.10' {
+                # Test-ReauthWithCode.ps1
+                # 7.2.10 (L1) Ensure reauthentication with verification code is restricted
+                # Retrieve reauthentication settings for SharePoint Online
+                $SPOTenantReauthentication = Get-SPOTenant | Select-Object EmailAttestationRequired, EmailAttestationReAuthDays
+                return $SPOTenantReauthentication
+            }
+            '7.3.1' {
+                # Test-DisallowInfectedFilesDownload.ps1
+                # Retrieve the SharePoint tenant configuration
+                $SPOTenantDisallowInfectedFileDownload = Get-SPOTenant | Select-Object DisallowInfectedFileDownload
+                return $SPOTenantDisallowInfectedFileDownload
+            }
+            '7.3.2' {
+                # Test-OneDriveSyncRestrictions.ps1
+                # Retrieve OneDrive sync client restriction settings
+                $SPOTenantSyncClientRestriction = Get-SPOTenantSyncClientRestriction | Select-Object TenantRestrictionEnabled, AllowedDomainList
+                return $SPOTenantSyncClientRestriction
+            }
+            '7.3.4' {
+                # Test-RestrictCustomScripts.ps1
+                # Retrieve all site collections and select necessary properties
+                $SPOSitesCustomScript = Get-SPOSite -Limit All | Select-Object Title, Url, DenyAddAndCustomizePages
+                return $SPOSitesCustomScript
+            }
+            default { throw "No match found for test: $Rec" }
+        }
+    }
+    end {
+        Write-Verbose "Retuning data for Rec: $Rec"
+    }
+} # end function Get-CISMSTeamsOutput

source/Private/Get-TestError.ps1

@@ -0,0 +1,33 @@
+
+
+<#
+    .SYNOPSIS
+    This is a sample Private function only visible within the module.
+
+    .DESCRIPTION
+    This sample function is not exported to the module and only return the data passed as parameter.
+
+    .EXAMPLE
+    $null = Get-TestError -PrivateData 'NOTHING TO SEE HERE'
+
+    .PARAMETER PrivateData
+    The PrivateData parameter is what will be returned without transformation.
+
+#>
+
+function Get-TestError {
+    [cmdletBinding()]
+    param (
+        $LastError,
+        $recnum
+    )
+    # Retrieve the description from the test definitions
+    $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
+    $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
+    $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $LastError })
+    # Call Initialize-CISAuditResult with error parameters
+    $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+    Write-Verbose "An error occurred during the test: `n$LastError" -Verbose
+    return $auditResult
+}
+

source/Private/Get-UrlLine.ps1

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

source/Private/Measure-AuditResult.ps1

@@ -19,7 +19,7 @@ function Measure-AuditResult {
 
     # Display the pass percentage to the user
     Write-Host "Audit completed. $passedTests out of $totalTests tests passed." -ForegroundColor Cyan
-    Write-Host "Your passing percentage is $passPercentage%."
+    Write-Host "Your passing percentage is $passPercentage%." -ForegroundColor Magenta
 
     # Display details of failed tests
     if ($FailedTests.Count -gt 0) {

source/Private/Merge-CISExcelAndCsvData.ps1

@@ -1,42 +0,0 @@
-function Merge-CISExcelAndCsvData {
-    [CmdletBinding(DefaultParameterSetName = 'CsvInput')]
-    [OutputType([PSCustomObject[]])]
-    param (
-        [Parameter(Mandatory = $true)]
-        [string]$ExcelPath,
-
-        [Parameter(Mandatory = $true)]
-        [string]$WorksheetName,
-
-        [Parameter(Mandatory = $true, ParameterSetName = 'CsvInput')]
-        [string]$CsvPath,
-
-        [Parameter(Mandatory = $true, ParameterSetName = 'ObjectInput')]
-        [CISAuditResult[]]$AuditResults
-    )
-
-    process {
-        # Import data from Excel
-        $import = Import-Excel -Path $ExcelPath -WorksheetName $WorksheetName
-
-        # Import data from CSV or use provided object
-        $csvData = if ($PSCmdlet.ParameterSetName -eq 'CsvInput') {
-            Import-Csv -Path $CsvPath
-        } else {
-            $AuditResults
-        }
-
-        # Iterate over each item in the imported Excel object and merge with CSV data or audit results
-        $mergedData = foreach ($item in $import) {
-            $csvRow = $csvData | Where-Object { $_.Rec -eq $item.'recommendation #' }
-            if ($csvRow) {
-                New-MergedObject -ExcelItem $item -CsvRow $csvRow
-            } else {
-                New-MergedObject -ExcelItem $item -CsvRow ([PSCustomObject]@{Connection=$null;Status=$null; Details=$null; FailureReason=$null })
-            }
-        }
-
-        # Return the merged data
-        return $mergedData
-    }
-}

source/Private/New-MergedObject.ps1

@@ -1,22 +0,0 @@
-function New-MergedObject {
-    [CmdletBinding()]
-    [OutputType([PSCustomObject])]
-    param (
-        [Parameter(Mandatory = $true)]
-        [psobject]$ExcelItem,
-
-        [Parameter(Mandatory = $true)]
-        [psobject]$CsvRow
-    )
-
-    $newObject = New-Object PSObject
-
-    foreach ($property in $ExcelItem.PSObject.Properties) {
-        $newObject | Add-Member -MemberType NoteProperty -Name $property.Name -Value $property.Value
-    }
-    $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Connection' -Value $CsvRow.Connection
-    $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Status' -Value $CsvRow.Status
-    $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Details' -Value $CsvRow.Details
-    $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_FailureReason' -Value $CsvRow.FailureReason
-    return $newObject
-}

source/Private/Update-CISExcelWorksheet.ps1

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

source/Private/Update-WorksheetCell.ps1

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

source/Public/Export-M365SecurityAuditTable.ps1

@@ -16,28 +16,30 @@
     The path where the CSV files will be exported.
     .PARAMETER ExportOriginalTests
     Switch to export the original audit results to a CSV file.
+    .PARAMETER ExportToExcel
+    Switch to export the results to an Excel file.
     .INPUTS
     [CISAuditResult[]], [string]
     .OUTPUTS
     [PSCustomObject]
     .EXAMPLE
-    # Output object for a single test number from audit results
     Export-M365SecurityAuditTable -AuditResults $object -OutputTestNumber 6.1.2
+    # Output object for a single test number from audit results
     .EXAMPLE
-    # Export all results from audit results to the specified path
     Export-M365SecurityAuditTable -ExportAllTests -AuditResults $object -ExportPath "C:\temp"
+    # Export all results from audit results to the specified path
     .EXAMPLE
-    # Output object for a single test number from CSV
     Export-M365SecurityAuditTable -CsvPath "C:\temp\auditresultstoday1.csv" -OutputTestNumber 6.1.2
+    # Output object for a single test number from CSV
     .EXAMPLE
-    # Export all results from CSV to the specified path
     Export-M365SecurityAuditTable -ExportAllTests -CsvPath "C:\temp\auditresultstoday1.csv" -ExportPath "C:\temp"
+    # Export all results from CSV to the specified path
     .EXAMPLE
-    # Export all results from audit results to the specified path along with the original tests
     Export-M365SecurityAuditTable -ExportAllTests -AuditResults $object -ExportPath "C:\temp" -ExportOriginalTests
+    # Export all results from audit results to the specified path along with the original tests
     .EXAMPLE
-    # Export all results from CSV to the specified path along with the original tests
     Export-M365SecurityAuditTable -ExportAllTests -CsvPath "C:\temp\auditresultstoday1.csv" -ExportPath "C:\temp" -ExportOriginalTests
+    # Export all results from CSV to the specified path along with the original tests
     .LINK
     https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Export-M365SecurityAuditTable
 #>
@@ -69,9 +71,15 @@ function Export-M365SecurityAuditTable {
 
         [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromAuditResults")]
         [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromCsv")]
-        [switch]$ExportOriginalTests
-    )
+        [switch]$ExportOriginalTests,
 
+        [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromAuditResults")]
+        [Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromCsv")]
+        [switch]$ExportToExcel
+    )
+    if ($ExportToExcel) {
+        Assert-ModuleAvailability -ModuleName ImportExcel -RequiredVersion "7.8.9"
+    }
     if ($PSCmdlet.ParameterSetName -like "ExportAllResultsFromCsv" -or $PSCmdlet.ParameterSetName -eq "OutputObjectFromCsvSingle") {
         $AuditResults = Import-Csv -Path $CsvPath | ForEach-Object {
             $params = @{
@@ -103,7 +111,12 @@ function Export-M365SecurityAuditTable {
         switch ($test) {
             "6.1.2" {
                 $details = $auditResult.Details
-                $csv = $details | ConvertFrom-Csv -Delimiter '|'
+                if ($details -ne "No M365 E3 licenses found.") {
+                    $csv = $details | ConvertFrom-Csv -Delimiter '|'
+                }
+                else {
+                    $csv = $null
+                }
 
                 if ($null -ne $csv) {
                     foreach ($row in $csv) {
@@ -120,7 +133,12 @@ function Export-M365SecurityAuditTable {
             }
             "6.1.3" {
                 $details = $auditResult.Details
-                $csv = $details | ConvertFrom-Csv -Delimiter '|'
+                if ($details -ne "No M365 E5 licenses found.") {
+                    $csv = $details | ConvertFrom-Csv -Delimiter '|'
+                }
+                else {
+                    $csv = $null
+                }
 
                 if ($null -ne $csv) {
                     foreach ($row in $csv) {
@@ -155,8 +173,16 @@ function Export-M365SecurityAuditTable {
                     Write-Information "No results found for test number $($result.TestNumber)." -InformationAction Continue
                 }
                 else {
-                    $result.Details | Export-Csv -Path $fileName -NoTypeInformation
-                    $exportedTests += $result.TestNumber
+                    if (($result.Details -ne "No M365 E3 licenses found.") -and ($result.Details -ne "No M365 E5 licenses found.")) {
+                        if ($ExportToExcel) {
+                            $xlsxPath = [System.IO.Path]::ChangeExtension($fileName, '.xlsx')
+                            $result.Details | Export-Excel -Path $xlsxPath -WorksheetName Table -TableName Table -AutoSize -TableStyle Medium2
+                        }
+                        else {
+                            $result.Details | Export-Csv -Path $fileName -NoTypeInformation
+                        }
+                        $exportedTests += $result.TestNumber
+                    }
                 }
             }
         }
@@ -179,7 +205,13 @@ function Export-M365SecurityAuditTable {
             # Check for large details and update the AuditResults array
             $updatedAuditResults = Get-ExceededLengthResultDetail -AuditResults $AuditResults -TestNumbersToCheck $TestNumbersToCheck -ExportedTests $exportedTests -DetailsLengthLimit 30000 -PreviewLineCount 25
             $originalFileName = "$ExportPath\$timestamp`_M365FoundationsAudit.csv"
+            if ($ExportToExcel) {
+                $xlsxPath = [System.IO.Path]::ChangeExtension($originalFileName, '.xlsx')
+                $updatedAuditResults | Export-Excel -Path $xlsxPath -WorksheetName Table -TableName Table -AutoSize -TableStyle Medium2
+            }
+            else {
             $updatedAuditResults | Export-Csv -Path $originalFileName -NoTypeInformation
+            }
         }
     }
     elseif ($OutputTestNumber) {

source/Public/Get-MFAStatus.ps1

@@ -33,7 +33,8 @@ function Get-MFAStatus {
     param (
         [Parameter(Mandatory = $false)]
         [ValidateNotNullOrEmpty()]
-        [string]$UserId
+        [string]$UserId,
+        [switch]$SkipMSOLConnectionChecks
     )
 
     begin {
@@ -43,8 +44,10 @@ function Get-MFAStatus {
 
     process {
         if (Get-Module MSOnline){
-            Connect-MsolService
-            Write-Host -Object "Finding Azure Active Directory Accounts..."
+            if (-not $SkipMSOLConnectionChecks) {
+                Connect-MsolService
+            }
+            Write-Host "Finding Azure Active Directory Accounts..."
             # Get all users, excluding guests
             $Users = if ($PSBoundParameters.ContainsKey('UserId')) {
                 Get-MsolUser -UserPrincipalName $UserId
@@ -52,7 +55,7 @@ function Get-MFAStatus {
                 Get-MsolUser -All | Where-Object { $_.UserType -ne "Guest" }
             }
             $Report = [System.Collections.Generic.List[Object]]::new() # Create output list
-            Write-Host -Object "Processing" $Users.Count "accounts..."
+            Write-Host "Processing $($Users.Count) accounts..."
             ForEach ($User in $Users) {
                 $MFADefaultMethod = ($User.StrongAuthenticationMethods | Where-Object { $_.IsDefault -eq "True" }).MethodType
                 $MFAPhoneNumber = $User.StrongAuthenticationUserDetails.PhoneNumber
@@ -87,17 +90,18 @@ function Get-MFAStatus {
                     MFAPhoneNumber    = $MFAPhoneNumber
                     PrimarySMTP       = ($PrimarySMTP -join ',')
                     Aliases           = ($Aliases -join ',')
+                    isLicensed        = $User.isLicensed
                 }
 
                 $Report.Add($ReportLine)
             }
 
-            Write-Host -Object "Processing complete."
-            return $Report | Select-Object UserPrincipalName, DisplayName, MFAState, MFADefaultMethod, MFAPhoneNumber, PrimarySMTP, Aliases | Sort-Object UserPrincipalName
+            Write-Host "Processing complete."
+            Write-Host "To disconnect from the MsolService close the powershell session or wait for the session to expire."
+            return $Report | Select-Object UserPrincipalName, DisplayName, MFAState, MFADefaultMethod, MFAPhoneNumber, PrimarySMTP, Aliases, isLicensed | Sort-Object UserPrincipalName
         }
         else {
-            Write-Host -Object "You must first install MSOL using:`nInstall-Module MSOnline -Scope CurrentUser -Force"
+            Write-Host "You must first install MSOL using:`nInstall-Module MSOnline -Scope CurrentUser -Force"
         }
     }
-
-}
+}

source/Public/Invoke-M365SecurityAudit.ps1

@@ -1,118 +1,125 @@
 <#
     .SYNOPSIS
-    Invokes a security audit for Microsoft 365 environments.
+        Invokes a security audit for Microsoft 365 environments.
     .DESCRIPTION
-    The Invoke-M365SecurityAudit cmdlet performs a comprehensive security audit based on the specified parameters. It allows auditing of various configurations and settings within a Microsoft 365 environment, such as compliance with CIS benchmarks.
+        The Invoke-M365SecurityAudit cmdlet performs a comprehensive security audit based on the specified parameters. It allows auditing of various configurations and settings within a Microsoft 365 environment, such as compliance with CIS benchmarks.
     .PARAMETER TenantAdminUrl
-    The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.
+        The URL of the tenant admin. If not specified, none of the SharePoint Online tests will run.
     .PARAMETER M365DomainForPWPolicyTest
-    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. This parameter is not mandatory and by default it will pass/fail all found domains as a group if a specific domain is not specified.
     .PARAMETER ELevel
-    Specifies the E-Level (E3 or E5) for the audit. This parameter is optional and can be combined with the ProfileLevel parameter.
+        Specifies the E-Level (E3 or E5) for the audit. This parameter is optional and can be combined with the ProfileLevel parameter.
     .PARAMETER ProfileLevel
-    Specifies the profile level (L1 or L2) for the audit. This parameter is optional and can be combined with the ELevel parameter.
+        Specifies the profile level (L1 or L2) for the audit. This parameter is optional and can be combined with the ELevel parameter.
     .PARAMETER IncludeIG1
-    If specified, includes tests where IG1 is true.
+        If specified, includes tests where IG1 is true.
     .PARAMETER IncludeIG2
-    If specified, includes tests where IG2 is true.
+        If specified, includes tests where IG2 is true.
     .PARAMETER IncludeIG3
-    If specified, includes tests where IG3 is true.
+        If specified, includes tests where IG3 is true.
     .PARAMETER IncludeRecommendation
-    Specifies specific recommendations to include in the audit. Accepts an array of recommendation numbers.
+        Specifies specific recommendations to include in the audit. Accepts an array of recommendation numbers.
     .PARAMETER SkipRecommendation
-    Specifies specific recommendations to exclude from the audit. Accepts an array of recommendation numbers.
+        Specifies specific recommendations to exclude from the audit. Accepts an array of recommendation numbers.
     .PARAMETER DoNotConnect
-    If specified, the cmdlet will not establish a connection to Microsoft 365 services.
+        If specified, the cmdlet will not establish a connection to Microsoft 365 services.
     .PARAMETER DoNotDisconnect
-    If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.
+        If specified, the cmdlet will not disconnect from Microsoft 365 services after execution.
     .PARAMETER NoModuleCheck
-    If specified, the cmdlet will not check for the presence of required modules.
+        If specified, the cmdlet will not check for the presence of required modules.
+    .PARAMETER DoNotConfirmConnections
+        If specified, the cmdlet will not prompt for confirmation before proceeding with established connections and will disconnect from all of them.
     .EXAMPLE
-    PS> Invoke-M365SecurityAudit
-    Performs a security audit using default parameters.
-    Output:
-    Status      : Fail
-    ELevel      : E3
-    ProfileLevel: L1
-    Connection  : Microsoft Graph
-    Rec         : 1.1.1
-    Result      : False
-    Details     : Non-compliant accounts:
-                Username        | Roles                  | HybridStatus | Missing Licence
-                user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
-                user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
-    FailureReason: Non-Compliant Accounts: 2
+        PS> Invoke-M365SecurityAudit
+
+        Performs a security audit using default parameters.
+        Output:
+        Status      : Fail
+        ELevel      : E3
+        ProfileLevel: L1
+        Connection  : Microsoft Graph
+        Rec         : 1.1.1
+        Result      : False
+        Details     : Non-compliant accounts:
+                        Username        | Roles                  | HybridStatus | Missing Licence
+                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
+                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
+        FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-    PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -ELevel "E5" -ProfileLevel "L1"
-    Performs a security audit for the E5 level and L1 profile in the specified Microsoft 365 environment.
-    Output:
-    Status      : Fail
-    ELevel      : E5
-    ProfileLevel: L1
-    Connection  : Microsoft Graph
-    Rec         : 1.1.1
-    Result      : False
-    Details     : Non-compliant accounts:
-                Username        | Roles                  | HybridStatus | Missing Licence
-                user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
-                user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
-    FailureReason: Non-Compliant Accounts: 2
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -ELevel "E5" -ProfileLevel "L1"
+
+        Performs a security audit for the E5 level and L1 profile in the specified Microsoft 365 environment.
+        Output:
+        Status      : Fail
+        ELevel      : E5
+        ProfileLevel: L1
+        Connection  : Microsoft Graph
+        Rec         : 1.1.1
+        Result      : False
+        Details     : Non-compliant accounts:
+                        Username        | Roles                  | HybridStatus | Missing Licence
+                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
+                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
+        FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-    PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -IncludeIG1
-    Performs an audit including all tests where IG1 is true.
-    Output:
-    Status      : Fail
-    ELevel      : E3
-    ProfileLevel: L1
-    Connection  : Microsoft Graph
-    Rec         : 1.1.1
-    Result      : False
-    Details     : Non-compliant accounts:
-                Username        | Roles                  | HybridStatus | Missing Licence
-                user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
-                user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
-    FailureReason: Non-Compliant Accounts: 2
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -IncludeIG1
+
+        Performs an audit including all tests where IG1 is true.
+        Output:
+        Status      : Fail
+        ELevel      : E3
+        ProfileLevel: L1
+        Connection  : Microsoft Graph
+        Rec         : 1.1.1
+        Result      : False
+        Details     : Non-compliant accounts:
+                        Username        | Roles                  | HybridStatus | Missing Licence
+                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
+                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
+        FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-    PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -SkipRecommendation '1.1.3', '2.1.1'
-    Performs an audit while excluding specific recommendations 1.1.3 and 2.1.1.
-    Output:
-    Status      : Fail
-    ELevel      : E3
-    ProfileLevel: L1
-    Connection  : Microsoft Graph
-    Rec         : 1.1.1
-    Result      : False
-    Details     : Non-compliant accounts:
-                Username        | Roles                  | HybridStatus | Missing Licence
-                user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
-                user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
-    FailureReason: Non-Compliant Accounts: 2
+        PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com" -SkipRecommendation '1.1.3', '2.1.1'
+        Performs an audit while excluding specific recommendations 1.1.3 and 2.1.1.
+        Output:
+        Status      : Fail
+        ELevel      : E3
+        ProfileLevel: L1
+        Connection  : Microsoft Graph
+        Rec         : 1.1.1
+        Result      : False
+        Details     : Non-compliant accounts:
+                        Username        | Roles                  | HybridStatus | Missing Licence
+                        user1@domain.com| Global Administrator   | Cloud-Only   | AAD_PREMIUM
+                        user2@domain.com| Global Administrator   | Hybrid       | AAD_PREMIUM, AAD_PREMIUM_P2
+        FailureReason: Non-Compliant Accounts: 2
     .EXAMPLE
-    PS> $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com"
-    PS> $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation
-    Captures the audit results into a variable and exports them to a CSV file.
-    Output:
-    CISAuditResult[]
-    auditResults.csv
+        PS> $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://contoso-admin.sharepoint.com" -M365DomainForPWPolicyTest "contoso.com"
+        PS> $auditResults | Export-Csv -Path "auditResults.csv" -NoTypeInformation
+
+        Captures the audit results into a variable and exports them to a CSV file.
+        Output:
+        CISAuditResult[]
+        auditResults.csv
     .EXAMPLE
-    PS> Invoke-M365SecurityAudit -WhatIf
-    Displays what would happen if the cmdlet is run without actually performing the audit.
-    Output:
-    What if: Performing the operation "Invoke-M365SecurityAudit" on target "Microsoft 365 environment".
+        PS> Invoke-M365SecurityAudit -WhatIf
+
+        Displays what would happen if the cmdlet is run without actually performing the audit.
+        Output:
+        What if: Performing the operation "Invoke-M365SecurityAudit" on target "Microsoft 365 environment".
     .INPUTS
-    None. You cannot pipe objects to Invoke-M365SecurityAudit.
+        None. You cannot pipe objects to Invoke-M365SecurityAudit.
     .OUTPUTS
-    CISAuditResult[]
-    The cmdlet returns an array of CISAuditResult objects representing the results of the security audit.
+        CISAuditResult[]
+        The cmdlet returns an array of CISAuditResult objects representing the results of the security audit.
     .NOTES
-    - This module is based on CIS benchmarks.
-    - Governed by the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
-    - Commercial use is not permitted. This module cannot be sold or used for commercial purposes.
-    - Modifications and sharing are allowed under the same license.
-    - For full license details, visit: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en
-    - Register for CIS Benchmarks at: https://www.cisecurity.org/cis-benchmarks
+        - This module is based on CIS benchmarks.
+        - Governed by the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
+        - Commercial use is not permitted. This module cannot be sold or used for commercial purposes.
+        - Modifications and sharing are allowed under the same license.
+        - For full license details, visit: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en
+        - Register for CIS Benchmarks at: https://www.cisecurity.org/cis-benchmarks
     .LINK
-    https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit
+        https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Invoke-M365SecurityAudit
 #>
 function Invoke-M365SecurityAudit {
     [CmdletBinding(SupportsShouldProcess = $true, DefaultParameterSetName = 'Default')]
@@ -174,7 +181,8 @@ function Invoke-M365SecurityAudit {
         # Common parameters for all parameter sets
         [switch]$DoNotConnect,
         [switch]$DoNotDisconnect,
-        [switch]$NoModuleCheck
+        [switch]$NoModuleCheck,
+        [switch]$DoNotConfirmConnections
     )
 
     Begin {
@@ -189,6 +197,7 @@ function Invoke-M365SecurityAudit {
 
         # Check and install required modules if necessary
         if (!($NoModuleCheck) -and $PSCmdlet.ShouldProcess("Check for required modules: $requiredModulesFormatted", "Check")) {
+            Write-Host "Checking for and installing required modules..." -ForegroundColor DarkMagenta
             foreach ($module in $requiredModules) {
                 Assert-ModuleAvailability -ModuleName $module.ModuleName -RequiredVersion $module.RequiredVersion -SubModules $module.SubModules
             }
@@ -240,48 +249,62 @@ function Invoke-M365SecurityAudit {
         $currentTestIndex = 0
 
         # Establishing connections if required
-        $actualUniqueConnections = Get-UniqueConnection -Connections $requiredConnections
-        if (!($DoNotConnect) -and $PSCmdlet.ShouldProcess("Establish connections to Microsoft 365 services: $($actualUniqueConnections -join ', ')", "Connect")) {
-            Write-Information "Establishing connections to Microsoft 365 services: $($actualUniqueConnections -join ', ')" -InformationAction Continue
-            Connect-M365Suite -TenantAdminUrl $TenantAdminUrl -RequiredConnections $requiredConnections
+        try {
+            $actualUniqueConnections = Get-UniqueConnection -Connections $requiredConnections
+            if (!($DoNotConnect) -and $PSCmdlet.ShouldProcess("Establish connections to Microsoft 365 services: $($actualUniqueConnections -join ', ')", "Connect")) {
+                Write-Host "Establishing connections to Microsoft 365 services: $($actualUniqueConnections -join ', ')" -ForegroundColor DarkMagenta
+                Connect-M365Suite -TenantAdminUrl $TenantAdminUrl -RequiredConnections $requiredConnections -SkipConfirmation:$DoNotConfirmConnections
+            }
+        }
+        catch {
+            Write-Host "Connection execution aborted: $_" -ForegroundColor Red
+            break
         }
 
 
-        Write-Information "A total of $($totalTests) tests were selected to run..." -InformationAction Continue
-        # Import the test functions
-        $testFiles | ForEach-Object {
-            $currentTestIndex++
-            Write-Progress -Activity "Loading Test Scripts" -Status "Loading $($currentTestIndex) of $($totalTests): $($_.Name)" -PercentComplete (($currentTestIndex / $totalTests) * 100)
-            Try {
-                # Dot source the test function
-                . $_.FullName
+        try {
+            Write-Host "A total of $($totalTests) tests were selected to run..." -ForegroundColor DarkMagenta
+            # Import the test functions
+            $testFiles | ForEach-Object {
+                $currentTestIndex++
+                Write-Progress -Activity "Loading Test Scripts" -Status "Loading $($currentTestIndex) of $($totalTests): $($_.Name)" -PercentComplete (($currentTestIndex / $totalTests) * 100)
+                Try {
+                    # Dot source the test function
+                    . $_.FullName
+                }
+                Catch {
+                    # Log the error and add the test to the failed tests collection
+                    Write-Verbose "Failed to load test function $($_.Name): $_" -Verbose
+                    $script:FailedTests.Add([PSCustomObject]@{ Test = $_.Name; Error = $_ })
+                }
             }
-            Catch {
-                # Log the error and add the test to the failed tests collection
-                Write-Error "Failed to load test function $($_.Name): $_"
-                $script:FailedTests.Add([PSCustomObject]@{ Test = $_.Name; Error = $_ })
+
+            $currentTestIndex = 0
+            # Execute each test function from the prepared list
+            foreach ($testFunction in $testFiles) {
+                $currentTestIndex++
+                Write-Progress -Activity "Executing Tests" -Status "Executing $($currentTestIndex) of $($totalTests): $($testFunction.Name)" -PercentComplete (($currentTestIndex / $totalTests) * 100)
+                $functionName = $testFunction.BaseName
+                if ($PSCmdlet.ShouldProcess($functionName, "Execute test")) {
+                    $auditResult = Invoke-TestFunction -FunctionFile $testFunction -DomainName $M365DomainForPWPolicyTest
+                    # Add the result to the collection
+                    [void]$allAuditResults.Add($auditResult)
+                }
             }
         }
-
-        $currentTestIndex = 0
-        # Execute each test function from the prepared list
-        foreach ($testFunction in $testFiles) {
-            $currentTestIndex++
-            Write-Progress -Activity "Executing Tests" -Status "Executing $($currentTestIndex) of $($totalTests): $($testFunction.Name)" -PercentComplete (($currentTestIndex / $totalTests) * 100)
-            $functionName = $testFunction.BaseName
-            if ($PSCmdlet.ShouldProcess($functionName, "Execute test")) {
-                $auditResult = Invoke-TestFunction -FunctionFile $testFunction -DomainName $M365DomainForPWPolicyTest
-                # Add the result to the collection
-                [void]$allAuditResults.Add($auditResult)
+        catch {
+            # Log the error and add the test to the failed tests collection
+            Write-Verbose "Invoke-M365SecurityAudit: Failed to load test function $($_.Name): $_" -Verbose
+            $script:FailedTests.Add([PSCustomObject]@{ Test = $_.Name; Error = $_ })
+        }
+        finally {
+            if (!($DoNotDisconnect) -and $PSCmdlet.ShouldProcess("Disconnect from Microsoft 365 services: $($actualUniqueConnections -join ', ')", "Disconnect")) {
+                # Clean up sessions
+                Disconnect-M365Suite -RequiredConnections $requiredConnections
             }
         }
     }
-
     End {
-        if (!($DoNotDisconnect) -and $PSCmdlet.ShouldProcess("Disconnect from Microsoft 365 services: $($actualUniqueConnections -join ', ')", "Disconnect")) {
-            # Clean up sessions
-            Disconnect-M365Suite -RequiredConnections $requiredConnections
-        }
         if ($PSCmdlet.ShouldProcess("Measure and display audit results for $($totalTests) tests", "Measure")) {
             # Call the private function to calculate and display results
             Measure-AuditResult -AllAuditResults $allAuditResults -FailedTests $script:FailedTests
@@ -301,3 +324,5 @@ function Invoke-M365SecurityAudit {
     }
 }
 
+
+

source/Public/Remove-RowsWithEmptyCSVStatus.ps1

@@ -1,3 +1,18 @@
+<#
+    .SYNOPSIS
+        Removes rows from an Excel worksheet where the 'CSV_Status' column is empty and saves the result to a new file.
+    .DESCRIPTION
+        The Remove-RowsWithEmptyCSVStatus function imports data from a specified worksheet in an Excel file, checks for the presence of the 'CSV_Status' column, and filters out rows where the 'CSV_Status' column is empty. The filtered data is then exported to a new Excel file with a '-Filtered' suffix added to the original file name.
+    .PARAMETER FilePath
+        The path to the Excel file to be processed.
+    .PARAMETER WorksheetName
+        The name of the worksheet within the Excel file to be processed.
+    .EXAMPLE
+        PS C:\> Remove-RowsWithEmptyCSVStatus -FilePath "C:\Reports\Report.xlsx" -WorksheetName "Sheet1"
+        This command imports data from the "Sheet1" worksheet in the "Report.xlsx" file, removes rows where the 'CSV_Status' column is empty, and saves the filtered data to a new file named "Report-Filtered.xlsx" in the same directory.
+    .NOTES
+        This function requires the ImportExcel module to be installed.
+#>
 function Remove-RowsWithEmptyCSVStatus {
     [CmdletBinding()]
     param (

source/Public/Sync-CISExcelAndCsvData.ps1

@@ -1,90 +1,102 @@
 <#
-.SYNOPSIS
-Synchronizes data between an Excel file and either a CSV file or an output object from Invoke-M365SecurityAudit, and optionally updates the Excel worksheet.
-.DESCRIPTION
-The Sync-CISExcelAndCsvData function merges data from a specified Excel file with data from either a CSV file or an output object from Invoke-M365SecurityAudit based on a common key. It can also update the Excel worksheet with the merged data. This function is particularly useful for updating Excel records with additional data from a CSV file or audit results while preserving the original formatting and structure of the Excel worksheet.
-.PARAMETER ExcelPath
-The path to the Excel file that contains the original data. This parameter is mandatory.
-.PARAMETER WorksheetName
-The name of the worksheet within the Excel file that contains the data to be synchronized. This parameter is mandatory.
-.PARAMETER CsvPath
-The path to the CSV file containing data to be merged with the Excel data. This parameter is mandatory when using the CsvInput parameter set.
-.PARAMETER AuditResults
-An array of CISAuditResult objects from Invoke-M365SecurityAudit to be merged with the Excel data. This parameter is mandatory when using the ObjectInput parameter set. It can also accept pipeline input.
-.PARAMETER SkipUpdate
-If specified, the function will return the merged data object without updating the Excel worksheet. This is useful for previewing the merged data.
-.EXAMPLE
-PS> Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -WorksheetName "DataSheet" -CsvPath "path\to\data.csv"
-Merges data from 'data.csv' into 'excel.xlsx' on the 'DataSheet' worksheet and updates the worksheet with the merged data.
-.EXAMPLE
-PS> $mergedData = Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -WorksheetName "DataSheet" -CsvPath "path\to\data.csv" -SkipUpdate
-Retrieves the merged data object for preview without updating the Excel worksheet.
-.EXAMPLE
-PS> $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://tenant-admin.url" -DomainName "example.com"
-PS> Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -WorksheetName "DataSheet" -AuditResults $auditResults
-Merges data from the audit results into 'excel.xlsx' on the 'DataSheet' worksheet and updates the worksheet with the merged data.
-.EXAMPLE
-PS> $auditResults = Invoke-M365SecurityAudit -TenantAdminUrl "https://tenant-admin.url" -DomainName "example.com"
-PS> $mergedData = Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -WorksheetName "DataSheet" -AuditResults $auditResults -SkipUpdate
-Retrieves the merged data object for preview without updating the Excel worksheet.
-.EXAMPLE
-PS> Invoke-M365SecurityAudit -TenantAdminUrl "https://tenant-admin.url" -DomainName "example.com" | Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -WorksheetName "DataSheet"
-Pipes the audit results into Sync-CISExcelAndCsvData to merge data into 'excel.xlsx' on the 'DataSheet' worksheet and updates the worksheet with the merged data.
-.INPUTS
-System.String, CISAuditResult[]
-You can pipe CISAuditResult objects to Sync-CISExcelAndCsvData.
-.OUTPUTS
-Object[]
-If the SkipUpdate switch is used, the function returns an array of custom objects representing the merged data.
-.NOTES
-- Ensure that the 'ImportExcel' module is installed and up to date.
-- It is recommended to backup the Excel file before running this script to prevent accidental data loss.
-- This function is part of the CIS Excel and CSV Data Management Toolkit.
-.LINK
-https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Sync-CISExcelAndCsvData
+    .SYNOPSIS
+    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.
+    .PARAMETER ExcelPath
+    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.
+    .PARAMETER SheetName
+    Specifies the name of the worksheet in the Excel file where data will be merged and updated. This parameter is mandatory.
+    .EXAMPLE
+    PS> Sync-CISExcelAndCsvData -ExcelPath "path\to\excel.xlsx" -CsvPath "path\to\data.csv" -SheetName "AuditData"
+    Updates the 'AuditData' worksheet in 'excel.xlsx' with data from 'data.csv', adding new information and the date of the update.
+    .INPUTS
+    System.String
+    The function accepts strings for file paths and worksheet names.
+    .OUTPUTS
+    None
+    The function directly updates the Excel file and does not output any objects.
+    .NOTES
+    - Ensure that the 'ImportExcel' module is installed and up to date to handle Excel file manipulations.
+    - It is recommended to back up the Excel file before running this function to avoid accidental data loss.
+    - The CSV file should have columns that match expected headers like 'Connection', 'Details', 'FailureReason', and 'Status' for correct data mapping.
+    .LINK
+    https://criticalsolutionsnetwork.github.io/M365FoundationsCISReport/#Sync-CISExcelAndCsvData
 #>
+
 function Sync-CISExcelAndCsvData {
-    [OutputType([void], [PSCustomObject[]])]
-    [CmdletBinding(DefaultParameterSetName = 'CsvInput')]
-    param (
-        [Parameter(Mandatory = $true)]
-        [ValidateScript({ Test-Path $_ })]
+    [OutputType([void])]
+    [CmdletBinding()]
+    param(
         [string]$ExcelPath,
-
-        [Parameter(Mandatory = $true)]
-        [string]$WorksheetName,
-
-        [Parameter(Mandatory = $true, ParameterSetName = 'CsvInput')]
-        [ValidateScript({ Test-Path $_ })]
         [string]$CsvPath,
-
-        [Parameter(Mandatory = $true, ParameterSetName = 'ObjectInput', ValueFromPipeline = $true)]
-        [CISAuditResult[]]$AuditResults,
-
-        [Parameter(Mandatory = $false)]
-        [switch]$SkipUpdate
+        [string]$SheetName
     )
 
-    process {
-        # Verify ImportExcel module is available
-        $requiredModules = Get-RequiredModule -SyncFunction
-        foreach ($module in $requiredModules) {
-            Assert-ModuleAvailability -ModuleName $module.ModuleName -RequiredVersion $module.RequiredVersion -SubModuleName $module.SubModuleName
-        }
+    # Import the CSV file
+    $csvData = Import-Csv -Path $CsvPath
 
-        # Merge Excel and CSV data or Audit Results
-        if ($PSCmdlet.ParameterSetName -eq 'CsvInput') {
-            $mergedData = Merge-CISExcelAndCsvData -ExcelPath $ExcelPath -WorksheetName $WorksheetName -CsvPath $CsvPath
-        } else {
-            $mergedData = Merge-CISExcelAndCsvData -ExcelPath $ExcelPath -WorksheetName $WorksheetName -AuditResults $AuditResults
-        }
+    # Get the current date in the specified format
+    $currentDate = Get-Date -Format "yyyy-MM-ddTHH:mm:ss"
 
-        # Output the merged data if the user chooses to skip the update
-        if ($SkipUpdate) {
-            return $mergedData
-        } else {
-            # Update the Excel worksheet with the merged data
-            Update-CISExcelWorksheet -ExcelPath $ExcelPath -WorksheetName $WorksheetName -Data $mergedData
+    # Load the Excel workbook
+    $excelPackage = Open-ExcelPackage -Path $ExcelPath
+    $worksheet = $excelPackage.Workbook.Worksheets[$SheetName]
+
+    # Define and check new headers, including the date header
+    $lastCol = $worksheet.Dimension.End.Column
+    $newHeaders = @("CSV_Connection", "CSV_Status", "CSV_Date", "CSV_Details", "CSV_FailureReason")
+    $existingHeaders = $worksheet.Cells[1, 1, 1, $lastCol].Value
+
+    # Add new headers if they do not exist
+    foreach ($header in $newHeaders) {
+        if ($header -notin $existingHeaders) {
+            $lastCol++
+            $worksheet.Cells[1, $lastCol].Value = $header
         }
     }
-}
+
+    # Save changes made to add headers
+    $excelPackage.Save()
+
+    # Update the worksheet variable to include possible new columns
+    $worksheet = $excelPackage.Workbook.Worksheets[$SheetName]
+
+    # Mapping the headers to their corresponding column numbers
+    $headerMap = @{}
+    for ($col = 1; $col -le $worksheet.Dimension.End.Column; $col++) {
+        $headerMap[$worksheet.Cells[1, $col].Text] = $col
+    }
+
+    # For each record in CSV, find the matching row and update/add data
+    foreach ($row in $csvData) {
+        # Find the matching recommendation # row
+        $matchRow = $null
+        for ($i = 2; $i -le $worksheet.Dimension.End.Row; $i++) {
+            if ($worksheet.Cells[$i, $headerMap['Recommendation #']].Text -eq $row.rec) {
+                $matchRow = $i
+                break
+            }
+        }
+
+        # Update values if a matching row is found
+        if ($matchRow) {
+            foreach ($header in $newHeaders) {
+                if ($header -eq 'CSV_Date') {
+                    $columnIndex = $headerMap[$header]
+                    $worksheet.Cells[$matchRow, $columnIndex].Value = $currentDate
+                } else {
+                    $csvKey = $header -replace 'CSV_', ''
+                    $columnIndex = $headerMap[$header]
+                    $worksheet.Cells[$matchRow, $columnIndex].Value = $row.$csvKey
+                }
+            }
+        }
+    }
+
+    # Save the updated Excel file
+    $excelPackage.Save()
+    $excelPackage.Dispose()
+}

source/helper/TestDefinitions.csv

@@ -17,7 +17,7 @@
 16,Test-AuditLogSearch.ps1,3.1.1,Ensure Microsoft 365 audit log search is Enabled,E3,L1,8.2,Collect Audit Logs,TRUE,TRUE,TRUE,TRUE,EXO
 17,Test-RestrictTenantCreation.ps1,5.1.2.3,Ensure 'Restrict non-admin users from creating tenants' is set to 'Yes',E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,Microsoft Graph
 18,Test-PasswordHashSync.ps1,5.1.8.1,Ensure password hash sync is enabled for hybrid deployments,E3,L1,6.7,Centralize Access Control,FALSE,TRUE,TRUE,TRUE,Microsoft Graph
-19,Test-AuditDisabledFalse.ps1,6.1.1,Ensure 'AuditDisabled' organizationally is set to 'False',E3,L1,8.2,Collect Audit Logs,TRUE,TRUE,TRUE,TRUE,Microsoft Graph
+19,Test-AuditDisabledFalse.ps1,6.1.1,Ensure 'AuditDisabled' organizationally is set to 'False',E3,L1,8.2,Collect Audit Logs,TRUE,TRUE,TRUE,TRUE,EXO
 20,Test-MailboxAuditingE3.ps1,6.1.2,Ensure mailbox auditing for Office E3 users is Enabled,E3,L1,8.2,Collect audit logs.,TRUE,TRUE,TRUE,TRUE,EXO | Microsoft Graph
 21,Test-MailboxAuditingE5.ps1,6.1.3,Ensure mailbox auditing for Office E5 users is Enabled,E5,L1,8.2,Collect audit logs.,TRUE,TRUE,TRUE,TRUE,EXO | Microsoft Graph
 22,Test-BlockMailForwarding.ps1,6.2.1,Ensure all forms of mail forwarding are blocked and/or disabled,E3,L1,0,Explicitly Not Mapped,FALSE,FALSE,FALSE,TRUE,EXO

source/tests/Test-AdministrativeAccountCompliance.ps1

@@ -1,76 +1,59 @@
 function Test-AdministrativeAccountCompliance {
     [CmdletBinding()]
-    param (
-        # Aligned
-        # Parameters can be added if needed
-    )
+    param ()
 
     begin {
         # The following conditions are checked:
         # Condition A: The administrative account is cloud-only (not synced).
         # Condition B: The account is assigned a valid license (e.g., Microsoft Entra ID P1 or P2).
         # Condition C: The administrative account does not have any other application assignments (only valid licenses).
-
         $validLicenses = @('AAD_PREMIUM', 'AAD_PREMIUM_P2')
         $recnum = "1.1.1"
         Write-Verbose "Starting Test-AdministrativeAccountCompliance with Rec: $recnum"
     }
 
     process {
-        try {
-            # Retrieve all admin roles
-            Write-Verbose "Retrieving all admin roles"
-            # Get the DisplayNames of all admin roles
-            $adminRoleNames = (Get-MgDirectoryRole | Where-Object { $null -ne $_.RoleTemplateId }).DisplayName
 
-            # Use the DisplayNames to filter the roles in Get-MgRoleManagementDirectoryRoleDefinition
-            $adminRoles = Get-MgRoleManagementDirectoryRoleDefinition | Where-Object { ($adminRoleNames -contains $_.DisplayName) -and ($_.DisplayName -ne "Directory Synchronization Accounts")}
+        try {
+            # Retrieve admin roles, assignments, and user details including licenses
+            Write-Verbose "Retrieving admin roles, assignments, and user details including licenses"
+            $adminRoleAssignments = Get-CISMgOutput -Rec $recnum
 
             $adminRoleUsers = @()
 
-            # Loop through each admin role to get role assignments and user details
-            foreach ($role in $adminRoles) {
-                Write-Verbose "Processing role: $($role.DisplayName)"
-                $roleAssignments = Get-MgRoleManagementDirectoryRoleAssignment -Filter "roleDefinitionId eq '$($role.Id)'"
+            foreach ($roleName in $adminRoleAssignments.Keys) {
+                $assignments = $adminRoleAssignments[$roleName]
+                foreach ($assignment in $assignments) {
+                    $userDetails = $assignment.UserDetails
+                    $userId = $userDetails.Id
+                    $userPrincipalName = $userDetails.UserPrincipalName
+                    $licenses = $assignment.Licenses
+                    $licenseString = if ($licenses) { ($licenses.SkuPartNumber -join '|') } else { "No Licenses Found" }
 
-                foreach ($assignment in $roleAssignments) {
-                    Write-Verbose "Processing role assignment for principal ID: $($assignment.PrincipalId)"
-                    # Get user details for each principal ID
-                    $userDetails = Get-MgUser -UserId $assignment.PrincipalId -Property "DisplayName, UserPrincipalName, Id, OnPremisesSyncEnabled" -ErrorAction SilentlyContinue
-                    if ($userDetails) {
-                        Write-Verbose "Retrieved user details for: $($userDetails.UserPrincipalName)"
-                        # Get user license details
-                        $licenses = Get-MgUserLicenseDetail -UserId $assignment.PrincipalId -ErrorAction SilentlyContinue
-                        $licenseString = if ($licenses) { ($licenses.SkuPartNumber -join '|') } else { "No Licenses Found" }
+                    # Condition A: Check if the account is cloud-only
+                    $cloudOnlyStatus = if ($userDetails.OnPremisesSyncEnabled) { "Fail" } else { "Pass" }
 
-                        # Condition A: Check if the account is cloud-only
-                        $cloudOnlyStatus = if ($userDetails.OnPremisesSyncEnabled) { "Fail" } else { "Pass" }
+                    # Condition B: Check if the account has valid licenses
+                    $hasValidLicense = $licenses.SkuPartNumber | ForEach-Object { $validLicenses -contains $_ }
+                    $validLicensesStatus = if ($hasValidLicense) { "Pass" } else { "Fail" }
 
-                        # Condition B: Check if the account has valid licenses
-                        $hasValidLicense = $licenses.SkuPartNumber | ForEach-Object { $validLicenses -contains $_ }
-                        $validLicensesStatus = if ($hasValidLicense) { "Pass" } else { "Fail" }
+                    # Condition C: Check if the account has no other licenses
+                    $hasInvalidLicense = $licenses.SkuPartNumber | ForEach-Object { $validLicenses -notcontains $_ }
+                    $invalidLicenses = $licenses.SkuPartNumber | Where-Object { $validLicenses -notcontains $_ }
+                    $applicationAssignmentStatus = if ($hasInvalidLicense) { "Fail" } else { "Pass" }
 
-                        # Condition C: Check if the account has no other licenses
-                        $hasInvalidLicense = $licenses.SkuPartNumber | ForEach-Object { $validLicenses -notcontains $_ }
-                        $invalidLicenses = $licenses.SkuPartNumber | Where-Object { $validLicenses -notcontains $_ }
-                        $applicationAssignmentStatus = if ($hasInvalidLicense) { "Fail" } else { "Pass" }
+                    Write-Verbose "User: $userPrincipalName, Cloud-Only: $cloudOnlyStatus, Valid Licenses: $validLicensesStatus, Invalid Licenses: $($invalidLicenses -join ', ')"
 
-                        Write-Verbose "User: $($userDetails.UserPrincipalName), Cloud-Only: $cloudOnlyStatus, Valid Licenses: $validLicensesStatus, Invalid Licenses: $($invalidLicenses -join ', ')"
-
-                        # Collect user information
-                        $adminRoleUsers += [PSCustomObject]@{
-                            UserName                    = $userDetails.UserPrincipalName
-                            RoleName                    = $role.DisplayName
-                            UserId                      = $userDetails.Id
-                            HybridUser                  = $userDetails.OnPremisesSyncEnabled
-                            Licenses                    = $licenseString
-                            CloudOnlyStatus             = $cloudOnlyStatus
-                            ValidLicensesStatus         = $validLicensesStatus
-                            ApplicationAssignmentStatus = $applicationAssignmentStatus
-                        }
-                    }
-                    else {
-                        Write-Verbose "No user details found for principal ID: $($assignment.PrincipalId)"
+                    # Collect user information
+                    $adminRoleUsers += [PSCustomObject]@{
+                        UserName                    = $userPrincipalName
+                        RoleName                    = $roleName
+                        UserId                      = $userId
+                        HybridUser                  = $userDetails.OnPremisesSyncEnabled
+                        Licenses                    = $licenseString
+                        CloudOnlyStatus             = $cloudOnlyStatus
+                        ValidLicensesStatus         = $validLicensesStatus
+                        ApplicationAssignmentStatus = $applicationAssignmentStatus
                     }
                 }
             }
@@ -124,15 +107,8 @@ function Test-AdministrativeAccountCompliance {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Handle the error and create a failure result
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-AntiPhishingPolicy.ps1

@@ -34,7 +34,7 @@ function Test-AntiPhishingPolicy {
 
         try {
             # Condition A: Ensure that an anti-phishing policy has been created
-            $antiPhishPolicies = Get-AntiPhishPolicy
+            $antiPhishPolicies = Get-CISExoOutput -Rec $recnum
 
             # Condition B: Verify the anti-phishing policy settings using PowerShell
             $validatedPolicies = $antiPhishPolicies | Where-Object {
@@ -92,16 +92,8 @@ function Test-AntiPhishingPolicy {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-AuditDisabledFalse.ps1

@@ -35,8 +35,7 @@ function Test-AuditDisabledFalse {
             # 6.1.1 (L1) Ensure 'AuditDisabled' organizationally is set to 'False'
 
             # Retrieve the AuditDisabled configuration (Condition B)
-            $auditDisabledConfig = Get-OrganizationConfig | Select-Object AuditDisabled
-            $auditNotDisabled = -not $auditDisabledConfig.AuditDisabled
+            $auditNotDisabled = Get-CISExoOutput -Rec $recnum
 
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $auditNotDisabled) {
@@ -64,16 +63,8 @@ function Test-AuditDisabledFalse {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-AuditLogSearch.ps1

@@ -36,9 +36,7 @@ function Test-AuditLogSearch {
         try {
             # 3.1.1 (L1) Ensure Microsoft 365 audit log search is Enabled
 
-            # Retrieve the audit log configuration
-            $auditLogConfig = Get-AdminAuditLogConfig | Select-Object UnifiedAuditLogIngestionEnabled
-            $auditLogResult = $auditLogConfig.UnifiedAuditLogIngestionEnabled
+            $auditLogResult = Get-CISExoOutput -Rec $recnum
 
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $auditLogResult) {
@@ -68,16 +66,8 @@ function Test-AuditLogSearch {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-BlockChannelEmails.ps1

@@ -33,7 +33,7 @@ function Test-BlockChannelEmails {
             #   - Condition C: Verification using PowerShell indicates that the `AllowEmailIntoChannel` setting is enabled.
 
             # Retrieve Teams client configuration
-            $teamsClientConfig = Get-CsTeamsClientConfiguration -Identity Global
+            $teamsClientConfig = Get-CISMSTeamsOutput -Rec $recnum
             $allowEmailIntoChannel = $teamsClientConfig.AllowEmailIntoChannel
 
             # Prepare failure reasons and details based on compliance
@@ -62,16 +62,8 @@ function Test-BlockChannelEmails {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-BlockMailForwarding.ps1

@@ -35,12 +35,10 @@ function Test-BlockMailForwarding {
             # 6.2.1 (L1) Ensure all forms of mail forwarding are blocked and/or disabled
 
             # Step 1: Retrieve the transport rules that redirect messages
-            $transportRules = Get-TransportRule | Where-Object { $null -ne $_.RedirectMessageTo }
+            $transportRules,$nonCompliantSpamPolicies = Get-CISExoOutput -Rec $recnum
             $transportForwardingBlocked = $transportRules.Count -eq 0
 
             # Step 2: Check all anti-spam outbound policies
-            $outboundSpamPolicies = Get-HostedOutboundSpamFilterPolicy
-            $nonCompliantSpamPolicies = $outboundSpamPolicies | Where-Object { $_.AutoForwardingMode -ne 'Off' }
             $nonCompliantSpamPoliciesArray = @($nonCompliantSpamPolicies)
             $spamForwardingBlocked = $nonCompliantSpamPoliciesArray.Count -eq 0
 
@@ -51,7 +49,7 @@ function Test-BlockMailForwarding {
             $failureReasons = @()
             $details = @()
 
-            if ($transportRules.Count -gt 0) {
+            if ($transportRules -ne 1) {
                 # Fail Condition A
                 $failureReasons += "Mail forwarding rules found: $($transportRules.Name -join ', ')"
                 $details += "Transport Rules Details:`nRule Name|Redirects To"
@@ -90,16 +88,8 @@ function Test-BlockMailForwarding {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-BlockSharedMailboxSignIn.ps1

@@ -30,10 +30,11 @@ function Test-BlockSharedMailboxSignIn {
     process {
         try {
             # Step: Retrieve shared mailbox details
-            $MBX = Get-EXOMailbox -RecipientTypeDetails SharedMailbox
-
+            $MBX = Get-CISExoOutput -Rec $recnum
+            $objectids = $MBX.ExternalDirectoryObjectId
+            $users = Get-CISAadOutput -Rec $recnum
             # Step: Retrieve details of shared mailboxes from Azure AD (Condition B: Pass/Fail)
-            $sharedMailboxDetails = $MBX | ForEach-Object { Get-AzureADUser -ObjectId $_.ExternalDirectoryObjectId }
+            $sharedMailboxDetails = $users | Where-Object {$_.objectid -in $objectids}
 
             # Step: Identify enabled mailboxes (Condition B: Pass/Fail)
             $enabledMailboxes = $sharedMailboxDetails | Where-Object { $_.AccountEnabled } | ForEach-Object { $_.DisplayName }
@@ -66,16 +67,8 @@ function Test-BlockSharedMailboxSignIn {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-CommonAttachmentFilter.ps1

@@ -38,8 +38,7 @@ function Test-CommonAttachmentFilter {
             # Condition B: Using Exchange Online PowerShell, verify that the `EnableFileFilter` property of the default malware filter policy is set to `True`.
 
             # Retrieve the attachment filter policy
-            $attachmentFilter = Get-MalwareFilterPolicy -Identity Default | Select-Object EnableFileFilter
-            $result = $attachmentFilter.EnableFileFilter
+            $result = Get-CISExoOutput -Rec $recnum
 
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $result) {
@@ -69,16 +68,8 @@ function Test-CommonAttachmentFilter {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-CustomerLockbox.ps1

@@ -33,8 +33,7 @@ function Test-CustomerLockbox {
     process {
         try {
             # Step: Retrieve the organization configuration (Condition C: Pass/Fail)
-            $orgConfig = Get-OrganizationConfig | Select-Object CustomerLockBoxEnabled
-            $customerLockboxEnabled = $orgConfig.CustomerLockBoxEnabled
+            $customerLockboxEnabled = Get-CISExoOutput -Rec $recnum
 
             # Step: Prepare failure reasons and details based on compliance (Condition A, B, & C: Fail)
             $failureReasons = if (-not $customerLockboxEnabled) {
@@ -63,16 +62,8 @@ function Test-CustomerLockbox {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-DialInBypassLobby.ps1

@@ -33,7 +33,7 @@ function Test-DialInBypassLobby {
             #   - Condition C: Individuals who dial in by phone are able to join the meeting directly without waiting in the lobby.
 
             # Retrieve Teams meeting policy for PSTN users
-            $CsTeamsMeetingPolicyPSTN = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowPSTNUsersToBypassLobby
+            $CsTeamsMeetingPolicyPSTN = Get-CISMSTeamsOutput -Rec $recnum
             $PSTNBypassDisabled = -not $CsTeamsMeetingPolicyPSTN.AllowPSTNUsersToBypassLobby
 
             # Prepare failure reasons and details based on compliance
@@ -62,16 +62,8 @@ function Test-DialInBypassLobby {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-DisallowInfectedFilesDownload.ps1

@@ -34,7 +34,7 @@ function Test-DisallowInfectedFilesDownload {
             #   - Condition C: Verification using the PowerShell command indicates that the setting is incorrectly configured.
 
             # Retrieve the SharePoint tenant configuration
-            $SPOTenantDisallowInfectedFileDownload = Get-SPOTenant | Select-Object DisallowInfectedFileDownload
+            $SPOTenantDisallowInfectedFileDownload = Get-CISSpoOutput -Rec $recnum
 
             # Condition A: The `DisallowInfectedFileDownload` setting is set to `True`
             $isDisallowInfectedFileDownloadEnabled = $SPOTenantDisallowInfectedFileDownload.DisallowInfectedFileDownload
@@ -65,16 +65,8 @@ function Test-DisallowInfectedFilesDownload {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-EnableDKIM.ps1

@@ -36,7 +36,7 @@ function Test-EnableDKIM {
             # 2.1.9 (L1) Ensure DKIM is enabled for all Exchange Online Domains
 
             # Retrieve DKIM configuration for all domains
-            $dkimConfig = Get-DkimSigningConfig | Select-Object Domain, Enabled
+            $dkimConfig = Get-CISExoOutput -Rec $recnum
             $dkimResult = ($dkimConfig | ForEach-Object { $_.Enabled }) -notcontains $false
             $dkimFailedDomains = $dkimConfig | Where-Object { -not $_.Enabled } | ForEach-Object { $_.Domain }
 
@@ -66,16 +66,8 @@ function Test-EnableDKIM {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-ExternalNoControl.ps1

@@ -34,7 +34,8 @@ function Test-ExternalNoControl {
             #   - Condition C: Verification using the UI indicates that external participants can give or request control.
 
             # Retrieve Teams meeting policy for external participant control
-            $CsTeamsMeetingPolicyControl = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowExternalParticipantGiveRequestControl
+            $CsTeamsMeetingPolicyControl = Get-CISMSTeamsOutput -Rec $recnum
+            # Check if external participants can give or request control
             $externalControlRestricted = -not $CsTeamsMeetingPolicyControl.AllowExternalParticipantGiveRequestControl
 
             # Prepare failure reasons and details based on compliance
@@ -63,16 +64,8 @@ function Test-ExternalNoControl {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-ExternalSharingCalendars.ps1

@@ -31,7 +31,7 @@ function Test-ExternalSharingCalendars {
     process {
         try {
             # Step: Retrieve sharing policies related to calendar sharing
-            $sharingPolicies = Get-SharingPolicy | Where-Object { $_.Domains -like '*CalendarSharing*' }
+            $sharingPolicies = Get-CISExoOutput -Rec $recnum
 
             # Step (Condition A & B: Pass/Fail): Check if calendar sharing is disabled in all applicable policies
             $isExternalSharingDisabled = $true
@@ -70,16 +70,8 @@ function Test-ExternalSharingCalendars {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-GlobalAdminsCount.ps1

@@ -30,11 +30,7 @@ function Test-GlobalAdminsCount {
 
     process {
         try {
-            # Step: Retrieve global admin role
-            $globalAdminRole = Get-MgDirectoryRole -Filter "RoleTemplateId eq '62e90394-69f5-4237-9190-012177145e10'"
-
-            # Step: Retrieve global admin members
-            $globalAdmins = Get-MgDirectoryRoleMember -DirectoryRoleId $globalAdminRole.Id
+            $globalAdmins = Get-CISMgOutput -Rec $recnum
 
             # Step: Count the number of global admins
             $globalAdminCount = $globalAdmins.Count
@@ -69,16 +65,8 @@ function Test-GlobalAdminsCount {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-GuestAccessExpiration.ps1

@@ -34,7 +34,7 @@ function Test-GuestAccessExpiration {
             #   - 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 = Get-SPOTenant | Select-Object ExternalUserExpirationRequired, ExternalUserExpireInDays
+            $SPOTenantGuestAccess = Get-CISSpoOutput -Rec $recnum
             $isGuestAccessExpirationConfiguredCorrectly = $SPOTenantGuestAccess.ExternalUserExpirationRequired -and $SPOTenantGuestAccess.ExternalUserExpireInDays -le 30
 
             # Prepare failure reasons and details based on compliance
@@ -58,16 +58,8 @@ function Test-GuestAccessExpiration {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-GuestUsersBiweeklyReview.ps1

@@ -50,16 +50,8 @@ function Test-GuestUsersBiweeklyReview {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-IdentifyExternalEmail.ps1

@@ -36,7 +36,7 @@ function Test-IdentifyExternalEmail {
             # 6.2.3 (L1) Ensure email from external senders is identified
 
             # Retrieve external sender tagging configuration
-            $externalInOutlook = Get-ExternalInOutlook
+            $externalInOutlook = Get-CISExoOutput -Rec $recnum
             $externalTaggingEnabled = ($externalInOutlook | ForEach-Object { $_.Enabled }) -contains $true
 
             # Prepare failure reasons and details based on compliance
@@ -62,16 +62,8 @@ function Test-IdentifyExternalEmail {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-LinkSharingRestrictions.ps1

@@ -33,7 +33,7 @@ function Test-LinkSharingRestrictions {
             #   - 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 = Get-SPOTenant | Select-Object DefaultSharingLinkType
+            $SPOTenantLinkSharing = Get-CISSpoOutput -Rec $recnum
             $isLinkSharingRestricted = $SPOTenantLinkSharing.DefaultSharingLinkType -eq 'Direct'  # Or 'SpecificPeople' as per the recommendation
 
             # Prepare failure reasons and details based on compliance
@@ -58,16 +58,8 @@ function Test-LinkSharingRestrictions {
 
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-MailTipsEnabled.ps1

@@ -38,7 +38,7 @@ function Test-MailTipsEnabled {
             # 6.5.2 (L2) Ensure MailTips are enabled for end users
 
             # Retrieve organization configuration for MailTips settings
-            $orgConfig = Get-OrganizationConfig | Select-Object MailTipsAllTipsEnabled, MailTipsExternalRecipientsTipsEnabled, MailTipsGroupMetricsEnabled, MailTipsLargeAudienceThreshold
+            $orgConfig = Get-CISExoOutput -Rec $recnum
 
             # Check the MailTips settings (Conditions A, B, C, D)
             $allTipsEnabled = $orgConfig.MailTipsAllTipsEnabled -and $orgConfig.MailTipsGroupMetricsEnabled -and $orgConfig.MailTipsLargeAudienceThreshold -eq 25
@@ -70,16 +70,8 @@ function Test-MailTipsEnabled {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-MailboxAuditingE3.ps1

@@ -29,7 +29,6 @@ function Test-MailboxAuditingE3 {
         # Dot source the class script if necessary
         #. .\source\Classes\CISAuditResult.ps1
 
-        $e3SkuPartNumber = "SPE_E3"
 
         $actionDictionaries = Get-Action -Dictionaries
         # E3 specific actions
@@ -38,15 +37,15 @@ function Test-MailboxAuditingE3 {
         $OwnerActions = $actionDictionaries.OwnerActions.Keys | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }
 
         $allFailures = @()
-        $founde3Sku = Get-MgSubscribedSku -All | Where-Object { $_.SkuPartNumber -eq $e3SkuPartNumber }
-        $processedUsers = @{}  # Dictionary to track processed users
         $recnum = "6.1.2"
+        $allUsers = Get-CISMgOutput -Rec $recnum
+        $processedUsers = @{}  # Dictionary to track processed users
+
     }
 
     process {
-        if ($founde3Sku.Count -ne 0) {
-            $allUsers = Get-MgUser -Filter "assignedLicenses/any(x:x/skuId eq $($founde3Sku.SkuId) )" -All
-            $mailboxes = Get-EXOMailbox -PropertySets Audit
+        if ($null -ne $allUsers) {
+            $mailboxes = Get-CISExoOutput -Rec $recnum
             try {
                 foreach ($user in $allUsers) {
                     if ($processedUsers.ContainsKey($user.UserPrincipalName)) {

source/tests/Test-MailboxAuditingE5.ps1

@@ -27,9 +27,6 @@ function Test-MailboxAuditingE5 {
         #   - 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.
 
-        $e5SkuPartNumber = "SPE_E5"
-        $founde5Sku = Get-MgSubscribedSku -All | Where-Object { $_.SkuPartNumber -eq $e5SkuPartNumber }
-
         $actionDictionaries = Get-Action -Dictionaries
         $AdminActions = $actionDictionaries.AdminActions.Keys
         $DelegateActions = $actionDictionaries.DelegateActions.Keys
@@ -38,12 +35,12 @@ function Test-MailboxAuditingE5 {
         $allFailures = @()
         $processedUsers = @{}
         $recnum = "6.1.3"
+        $allUsers = Get-CISMgOutput -Rec $recnum
     }
 
     process {
-        if (($founde5Sku.count) -ne 0) {
-            $allUsers = Get-MgUser -Filter "assignedLicenses/any(x:x/skuId eq $($founde5Sku.SkuId) )" -All
-            $mailboxes = Get-EXOMailbox -PropertySets Audit
+        if ($null -ne $allUsers) {
+            $mailboxes = Get-CISExoOutput -Rec $recnum
             try {
                 foreach ($user in $allUsers) {
                     if ($processedUsers.ContainsKey($user.UserPrincipalName)) {

source/tests/Test-ManagedApprovedPublicGroups.ps1

@@ -30,7 +30,7 @@ function Test-ManagedApprovedPublicGroups {
     process {
         try {
             # Step: Retrieve all groups with visibility set to 'Public'
-            $allGroups = Get-MgGroup -All | Where-Object { $_.Visibility -eq "Public" } | Select-Object DisplayName, Visibility
+            $allGroups = Get-CISMgOutput -Rec $recnum
 
             # Step: Determine failure reasons based on the presence of public groups
             $failureReasons = if ($null -ne $allGroups -and $allGroups.Count -gt 0) {
@@ -60,16 +60,8 @@ function Test-ManagedApprovedPublicGroups {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-MeetingChatNoAnonymous.ps1

@@ -32,7 +32,7 @@ function Test-MeetingChatNoAnonymous {
             #   - Condition C: Verification using the Teams Admin Center indicates that the meeting chat settings are not configured as recommended.
 
             # Retrieve the Teams meeting policy for meeting chat
-            $CsTeamsMeetingPolicyChat = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property MeetingChatEnabledType
+            $CsTeamsMeetingPolicyChat = Get-CISMSTeamsOutput -Rec $recnum
             # Condition A: Check if the MeetingChatEnabledType is set to 'EnabledExceptAnonymous'
             $chatAnonDisabled = $CsTeamsMeetingPolicyChat.MeetingChatEnabledType -eq 'EnabledExceptAnonymous'
 
@@ -57,16 +57,8 @@ function Test-MeetingChatNoAnonymous {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-ModernAuthExchangeOnline.ps1

@@ -31,12 +31,10 @@ function Test-ModernAuthExchangeOnline {
 
     process {
         try {
-            # Ensuring the ExchangeOnlineManagement module is available
-
             # 6.5.1 (L1) Ensure modern authentication for Exchange Online is enabled
 
             # Check modern authentication setting in Exchange Online configuration (Condition A and B)
-            $orgConfig = Get-OrganizationConfig | Select-Object -Property Name, OAuth2ClientProfileEnabled
+            $orgConfig = Get-CISExoOutput -Rec $recnum
 
             # Prepare failure reasons and details based on compliance
             $failureReasons = if (-not $orgConfig.OAuth2ClientProfileEnabled) {
@@ -61,16 +59,8 @@ function Test-ModernAuthExchangeOnline {
 
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
 
     }

source/tests/Test-ModernAuthSharePoint.ps1

@@ -33,7 +33,7 @@ function Test-ModernAuthSharePoint {
     process {
         try {
             # 7.2.1 (L1) Ensure modern authentication for SharePoint applications is required
-            $SPOTenant = Get-SPOTenant | Select-Object -Property LegacyAuthProtocolsEnabled
+            $SPOTenant = Get-CISSpoOutput -Rec $recnum
             $modernAuthForSPRequired = -not $SPOTenant.LegacyAuthProtocolsEnabled
 
             # Prepare failure reasons and details based on compliance
@@ -57,16 +57,8 @@ function Test-ModernAuthSharePoint {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-NoAnonymousMeetingJoin.ps1

@@ -33,7 +33,7 @@ function Test-NoAnonymousMeetingJoin {
 
             # Connect to Teams PowerShell using Connect-MicrosoftTeams
 
-            $teamsMeetingPolicy = Get-CsTeamsMeetingPolicy -Identity Global
+            $teamsMeetingPolicy = Get-CISMSTeamsOutput -Rec $recnum
             $allowAnonymousUsersToJoinMeeting = $teamsMeetingPolicy.AllowAnonymousUsersToJoinMeeting
 
             # Prepare failure reasons and details based on compliance
@@ -57,16 +57,8 @@ function Test-NoAnonymousMeetingJoin {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-NoAnonymousMeetingStart.ps1

@@ -34,7 +34,7 @@ function Test-NoAnonymousMeetingStart {
             # Connect to Teams PowerShell using Connect-MicrosoftTeams
 
             # Retrieve the Teams meeting policy for the global scope and check if anonymous users can start meetings
-            $CsTeamsMeetingPolicyAnonymous = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AllowAnonymousUsersToStartMeeting
+            $CsTeamsMeetingPolicyAnonymous = Get-CISMSTeamsOutput -Rec $recnum
             $anonymousStartDisabled = -not $CsTeamsMeetingPolicyAnonymous.AllowAnonymousUsersToStartMeeting
 
             # Prepare failure reasons and details based on compliance
@@ -58,16 +58,8 @@ function Test-NoAnonymousMeetingStart {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-NoWhitelistDomains.ps1

@@ -38,8 +38,7 @@ function Test-NoWhitelistDomains {
 
             # Retrieve transport rules that whitelist specific domains
             # Condition A: Checking for transport rules that whitelist specific domains
-            $whitelistedRules = Get-TransportRule | Where-Object { $_.SetSCL -eq -1 -and $null -ne $_.SenderDomainIs }
-
+            $whitelistedRules = Get-CISExoOutput -Rec $recnum
             # Prepare failure reasons and details based on compliance
             # Condition B: Prepare failure reasons based on the presence of whitelisted rules
             $failureReasons = if ($whitelistedRules) {
@@ -69,16 +68,8 @@ function Test-NoWhitelistDomains {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-NotifyMalwareInternal.ps1

@@ -34,7 +34,7 @@ function Test-NotifyMalwareInternal {
             # 2.1.3 Ensure notifications for internal users sending malware is Enabled
 
             # Retrieve all 'Custom' malware filter policies and check notification settings
-            $malwareNotifications = Get-MalwareFilterPolicy | Where-Object { $_.RecommendedPolicyType -eq 'Custom' }
+            $malwareNotifications = Get-CISExoOutput -Rec $recnum
 
             # Condition B: Using PowerShell, the `NotifyInternal` property in the anti-malware policy is set to `True` and includes at least one valid email address for notifications.
             $policiesToReport = @()
@@ -74,16 +74,8 @@ function Test-NotifyMalwareInternal {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-OneDriveContentRestrictions.ps1

@@ -34,7 +34,7 @@ function Test-OneDriveContentRestrictions {
             # 7.2.4 (L2) Ensure OneDrive content sharing is restricted
 
             # Retrieve OneDrive sharing capability settings
-            $SPOTenant = Get-SPOTenant | Select-Object OneDriveSharingCapability
+            $SPOTenant = Get-CISSpoOutput -Rec $recnum
             $isOneDriveSharingRestricted = $SPOTenant.OneDriveSharingCapability -eq 'Disabled'
 
             # Prepare failure reasons and details based on compliance
@@ -63,16 +63,8 @@ function Test-OneDriveContentRestrictions {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-OneDriveSyncRestrictions.ps1

@@ -32,7 +32,7 @@ function Test-OneDriveSyncRestrictions {
             #   - Condition C: "AllowedDomainList" does not contain the trusted domain GUIDs from the on-premises environment.
 
             # Retrieve OneDrive sync client restriction settings
-            $SPOTenantSyncClientRestriction = Get-SPOTenantSyncClientRestriction | Select-Object TenantRestrictionEnabled, AllowedDomainList
+            $SPOTenantSyncClientRestriction = Get-CISSpoOutput -Rec $recnum
             $isSyncRestricted = $SPOTenantSyncClientRestriction.TenantRestrictionEnabled -and $SPOTenantSyncClientRestriction.AllowedDomainList
 
             # Condition A: Check if TenantRestrictionEnabled is True
@@ -63,16 +63,8 @@ function Test-OneDriveSyncRestrictions {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-OrgOnlyBypassLobby.ps1

@@ -34,7 +34,7 @@ function Test-OrgOnlyBypassLobby {
             # Connect to Teams PowerShell using Connect-MicrosoftTeams
 
             # Retrieve the Teams meeting policy for lobby bypass settings
-            $CsTeamsMeetingPolicyLobby = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property AutoAdmittedUsers
+            $CsTeamsMeetingPolicyLobby = Get-CISMSTeamsOutput -Rec $recnum
             $lobbyBypassRestricted = $CsTeamsMeetingPolicyLobby.AutoAdmittedUsers -eq 'EveryoneInCompanyExcludingGuests'
 
             # Prepare failure reasons and details based on compliance
@@ -66,16 +66,8 @@ function Test-OrgOnlyBypassLobby {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-OrganizersPresent.ps1

@@ -32,7 +32,7 @@ function Test-OrganizersPresent {
             #   - Condition C: Verification using PowerShell indicates that the `DesignatedPresenterRoleMode` is not set to `OrganizerOnlyUserOverride`.
 
             # Retrieve the Teams meeting policy for presenters
-            $CsTeamsMeetingPolicyPresenters = Get-CsTeamsMeetingPolicy -Identity Global | Select-Object -Property DesignatedPresenterRoleMode
+            $CsTeamsMeetingPolicyPresenters = Get-CISMSTeamsOutput -Rec $recnum
             $presenterRoleRestricted = $CsTeamsMeetingPolicyPresenters.DesignatedPresenterRoleMode -eq 'OrganizerOnlyUserOverride'
 
             # Prepare failure reasons and details based on compliance
@@ -61,16 +61,8 @@ function Test-OrganizersPresent {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-PasswordHashSync.ps1

@@ -34,7 +34,7 @@ function Test-PasswordHashSync {
             # 5.1.8.1 (L1) Ensure password hash sync is enabled for hybrid deployments
 
             # Retrieve password hash sync status (Condition A and C)
-            $passwordHashSync = Get-MgOrganization | Select-Object -ExpandProperty OnPremisesSyncEnabled
+            $passwordHashSync = Get-CISMgOutput -Rec $recnum
             $hashSyncResult = $passwordHashSync
 
             # Prepare failure reasons and details based on compliance
@@ -58,16 +58,8 @@ function Test-PasswordHashSync {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-PasswordNeverExpirePolicy.ps1

@@ -17,7 +17,7 @@ function Test-PasswordNeverExpirePolicy {
         $failureReasonsList = @()
 
         # Add headers for the details
-        $detailsList += "Domain|Validity Period|IsDefault"
+        $detailsList += "Domain|Validity Period|Notification Window|IsDefault"
 
         # Conditions for 1.3.1 (L1) Ensure the 'Password expiration policy' is set to 'Set passwords to never expire (recommended)'
         #
@@ -26,41 +26,41 @@ function Test-PasswordNeverExpirePolicy {
         # - Specific conditions to check:
         #   - Condition A: Password expiration policy is set to "Set passwords to never expire" in the Microsoft 365 admin center.
         #   - Condition B: Using Microsoft Graph PowerShell, the `PasswordPolicies` property for all users is set to `DisablePasswordExpiration`.
+        #   - Condition C: Notification window for password expiration is set to 30 days.
         #
         # Validate test for a fail:
         # - Confirm that the failure conditions in the automated test are consistent with the manual audit results.
         # - Specific conditions to check:
         #   - Condition A: Password expiration policy is not set to "Set passwords to never expire" in the Microsoft 365 admin center.
         #   - Condition B: Using Microsoft Graph PowerShell, the `PasswordPolicies` property for one or more users is not set to `DisablePasswordExpiration`.
+        #   - Condition C: Notification window for password expiration is not set to 30 days.
     }
 
     process {
         try {
             # Step: Retrieve all domains or a specific domain
-            $domains = if ($DomainName) {
-                Get-MgDomain -DomainId $DomainName
-            } else {
-                Get-MgDomain
-            }
-
+            $domains = Get-CISMgOutput -Rec $recnum -DomainName $DomainName
             foreach ($domain in $domains) {
                 $domainName = $domain.Id
                 $isDefault = $domain.IsDefault
+                # Step (Condition C): Determine if the notification window is set to 30 days
+                $notificationWindow = $domain.PasswordNotificationWindowInDays
+                $notificationPolIsCompliant = $notificationWindow -eq 30
                 # Step (Condition A): Retrieve password expiration policy
                 $passwordPolicy = $domain.PasswordValidityPeriodInDays
-
+                $pwPolIsCompliant = $passwordPolicy -eq 2147483647
                 # Step (Condition A & B): Determine if the policy is compliant
-                $isCompliant = $passwordPolicy -eq 0
-                $overallResult = $overallResult -and $isCompliant
+                $overallResult = $overallResult -and $notificationPolIsCompliant -and $pwPolIsCompliant
 
                 # Step (Condition A & B): Prepare failure reasons and details based on compliance
-                $failureReasons = if ($isCompliant) {
+                $failureReasons = if ($notificationPolIsCompliant -and $pwPolIsCompliant) {
                     "N/A"
-                } else {
-                    "Password expiration is not set to never expire for domain $domainName. Run the following command to remediate: `nUpdate-MgDomain -DomainId $domainName -PasswordValidityPeriodInDays 2147483647 -PasswordNotificationWindowInDays 30`n"
+                }
+                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|$isDefault"
+                $details = "$domainName|$passwordPolicy days|$notificationWindow days|$isDefault"
 
                 # Add details and failure reasons to the lists
                 $detailsList += $details
@@ -82,16 +82,8 @@ function Test-PasswordNeverExpirePolicy {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-ReauthWithCode.ps1

@@ -34,7 +34,7 @@ function Test-ReauthWithCode {
             # 7.2.10 (L1) Ensure reauthentication with verification code is restricted
 
             # Retrieve reauthentication settings for SharePoint Online
-            $SPOTenantReauthentication = Get-SPOTenant | Select-Object EmailAttestationRequired, EmailAttestationReAuthDays
+            $SPOTenantReauthentication = Get-CISSpoOutput -Rec $recnum
             $isReauthenticationRestricted = $SPOTenantReauthentication.EmailAttestationRequired -and $SPOTenantReauthentication.EmailAttestationReAuthDays -le 15
 
             # Prepare failure reasons and details based on compliance
@@ -58,16 +58,8 @@ function Test-ReauthWithCode {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-ReportSecurityInTeams.ps1

@@ -16,16 +16,15 @@ function Test-ReportSecurityInTeams {
 
     process {
         try {
+            # Test-ReportSecurityInTeams.ps1
             # 8.6.1 (L1) Ensure users can report security concerns in Teams
 
             # Retrieve the necessary settings for Teams and Exchange Online
             # Condition A: Ensure the 'Report a security concern' setting in the Teams admin center is set to 'On'.
-            $CsTeamsMessagingPolicy = Get-CsTeamsMessagingPolicy -Identity Global | Select-Object -Property AllowSecurityEndUserReporting
-
+            $CsTeamsMessagingPolicy = Get-CISMSTeamsOutput -Rec $recnum
             # Condition B: Verify that 'Monitor reported messages in Microsoft Teams' is checked in the Microsoft 365 Defender portal.
             # Condition C: Ensure the 'Send reported messages to' setting in the Microsoft 365 Defender portal is set to 'My reporting mailbox only' with the correct report email addresses.
-            $ReportSubmissionPolicy = Get-ReportSubmissionPolicy | Select-Object -Property ReportJunkToCustomizedAddress, ReportNotJunkToCustomizedAddress, ReportPhishToCustomizedAddress, ReportChatMessageToCustomizedAddressEnabled
-
+            $ReportSubmissionPolicy = Get-CISExoOutput -Rec $recnum
             # Check if all the required settings are enabled
             $securityReportEnabled = $CsTeamsMessagingPolicy.AllowSecurityEndUserReporting -and
             $ReportSubmissionPolicy.ReportJunkToCustomizedAddress -and
@@ -58,16 +57,8 @@ function Test-ReportSecurityInTeams {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-RestrictCustomScripts.ps1

@@ -32,7 +32,7 @@ function Test-RestrictCustomScripts {
             #   - 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 = Get-SPOSite -Limit All | Select-Object Title, Url, DenyAddAndCustomizePages
+            $SPOSitesCustomScript = Get-CISSpoOutput -Rec $recnum
 
             # Process URLs to replace 'sharepoint.com' with '<SPUrl>'
             $processedUrls = $SPOSitesCustomScript | ForEach-Object {
@@ -111,16 +111,8 @@ function Test-RestrictCustomScripts {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-RestrictExternalSharing.ps1

@@ -36,7 +36,7 @@ function Test-RestrictExternalSharing {
             # 7.2.3 (L1) Ensure external content sharing is restricted
 
             # Retrieve the SharingCapability setting for the SharePoint tenant
-            $SPOTenantSharingCapability = Get-SPOTenant | Select-Object SharingCapability
+            $SPOTenantSharingCapability = Get-CISSpoOutput -Rec $recnum
             $isRestricted = $SPOTenantSharingCapability.SharingCapability -in @('ExternalUserSharingOnly', 'ExistingExternalUserSharingOnly', 'Disabled')
 
             # Prepare failure reasons and details based on compliance
@@ -63,16 +63,8 @@ function Test-RestrictExternalSharing {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-RestrictOutlookAddins.ps1

@@ -11,7 +11,6 @@ function Test-RestrictOutlookAddins {
         #. .\source\Classes\CISAuditResult.ps1
 
         # Initialization code
-        $customPolicyFailures = @()
         $defaultPolicyFailureDetails = @()
         $relevantRoles = @('My Custom Apps', 'My Marketplace Apps', 'My ReadWriteMailbox Apps')
         $recnum = "6.3.1"
@@ -36,24 +35,8 @@ function Test-RestrictOutlookAddins {
             # 6.3.1 (L2) Ensure users installing Outlook add-ins is not allowed
 
             # Check all mailboxes for custom policies with unallowed add-ins
-            $roleAssignmentPolicies = Get-EXOMailbox | Select-Object -Unique RoleAssignmentPolicy
-
-            if ($roleAssignmentPolicies.RoleAssignmentPolicy) {
-                foreach ($policy in $roleAssignmentPolicies) {
-                    if ($policy.RoleAssignmentPolicy) {
-                        $rolePolicyDetails = Get-RoleAssignmentPolicy -Identity $policy.RoleAssignmentPolicy
-                        $foundRoles = $rolePolicyDetails.AssignedRoles | Where-Object { $_ -in $relevantRoles }
-
-                        # Condition B: Using PowerShell, verify that MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are not assigned to users.
-                        if ($foundRoles) {
-                            $customPolicyFailures += "Policy: $($policy.RoleAssignmentPolicy): Roles: $($foundRoles -join ', ')"
-                        }
-                    }
-                }
-            }
-
             # Check Default Role Assignment Policy
-            $defaultPolicy = Get-RoleAssignmentPolicy "Default Role Assignment Policy"
+            $customPolicyFailures, $defaultPolicy = Get-CISExoOutput -Rec $recnum
             $defaultPolicyRoles = $defaultPolicy.AssignedRoles | Where-Object { $_ -in $relevantRoles }
 
             # Condition A: Verify that the roles MyCustomApps, MyMarketplaceApps, and MyReadWriteMailboxApps are unchecked under Other roles.
@@ -93,16 +76,8 @@ function Test-RestrictOutlookAddins {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-RestrictStorageProvidersOutlook.ps1

@@ -34,7 +34,7 @@ function Test-RestrictStorageProvidersOutlook {
             # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
 
             # Retrieve all OwaMailbox policies
-            $owaPolicies = Get-OwaMailboxPolicy
+            $owaPolicies = Get-CISExoOutput -Rec $recnum
             # Condition A: Check if AdditionalStorageProvidersAvailable is set to False
             $nonCompliantPolicies = $owaPolicies | Where-Object { $_.AdditionalStorageProvidersAvailable }
 
@@ -67,16 +67,8 @@ function Test-RestrictStorageProvidersOutlook {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-RestrictTenantCreation.ps1

@@ -35,7 +35,7 @@ function Test-RestrictTenantCreation {
             # 5.1.2.3 (L1) Ensure 'Restrict non-admin users from creating tenants' is set to 'Yes'
 
             # Retrieve the tenant creation policy
-            $tenantCreationPolicy = (Get-MgPolicyAuthorizationPolicy).DefaultUserRolePermissions | Select-Object AllowedToCreateTenants
+            $tenantCreationPolicy = Get-CISMgOutput -Rec $recnum
             $tenantCreationResult = -not $tenantCreationPolicy.AllowedToCreateTenants
 
             # Prepare failure reasons and details based on compliance
@@ -59,16 +59,8 @@ function Test-RestrictTenantCreation {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-SafeAttachmentsPolicy.ps1

@@ -28,10 +28,9 @@ function Test-SafeAttachmentsPolicy {
     }
 
     process {
-        if (Get-Command Get-SafeAttachmentPolicy -ErrorAction SilentlyContinue) {
+        $safeAttachmentPolicies = Get-CISExoOutput -Rec $recnum
+        if ($safeAttachmentPolicies -ne 1) {
             try {
-                # Retrieve all Safe Attachment policies where Enable is set to True
-                $safeAttachmentPolicies = Get-SafeAttachmentPolicy -ErrorAction SilentlyContinue | Where-Object { $_.Enable -eq $true }
                 # Check if any Safe Attachments policy is enabled (Condition A)
                 $result = $null -ne $safeAttachmentPolicies -and $safeAttachmentPolicies.Count -gt 0
 

source/tests/Test-SafeAttachmentsTeams.ps1

@@ -31,18 +31,9 @@ function Test-SafeAttachmentsTeams {
     }
 
     process {
-        if (Get-Command Get-AtpPolicyForO365 -ErrorAction SilentlyContinue) {
+        $atpPolicyResult = Get-CISExoOutput -Rec $recnum
+        if ($atpPolicyResult -ne 1) {
             try {
-                # 2.1.5 (L2) Ensure Safe Attachments for SharePoint, OneDrive, and Microsoft Teams is Enabled
-                # Retrieve the ATP policies for Office 365 and check Safe Attachments settings
-                $atpPolicies = Get-AtpPolicyForO365
-                # Check if the required ATP policies are enabled
-                $atpPolicyResult = $atpPolicies | Where-Object {
-                    $_.EnableATPForSPOTeamsODB -eq $true -and
-                    $_.EnableSafeDocs -eq $true -and
-                    $_.AllowSafeDocsOpen -eq $false
-                }
-
                 # Condition A: Check Safe Attachments for SharePoint
                 # Condition B: Check Safe Attachments for OneDrive
                 # Condition C: Check Safe Attachments for Microsoft Teams

source/tests/Test-SafeLinksOfficeApps.ps1

@@ -40,33 +40,12 @@ function Test-SafeLinksOfficeApps {
     }
 
     process {
-        if (Get-Command Get-SafeLinksPolicy -ErrorAction SilentlyContinue) {
+        # 2.1.1 (L2) Ensure Safe Links for Office Applications is Enabled
+        # Retrieve all Safe Links policies
+        $misconfiguredDetails = Get-CISExoOutput -Rec $recnum
+        # Misconfigured details returns 1 if EXO Commands needed for the test are not available
+        if ($misconfiguredDetails -ne 1) {
             try {
-                # 2.1.1 (L2) Ensure Safe Links for Office Applications is Enabled
-                # Retrieve all Safe Links policies
-                $policies = Get-SafeLinksPolicy
-                # Initialize the details collection
-                $misconfiguredDetails = @()
-
-                foreach ($policy in $policies) {
-                    # Get the detailed configuration of each policy
-                    $policyDetails = Get-SafeLinksPolicy -Identity $policy.Name
-
-                    # Check each required property and record failures
-                    # Condition A: Checking policy settings
-                    $failures = @()
-                    if ($policyDetails.EnableSafeLinksForEmail -ne $true) { $failures += "EnableSafeLinksForEmail: False" } # Email: On
-                    if ($policyDetails.EnableSafeLinksForTeams -ne $true) { $failures += "EnableSafeLinksForTeams: False" } # Teams: On
-                    if ($policyDetails.EnableSafeLinksForOffice -ne $true) { $failures += "EnableSafeLinksForOffice: False" } # Office 365 Apps: On
-                    if ($policyDetails.TrackClicks -ne $true) { $failures += "TrackClicks: False" } # Click protection settings: On
-                    if ($policyDetails.AllowClickThrough -ne $false) { $failures += "AllowClickThrough: True" } # Do not track when users click safe links: Off
-
-                    # Only add details for policies that have misconfigurations
-                    if ($failures.Count -gt 0) {
-                        $misconfiguredDetails += "Policy: $($policy.Name); Failures: $($failures -join ', ')"
-                    }
-                }
-
                 # Prepare the final result
                 # Condition B: Ensuring no misconfigurations
                 $result = $misconfiguredDetails.Count -eq 0

source/tests/Test-SharePointAADB2B.ps1

@@ -33,7 +33,7 @@ function Test-SharePointAADB2B {
     process {
         try {
             # 7.2.2 (L1) Ensure SharePoint and OneDrive integration with Azure AD B2B is enabled
-            $SPOTenantAzureADB2B = Get-SPOTenant | Select-Object EnableAzureADB2BIntegration
+            $SPOTenantAzureADB2B = Get-CISSpoOutput -Rec $recnum
 
             # Populate the auditResult object with the required properties
             $params = @{
@@ -46,16 +46,8 @@ function Test-SharePointAADB2B {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-SharePointExternalSharingDomains.ps1

@@ -33,7 +33,7 @@ function Test-SharePointExternalSharingDomains {
     process {
         try {
             # 7.2.6 (L2) Ensure SharePoint external sharing is managed through domain whitelist/blacklists
-            $SPOTenant = Get-SPOTenant | Select-Object SharingDomainRestrictionMode, SharingAllowedDomainList
+            $SPOTenant = Get-CISSpoOutput -Rec $recnum
             $isDomainRestrictionConfigured = $SPOTenant.SharingDomainRestrictionMode -eq 'AllowList'
 
             # Populate the auditResult object with the required properties
@@ -47,16 +47,8 @@ function Test-SharePointExternalSharingDomains {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-SharePointGuestsItemSharing.ps1

@@ -33,7 +33,7 @@ function Test-SharePointGuestsItemSharing {
     process {
         try {
             # 7.2.5 (L2) Ensure that SharePoint guest users cannot share items they don't own
-            $SPOTenant = Get-SPOTenant | Select-Object PreventExternalUsersFromResharing
+            $SPOTenant = Get-CISSpoOutput -Rec $recnum
             $isGuestResharingPrevented = $SPOTenant.PreventExternalUsersFromResharing
 
             # Populate the auditResult object with the required properties
@@ -47,16 +47,8 @@ function Test-SharePointGuestsItemSharing {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-SpamPolicyAdminNotify.ps1

@@ -38,7 +38,7 @@ function Test-SpamPolicyAdminNotify {
             # 2.1.6 Ensure Exchange Online Spam Policies are set to notify administrators
 
             # Retrieve the default hosted outbound spam filter policy
-            $hostedOutboundSpamFilterPolicy = Get-HostedOutboundSpamFilterPolicy | Where-Object { $_.IsDefault -eq $true }
+            $hostedOutboundSpamFilterPolicy = Get-CISExoOutput -Rec $recnum
 
             # Check if both settings are enabled (Condition A and Condition B for pass)
             $bccSuspiciousOutboundMailEnabled = $hostedOutboundSpamFilterPolicy.BccSuspiciousOutboundMail
@@ -65,16 +65,8 @@ function Test-SpamPolicyAdminNotify {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-TeamsExternalAccess.ps1

@@ -10,8 +10,6 @@ function Test-TeamsExternalAccess {
         # Dot source the class script if necessary
         # . .\source\Classes\CISAuditResult.ps1
         # Initialization code, if needed
-
-        $auditResult = [CISAuditResult]::new()
         $recnum = "8.2.1"
     }
 
@@ -35,7 +33,7 @@ function Test-TeamsExternalAccess {
 
             # Connect to Teams PowerShell using Connect-MicrosoftTeams
 
-            $externalAccessConfig = Get-CsTenantFederationConfiguration
+            $externalAccessConfig = Get-CISMSTeamsOutput -Rec $recnum
 
             $allowedDomainsLimited = $false
             if ($externalAccessConfig.AllowFederatedUsers -and $externalAccessConfig.AllowedDomains -and $externalAccessConfig.AllowedDomains.AllowedDomain.Count -gt 0) {
@@ -56,16 +54,8 @@ function Test-TeamsExternalAccess {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

source/tests/Test-TeamsExternalFileSharing.ps1

@@ -26,9 +26,8 @@ function Test-TeamsExternalFileSharing {
 
             # Assuming that 'approvedProviders' is a list of approved cloud storage service names
             # This list must be defined according to your organization's approved cloud storage services
+            $clientConfig = Get-CISMSTeamsOutput -Rec $recnum
             $approvedProviders = @("AllowDropBox", "AllowBox", "AllowGoogleDrive", "AllowShareFile", "AllowEgnyte")
-            $clientConfig = Get-CsTeamsClientConfiguration
-
             $isCompliant = $true
             $nonCompliantProviders = @()
 
@@ -50,16 +49,8 @@ function Test-TeamsExternalFileSharing {
             $auditResult = Initialize-CISAuditResult @params
         }
         catch {
-            Write-Error "An error occurred during the test: $_"
-
-            # Retrieve the description from the test definitions
-            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
-            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
-
-            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
-
-            # Call Initialize-CISAuditResult with error parameters
-            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+            $LastError = $_
+            $auditResult = Get-TestError -LastError $LastError -recnum $recnum
         }
     }
 

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

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

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

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

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

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

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

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

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

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

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

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

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