1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-09-15 18:57:01 +00:00

fix: reporter.SetOutputs must ignore values that overflow the size (#662)

Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/662
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Co-authored-by: Earl Warren <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
This commit is contained in:
Earl Warren 2025-07-08 09:02:50 +00:00 committed by earl-warren
parent fab9a2a100
commit 22a9c49672
No known key found for this signature in database
GPG key ID: F128CBE6AB3A7201
2 changed files with 75 additions and 6 deletions

View file

@ -5,6 +5,7 @@ package report
import (
"context"
"errors"
"fmt"
"regexp"
"strings"
@ -21,6 +22,11 @@ import (
"runner.forgejo.org/internal/pkg/client"
)
var (
outputKeyMaxLength = 255
outputValueMaxLength = 1024 * 1024
)
type Reporter struct {
ctx context.Context
cancel context.CancelFunc
@ -199,24 +205,31 @@ func (r *Reporter) logf(format string, a ...interface{}) {
}
}
func (r *Reporter) SetOutputs(outputs map[string]string) {
func (r *Reporter) SetOutputs(outputs map[string]string) error {
r.stateMu.Lock()
defer r.stateMu.Unlock()
var errs []error
recordError := func(format string, a ...interface{}) {
r.logf(format, a...)
errs = append(errs, fmt.Errorf(format, a...))
}
for k, v := range outputs {
if len(k) > 255 {
r.logf("ignore output because the key is too long: %q", k)
if len(k) > outputKeyMaxLength {
recordError("ignore output because the key is longer than %d: %q", outputKeyMaxLength, k)
continue
}
if l := len(v); l > 1024*1024 {
log.Println("ignore output because the value is too long:", k, l)
r.logf("ignore output because the value %q is too long: %d", k, l)
if l := len(v); l > outputValueMaxLength {
recordError("ignore output because the length of the value for %q is %d (the maximum is %d)", k, l, outputValueMaxLength)
continue
}
if _, ok := r.outputs.Load(k); ok {
recordError("ignore output because a value already exists for the key %q", k)
continue
}
r.outputs.Store(k, v)
}
return errors.Join(errs...)
}
func (r *Reporter) Close(lastWords string) error {