Updated ACL extraction scripts for tests

Author: p0dalirius

…scripts/Dump-ActiveDirectoryAcls.ps1.ps1 …sts/scripts/Dump-ActiveDirectoryAcls.ps1securitydescriptor/tests/scripts/Dump-ActiveDirectoryAcls.ps1.ps1 renamed to securitydescriptor/tests/scripts/Dump-ActiveDirectoryAcls.ps1 securitydescriptor/tests/scripts/Dump-ActiveDirectoryAcls.ps1.ps1 renamed to securitydescriptor/tests/scripts/Dump-ActiveDirectoryAcls.ps1

@@ -14,9 +14,16 @@ $os = Get-CimInstance Win32_OperatingSystem
 $osKey = "$($os.Caption) - $($os.Version)"
 
 $result = @{
-    $osKey = @{
-        ActiveDirectory = @()
+    Metadata = @{
+        Timestamp = $(Get-Date -Format "yyyy-MM-dd HH:mm:ss")
+        OS = @{
+            OSVersion = $os.Version
+            OSArchitecture = $os.OSArchitecture
+            OSBuild = $os.BuildNumber
+            OSVersionString = $os.VersionString
+        }
     }
+    ActiveDirectory = @()
 }
 
 # -----------------------------
@@ -52,20 +59,28 @@ foreach ($nc in $namingContexts) {
         }
 
         $dn = $res.Properties["distinguishedName"][0]
+        Write-Host $dn
         $sdBytes = $res.Properties["nTSecurityDescriptor"][0]
 
-        $result[$osKey]["ActiveDirectory"] += [PSCustomObject]@{
+        $result["ActiveDirectory"] += [PSCustomObject]@{
             name    = $dn
             hexdata = (Convert-BytesToHex $sdBytes)
         }
     }
 }
 
 # Deterministic ordering
-$result[$osKey]["ActiveDirectory"] =
-    $result[$osKey]["ActiveDirectory"] | Sort-Object name
+$result["ActiveDirectory"] =
+    $result["ActiveDirectory"] | Sort-Object name
 
 # -----------------------------
 # Output JSON
 # -----------------------------
-$result | ConvertTo-Json -Depth 5
+
+$dirPath = Join-Path -Path (Get-Location) -ChildPath $osKey
+if (-not (Test-Path -Path $dirPath -PathType Container)) {
+    New-Item -Path $dirPath -ItemType Directory | Out-Null
+}
+
+$jsonPath = Join-Path -Path $dirPath -ChildPath "ActiveDirectory.json"
+$result | ConvertTo-Json -Depth 5 | Set-Content -Path $jsonPath -Encoding UTF8

securitydescriptor/tests/scripts/Dump-LocalFileSystemAcls.ps1

@@ -14,9 +14,16 @@ $os = Get-CimInstance Win32_OperatingSystem
 $osKey = "$($os.Caption) - $($os.Version)"
 
 $result = @{
-    $osKey = @{
-        LocalFileSystem = @()
+    Metadata = @{
+        Timestamp = $(Get-Date -Format "yyyy-MM-dd HH:mm:ss")
+        OS = @{
+            OSVersion = $os.Version
+            OSArchitecture = $os.OSArchitecture
+            OSBuild = $os.BuildNumber
+            OSVersionString = $os.VersionString
+        }
     }
+    LocalFileSystem = @()
 }
 
 # -----------------------------
@@ -28,10 +35,11 @@ foreach ($root in $roots) {
     Get-ChildItem -Path $root -Recurse -Force -ErrorAction SilentlyContinue |
     ForEach-Object {
         try {
+            Write-Host $_.FullName
             $acl = Get-Acl -LiteralPath $_.FullName
             $sdBytes = $acl.GetSecurityDescriptorBinaryForm()
 
-            $result[$osKey]["LocalFileSystem"] += [PSCustomObject]@{
+            $result["LocalFileSystem"] += [PSCustomObject]@{
                 name    = $_.FullName -replace "\\", "/"
                 hexdata = (Convert-BytesToHex $sdBytes)
             }
@@ -43,10 +51,16 @@ foreach ($root in $roots) {
 }
 
 # Deterministic ordering
-$result[$osKey]["LocalFileSystem"] =
-    $result[$osKey]["LocalFileSystem"] | Sort-Object name
+$result["LocalFileSystem"] =
+    $result["LocalFileSystem"] | Sort-Object name
 
 # -----------------------------
 # Output JSON
 # -----------------------------
-$result | ConvertTo-Json -Depth 5
+$dirPath = Join-Path -Path (Get-Location) -ChildPath $osKey
+if (-not (Test-Path -Path $dirPath -PathType Container)) {
+    New-Item -Path $dirPath -ItemType Directory | Out-Null
+}
+
+$jsonPath = Join-Path -Path $dirPath -ChildPath "LocalFileSystem.json"
+$result | ConvertTo-Json -Depth 5 | Set-Content -Path $jsonPath -Encoding UTF8