root
/
keypairs
mirror of https://github.com/therootcompany/keypairs
2
0
Fork 0
Code Issues Releases Wiki Activity

minor bugfix

This commit is contained in:
AJ ONeal 2019-02-28 19:16:58 -07:00
parent a3d33da5d0
commit c74a56b907
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
keyserve/keyserve.go
View File

@ -41,7 +41,8 @@ type Middleware struct {
// for Content-Type, and it doesn't add practical benefit, so we omit it // for Content-Type, and it doesn't add practical benefit, so we omit it
// (JSON _is_ utf-8, per spec, already). // (JSON _is_ utf-8, per spec, already).
// Handler // Handler will match either OIDC or Auth0 jwks URLs and return true if it
// matches on (and responds to) either. Otherwise it will return false.
func (m *Middleware) Handler(w http.ResponseWriter, r *http.Request) bool { func (m *Middleware) Handler(w http.ResponseWriter, r *http.Request) bool {
if strings.HasSuffix(r.URL.Path, jwksURL.Path) { if strings.HasSuffix(r.URL.Path, jwksURL.Path) {
@ -68,6 +69,11 @@ func (m *Middleware) WellKnownOIDC(w http.ResponseWriter, r *http.Request) {
baseURL = *m.BaseURL baseURL = *m.BaseURL
} else { } else {
baseURL = *r.URL baseURL = *r.URL
if nil == r.TLS && "https" != r.Header.Get("X-Forwarded-Proto") {
baseURL.Scheme = "http"
} else {
baseURL.Scheme = "https"
}
baseURL.Host = r.Host baseURL.Host = r.Host
baseURL.Path = strings.TrimSuffix(baseURL.Path, oidcURL.Path) baseURL.Path = strings.TrimSuffix(baseURL.Path, oidcURL.Path)
} }
@ -76,7 +82,7 @@ func (m *Middleware) WellKnownOIDC(w http.ResponseWriter, r *http.Request) {
u := baseURL.ResolveReference(jwksURL) u := baseURL.ResolveReference(jwksURL)
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
w.Write([]byte(fmt.Sprintf(`{ "issuer": %q, "jwks_uri": %q }`, baseURL, u))) w.Write([]byte(fmt.Sprintf(`{ "issuer": %q, "jwks_uri": %q }`, baseURL.String(), u.String())))
} }
// WellKnownJWKs serves a JSON array of keys, no fluff // WellKnownJWKs serves a JSON array of keys, no fluff