mirror of
https://gitea.com/gitea/runner.git
synced 2026-08-27 22:37:46 +00:00
12dc9d26a2
Fixes 51 bugs discovered via comparison with `actions/runner`. Every fix has test coverage.
### Secrets
- A short secret registered no shifted-base64 form, so `base64("user:$TOKEN")` printed in the clear
- Encoded forms came only from the whole trimmed value, missing padded and per-line spellings
- Masks split only on `\n`, so `::add-mask::a%0Db` registered neither half
- Adds XML, expression-string and quote-trimming encoders
### Workflow commands
- Split at the last `::` or `]` rather than the first, so `::add-mask::a::b` registered no mask
- A command on the last line without a newline was ignored, and `::ADD-MASK::` did nothing
- `##[...]` did not decode `%3B`/`%5D`, properties lost anything after a second `=`
- `$GITHUB_ENV` and `::set-env::` now refuse `NODE_OPTIONS`
### Status
- `continue-on-error` reported failed, a cancelled job reported success, an `if:` error reported cancelled
- File commands ran after `continue-on-error`, failing the job while the step stayed green
- A bad job output aborted the whole run instead of that job
### Steps and actions
- `${{ matrix.* }}` and `${{ strategy.* }}` were empty inside composite actions
- Composite inputs leaked into nested actions as `INPUT_*`, `with:` matched case-sensitively, `pre` failures were dropped
- Docker actions dropped `runs.env` when the caller passed `with: args:`, and caller `args`/`entrypoint` beat the manifest
- An implicit shell ran with `pipefail`, a `shell:` without `{0}` passed without running
- `container.env` overrode job env and every `$GITHUB_ENV` write, heredocs lost leading blank lines, `$GITHUB_PATH` was not BOM-decoded
Written by Claude Opus 5.
Reviewed-on: https://gitea.com/gitea/runner/pulls/1194
Reviewed-by: bircni <bircni@icloud.com>
Co-authored-by: silverwind <me@silverwind.io>
491 lines
13 KiB
Go
491 lines
13 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// Copyright 2020 The nektos/act Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package runner
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/base64"
|
|
"encoding/json/jsontext"
|
|
"encoding/json/v2"
|
|
"fmt"
|
|
"io"
|
|
"net/url"
|
|
"os"
|
|
"slices"
|
|
"strings"
|
|
"sync"
|
|
|
|
"gitea.com/gitea/runner/act/common"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
"golang.org/x/term"
|
|
)
|
|
|
|
const (
|
|
// nocolor = 0
|
|
red = 31
|
|
green = 32
|
|
yellow = 33
|
|
blue = 34
|
|
magenta = 35
|
|
cyan = 36
|
|
gray = 37
|
|
)
|
|
|
|
const (
|
|
rawOutputField = "raw_output"
|
|
scriptLineCyanField = "script_line_cyan"
|
|
)
|
|
|
|
var (
|
|
colors []int
|
|
nextColor int
|
|
mux sync.Mutex
|
|
)
|
|
|
|
func init() {
|
|
nextColor = 0
|
|
colors = []int{
|
|
blue, yellow, green, magenta, red, gray, cyan,
|
|
}
|
|
}
|
|
|
|
type masksContextKey string
|
|
|
|
const masksContextKeyVal = masksContextKey("logrus.FieldLogger")
|
|
|
|
// Logger returns the appropriate logger for current context
|
|
func Masks(ctx context.Context) *[]string {
|
|
val := ctx.Value(masksContextKeyVal)
|
|
if val != nil {
|
|
if masks, ok := val.(*[]string); ok {
|
|
return masks
|
|
}
|
|
}
|
|
return &[]string{}
|
|
}
|
|
|
|
// WithMasks adds a value to the context for the logger
|
|
func WithMasks(ctx context.Context, masks *[]string) context.Context {
|
|
return context.WithValue(ctx, masksContextKeyVal, masks)
|
|
}
|
|
|
|
type JobLoggerFactory interface {
|
|
WithJobLogger() *logrus.Logger
|
|
}
|
|
|
|
type jobLoggerFactoryContextKey string
|
|
|
|
var jobLoggerFactoryContextKeyVal = jobLoggerFactoryContextKey("jobloggerkey")
|
|
|
|
func WithJobLoggerFactory(ctx context.Context, factory JobLoggerFactory) context.Context {
|
|
return context.WithValue(ctx, jobLoggerFactoryContextKeyVal, factory)
|
|
}
|
|
|
|
// WithJobLogger attaches a new logger to context that is aware of steps
|
|
func WithJobLogger(ctx context.Context, jobID, jobName string, config *Config, masks *[]string, matrix map[string]any) context.Context {
|
|
ctx = WithMasks(ctx, masks)
|
|
|
|
var logger *logrus.Logger
|
|
if jobLoggerFactory, ok := ctx.Value(jobLoggerFactoryContextKeyVal).(JobLoggerFactory); ok && jobLoggerFactory != nil {
|
|
logger = jobLoggerFactory.WithJobLogger()
|
|
} else {
|
|
var formatter logrus.Formatter
|
|
if config.JSONLogger {
|
|
formatter = &logrus.JSONFormatter{}
|
|
} else {
|
|
mux.Lock()
|
|
defer mux.Unlock()
|
|
nextColor++
|
|
formatter = &jobLogFormatter{color: colors[nextColor%len(colors)]}
|
|
}
|
|
|
|
logger = logrus.New()
|
|
logger.SetOutput(os.Stdout)
|
|
logger.SetLevel(logrus.GetLevel())
|
|
logger.SetFormatter(formatter)
|
|
}
|
|
|
|
{ // Adapt to Gitea
|
|
if hook := common.LoggerHook(ctx); hook != nil {
|
|
logger.AddHook(hook)
|
|
}
|
|
if config.JobLoggerLevel != nil {
|
|
logger.SetLevel(*config.JobLoggerLevel)
|
|
} else {
|
|
logger.SetLevel(logrus.TraceLevel)
|
|
}
|
|
}
|
|
|
|
logger.SetFormatter(&maskedFormatter{
|
|
Formatter: logger.Formatter,
|
|
masker: valueMasker(config.InsecureSecrets, config.maskers()),
|
|
})
|
|
rtn := logger.WithFields(logrus.Fields{
|
|
"job": jobName,
|
|
"jobID": jobID,
|
|
"dryrun": common.Dryrun(ctx),
|
|
"matrix": matrix,
|
|
}).WithContext(ctx)
|
|
|
|
return common.WithLogger(ctx, rtn)
|
|
}
|
|
|
|
func WithCompositeLogger(ctx context.Context, masks *[]string) context.Context {
|
|
ctx = WithMasks(ctx, masks)
|
|
return common.WithLogger(ctx, common.Logger(ctx).WithFields(logrus.Fields{}).WithContext(ctx))
|
|
}
|
|
|
|
func WithCompositeStepLogger(ctx context.Context, stepID string) context.Context {
|
|
val := common.Logger(ctx)
|
|
stepIDs := make([]string, 0)
|
|
|
|
if logger, ok := val.(*logrus.Entry); ok {
|
|
if oldStepIDs, ok := logger.Data["stepID"].([]string); ok {
|
|
stepIDs = append(stepIDs, oldStepIDs...)
|
|
}
|
|
}
|
|
|
|
stepIDs = append(stepIDs, stepID)
|
|
|
|
return common.WithLogger(ctx, common.Logger(ctx).WithFields(logrus.Fields{
|
|
"stepID": stepIDs,
|
|
}).WithContext(ctx))
|
|
}
|
|
|
|
func withStepLogger(ctx context.Context, stepNumber int, stepID, stepName, stageName string) context.Context {
|
|
rtn := common.Logger(ctx).WithFields(logrus.Fields{
|
|
"stepNumber": stepNumber,
|
|
"step": stepName,
|
|
"stepID": []string{stepID},
|
|
"stage": stageName,
|
|
})
|
|
return common.WithLogger(ctx, rtn)
|
|
}
|
|
|
|
type entryProcessor func(entry *logrus.Entry) *logrus.Entry
|
|
|
|
var secretValueEncoders = []func(string) string{
|
|
func(v string) string { return base64.StdEncoding.EncodeToString([]byte(v)) },
|
|
base64ShiftEncoder(1),
|
|
base64ShiftEncoder(2),
|
|
base64InteriorEncoder(0),
|
|
base64InteriorEncoder(1),
|
|
base64InteriorEncoder(2),
|
|
expressionStringEscape,
|
|
jsonStringEscape,
|
|
jsonStringEscapeNoHTML,
|
|
uriDataEscape,
|
|
url.QueryEscape, // the form-encoded twin of uriDataEscape, which spells a space "+"
|
|
url.PathEscape,
|
|
xmlDataEscape,
|
|
trimDoubleQuotes,
|
|
}
|
|
|
|
// base64ShiftEncoder reproduces the 3-byte alignments of `Basic base64("user:token")`, and
|
|
// its padded tail only matches a secret that ends the payload.
|
|
func base64ShiftEncoder(shift int) func(string) string {
|
|
return func(v string) string {
|
|
value := []byte(v)
|
|
if len(value) > shift {
|
|
value = value[shift:]
|
|
}
|
|
return base64.StdEncoding.EncodeToString(value)
|
|
}
|
|
}
|
|
|
|
const minInteriorBase64Len = 8 // below this a fragment matches unrelated output
|
|
|
|
// base64InteriorEncoder keeps the aligned middle, so a secret with data after it still matches.
|
|
func base64InteriorEncoder(shift int) func(string) string {
|
|
return func(v string) string {
|
|
buf := make([]byte, shift+len(v))
|
|
copy(buf[shift:], v)
|
|
encoded := base64.StdEncoding.EncodeToString(buf)
|
|
if len(encoded) < 8+minInteriorBase64Len {
|
|
return ""
|
|
}
|
|
return encoded[4 : len(encoded)-4]
|
|
}
|
|
}
|
|
|
|
func expressionStringEscape(v string) string {
|
|
return strings.ReplaceAll(v, "'", "''")
|
|
}
|
|
|
|
func uriDataEscape(v string) string {
|
|
return strings.ReplaceAll(url.QueryEscape(v), "+", "%20")
|
|
}
|
|
|
|
var xmlDataEscaper = strings.NewReplacer(
|
|
"&", "&",
|
|
"<", "<",
|
|
">", ">",
|
|
`"`, """,
|
|
"'", "'",
|
|
)
|
|
|
|
func xmlDataEscape(v string) string {
|
|
return xmlDataEscaper.Replace(v)
|
|
}
|
|
|
|
func trimDoubleQuotes(v string) string {
|
|
if len(v) > 8 && strings.HasPrefix(v, `"`) && strings.HasSuffix(v, `"`) {
|
|
return v[1 : len(v)-1]
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// jsonStringEscape returns v as it appears inside a JSON string, without the quotes,
|
|
// which is what `toJSON(secrets)` or any action logging a JSON body produces. Go's encoder
|
|
// escapes <, >, & (as act's own toJSON does); the non-HTML variant below covers the runtimes
|
|
// that do not. When v has none of those characters both forms are equal and deduplicated.
|
|
func jsonStringEscape(v string) string {
|
|
encoded, err := json.Marshal(v, jsontext.EscapeForHTML(true))
|
|
if err != nil {
|
|
return v
|
|
}
|
|
return string(encoded[1 : len(encoded)-1])
|
|
}
|
|
|
|
// jsonStringEscapeNoHTML is jsonStringEscape without HTML escaping, matching the JSON a
|
|
// JavaScript (JSON.stringify) or .NET action emits, so a secret containing < > or & is
|
|
// masked in that form too.
|
|
func jsonStringEscapeNoHTML(v string) string {
|
|
encoded, err := json.Marshal(v)
|
|
if err != nil {
|
|
return v
|
|
}
|
|
return string(encoded[1 : len(encoded)-1])
|
|
}
|
|
|
|
// AppendSecretMaskers skips the debug settings, as GitHub does: they arrive as secrets, but
|
|
// masking "true" would corrupt unrelated log lines and drop job outputs that say it.
|
|
func AppendSecretMaskers(oldnew []string, secrets map[string]string) []string {
|
|
for k, v := range secrets {
|
|
if k != "ACTIONS_STEP_DEBUG" && k != "ACTIONS_RUNNER_DEBUG" {
|
|
oldnew = AppendSecretMasker(oldnew, v)
|
|
}
|
|
}
|
|
return oldnew
|
|
}
|
|
|
|
// AppendSecretMasker registers v and each of its lines, as GitHub does.
|
|
func AppendSecretMasker(oldnew []string, v string) []string {
|
|
ret := appendMaskedValue(oldnew, v)
|
|
for l := range strings.FieldsFuncSeq(v, func(r rune) bool { return r == '\r' || r == '\n' }) {
|
|
ret = appendMaskedValue(ret, strings.TrimSpace(l))
|
|
}
|
|
return ret
|
|
}
|
|
|
|
// appendMaskedValue registers one value and every shape it takes on its way into a log.
|
|
func appendMaskedValue(ret []string, v string) []string {
|
|
// formatted JSON secrets could otherwise mask {,[,],} everywhere
|
|
if len(strings.TrimSpace(v)) <= 1 || slices.Contains(ret, v) {
|
|
return ret
|
|
}
|
|
ret = append(ret, v, "***")
|
|
// command data reaches the log escaped, so "pass%word" also arrives as "pass%25word"
|
|
if strings.ContainsAny(v, "%\r\n") {
|
|
ret = append(ret, EscapeCommandData(v), "***")
|
|
}
|
|
for _, encode := range secretValueEncoders {
|
|
encoded := encode(v)
|
|
// An encoding that leaves the value unchanged is already masked above.
|
|
if encoded == v || len(encoded) <= 1 || slices.Contains(ret, encoded) {
|
|
continue
|
|
}
|
|
ret = append(ret, encoded, "***")
|
|
}
|
|
return ret
|
|
}
|
|
|
|
// valueMasker applies secrets and ::add-mask:: patterns to every log entry, including
|
|
// raw_output (command/stream) lines; there is no bypass by field.
|
|
func valueMasker(insecureSecrets bool, oldnew []string) entryProcessor {
|
|
oldnew = slices.Clip(oldnew)
|
|
defReplacer := NewSecretReplacer(oldnew)
|
|
|
|
// A ::add-mask:: only ever appends to the job's mask slice, so the replacer built for
|
|
// it stays valid until the slice grows. Cache it, keyed by the slice itself and its
|
|
// length, instead of encoding every secret and mask again for each log line.
|
|
var (
|
|
mu sync.Mutex
|
|
masksRef *[]string
|
|
pairs []string
|
|
masked int
|
|
replacer *strings.Replacer
|
|
)
|
|
|
|
return func(entry *logrus.Entry) *logrus.Entry {
|
|
if insecureSecrets {
|
|
return entry
|
|
}
|
|
|
|
masks := Masks(entry.Context)
|
|
|
|
if len(*masks) == 0 {
|
|
entry.Message = defReplacer.Replace(entry.Message)
|
|
return entry
|
|
}
|
|
|
|
mu.Lock()
|
|
// A composite action logs through the same masker with its own mask slice, so a
|
|
// different slice starts the cache over.
|
|
if masksRef != masks {
|
|
masksRef, pairs, masked, replacer = masks, oldnew, 0, nil
|
|
}
|
|
if replacer == nil || masked != len(*masks) {
|
|
for _, v := range (*masks)[masked:] {
|
|
pairs = AppendSecretMasker(pairs, v)
|
|
}
|
|
masked = len(*masks)
|
|
replacer = NewSecretReplacer(pairs)
|
|
}
|
|
cmasker := replacer
|
|
mu.Unlock()
|
|
|
|
entry.Message = cmasker.Replace(entry.Message)
|
|
|
|
return entry
|
|
}
|
|
}
|
|
|
|
type maskedFormatter struct {
|
|
logrus.Formatter
|
|
masker entryProcessor
|
|
}
|
|
|
|
func (f *maskedFormatter) Format(entry *logrus.Entry) ([]byte, error) {
|
|
return f.Formatter.Format(f.masker(entry))
|
|
}
|
|
|
|
type jobLogFormatter struct {
|
|
color int
|
|
}
|
|
|
|
func (f *jobLogFormatter) Format(entry *logrus.Entry) ([]byte, error) {
|
|
b := &bytes.Buffer{}
|
|
|
|
// the web renderer decodes command data, so this local view has to as well
|
|
if _, _, _, ok := tryParseRawActionCommand(entry.Message + "\n"); ok {
|
|
entry.Message = UnescapeCommandData(entry.Message)
|
|
}
|
|
|
|
if f.isColored(entry) {
|
|
f.printColored(b, entry)
|
|
} else {
|
|
f.print(b, entry)
|
|
}
|
|
|
|
b.WriteByte('\n')
|
|
return b.Bytes(), nil
|
|
}
|
|
|
|
func (f *jobLogFormatter) printColored(b *bytes.Buffer, entry *logrus.Entry) {
|
|
entry.Message = strings.TrimSuffix(entry.Message, "\n")
|
|
|
|
job := entry.Data["job"]
|
|
|
|
debugFlag := ""
|
|
if entry.Level == logrus.DebugLevel {
|
|
debugFlag = "[DEBUG] "
|
|
}
|
|
|
|
switch {
|
|
case entry.Data[rawOutputField] == true:
|
|
if entry.Data[scriptLineCyanField] == true {
|
|
fmt.Fprintf(b, "\x1b[%dm|\x1b[0m \x1b[36;1m%s\x1b[0m", f.color, entry.Message)
|
|
} else {
|
|
fmt.Fprintf(b, "\x1b[%dm|\x1b[0m %s", f.color, entry.Message)
|
|
}
|
|
case entry.Data["dryrun"] == true:
|
|
fmt.Fprintf(b, "\x1b[1m\x1b[%dm\x1b[7m*DRYRUN*\x1b[0m \x1b[%dm[%s] \x1b[0m%s%s", gray, f.color, job, debugFlag, entry.Message)
|
|
default:
|
|
fmt.Fprintf(b, "\x1b[%dm[%s] \x1b[0m%s%s", f.color, job, debugFlag, entry.Message)
|
|
}
|
|
}
|
|
|
|
func (f *jobLogFormatter) print(b *bytes.Buffer, entry *logrus.Entry) {
|
|
entry.Message = strings.TrimSuffix(entry.Message, "\n")
|
|
|
|
job := entry.Data["job"]
|
|
|
|
debugFlag := ""
|
|
if entry.Level == logrus.DebugLevel {
|
|
debugFlag = "[DEBUG] "
|
|
}
|
|
|
|
switch {
|
|
case entry.Data[rawOutputField] == true:
|
|
fmt.Fprintf(b, "[%s] | %s", job, entry.Message)
|
|
case entry.Data["dryrun"] == true:
|
|
fmt.Fprintf(b, "*DRYRUN* [%s] %s%s", job, debugFlag, entry.Message)
|
|
default:
|
|
fmt.Fprintf(b, "[%s] %s%s", job, debugFlag, entry.Message)
|
|
}
|
|
}
|
|
|
|
func (f *jobLogFormatter) isColored(entry *logrus.Entry) bool {
|
|
isColored := checkIfTerminal(entry.Logger.Out)
|
|
|
|
if force, ok := os.LookupEnv("CLICOLOR_FORCE"); ok && force != "0" {
|
|
isColored = true
|
|
} else if ok && force == "0" {
|
|
isColored = false
|
|
} else if os.Getenv("CLICOLOR") == "0" {
|
|
isColored = false
|
|
}
|
|
|
|
return isColored
|
|
}
|
|
|
|
func checkIfTerminal(w io.Writer) bool {
|
|
switch v := w.(type) {
|
|
case *os.File:
|
|
return term.IsTerminal(int(v.Fd()))
|
|
default:
|
|
return false
|
|
}
|
|
}
|
|
|
|
// maskSecrets hides this job's secrets in a value that reaches somewhere the log maskers cannot,
|
|
// such as a container name or a job summary. Masks added at runtime count, so a summary written
|
|
// after ::add-mask:: is covered too.
|
|
func (rc *RunContext) maskSecrets(value string) string {
|
|
oldnew := rc.Config.maskers()
|
|
for _, mask := range rc.Masks {
|
|
oldnew = AppendSecretMasker(oldnew, mask)
|
|
}
|
|
return NewSecretReplacer(oldnew).Replace(value)
|
|
}
|
|
|
|
// maskers is every value this job's configuration says to hide, whatever the sink.
|
|
func (c *Config) maskers() []string {
|
|
oldnew := AppendSecretMaskers(nil, c.Secrets)
|
|
for _, mask := range c.ExtraMasks {
|
|
oldnew = AppendSecretMasker(oldnew, mask)
|
|
}
|
|
return oldnew
|
|
}
|
|
|
|
// NewSecretReplacer masks the longest secret first. Replacer matches in argument order, so a
|
|
// secret that prefixes another would otherwise mask only that prefix and print the rest.
|
|
func NewSecretReplacer(oldnew []string) *strings.Replacer {
|
|
pairs := make([][2]string, 0, len(oldnew)/2)
|
|
for i := 0; i+1 < len(oldnew); i += 2 {
|
|
pairs = append(pairs, [2]string{oldnew[i], oldnew[i+1]})
|
|
}
|
|
slices.SortFunc(pairs, func(a, b [2]string) int { return len(b[0]) - len(a[0]) })
|
|
|
|
sorted := make([]string, 0, len(pairs)*2)
|
|
for _, pair := range pairs {
|
|
sorted = append(sorted, pair[0], pair[1])
|
|
}
|
|
return strings.NewReplacer(sorted...)
|
|
}
|