From 5f792e1f2e6111f9833cae4b19c1ac3aa047a3de Mon Sep 17 00:00:00 2001 From: Vincent Koc Date: Mon, 16 Nov 2026 12:44:54 +0800 Subject: [PATCH] fix(crawlctl): reject malformed log tail counts --- CHANGELOG.md | 2 ++ README.md | 2 +- cmd/crawlctl/main.go | 5 ++-- cmd/crawlctl/main_test.go | 56 ++++++++++++++++++++++++++++++++++----- 4 files changed, 56 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a69c154..43e9418 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- Reject malformed `crawlctl logs --tail` counts instead of silently accepting an integer prefix. + - Save discovered executables as absolute paths so relative app selections work from another runner directory. - Preserve each job's latest text status when history keys collide or runs finish in the same second. diff --git a/README.md b/README.md index 391a2d7..2b424dc 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ applies private file permissions before replacing existing content. | `discover` | Print discovered crawl apps | | `run` | Run enabled refresh jobs | | `status` | Show the latest recorded job status | -| `logs` | Print recent job logs | +| `logs` | Print recent job logs (`--tail` requires a positive integer) | | `install` | Install or render a periodic schedule | | `uninstall` | Remove an installed periodic schedule | diff --git a/cmd/crawlctl/main.go b/cmd/crawlctl/main.go index c34c699..0bcbca9 100644 --- a/cmd/crawlctl/main.go +++ b/cmd/crawlctl/main.go @@ -12,6 +12,7 @@ import ( "path/filepath" "runtime/debug" "sort" + "strconv" "strings" "github.com/openclaw/crawlkit/scheduler" @@ -368,8 +369,8 @@ func (a *app) runLogs(args []string) error { } func parseTail(value string) (int, error) { - var parsed int - if _, err := fmt.Sscanf(value, "%d", &parsed); err != nil { + parsed, err := strconv.Atoi(value) + if err != nil { return 0, fmt.Errorf("invalid --tail value %q", value) } if parsed <= 0 { diff --git a/cmd/crawlctl/main_test.go b/cmd/crawlctl/main_test.go index b6a08d1..35a824f 100644 --- a/cmd/crawlctl/main_test.go +++ b/cmd/crawlctl/main_test.go @@ -197,12 +197,56 @@ every = "7m" } func TestRunLogsRejectsInvalidTail(t *testing.T) { - var stdout bytes.Buffer - a := app{stdout: &stdout, stderr: ioDiscard{}} - err := a.runLogs([]string{"--tail=-1"}) - var usage usageError - if !errors.As(err, &usage) { - t.Fatalf("err = %v, want usageError", err) + for _, value := range []string{"-1", "0", "", "bad", "2junk", "1.5", "1e3", "2 3", " 2", "2\n"} { + for _, joined := range []bool{false, true} { + t.Run(fmt.Sprintf("%q/joined=%t", value, joined), func(t *testing.T) { + args := []string{"--tail", value} + if joined { + args = []string{"--tail=" + value} + } + var stdout bytes.Buffer + a := app{stdout: &stdout, stderr: ioDiscard{}, config: filepath.Join(t.TempDir(), "missing.toml")} + err := a.runLogs(args) + var usage usageError + if !errors.As(err, &usage) || exitCode(err) != 2 || stdout.Len() != 0 { + t.Fatalf("err = %v, stdout = %q; want usage error without output", err, stdout.String()) + } + }) + } + } +} + +func TestRunLogsHonorsTailCount(t *testing.T) { + configPath := filepath.Join(t.TempDir(), "crawlctl.toml") + paths, err := scheduler.Save(configPath, scheduler.DefaultConfig(), false) + if err != nil { + t.Fatal(err) + } + if err := os.MkdirAll(paths.StateDir, 0o700); err != nil { + t.Fatal(err) + } + logPath := filepath.Join(paths.BaseDir, "job.log") + if err := os.WriteFile(logPath, []byte("first\nsecond\nthird\n"), 0o600); err != nil { + t.Fatal(err) + } + history, err := json.Marshal(scheduler.RunRecord{Job: "sync", LogPath: logPath}) + if err != nil { + t.Fatal(err) + } + if err := os.WriteFile(paths.History, append(history, '\n'), 0o600); err != nil { + t.Fatal(err) + } + for _, args := range [][]string{{"--tail", "2"}, {"--tail=2"}, {"--tail=+2"}, {"--tail=02"}} { + t.Run(strings.Join(args, " "), func(t *testing.T) { + var stdout bytes.Buffer + a := app{stdout: &stdout, stderr: ioDiscard{}, config: configPath} + if err := a.runLogs(args); err != nil { + t.Fatal(err) + } + if stdout.String() != "second\nthird\n" { + t.Fatalf("tail = %q", stdout.String()) + } + }) } }