diff --git a/docs/roadmap/remediation.md b/docs/roadmap/remediation.md index 8cb989f..96f5988 100644 --- a/docs/roadmap/remediation.md +++ b/docs/roadmap/remediation.md @@ -124,6 +124,11 @@ and stream behavior; no new formatter or replay algorithm is needed. ## R6: Prevent artifact read-limit overflow (Stage 4) +**Complete.** The read cap no longer overflows at `math.MaxInt64`. +The new test failed before the fix and now verifies that a small file keeps +its full body and size at that limit. The existing size-limit tests, full +Go suite, race suite, vet, and build passed. + [The restricted HTTP artifact reader](../../internal/adapter/http/artifact_reader.go) allows the same nonnegative `int64` limit as application configuration and the CLI. It computes `maxBytes + 1` for `io.LimitReader` to detect diff --git a/internal/adapter/http/artifact_reader.go b/internal/adapter/http/artifact_reader.go index f59502e..ebd1002 100644 --- a/internal/adapter/http/artifact_reader.go +++ b/internal/adapter/http/artifact_reader.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "io" + "math" "mime" "os" "path/filepath" @@ -136,7 +137,11 @@ func readArtifactFile(path string, maxBytes int64) (*promptkit.Artifact, error) var reader io.Reader = file if maxBytes > 0 { - reader = io.LimitReader(file, maxBytes+1) + readLimit := maxBytes + if readLimit < math.MaxInt64 { + readLimit++ // Read one extra byte to detect an oversized file. + } + reader = io.LimitReader(file, readLimit) } body, err := io.ReadAll(reader) if err != nil { diff --git a/internal/adapter/http/artifact_reader_test.go b/internal/adapter/http/artifact_reader_test.go index e1bb25b..8466262 100644 --- a/internal/adapter/http/artifact_reader_test.go +++ b/internal/adapter/http/artifact_reader_test.go @@ -3,6 +3,7 @@ package httpadapter import ( "context" "errors" + "math" "mime" "os" "path/filepath" @@ -180,6 +181,15 @@ func TestRestrictedArtifactReaderEnforcesLimits(t *testing.T) { t.Fatalf("expected unlimited artifact, got %#v and %v", artifact, err) } + maxLimited, err := NewRestrictedArtifactReader(root, math.MaxInt64) + if err != nil { + t.Fatalf("construct reader at maximum limit: %v", err) + } + artifact, err = maxLimited.Read(context.Background(), promptkit.File("large.txt")) + if err != nil || string(artifact.Body) != "123456" || artifact.Size != 6 { + t.Fatalf("expected full artifact at maximum limit, got %#v and %v", artifact, err) + } + if _, err := NewRestrictedArtifactReader(root, -1); err == nil { t.Fatal("expected negative limit to fail") }