Merge pull request #13978 from deads2k/auth-08-sa-via-websocket

OpenShift Bot · web-flow · commit 8508081538ed · 2017-05-04T20:01:21.000-05:00
Merged by openshift-bot
diff --git a/pkg/cmd/server/origin/master_config.go b/pkg/cmd/server/origin/master_config.go
@@ -686,7 +686,7 @@ func newAuthenticator(config configapi.MasterConfig, restOptionsGetter restoptio
 			publicKeys = append(publicKeys, readPublicKeys...)
 		}
 		serviceAccountTokenAuthenticator := serviceaccount.JWTTokenAuthenticator(publicKeys, true, tokenGetter)
-		tokenAuthenticators = append(tokenAuthenticators, bearertoken.New(serviceAccountTokenAuthenticator, true))
+		tokenAuthenticators = append(tokenAuthenticators, bearertoken.New(serviceAccountTokenAuthenticator, true), paramtoken.New("access_token", serviceAccountTokenAuthenticator, true))
 	}
 
 	// OAuth token

Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,7 @@ func newAuthenticator(config configapi.MasterConfig, restOptionsGetter restoptio`
`686`	`686`	`publicKeys = append(publicKeys, readPublicKeys...)`
`687`	`687`	`}`
`688`	`688`	`serviceAccountTokenAuthenticator := serviceaccount.JWTTokenAuthenticator(publicKeys, true, tokenGetter)`
`689`		`- tokenAuthenticators = append(tokenAuthenticators, bearertoken.New(serviceAccountTokenAuthenticator, true))`
	`689`	`+ tokenAuthenticators = append(tokenAuthenticators, bearertoken.New(serviceAccountTokenAuthenticator, true), paramtoken.New("access_token", serviceAccountTokenAuthenticator, true))`
`690`	`690`	`}`
`691`	`691`
`692`	`692`	`// OAuth token`