Merge pull request #182 from redcanaryco/cyberbuff-patch-2

Update Invoke-AtomicTest.ps1
redcanaryco · Dec 28, 2023 · 05bfb2b · 05bfb2b
2 parents bc546d3 + e6c4d84
commit 05bfb2b
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/Public/Invoke-AtomicTest.ps1 b/Public/Invoke-AtomicTest.ps1
@@ -135,6 +135,24 @@ function Invoke-AtomicTest {
         $executionPlatform, $isElevated, $tmpDir, $executionHostname, $executionUser = Get-TargetInfo $Session
         $PathToPayloads = if ($Session) { "$tmpDir`AtomicRedTeam" }  else { $PathToAtomicsFolder }
 
+        # Since there might a comma(T1559-1,2,3) Powershell takes it as array.
+        # So converting it back to string.
+        if ($AtomicTechnique -is [array]) {
+            $AtomicTechnique = $AtomicTechnique -join ","
+        }
+
+        # Splitting Atomic Technique short form into technique and test numbers.
+        $AtomicTechniqueParams = ($AtomicTechnique -split '-')
+        $AtomicTechnique = $AtomicTechniqueParams[0]
+
+        if ($AtomicTechniqueParams.Length -gt 1) {
+            $ShortTestNumbers = $AtomicTechniqueParams[-1]
+        }
+
+        if ($null -eq $TestNumbers -and $null -ne $ShortTestNumbers) {
+            $TestNumbers = $ShortTestNumbers -split ','
+        }
+
         $isLoggingModuleSet = $false
         if (-not $NoExecutionLog) {
             $isLoggingModuleSet = $true
@@ -193,24 +211,6 @@ function Invoke-AtomicTest {
                 return
             }
 
-            # Since there might a comma(T1559-1,2,3) Powershell takes it as array.
-            # So converting it back to string.
-            if ($AtomicTechnique -is [array]) {
-                $AtomicTechnique = $AtomicTechnique -join ","
-            }
-
-            # Splitting Atomic Technique short form into technique and test numbers.
-            $AtomicTechniqueParams = ($AtomicTechnique -split '-')
-            $AtomicTechnique = $AtomicTechniqueParams[0]
-
-            if ($AtomicTechniqueParams.Length -gt 1) {
-                $ShortTestNumbers = $AtomicTechniqueParams[-1]
-            }
-
-            if ($null -eq $TestNumbers -and $null -ne $ShortTestNumbers) {
-                $TestNumbers = $ShortTestNumbers -split ','
-            }
-
             # Here we're rebuilding an equivalent command line to put in the logs
             $commandLine = "Invoke-AtomicTest $AtomicTechnique"