Commit f9557a80 authored by GitLab Release Tools Bot's avatar GitLab Release Tools Bot

Merge branch 'security-workhorse-artifacts-logs-scrubbing' into 'master'

Scrub artifacts signed URL in SendEntry logs

See merge request gitlab-org/security/gitlab!1837
parents c09574d0 e9d2f771
...@@ -14,6 +14,7 @@ import ( ...@@ -14,6 +14,7 @@ import (
"syscall" "syscall"
"gitlab.com/gitlab-org/labkit/log" "gitlab.com/gitlab-org/labkit/log"
"gitlab.com/gitlab-org/labkit/mask"
"gitlab.com/gitlab-org/gitlab/workhorse/internal/helper" "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper"
"gitlab.com/gitlab-org/gitlab/workhorse/internal/senddata" "gitlab.com/gitlab-org/gitlab/workhorse/internal/senddata"
...@@ -35,7 +36,7 @@ func (e *entry) Inject(w http.ResponseWriter, r *http.Request, sendData string) ...@@ -35,7 +36,7 @@ func (e *entry) Inject(w http.ResponseWriter, r *http.Request, sendData string)
log.WithContextFields(r.Context(), log.Fields{ log.WithContextFields(r.Context(), log.Fields{
"entry": params.Entry, "entry": params.Entry,
"archive": params.Archive, "archive": mask.URL(params.Archive),
"path": r.URL.Path, "path": r.URL.Path,
}).Print("SendEntry: sending") }).Print("SendEntry: sending")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment