mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-07 06:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix OAuth2 user info credentials and add HTTP error handling.

Browse source
This commit is contained in:
Tommie Gannert 2022-05-27 18:07:52 +02:00
parent 43bac75c5f
commit 6663882cf2
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clientapi/auth/sso/oauth2.go
View file

@ -136,6 +136,10 @@ func (p *oauth2IdentityProvider) getAccessToken(ctx context.Context, callbackURL
} }
defer hresp.Body.Close() // nolint:errcheck defer hresp.Body.Close() // nolint:errcheck
if hresp.StatusCode/100 != 2 {
return "", fmt.Errorf("OAuth2 access token request %q failed: %d %s", p.accessTokenURL, hresp.StatusCode, hresp.Status)
}
var resp oauth2TokenResponse var resp oauth2TokenResponse
if err := json.NewDecoder(hresp.Body).Decode(&resp); err != nil { if err := json.NewDecoder(hresp.Body).Decode(&resp); err != nil {
return "", err return "", err
@ -170,7 +174,7 @@ func (p *oauth2IdentityProvider) getUserInfo(ctx context.Context, accessToken st
if err != nil { if err != nil {
return "", "", "", err return "", "", "", err
} }
hreq.Header.Set("Authorization", "token "+accessToken) hreq.Header.Set("Authorization", "Bearer "+accessToken)
hreq.Header.Set("Accept", p.responseMimeType) hreq.Header.Set("Accept", p.responseMimeType)
hresp, err := p.hc.Do(hreq) hresp, err := p.hc.Do(hreq)
@ -179,6 +183,10 @@ func (p *oauth2IdentityProvider) getUserInfo(ctx context.Context, accessToken st
} }
defer hresp.Body.Close() // nolint:errcheck defer hresp.Body.Close() // nolint:errcheck
if hresp.StatusCode/100 != 2 {
return "", "", "", fmt.Errorf("OAuth2 user info request %q failed: %d %s", p.userInfoURL, hresp.StatusCode, hresp.Status)
}
body, err := ioutil.ReadAll(hresp.Body) body, err := ioutil.ReadAll(hresp.Body)
if err != nil { if err != nil {
return "", "", "", err return "", "", "", err

4
clientapi/auth/sso/oidc.go
View file

@ -138,6 +138,10 @@ func oidcDiscover(ctx context.Context, url string) (*oidcDiscovery, error) {
} }
defer hresp.Body.Close() // nolint:errcheck defer hresp.Body.Close() // nolint:errcheck
if hresp.StatusCode/100 != 2 {
return nil, fmt.Errorf("OIDC discovery request %q failed: %d %s", url, hresp.StatusCode, hresp.Status)
}
var disc oidcDiscovery var disc oidcDiscovery
if err := json.NewDecoder(hresp.Body).Decode(&disc); err != nil { if err := json.NewDecoder(hresp.Body).Decode(&disc); err != nil {
return nil, fmt.Errorf("decoding OIDC discovery response from %q: %w", url, err) return nil, fmt.Errorf("decoding OIDC discovery response from %q: %w", url, err)