diff --git a/CHANGELOG.md b/CHANGELOG.md index a69c154..3977dd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- Reject malformed log tail counts such as `10oops` or `1.5` instead of silently using their 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/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..4aaedf9 100644 --- a/cmd/crawlctl/main_test.go +++ b/cmd/crawlctl/main_test.go @@ -197,12 +197,26 @@ 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", "10oops", "1.5", "1e2", "1 2", strings.Repeat("9", 40)} { + for _, args := range [][]string{{"--tail", value}, {"--tail=" + value}} { + t.Run(strings.Join(args, " "), func(t *testing.T) { + 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) { + t.Fatalf("err = %v, want usageError", err) + } + }) + } + } +} + +func TestParseTailAcceptsPositiveIntegers(t *testing.T) { + for _, value := range []string{"10", "+10", "0010"} { + if got, err := parseTail(value); err != nil || got != 10 { + t.Errorf("parseTail(%q) = %d, %v; want 10, nil", value, got, err) + } } }