add: Zip and hash computation to function
This commit is contained in:
DrIOS
@@ -50,179 +50,206 @@ function Export-M365SecurityAuditTable {
|
|||||||
[Parameter(Mandatory = $true, Position = 1, ParameterSetName = "ExportAllResultsFromAuditResults")]
|
[Parameter(Mandatory = $true, Position = 1, ParameterSetName = "ExportAllResultsFromAuditResults")]
|
||||||
[Parameter(Mandatory = $true, Position = 2, ParameterSetName = "OutputObjectFromAuditResultsSingle")]
|
[Parameter(Mandatory = $true, Position = 2, ParameterSetName = "OutputObjectFromAuditResultsSingle")]
|
||||||
[CISAuditResult[]]$AuditResults,
|
[CISAuditResult[]]$AuditResults,
|
||||||
|
|
||||||
[Parameter(Mandatory = $true, Position = 1, ParameterSetName = "ExportAllResultsFromCsv")]
|
[Parameter(Mandatory = $true, Position = 1, ParameterSetName = "ExportAllResultsFromCsv")]
|
||||||
[Parameter(Mandatory = $true, Position = 2, ParameterSetName = "OutputObjectFromCsvSingle")]
|
[Parameter(Mandatory = $true, Position = 2, ParameterSetName = "OutputObjectFromCsvSingle")]
|
||||||
[ValidateScript({ (Test-Path $_) -and ((Get-Item $_).PSIsContainer -eq $false) })]
|
[ValidateScript({ (Test-Path $_) -and ((Get-Item $_).PSIsContainer -eq $false) })]
|
||||||
[string]$CsvPath,
|
[string]$CsvPath,
|
||||||
|
|
||||||
[Parameter(Mandatory = $true, Position = 1, ParameterSetName = "OutputObjectFromAuditResultsSingle")]
|
[Parameter(Mandatory = $true, Position = 1, ParameterSetName = "OutputObjectFromAuditResultsSingle")]
|
||||||
[Parameter(Mandatory = $true, Position = 1, ParameterSetName = "OutputObjectFromCsvSingle")]
|
[Parameter(Mandatory = $true, Position = 1, ParameterSetName = "OutputObjectFromCsvSingle")]
|
||||||
[ValidateSet("1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4")]
|
[ValidateSet("1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4")]
|
||||||
[string]$OutputTestNumber,
|
[string]$OutputTestNumber,
|
||||||
|
|
||||||
[Parameter(Mandatory = $false, Position = 0, ParameterSetName = "ExportAllResultsFromAuditResults")]
|
[Parameter(Mandatory = $false, Position = 0, ParameterSetName = "ExportAllResultsFromAuditResults")]
|
||||||
[Parameter(Mandatory = $false, Position = 0, ParameterSetName = "ExportAllResultsFromCsv")]
|
[Parameter(Mandatory = $false, Position = 0, ParameterSetName = "ExportAllResultsFromCsv")]
|
||||||
[switch]$ExportAllTests,
|
[switch]$ExportAllTests,
|
||||||
|
|
||||||
[Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromAuditResults")]
|
[Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromAuditResults")]
|
||||||
[Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromCsv")]
|
[Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromCsv")]
|
||||||
[string]$ExportPath,
|
[string]$ExportPath,
|
||||||
|
|
||||||
[Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromAuditResults")]
|
[Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromAuditResults")]
|
||||||
[Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromCsv")]
|
[Parameter(Mandatory = $true, ParameterSetName = "ExportAllResultsFromCsv")]
|
||||||
[switch]$ExportOriginalTests,
|
[switch]$ExportOriginalTests,
|
||||||
|
|
||||||
[Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromAuditResults")]
|
[Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromAuditResults")]
|
||||||
[Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromCsv")]
|
[Parameter(Mandatory = $false, ParameterSetName = "ExportAllResultsFromCsv")]
|
||||||
[switch]$ExportToExcel
|
[switch]$ExportToExcel
|
||||||
)
|
)
|
||||||
if ($ExportToExcel) {
|
Begin {
|
||||||
Assert-ModuleAvailability -ModuleName ImportExcel -RequiredVersion "7.8.9"
|
$createdFiles = @() # Initialize an array to keep track of created files
|
||||||
}
|
if ($ExportToExcel) {
|
||||||
if ($PSCmdlet.ParameterSetName -like "ExportAllResultsFromCsv" -or $PSCmdlet.ParameterSetName -eq "OutputObjectFromCsvSingle") {
|
Assert-ModuleAvailability -ModuleName ImportExcel -RequiredVersion "7.8.9"
|
||||||
$AuditResults = Import-Csv -Path $CsvPath | ForEach-Object {
|
}
|
||||||
$params = @{
|
if ($PSCmdlet.ParameterSetName -like "ExportAllResultsFromCsv" -or $PSCmdlet.ParameterSetName -eq "OutputObjectFromCsvSingle") {
|
||||||
Rec = $_.Rec
|
$AuditResults = Import-Csv -Path $CsvPath | ForEach-Object {
|
||||||
Result = [bool]$_.Result
|
$params = @{
|
||||||
Status = $_.Status
|
Rec = $_.Rec
|
||||||
Details = $_.Details
|
Result = [bool]$_.Result
|
||||||
FailureReason = $_.FailureReason
|
Status = $_.Status
|
||||||
|
Details = $_.Details
|
||||||
|
FailureReason = $_.FailureReason
|
||||||
|
}
|
||||||
|
Initialize-CISAuditResult @params
|
||||||
}
|
}
|
||||||
Initialize-CISAuditResult @params
|
|
||||||
}
|
}
|
||||||
}
|
if ($ExportAllTests) {
|
||||||
|
$TestNumbers = "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4"
|
||||||
if ($ExportAllTests) {
|
|
||||||
$TestNumbers = "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4"
|
|
||||||
}
|
|
||||||
|
|
||||||
$results = @()
|
|
||||||
|
|
||||||
$testsToProcess = if ($OutputTestNumber) { @($OutputTestNumber) } else { $TestNumbers }
|
|
||||||
|
|
||||||
foreach ($test in $testsToProcess) {
|
|
||||||
$auditResult = $AuditResults | Where-Object { $_.Rec -eq $test }
|
|
||||||
if (-not $auditResult) {
|
|
||||||
Write-Information "No audit results found for the test number $test."
|
|
||||||
continue
|
|
||||||
}
|
}
|
||||||
|
$results = @()
|
||||||
switch ($test) {
|
$testsToProcess = if ($OutputTestNumber) { @($OutputTestNumber) } else { $TestNumbers }
|
||||||
"6.1.2" {
|
}
|
||||||
$details = $auditResult.Details
|
Process {
|
||||||
if ($details -ne "No M365 E3 licenses found.") {
|
foreach ($test in $testsToProcess) {
|
||||||
$csv = $details | ConvertFrom-Csv -Delimiter '|'
|
$auditResult = $AuditResults | Where-Object { $_.Rec -eq $test }
|
||||||
}
|
if (-not $auditResult) {
|
||||||
else {
|
Write-Information "No audit results found for the test number $test."
|
||||||
$csv = $null
|
continue
|
||||||
}
|
}
|
||||||
|
switch ($test) {
|
||||||
if ($null -ne $csv) {
|
"6.1.2" {
|
||||||
foreach ($row in $csv) {
|
$details = $auditResult.Details
|
||||||
$row.AdminActionsMissing = (Get-Action -AbbreviatedActions $row.AdminActionsMissing.Split(',') -ReverseActionType Admin | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }) -join ','
|
if ($details -ne "No M365 E3 licenses found.") {
|
||||||
$row.DelegateActionsMissing = (Get-Action -AbbreviatedActions $row.DelegateActionsMissing.Split(',') -ReverseActionType Delegate | Where-Object { $_ -notin @("MailItemsAccessed") }) -join ','
|
$csv = $details | ConvertFrom-Csv -Delimiter '|'
|
||||||
$row.OwnerActionsMissing = (Get-Action -AbbreviatedActions $row.OwnerActionsMissing.Split(',') -ReverseActionType Owner | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }) -join ','
|
|
||||||
}
|
}
|
||||||
$newObjectDetails = $csv
|
else {
|
||||||
}
|
$csv = $null
|
||||||
else {
|
|
||||||
$newObjectDetails = $details
|
|
||||||
}
|
|
||||||
$results += [PSCustomObject]@{ TestNumber = $test; Details = $newObjectDetails }
|
|
||||||
}
|
|
||||||
"6.1.3" {
|
|
||||||
$details = $auditResult.Details
|
|
||||||
if ($details -ne "No M365 E5 licenses found.") {
|
|
||||||
$csv = $details | ConvertFrom-Csv -Delimiter '|'
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$csv = $null
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($null -ne $csv) {
|
|
||||||
foreach ($row in $csv) {
|
|
||||||
$row.AdminActionsMissing = (Get-Action -AbbreviatedActions $row.AdminActionsMissing.Split(',') -ReverseActionType Admin) -join ','
|
|
||||||
$row.DelegateActionsMissing = (Get-Action -AbbreviatedActions $row.DelegateActionsMissing.Split(',') -ReverseActionType Delegate) -join ','
|
|
||||||
$row.OwnerActionsMissing = (Get-Action -AbbreviatedActions $row.OwnerActionsMissing.Split(',') -ReverseActionType Owner) -join ','
|
|
||||||
}
|
}
|
||||||
$newObjectDetails = $csv
|
if ($null -ne $csv) {
|
||||||
}
|
foreach ($row in $csv) {
|
||||||
else {
|
$row.AdminActionsMissing = (Get-Action -AbbreviatedActions $row.AdminActionsMissing.Split(',') -ReverseActionType Admin | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }) -join ','
|
||||||
$newObjectDetails = $details
|
$row.DelegateActionsMissing = (Get-Action -AbbreviatedActions $row.DelegateActionsMissing.Split(',') -ReverseActionType Delegate | Where-Object { $_ -notin @("MailItemsAccessed") }) -join ','
|
||||||
}
|
$row.OwnerActionsMissing = (Get-Action -AbbreviatedActions $row.OwnerActionsMissing.Split(',') -ReverseActionType Owner | Where-Object { $_ -notin @("MailItemsAccessed", "Send") }) -join ','
|
||||||
$results += [PSCustomObject]@{ TestNumber = $test; Details = $newObjectDetails }
|
|
||||||
}
|
|
||||||
Default {
|
|
||||||
$details = $auditResult.Details
|
|
||||||
$csv = $details | ConvertFrom-Csv -Delimiter '|'
|
|
||||||
$results += [PSCustomObject]@{ TestNumber = $test; Details = $csv }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($ExportPath) {
|
|
||||||
$timestamp = (Get-Date).ToString("yyyy.MM.dd_HH.mm.ss")
|
|
||||||
$exportedTests = @()
|
|
||||||
|
|
||||||
foreach ($result in $results) {
|
|
||||||
$testDef = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $result.TestNumber }
|
|
||||||
if ($testDef) {
|
|
||||||
$fileName = "$ExportPath\$($timestamp)_$($result.TestNumber).$($testDef.TestFileName -replace '\.ps1$').csv"
|
|
||||||
if ($result.Details.Count -eq 0) {
|
|
||||||
Write-Information "No results found for test number $($result.TestNumber)." -InformationAction Continue
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (($result.Details -ne "No M365 E3 licenses found.") -and ($result.Details -ne "No M365 E5 licenses found.")) {
|
|
||||||
if ($ExportToExcel) {
|
|
||||||
$xlsxPath = [System.IO.Path]::ChangeExtension($fileName, '.xlsx')
|
|
||||||
$result.Details | Export-Excel -Path $xlsxPath -WorksheetName Table -TableName Table -AutoSize -TableStyle Medium2
|
|
||||||
}
|
}
|
||||||
else {
|
$newObjectDetails = $csv
|
||||||
$result.Details | Export-Csv -Path $fileName -NoTypeInformation
|
|
||||||
}
|
|
||||||
$exportedTests += $result.TestNumber
|
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
$newObjectDetails = $details
|
||||||
|
}
|
||||||
|
$results += [PSCustomObject]@{ TestNumber = $test; Details = $newObjectDetails }
|
||||||
|
}
|
||||||
|
"6.1.3" {
|
||||||
|
$details = $auditResult.Details
|
||||||
|
if ($details -ne "No M365 E5 licenses found.") {
|
||||||
|
$csv = $details | ConvertFrom-Csv -Delimiter '|'
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$csv = $null
|
||||||
|
}
|
||||||
|
if ($null -ne $csv) {
|
||||||
|
foreach ($row in $csv) {
|
||||||
|
$row.AdminActionsMissing = (Get-Action -AbbreviatedActions $row.AdminActionsMissing.Split(',') -ReverseActionType Admin) -join ','
|
||||||
|
$row.DelegateActionsMissing = (Get-Action -AbbreviatedActions $row.DelegateActionsMissing.Split(',') -ReverseActionType Delegate) -join ','
|
||||||
|
$row.OwnerActionsMissing = (Get-Action -AbbreviatedActions $row.OwnerActionsMissing.Split(',') -ReverseActionType Owner) -join ','
|
||||||
|
}
|
||||||
|
$newObjectDetails = $csv
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$newObjectDetails = $details
|
||||||
|
}
|
||||||
|
$results += [PSCustomObject]@{ TestNumber = $test; Details = $newObjectDetails }
|
||||||
|
}
|
||||||
|
Default {
|
||||||
|
$details = $auditResult.Details
|
||||||
|
$csv = $details | ConvertFrom-Csv -Delimiter '|'
|
||||||
|
$results += [PSCustomObject]@{ TestNumber = $test; Details = $csv }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($exportedTests.Count -gt 0) {
|
}
|
||||||
Write-Information "The following tests were exported: $($exportedTests -join ', ')" -InformationAction Continue
|
End {
|
||||||
}
|
if ($ExportPath) {
|
||||||
else {
|
$timestamp = (Get-Date).ToString("yyyy.MM.dd_HH.mm.ss")
|
||||||
|
$exportedTests = @()
|
||||||
|
foreach ($result in $results) {
|
||||||
|
$testDef = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $result.TestNumber }
|
||||||
|
if ($testDef) {
|
||||||
|
$fileName = "$ExportPath\$($timestamp)_$($result.TestNumber).$($testDef.TestFileName -replace '\.ps1$').csv"
|
||||||
|
if ($result.Details.Count -eq 0) {
|
||||||
|
Write-Information "No results found for test number $($result.TestNumber)." -InformationAction Continue
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (($result.Details -ne "No M365 E3 licenses found.") -and ($result.Details -ne "No M365 E5 licenses found.")) {
|
||||||
|
if ($ExportToExcel) {
|
||||||
|
$xlsxPath = [System.IO.Path]::ChangeExtension($fileName, '.xlsx')
|
||||||
|
$result.Details | Export-Excel -Path $xlsxPath -WorksheetName Table -TableName Table -AutoSize -TableStyle Medium2
|
||||||
|
$createdFiles += $xlsxPath # Add the created file to the array
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$result.Details | Export-Csv -Path $fileName -NoTypeInformation
|
||||||
|
$createdFiles += $fileName # Add the created file to the array
|
||||||
|
}
|
||||||
|
$exportedTests += $result.TestNumber
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($exportedTests.Count -gt 0) {
|
||||||
|
Write-Information "The following tests were exported: $($exportedTests -join ', ')" -InformationAction Continue
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if ($ExportOriginalTests) {
|
||||||
|
Write-Information "Full audit results exported however, none of the following tests had exports: `n1.1.1, 1.3.1, 6.1.2, 6.1.3, 7.3.4" -InformationAction Continue
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Write-Information "No specified tests were included in the export." -InformationAction Continue
|
||||||
|
}
|
||||||
|
}
|
||||||
if ($ExportOriginalTests) {
|
if ($ExportOriginalTests) {
|
||||||
Write-Information "Full audit results exported however, none of the following tests had exports: `n1.1.1, 1.3.1, 6.1.2, 6.1.3, 7.3.4" -InformationAction Continue
|
# Define the test numbers to check
|
||||||
|
$TestNumbersToCheck = "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4"
|
||||||
|
# Check for large details and update the AuditResults array
|
||||||
|
$updatedAuditResults = Get-ExceededLengthResultDetail -AuditResults $AuditResults -TestNumbersToCheck $TestNumbersToCheck -ExportedTests $exportedTests -DetailsLengthLimit 30000 -PreviewLineCount 25
|
||||||
|
$originalFileName = "$ExportPath\$timestamp`_M365FoundationsAudit.csv"
|
||||||
|
if ($ExportToExcel) {
|
||||||
|
$xlsxPath = [System.IO.Path]::ChangeExtension($originalFileName, '.xlsx')
|
||||||
|
$updatedAuditResults | Export-Excel -Path $xlsxPath -WorksheetName Table -TableName Table -AutoSize -TableStyle Medium2
|
||||||
|
$createdFiles += $xlsxPath # Add the created file to the array
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$updatedAuditResults | Export-Csv -Path $originalFileName -NoTypeInformation
|
||||||
|
$createdFiles += $originalFileName # Add the created file to the array
|
||||||
|
}
|
||||||
|
}
|
||||||
|
# Hash each file and add it to a dictionary
|
||||||
|
# Hash each file and save the hashes to a text file
|
||||||
|
$hashFilePath = "$ExportPath\$timestamp`_Hashes.txt"
|
||||||
|
$fileHashes = @()
|
||||||
|
foreach ($file in $createdFiles) {
|
||||||
|
$hash = Get-FileHash -Path $file -Algorithm SHA256
|
||||||
|
$fileHashes += "$($file): $($hash.Hash)"
|
||||||
|
}
|
||||||
|
$fileHashes | Set-Content -Path $hashFilePath
|
||||||
|
$createdFiles += $hashFilePath # Add the hash file to the array
|
||||||
|
|
||||||
|
# Create a zip file and add all the created files
|
||||||
|
$zipFilePath = "$ExportPath\$timestamp`_M365FoundationsAudit.zip"
|
||||||
|
Compress-Archive -Path $createdFiles -DestinationPath $zipFilePath
|
||||||
|
|
||||||
|
# Remove the original files after they have been added to the zip
|
||||||
|
foreach ($file in $createdFiles) {
|
||||||
|
Remove-Item -Path $file -Force
|
||||||
|
}
|
||||||
|
|
||||||
|
# Compute the hash for the zip file and rename it
|
||||||
|
$zipHash = Get-FileHash -Path $zipFilePath -Algorithm SHA256
|
||||||
|
$newZipFilePath = "$ExportPath\$timestamp`_M365FoundationsAudit_$($zipHash.Hash.Substring(0, 8)).zip"
|
||||||
|
Rename-Item -Path $zipFilePath -NewName $newZipFilePath
|
||||||
|
|
||||||
|
# Output the zip file path with hash
|
||||||
|
[PSCustomObject]@{
|
||||||
|
ZipFilePath = $newZipFilePath
|
||||||
|
}
|
||||||
|
} # End of ExportPath
|
||||||
|
elseif ($OutputTestNumber) {
|
||||||
|
if ($results[0].Details) {
|
||||||
|
return $results[0].Details
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Write-Information "No specified tests were included in the export." -InformationAction Continue
|
Write-Information "No results found for test number $($OutputTestNumber)." -InformationAction Continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($ExportOriginalTests) {
|
|
||||||
# Define the test numbers to check
|
|
||||||
$TestNumbersToCheck = "1.1.1", "1.3.1", "6.1.2", "6.1.3", "7.3.4"
|
|
||||||
|
|
||||||
# Check for large details and update the AuditResults array
|
|
||||||
$updatedAuditResults = Get-ExceededLengthResultDetail -AuditResults $AuditResults -TestNumbersToCheck $TestNumbersToCheck -ExportedTests $exportedTests -DetailsLengthLimit 30000 -PreviewLineCount 25
|
|
||||||
$originalFileName = "$ExportPath\$timestamp`_M365FoundationsAudit.csv"
|
|
||||||
if ($ExportToExcel) {
|
|
||||||
$xlsxPath = [System.IO.Path]::ChangeExtension($originalFileName, '.xlsx')
|
|
||||||
$updatedAuditResults | Export-Excel -Path $xlsxPath -WorksheetName Table -TableName Table -AutoSize -TableStyle Medium2
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$updatedAuditResults | Export-Csv -Path $originalFileName -NoTypeInformation
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
elseif ($OutputTestNumber) {
|
|
||||||
if ($results[0].Details) {
|
|
||||||
return $results[0].Details
|
|
||||||
}
|
|
||||||
else {
|
else {
|
||||||
Write-Information "No results found for test number $($OutputTestNumber)." -InformationAction Continue
|
Write-Error "No valid operation specified. Please provide valid parameters."
|
||||||
}
|
}
|
||||||
}
|
# Output the created files at the end
|
||||||
else {
|
#if ($createdFiles.Count -gt 0) {
|
||||||
Write-Error "No valid operation specified. Please provide valid parameters."
|
########### $createdFiles
|
||||||
|
#}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user