Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retain the request body when logging HTTP. #378

Merged
merged 4 commits into from
Aug 21, 2019
Merged

Retain the request body when logging HTTP. #378

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8164900
Retain the request body when logging HTTP.
Harwayne Aug 19, 2019
e96212a
hack/build.sh -u
Harwayne Aug 19, 2019
6e30c5a
Add a unit test.
Harwayne Aug 21, 2019
689dbe3
Unit test redacted headers.
Harwayne Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions pkg/util/logging_http_transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ import (
"net/http/httputil"
"os"
"strings"

"k8s.io/apimachinery/pkg/util/sets"
)

var (
// sensitiveRequestHeaders are headers that will be redacted when logging requests.
sensitiveRequestHeaders = sets.NewString(
"Authorization",
"WWW-Authenticate",
"Cookie",
"Proxy-Authorization")
)

type LoggingHttpTransport struct {
Expand All @@ -36,35 +47,34 @@ func NewLoggingTransportWithStream(transport http.RoundTripper, s io.Writer) htt
return &LoggingHttpTransport{transport, s}
}

var SENSITIVE_HEADERS = map[string]bool{
"Authorization": true,
"WWW-Authenticate": true,
"Cookie": true,
"Proxy-Authorization": true,
}

func (t *LoggingHttpTransport) RoundTrip(r *http.Request) (*http.Response, error) {
stream := t.stream
if stream == nil {
stream = os.Stderr
}
reqCopy := *r
reqCopy.Header = make(http.Header, len(r.Header))
redacted := http.Header{}
for k, v := range r.Header {
sensitive := SENSITIVE_HEADERS[k]
if sensitive {
if sensitiveRequestHeaders.Has(k) {
redacted[k] = v
l := 0
for _, h := range v {
l += len(h)
}
reqCopy.Header.Set(k, strings.Repeat("*", l))
} else {
reqCopy.Header[k] = v
r.Header.Set(k, strings.Repeat("*", l))
}
}
reqBytes, _ := httputil.DumpRequestOut(&reqCopy, true)
reqBytes, err := httputil.DumpRequestOut(r, true)
if err != nil {
fmt.Fprintln(stream, "error dumping request:", err)
return nil, fmt.Errorf("dumping request: %v", err)
}
fmt.Fprintln(stream, "===== REQUEST =====")
fmt.Fprintln(stream, string(reqBytes))

for k, v := range redacted {
r.Header[k] = v
}

resp, err := t.transport.RoundTrip(r)
if err != nil {
fmt.Fprintln(stream, "===== ERROR =====")
Expand Down