mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-05 14:55:44 +00:00
Lunny Xiaoandbircni
4e8037a93b
Move the log calls in `internal` onto `logging`, and add what the process-wide logger setup and its tests need: `SetTextFormat` with a line filter for secret masking (replacing `report.MaskingFormatter`), `SetReportCaller`, `SetDefault` and `logtest.SetDefault`. After this only the `logging` package imports logrus. Stacked on https://gitea.com/gitea/runner/pulls/1301. Assisted-by: Codet Co-authored-by: bircni <[email protected]> Reviewed-on: https://gitea.com/gitea/runner/pulls/1302 Reviewed-by: bircni <[email protected]>
57 lines
1.4 KiB
Go
57 lines
1.4 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package report
|
|
|
|
import (
|
|
"strings"
|
|
"sync"
|
|
"sync/atomic"
|
|
|
|
"gitea.com/gitea/runner/act/runner"
|
|
)
|
|
|
|
// A job's plan runs before its job logger exists and logs through the process-wide one, which
|
|
// several tasks share, so that one holds the union of every live task's starting secrets.
|
|
var (
|
|
globalMu sync.Mutex
|
|
globalMasks = map[*Reporter][]string{}
|
|
globalReplacer atomic.Pointer[strings.Replacer] // nil while nothing is registered
|
|
)
|
|
|
|
func registerGlobalMasks(r *Reporter) {
|
|
globalMu.Lock()
|
|
defer globalMu.Unlock()
|
|
globalMasks[r] = r.oldnew
|
|
rebuildGlobalReplacer()
|
|
}
|
|
|
|
func deregisterGlobalMasks(r *Reporter) {
|
|
globalMu.Lock()
|
|
defer globalMu.Unlock()
|
|
delete(globalMasks, r)
|
|
rebuildGlobalReplacer()
|
|
}
|
|
|
|
func rebuildGlobalReplacer() { // caller holds globalMu
|
|
var oldnew []string
|
|
for _, masks := range globalMasks {
|
|
oldnew = append(oldnew, masks...)
|
|
}
|
|
if len(oldnew) == 0 {
|
|
globalReplacer.Store(nil)
|
|
return
|
|
}
|
|
globalReplacer.Store(runner.NewSecretReplacer(oldnew))
|
|
}
|
|
|
|
// MaskGlobal hides every registered value in a formatted line of the process-wide log, fields
|
|
// included. It is meant for logging.TextOptions.Filter.
|
|
func MaskGlobal(line []byte) []byte {
|
|
replacer := globalReplacer.Load()
|
|
if replacer == nil { // nothing to hide, so an idle daemon pays no copy
|
|
return line
|
|
}
|
|
return []byte(replacer.Replace(string(line)))
|
|
}
|