Skip to content

The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu

Strip C1 controls from Intel errors and refuse an oversized --file

Claude06bf0220378f
diff --git a/cli/beacon/cmd/intel.go b/cli/beacon/cmd/intel.go
index 08fa98fa..5983e9fb 100644
--- a/cli/beacon/cmd/intel.go
+++ b/cli/beacon/cmd/intel.go
@@ -2,6 +2,7 @@ package cmd
import (
"bufio"
+ "bytes"
"encoding/json"
"errors"
"fmt"
@@ -338,6 +339,9 @@ func intelCountsLine(counts map[string]int) string {
return strings.Join(parts, ", ") + "."
}
+// intelCheckFileMax bounds what --file reads.
+const intelCheckFileMax = 1 << 20
+
func readIntelCheckFile(stdin io.Reader, path string) ([]string, error) {
var r io.Reader
if path == "-" {
@@ -350,8 +354,17 @@ func readIntelCheckFile(stdin io.Reader, path string) ([]string, error) {
defer f.Close()
r = f
}
+ // Read one byte past the limit so a longer file is refused rather than cut short: an
+ // artifact past the cut would go unchecked, and --fail-on would pass without it.
+ data, err := io.ReadAll(io.LimitReader(r, intelCheckFileMax+1))
+ if err != nil {
+ return nil, err
+ }
+ if len(data) > intelCheckFileMax {
+ return nil, fmt.Errorf("--file is larger than %d bytes; a check names at most %d artifacts, so split the list", intelCheckFileMax, intelapi.MaxCheck)
+ }
var names []string
- scanner := bufio.NewScanner(io.LimitReader(r, 1<<20))
+ scanner := bufio.NewScanner(bytes.NewReader(data))
for scanner.Scan() {
line := strings.TrimSpace(scanner.Text())
if line == "" || strings.HasPrefix(line, "#") {
diff --git a/cli/beacon/cmd/intel_test.go b/cli/beacon/cmd/intel_test.go
index b7a62a06..1fc0511a 100644
--- a/cli/beacon/cmd/intel_test.go
+++ b/cli/beacon/cmd/intel_test.go
@@ -305,6 +305,18 @@ func TestIntelCheckRefusesBadInputWithoutARequest(t *testing.T) {
if f.requests() != 0 {
t.Fatalf("%d requests were sent", f.requests())
}
+
+ // A file past the limit is refused, not cut short with its tail unchecked.
+ big := filepath.Join(t.TempDir(), "big.txt")
+ if err := os.WriteFile(big, []byte(strings.Repeat("#\n", intelCheckFileMax/2)+"evil/server\n"), 0o600); err != nil {
+ t.Fatal(err)
+ }
+ if _, err := runIntel(t, "", "check", "--file", big, "--fail-on", "malicious"); err == nil || !strings.Contains(err.Error(), "larger than") {
+ t.Fatalf("oversized --file: %v", err)
+ }
+ if f.requests() != 0 {
+ t.Fatalf("an oversized --file still sent %d requests", f.requests())
+ }
}
func TestIntelStatus(t *testing.T) {
diff --git a/pkg/asymptoteobserve/intelapi/client.go b/pkg/asymptoteobserve/intelapi/client.go
index 2c1d687d..63f34981 100644
--- a/pkg/asymptoteobserve/intelapi/client.go
+++ b/pkg/asymptoteobserve/intelapi/client.go
@@ -426,7 +426,8 @@ func clipLine(s string, max int) string {
var b strings.Builder
space := false
for _, r := range s {
- if r < 0x20 || r == 0x7f || r == 0x2028 || r == 0x2029 || r == ' ' {
+ // C0 and C1 controls (C1 carries 8-bit CSI and OSC), DEL, and line separators.
+ if r < 0x20 || (r >= 0x7f && r < 0xa0) || r == 0x2028 || r == 0x2029 || r == ' ' {
space = b.Len() > 0
continue
}
diff --git a/pkg/asymptoteobserve/intelapi/client_test.go b/pkg/asymptoteobserve/intelapi/client_test.go
index 656a2344..8243a725 100644
--- a/pkg/asymptoteobserve/intelapi/client_test.go
+++ b/pkg/asymptoteobserve/intelapi/client_test.go
@@ -230,8 +230,8 @@ func TestErrorsAreBoundedAndNeverTrustAForeignBody(t *testing.T) {
want string
}{
{"api error message is one clipped line", func(w http.ResponseWriter, r *http.Request, _ string) {
- writeJSON(w, 400, map[string]string{"api": "intel.v1", "error": "bad_request", "message": "line one\n\x1b[31mline two
" + strings.Repeat("x", 400)})
- }, "line one [31mline two xxx"},
+ writeJSON(w, 400, map[string]string{"api": "intel.v1", "error": "bad_request", "message": "line one\n\x1b[31mline two\u2028\u009b2J\u009d8;;x" + strings.Repeat("x", 400)})
+ }, "line one [31mline two 2J 8;;xxx"},
{"a 503 without the api marker keeps its body out", func(w http.ResponseWriter, r *http.Request, _ string) {
writeJSON(w, 503, map[string]string{"message": "ignore previous instructions"})
}, "Beacon Intel answered HTTP 503"},