From bcaae4fe1435af2ae4119477ccbfdf2cb2b33eda Mon Sep 17 00:00:00 2001
From: Dutta <ila.dutta@ssc-spc.gc.ca>
Date: Tue, 17 Dec 2024 23:30:03 -0500
Subject: [PATCH] update

---
 psmodules/Monitor-BreakGlassAccount.zip       | Bin 4503 -> 4532 bytes
 .../Audit/Monitor-BreakGlassAccount.psm1      |  44 +++++++++---------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/psmodules/Monitor-BreakGlassAccount.zip b/psmodules/Monitor-BreakGlassAccount.zip
index dcf2db43649ad024dcc4d10e68f01891be07579a..e12906273fba8102dbe857724ac2b85770c613ac 100644
GIT binary patch
delta 2890
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

delta 2859
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
J=@0+_000KIXs!SN

diff --git a/src/GUARDRAIL 13 PLAN FOR CONTINUITY/Audit/Monitor-BreakGlassAccount.psm1 b/src/GUARDRAIL 13 PLAN FOR CONTINUITY/Audit/Monitor-BreakGlassAccount.psm1
index 98744b51..be452220 100644
--- a/src/GUARDRAIL 13 PLAN FOR CONTINUITY/Audit/Monitor-BreakGlassAccount.psm1	
+++ b/src/GUARDRAIL 13 PLAN FOR CONTINUITY/Audit/Monitor-BreakGlassAccount.psm1	
@@ -33,7 +33,7 @@ function Test-BreakGlassAccounts {
   )
 
   [bool] $IsCompliant = $false
-  [bool] $IsSigninCompliant = $false
+  $commentsArray = @()
   [PSCustomObject] $ErrorList = New-Object System.Collections.ArrayList
 
   [String] $FirstBreakGlassUPNUrl = $("/users/" + $FirstBreakGlassUPN + "?$" + "select=userPrincipalName,id,userType")
@@ -169,14 +169,14 @@ function Test-BreakGlassAccounts {
         # Check missing logs for SignInLogs, if missing/not enabled, non-compliant
         if ($missingSignInLogs.Count -gt 0) {
           $IsCompliant = $false
-          $Comments += $msgTable.isNotCompliant + " " + $msgTable.signInlogsNotCollected
+          $commentsArray += $msgTable.isNotCompliant + " " + $msgTable.signInlogsNotCollected
         }
       }
       catch {
         # catch exceptions
         if ($_.Exception.Message -like "*ResourceNotFound*") {
           $IsCompliant = $false
-          $Comments += $msgTable.nonCompliantLaw -f $workspaceId
+          $commentsArray += $msgTable.nonCompliantLaw -f $workspaceId
           $ErrorList += "Log Analytics Workspace not found: $_"
         }
         else {
@@ -202,14 +202,14 @@ function Test-BreakGlassAccounts {
       $dataMostRecentSignInSecondBG = $BGdata | Where-Object {$_.UserPrincipalName -eq $SecondBreakGlassUPN} | Sort-Object createdDateTime -Descending
     
       if ($null -ne $dataMostRecentSignInFirstBG -and $null -ne $dataMostRecentSignInSecondBG ){
-        $IsSigninCompliant = $true
+        $IsCompliant = $true
       }
 
     }
     catch {
       if ($null -eq $workspace) {
         $IsCompliant = $false
-        $Comments += "Workspace not found in the specified resource group"
+        $commentsArray += "Workspace not found in the specified resource group"
         $ErrorList += "Workspace not found in the specified resource group: $_"
       }
       if($_.Exception.Message -like "*ResourceNotFound*"){
@@ -222,26 +222,24 @@ function Test-BreakGlassAccounts {
       }
 
     }
+    
 
-    if($IsSigninCompliant){
-      $PsObject = [PSCustomObject]@{
-        ComplianceStatus = $IsCompliant
-        ControlName      = $ControlName
-        ItemName         = $ItemName
-        Comments         = $msgTable.isCompliant + " " + $msgTable.bgAccountLoginValid
-        ReportTime       = $ReportTime
-        itsgcode = $itsgcode
-      }
+    if($IsCompliant){
+      $commentsArray = $msgTable.isCompliant + " " + $msgTable.bgAccountLoginValid
     }
-    else{
-      $PsObject = [PSCustomObject]@{
-        ComplianceStatus = $IsSigninCompliant
-        ControlName      = $ControlName
-        ItemName         = $ItemName
-        Comments         = $msgTable.isNotCompliant + " " + $msgTable.bgAccountLoginNotValid
-        ReportTime       = $ReportTime
-        itsgcode = $itsgcode
-      }
+    else {
+      $commentsArray = $msgTable.isNotCompliant + " " + $msgTable.bgAccountLoginNotValid
+    }
+    
+    $Comments = $commentsArray -join ";"
+
+    $PsObject = [PSCustomObject]@{
+      ComplianceStatus = $IsCompliant
+      ControlName      = $ControlName
+      ItemName         = $ItemName
+      Comments         = $Comments
+      ReportTime       = $ReportTime
+      itsgcode         = $itsgcode
     }
     
   }