Modify functions to pass all test cmd line argument test cases except…

… test cases 8 - 10
T0pCyber · Jan 14, 2025 · 49dab29 · 49dab29
1 parent 0c41e1a
commit 49dab29
Show file tree

Hide file tree

Showing 4 changed files with 298 additions and 267 deletions.
diff --git a/Hawk/functions/Tenant/Start-HawkTenantInvestigation.ps1 b/Hawk/functions/Tenant/Start-HawkTenantInvestigation.ps1
@@ -100,37 +100,99 @@
     param (
         [DateTime]$StartDate,
         [DateTime]$EndDate,
-        [ValidateRange(1, 365)]
         [int]$DaysToLookBack,
         [string]$FilePath,
         [switch]$SkipUpdate,
         [switch]$NonInteractive
     )
 
 
+    # begin {
+    #     # Validate parameters if in non-interactive mode
+    #     if ($NonInteractive) {
+
+
+    #         # if ($NonInteractive) {
+
+    #         #     Write-Output "ENTERING COMMAND LINE INTERFACE NON INTERACTIVE MODE"
+
+    #         #     # Check if DaysToLookBack is valid before calling the conversion function
+    #         #     if ($DaysToLookBack -ne $null -and $DaysToLookBack -ge 1 -and $DaysToLookBack -le 365) {
+    #         #         $ConvertedDates = Convert-HawkDaysToDates -DaysToLookBack $DaysToLookBack
+    #         #         $StartDate = $ConvertedDates.StartDate
+    #         #         $EndDate = $ConvertedDates.EndDate
+    #         #     }
+
+    #         # }
+    #         # if ($NonInteractive) {
+
+    #         #     Write-Output "ENTERING COMMAND LINE INTERFACE NON INTERACTIVE MODE"
+
+    #         #     # Check if DaysToLookBack is valid before calling the conversion function
+    #         #     if ($DaysToLookBack -ne $null -and $DaysToLookBack -ge 1 -and $DaysToLookBack -le 365) {
+    #         #         $ConvertedDates = Convert-HawkDaysToDates -DaysToLookBack $DaysToLookBack
+    #         #         $StartDate = $ConvertedDates.StartDate
+    #         #         $EndDate = $ConvertedDates.EndDate
+    #         #     }
+
+    #         # }
+
+
+    #         $validation = Test-HawkInvestigationParameter -StartDate $StartDate -EndDate $EndDate `
+    #             -DaysToLookBack $DaysToLookBack -FilePath $FilePath -NonInteractive
+
+    #         if (-not $validation.IsValid) {
+    #             foreach ($error in $validation.ErrorMessages) {
+    #                 Stop-PSFFunction -Message $error -EnableException $true
+    #             }
+    #         }
+
+
+    #         try {
+    #             # Initialize with provided parameters
+    #             Initialize-HawkGlobalObject -StartDate $StartDate -EndDate $EndDate -DaysToLookBack $DaysToLookBack `
+    #                 -FilePath $FilePath -SkipUpdate:$SkipUpdate -NonInteractive:$NonInteractive
+    #         }
+    #         catch {
+    #             Stop-PSFFunction -Message "Failed to initialize Hawk: $_" -EnableException $true
+    #         }
+    #     }
+
+    # }
+
+
     begin {
-        # Validate parameters if in non-interactive mode
         if ($NonInteractive) {
-            $validation = Test-HawkInvestigationParameter -StartDate $StartDate -EndDate $EndDate `
+            # If DaysToLookBack is specified, convert it first
+            if ($PSBoundParameters.ContainsKey('DaysToLookBack') -and $DaysToLookBack -ge 1 -and $DaysToLookBack -le 365) {
+                $convertedDates = Convert-HawkDaysToDate -DaysToLookBack $DaysToLookBack
+                $StartDate = $convertedDates.StartDate
+                $EndDate   = $convertedDates.EndDate
+            }
+
+            # Now call validation with updated StartDate/EndDate
+            $validation = Test-HawkInvestigationParameter `
+                -StartDate $StartDate -EndDate $EndDate `
                 -DaysToLookBack $DaysToLookBack -FilePath $FilePath -NonInteractive
-
+    
             if (-not $validation.IsValid) {
                 foreach ($error in $validation.ErrorMessages) {
                     Stop-PSFFunction -Message $error -EnableException $true
                 }
             }
-        }
-
-        try {
-            # Initialize with provided parameters
-            Initialize-HawkGlobalObject -StartDate $StartDate -EndDate $EndDate -DaysToLookBack $DaysToLookBack `
-                -FilePath $FilePath -SkipUpdate:$SkipUpdate -NonInteractive:$NonInteractive
-        }
-        catch {
-            Stop-PSFFunction -Message "Failed to initialize Hawk: $_" -EnableException $true
+
+            try {
+                Initialize-HawkGlobalObject -StartDate $StartDate -EndDate $EndDate `
+                    -DaysToLookBack $DaysToLookBack -FilePath $FilePath `
+                    -SkipUpdate:$SkipUpdate -NonInteractive:$NonInteractive
+            }
+            catch {
+                Stop-PSFFunction -Message "Failed to initialize Hawk: $_" -EnableException $true
+            }
         }
     }
 
+
 	process {
 
         if (Test-PSFFunctionInterrupt) { return }

diff --git a/Hawk/internal/functions/Convert-HawkDaysToDate.ps1 b/Hawk/internal/functions/Convert-HawkDaysToDate.ps1
@@ -34,7 +34,7 @@ Function Convert-HawkDaysToDate {
 
     # Calculate the dates
     $startDate = (Get-Date).ToUniversalTime().AddDays(-$DaysToLookBack).Date
-    $endDate = (Get-Date).ToUniversalTime().AddDays(1).Date
+    $endDate = (Get-Date).ToUniversalTime().Date
 
     # Return the dates as a PSCustomObject
     [PSCustomObject]@{