archive-gh-me/gitpod
1
0
Fork 0
mirror of https://github.com/gitpod-io/gitpod.git synced 2025-12-08 17:36:30 +00:00
Code Issues Projects Releases Wiki Activity

Respond to /idp/keys with JSON (#17789)

Browse Source 
* Set JSON mimetype for `/idp/keys`

* Fix typos

* Test for header presence

* Assert JSON for ` /.well-known/openid-configuration` as well
This commit is contained in:
Filip Troníček 2023-05-31 08:45:05 +02:00 committed by GitHub
parent c1e80f5f8d
commit 624c79f9f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/public-api-server/pkg/identityprovider/cache.go
View File

@ -22,7 +22,7 @@ import (
// KeyCache caches public keys to ensure they're returned with the JWKS as long
// as there are valid tokens out there using those keys.
//
// PoC Note: in production this cache would likely be implemted using Redis or the database.
// PoC Note: in production this cache would likely be implemented using Redis or the database.
type KeyCache interface {
// Set rotates the current key
Set(ctx context.Context, current *rsa.PrivateKey) error

4
components/public-api-server/pkg/identityprovider/idp.go
View File

@ -115,6 +115,7 @@ func (kp *Service) Router() http.Handler {
EndSessionEndpoint: notSupported,
JwksURI: keysURL,
}
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(cfg)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
@ -127,9 +128,10 @@ func (kp *Service) Router() http.Handler {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(keys)
if err != nil {
log.WithError(err).Error("cannot repond to /keys")
log.WithError(err).Error("cannot respond to /keys")
}
}))

14
components/public-api-server/pkg/identityprovider/idp_test.go
View File

@ -32,6 +32,7 @@ func TestRouter(t *testing.T) {
Name string
Expectation Expectation
ResponseExpectation func(*Service) string
ExpectedHeaders map[string]string
Path string
}{
{
@ -40,6 +41,9 @@ func TestRouter(t *testing.T) {
Expectation: Expectation{
Response: `{"issuer":"https://api.gitpod.io/idp","authorization_endpoint":"https://api.gitpod.io/idp/not-supported","token_endpoint":"https://api.gitpod.io/idp/not-supported","introspection_endpoint":"https://api.gitpod.io/idp/not-supported","userinfo_endpoint":"https://api.gitpod.io/idp/not-supported","revocation_endpoint":"https://api.gitpod.io/idp/not-supported","end_session_endpoint":"https://api.gitpod.io/idp/not-supported","jwks_uri":"https://api.gitpod.io/idp/keys","scopes_supported":["openid","profile","email","phone","address","offline_access"],"response_types_supported":["code","id_token","id_token token"],"grant_types_supported":["authorization_code","implicit"],"subject_types_supported":["public"],"id_token_signing_alg_values_supported":["RS256"],"revocation_endpoint_auth_methods_supported":["none"],"introspection_endpoint_auth_methods_supported":["none"],"introspection_endpoint_auth_signing_alg_values_supported":["RS256"],"claims_supported":["sub","aud","exp","iat","iss","auth_time","nonce","acr","amr","c_hash","at_hash","act","scopes","client_id","azp","preferred_username","name","family_name","given_name","locale","email"],"request_uri_parameter_supported":false}` + "\n",
},
ExpectedHeaders: map[string]string{
"Content-Type": "application/json",
},
},
{
Name: "keys",
@ -48,6 +52,9 @@ func TestRouter(t *testing.T) {
r, _ := s.keys.PublicKeys(context.Background())
return string(r)
},
ExpectedHeaders: map[string]string{
"Content-Type": "application/json",
},
},
}
@ -79,6 +86,13 @@ func TestRouter(t *testing.T) {
if diff := cmp.Diff(test.Expectation, act); diff != "" {
t.Errorf("Router() mismatch (-want +got):\n%s", diff)
}
for name, expected := range test.ExpectedHeaders {
actual := resp.Header.Get(name)
if actual != expected {
t.Errorf("Unexpected value for header '%s'. got: '%s', want: '%s'", name, actual, expected)
}
}
})
}
}