Merge pull request #65 from jetstack/fix-system-authenticated

Ensure authenticated group is added

Author: jetstack-bot

pkg/proxy/proxy.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"k8s.io/apiserver/pkg/authentication/request/bearertoken"
+	authuser "k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/server"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/transport"
@@ -130,12 +131,27 @@ func (p *Proxy) RoundTrip(req *http.Request) (*http.Response, error) {
 		return nil, errNoName
 	}
 
+	// ensure group contains allauthenticated builtin
+	found := false
+	groups := user.GetGroups()
+	for _, elem := range groups {
+		if elem == authuser.AllAuthenticated {
+			found = true
+			break
+		}
+	}
+	if !found {
+		groups = append(groups, authuser.AllAuthenticated)
+	}
+
 	// set impersonation header using authenticated user identity
+
 	conf := transport.ImpersonationConfig{
 		UserName: user.GetName(),
-		Groups:   user.GetGroups(),
+		Groups:   groups,
 		Extra:    user.GetExtra(),
 	}
+
 	rt := transport.NewImpersonatingRoundTripper(conf, p.clientTransport)
 
 	// push request through round trippers to the API server

pkg/proxy/proxy_test.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"net/http"
 	"reflect"
+	"sort"
 	"strconv"
 	"strings"
 	"testing"
@@ -14,6 +15,7 @@ import (
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/request/bearertoken"
 	"k8s.io/apiserver/pkg/authentication/user"
+	authuser "k8s.io/apiserver/pkg/authentication/user"
 
 	"github.com/jetstack/kube-oidc-proxy/pkg/mocks"
 )
@@ -71,9 +73,12 @@ func (f *fakeRT) RoundTrip(h *http.Request) (*http.Response, error) {
 			f.expUser, h.Header.Get("Impersonate-User"))
 	}
 
-	if !reflect.DeepEqual(h.Header["Impersonate-Group"], f.expGroup) {
-		f.t.Errorf("client transport got unexpected group impersonation header, exp=%s got=%s",
-			f.expGroup, h.Header.Get("Impersonate-Group"))
+	if exp, act := sort.StringSlice(f.expGroup), sort.StringSlice(h.Header["Impersonate-Group"]); !reflect.DeepEqual(exp, act) {
+		f.t.Errorf(
+			"client transport got unexpected group impersonation header, exp=%#v got=%#v",
+			exp,
+			act,
+		)
 	}
 
 	for k, vv := range h.Header {
@@ -362,6 +367,7 @@ func Test_RoundTrip(t *testing.T) {
 	}
 	p.fakeToken.EXPECT().AuthenticateToken(gomock.Any(), "fake-token").Return(authResponse, true, nil)
 	p.fakeRT.expUser = "a-user"
+	p.fakeRT.expGroup = []string{authuser.AllAuthenticated}
 	req.Header["Authorization"] = []string{"bearer fake-token"}
 	_, err = p.RoundTrip(req)
 	if err != nil {
@@ -371,7 +377,7 @@ func Test_RoundTrip(t *testing.T) {
 	authResponse = &authenticator.Response{
 		User: &user.DefaultInfo{
 			Name:   "a-user",
-			Groups: []string{"a-group-a", "a-group-b"},
+			Groups: []string{"a-group-a", "a-group-b", authuser.AllAuthenticated},
 			Extra: map[string][]string{
 				"foo":     []string{"a", "b"},
 				"bar":     []string{"c", "d"},
@@ -381,7 +387,7 @@ func Test_RoundTrip(t *testing.T) {
 	}
 	p.fakeToken.EXPECT().AuthenticateToken(gomock.Any(), "fake-token").Return(authResponse, true, nil)
 	p.fakeRT.expUser = "a-user"
-	p.fakeRT.expGroup = []string{"a-group-a", "a-group-b"}
+	p.fakeRT.expGroup = []string{"a-group-a", "a-group-b", authuser.AllAuthenticated}
 	p.fakeRT.expExtra = map[string][]string{
 		"Impersonate-Extra-Foo":     []string{"a", "b"},
 		"Impersonate-Extra-Bar":     []string{"c", "d"},