From 64aff7b98370b6c140f30d4f43d496ebef376080 Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Fri, 22 Jan 2021 12:12:12 -0600 Subject: [PATCH] Only log user ID, not user name/groups. Signed-off-by: Margo Crawford --- internal/concierge/impersonator/impersonator.go | 5 +---- internal/concierge/impersonator/impersonator_test.go | 8 ++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/internal/concierge/impersonator/impersonator.go b/internal/concierge/impersonator/impersonator.go index 12f9e1b1..8c8cfd1c 100644 --- a/internal/concierge/impersonator/impersonator.go +++ b/internal/concierge/impersonator/impersonator.go @@ -103,10 +103,7 @@ func (p *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, "not authenticated", http.StatusUnauthorized) return } - log = log.WithValues( - "user", userInfo.GetName(), - "groups", userInfo.GetGroups(), - ) + log = log.WithValues("userID", userInfo.GetUID()) newHeaders := getProxyHeaders(userInfo, r.Header) r.Header = newHeaders diff --git a/internal/concierge/impersonator/impersonator_test.go b/internal/concierge/impersonator/impersonator_test.go index 9a8d1508..5ae19e02 100644 --- a/internal/concierge/impersonator/impersonator_test.go +++ b/internal/concierge/impersonator/impersonator_test.go @@ -190,13 +190,17 @@ func TestImpersonator(t *testing.T) { URL: validURL, }, expectMockToken: func(t *testing.T, recorder *mocktokenauthenticator.MockTokenMockRecorder) { - userInfo := user.DefaultInfo{Name: "test-user", Groups: []string{"test-group-1", "test-group-2"}} + userInfo := user.DefaultInfo{ + Name: "test-user", + Groups: []string{"test-group-1", "test-group-2"}, + UID: "test-uid", + } response := &authenticator.Response{User: &userInfo} recorder.AuthenticateToken(gomock.Any(), "test-token").Return(response, true, nil) }, wantHTTPBody: "successful proxied response", wantHTTPStatus: http.StatusOK, - wantLogs: []string{"\"level\"=0 \"msg\"=\"proxying authenticated request\" \"authenticator\"={\"apiGroup\":null,\"kind\":\"\",\"name\":\"authenticator-one\"} \"authenticatorNamespace\"=\"foo\" \"groups\"=[\"test-group-1\",\"test-group-2\"] \"method\"=\"GET\" \"url\"=\"http://pinniped.dev/blah\" \"user\"=\"test-user\""}, + wantLogs: []string{"\"level\"=0 \"msg\"=\"proxying authenticated request\" \"authenticator\"={\"apiGroup\":null,\"kind\":\"\",\"name\":\"authenticator-one\"} \"authenticatorNamespace\"=\"foo\" \"method\"=\"GET\" \"url\"=\"http://pinniped.dev/blah\" \"userID\"=\"test-uid\""}, }, }