fix: Prevent invalid negative timestamps getting container logs (#1038)

Co-authored-by: Andre Hofmeister <[email protected]>
testcontainers · Nov 1, 2023 · 5d5cb2d · 5d5cb2d
1 parent 082eea4
commit 5d5cb2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Testcontainers/Clients/DockerContainerOperations.cs b/src/Testcontainers/Clients/DockerContainerOperations.cs
@@ -69,8 +69,8 @@ public async Task<long> GetExitCodeAsync(string id, CancellationToken ct = defau
       {
         ShowStdout = true,
         ShowStderr = true,
-        Since = since.TotalSeconds.ToString("0", CultureInfo.InvariantCulture),
-        Until = until.TotalSeconds.ToString("0", CultureInfo.InvariantCulture),
+        Since = Math.Max(0, since.TotalSeconds).ToString("0", CultureInfo.InvariantCulture),
+        Until = Math.Max(0, until.TotalSeconds).ToString("0", CultureInfo.InvariantCulture),
         Timestamps = timestampsEnabled,
       };
 

diff --git a/src/Testcontainers/Clients/TestcontainersClient.cs b/src/Testcontainers/Clients/TestcontainersClient.cs
@@ -106,12 +106,12 @@ public Task<long> GetContainerExitCodeAsync(string id, CancellationToken ct = de
 
       if (default(DateTime).Equals(since))
       {
-        since = DateTime.MinValue;
+        since = unixEpoch;
       }
 
       if (default(DateTime).Equals(until))
       {
-        until = DateTime.MaxValue;
+        until = unixEpoch;
       }
 
       return Container.GetLogsAsync(id, since.ToUniversalTime().Subtract(unixEpoch), until.ToUniversalTime().Subtract(unixEpoch), timestampsEnabled, ct);