From 378c0e82d6c00fbca3d44e07541a4e2d7343a605 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 3 Sep 2026 15:13:35 +1000 Subject: [PATCH 1/2] Potential fix for code scanning alert no. 6: Slice memory allocation with excessive size value --- internal/webui/api_logs.go | 17 ++++++++++++++++- internal/webui/api_tasks_logs.go | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/internal/webui/api_logs.go b/internal/webui/api_logs.go index 31ead1302..0c28c946b 100644 --- a/internal/webui/api_logs.go +++ b/internal/webui/api_logs.go @@ -32,7 +32,22 @@ func (s *Server) handleLogs(w http.ResponseWriter, r *http.Request) { } q := r.URL.Query() - limit, _ := strconv.Atoi(q.Get("limit")) + limit := logging.DefaultTailLines + if raw := strings.TrimSpace(q.Get("limit")); raw != "" { + parsed, err := strconv.Atoi(raw) + if err != nil { + http.Error(w, "bad limit", http.StatusBadRequest) + return + } + switch { + case parsed <= 0: + limit = logging.DefaultTailLines + case parsed > logging.MaxTailLines: + limit = logging.MaxTailLines + default: + limit = parsed + } + } result, err := logging.Tail(path, logging.Query{ Levels: splitCSV(q.Get("level")), Component: strings.TrimSpace(q.Get("component")), diff --git a/internal/webui/api_tasks_logs.go b/internal/webui/api_tasks_logs.go index a8cfd007c..1966a5b17 100644 --- a/internal/webui/api_tasks_logs.go +++ b/internal/webui/api_tasks_logs.go @@ -56,7 +56,22 @@ func (s *Server) handleTaskLogs(w http.ResponseWriter, r *http.Request) { return } - limit, _ := strconv.Atoi(q.Get("limit")) + limit := logging.DefaultTailLines + if raw := strings.TrimSpace(q.Get("limit")); raw != "" { + parsed, err := strconv.Atoi(raw) + if err != nil { + http.Error(w, "bad limit", http.StatusBadRequest) + return + } + switch { + case parsed <= 0: + limit = logging.DefaultTailLines + case parsed > logging.MaxTailLines: + limit = logging.MaxTailLines + default: + limit = parsed + } + } result, err := logging.Tail(path, logging.Query{ Levels: splitCSV(q.Get("level")), Component: strings.TrimSpace(q.Get("component")), From 92cbda6d1f57f323770ba8f7843d4a725a5382b5 Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Thu, 3 Sep 2026 05:36:17 +0000 Subject: [PATCH 2/2] test(webui): cover log limit validation --- internal/webui/api_logs_test.go | 111 ++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 internal/webui/api_logs_test.go diff --git a/internal/webui/api_logs_test.go b/internal/webui/api_logs_test.go new file mode 100644 index 000000000..a6d928bbf --- /dev/null +++ b/internal/webui/api_logs_test.go @@ -0,0 +1,111 @@ +package webui + +import ( + "encoding/json" + "log/slog" + "net/http" + "net/http/httptest" + "path/filepath" + "strconv" + "testing" + + "github.com/samcharles93/archie-core/internal/config" + "github.com/samcharles93/archie-core/internal/logging" +) + +func TestLogEndpointsValidateAndBoundLimit(t *testing.T) { + srv := newTestServer(t) + const entryCount = logging.MaxTailLines + 1 + + daemonLogPath := filepath.Join(t.TempDir(), "archied.log") + daemonLog, closer, err := logging.New(logging.Options{File: daemonLogPath}) + if err != nil { + t.Fatal(err) + } + writeLogEntries(daemonLog, entryCount) + if err := closer.Close(); err != nil { + t.Fatal(err) + } + srv.Cfg = config.NewHolder(config.Config{Log: config.Log{File: daemonLogPath}}) + + taskLogDir := t.TempDir() + srv.TaskLogs = logging.NewTaskRegistry(taskLogDir, nil, logging.TaskSinkOptions{}) + if _, err := srv.Store.EnqueueIssue(t.Context(), "acme", "widget", 1, "task", "", "", ""); err != nil { + t.Fatal(err) + } + task, err := srv.Store.TaskByIssue(t.Context(), "acme", "widget", 1) + if err != nil { + t.Fatal(err) + } + taskSink, err := logging.NewTaskSink(taskLogDir, task.ID, task.Attempt, logging.TaskSinkOptions{}) + if err != nil { + t.Fatal(err) + } + writeLogEntries(taskSink.Logger(), entryCount) + if err := taskSink.Close(); err != nil { + t.Fatal(err) + } + + endpoints := []struct { + name string + path string + }{ + {name: "daemon logs", path: "/api/logs"}, + {name: "task logs", path: "/api/tasks/" + strconv.FormatInt(task.ID, 10) + "/logs"}, + } + tests := []struct { + name string + query string + wantStatus int + wantEntries int + }{ + {name: "missing uses default", wantStatus: http.StatusOK, wantEntries: logging.DefaultTailLines}, + {name: "zero uses default", query: "?limit=0", wantStatus: http.StatusOK, wantEntries: logging.DefaultTailLines}, + {name: "negative uses default", query: "?limit=-1", wantStatus: http.StatusOK, wantEntries: logging.DefaultTailLines}, + {name: "valid is honored", query: "?limit=3", wantStatus: http.StatusOK, wantEntries: 3}, + {name: "whitespace is ignored", query: "?limit=%203%20", wantStatus: http.StatusOK, wantEntries: 3}, + { + name: "oversized is clamped", + query: "?limit=" + strconv.Itoa(logging.MaxTailLines+1), + wantStatus: http.StatusOK, + wantEntries: logging.MaxTailLines, + }, + {name: "malformed is rejected", query: "?limit=not-a-number", wantStatus: http.StatusBadRequest}, + {name: "integer overflow is rejected", query: "?limit=999999999999999999999999", wantStatus: http.StatusBadRequest}, + } + + for _, endpoint := range endpoints { + t.Run(endpoint.name, func(t *testing.T) { + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, endpoint.path+tt.query, nil) + w := httptest.NewRecorder() + + srv.Handler().ServeHTTP(w, req) + + if w.Code != tt.wantStatus { + t.Fatalf("status = %d, want %d", w.Code, tt.wantStatus) + } + if tt.wantStatus != http.StatusOK { + return + } + var body struct { + Entries []logging.Entry `json:"entries"` + } + if err := json.Unmarshal(w.Body.Bytes(), &body); err != nil { + t.Fatalf("decode response: %v", err) + } + if len(body.Entries) != tt.wantEntries { + t.Errorf("entries = %d, want %d", len(body.Entries), tt.wantEntries) + } + }) + } + }) + } +} + +func writeLogEntries(log *slog.Logger, count int) { + for i := range count { + log.Info("entry", "index", i) + } +}