This commit is contained in:
seydx
2025-05-26 22:21:33 +02:00
parent bf45f64a7e
commit 7c17e64090
2 changed files with 14 additions and 14 deletions
+3 -3
View File
@@ -167,17 +167,17 @@ func ResponseJSON(w http.ResponseWriter, v any) {
func ResponsePrettyJSON(w http.ResponseWriter, v any) { func ResponsePrettyJSON(w http.ResponseWriter, v any) {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
var buf bytes.Buffer var buf bytes.Buffer
enc := json.NewEncoder(&buf) enc := json.NewEncoder(&buf)
enc.SetIndent("", " ") enc.SetIndent("", " ")
err := enc.Encode(v) err := enc.Encode(v)
if err != nil { if err != nil {
http.Error(w, "Internal Server Error", http.StatusInternalServerError) http.Error(w, "Internal Server Error", http.StatusInternalServerError)
return return
} }
redactedJSON := shell.Redact(buf.String()) redactedJSON := shell.Redact(buf.String())
w.Write([]byte(redactedJSON)) w.Write([]byte(redactedJSON))
} }
+11 -11
View File
@@ -116,11 +116,11 @@ func RunUntilSignal() {
func Redact(text string) string { func Redact(text string) string {
secretMutex.RLock() secretMutex.RLock()
defer secretMutex.RUnlock() defer secretMutex.RUnlock()
if secretReplacer == nil { if secretReplacer == nil {
return text return text
} }
return secretReplacer.Replace(text) return secretReplacer.Replace(text)
} }
@@ -130,13 +130,13 @@ func buildSecretReplacer(cfg struct {
}) { }) {
secretMutex.Lock() secretMutex.Lock()
defer secretMutex.Unlock() defer secretMutex.Unlock()
if secretValues == nil { if secretValues == nil {
secretValues = make(map[string]bool) secretValues = make(map[string]bool)
} }
var newSecrets []string var newSecrets []string
if dir, ok := os.LookupEnv("CREDENTIALS_DIRECTORY"); ok { if dir, ok := os.LookupEnv("CREDENTIALS_DIRECTORY"); ok {
entries, err := os.ReadDir(dir) entries, err := os.ReadDir(dir)
if err == nil { if err == nil {
@@ -154,7 +154,7 @@ func buildSecretReplacer(cfg struct {
} }
} }
} }
if cfg.Env != nil { if cfg.Env != nil {
for _, value := range cfg.Env { for _, value := range cfg.Env {
if len(value) > 0 && !secretValues[value] { if len(value) > 0 && !secretValues[value] {
@@ -163,7 +163,7 @@ func buildSecretReplacer(cfg struct {
} }
} }
} }
if cfg.Secrets != nil { if cfg.Secrets != nil {
for _, secretMap := range cfg.Secrets { for _, secretMap := range cfg.Secrets {
for _, value := range secretMap { for _, value := range secretMap {
@@ -174,7 +174,7 @@ func buildSecretReplacer(cfg struct {
} }
} }
} }
if len(newSecrets) > 0 { if len(newSecrets) > 0 {
rebuildReplacer() rebuildReplacer()
} }
@@ -182,14 +182,14 @@ func buildSecretReplacer(cfg struct {
func rebuildReplacer() { func rebuildReplacer() {
var replacements []string var replacements []string
for secret := range secretValues { for secret := range secretValues {
replacements = append(replacements, secret, "*****") replacements = append(replacements, secret, "*****")
} }
if len(replacements) > 0 { if len(replacements) > 0 {
secretReplacer = strings.NewReplacer(replacements...) secretReplacer = strings.NewReplacer(replacements...)
} else { } else {
secretReplacer = nil secretReplacer = nil
} }
} }