From e94e6adf91b4290e6436dd5d3b5f8f27a6474a6d Mon Sep 17 00:00:00 2001 From: jiuker <2818723467@qq.com> Date: Fri, 19 May 2023 17:13:33 +0800 Subject: [PATCH] fix: return proper error if OIDC Discoverydoc fails to respond (#17242) --- docs/sts/web-identity.go | 2 +- internal/config/identity/openid/jwt.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sts/web-identity.go b/docs/sts/web-identity.go index b7a12bc93..b39fb73bb 100644 --- a/docs/sts/web-identity.go +++ b/docs/sts/web-identity.go @@ -90,7 +90,7 @@ func parseDiscoveryDoc(ustr string) (DiscoveryDoc, error) { } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { - return d, err + return d, fmt.Errorf("unexpected error returned by %s : status(%s)", ustr, resp.Status) } dec := json.NewDecoder(resp.Body) if err = dec.Decode(&d); err != nil { diff --git a/internal/config/identity/openid/jwt.go b/internal/config/identity/openid/jwt.go index 97444f215..b23a033dd 100644 --- a/internal/config/identity/openid/jwt.go +++ b/internal/config/identity/openid/jwt.go @@ -279,7 +279,7 @@ func parseDiscoveryDoc(u *xnet.URL, transport http.RoundTripper, closeRespFn fun } defer closeRespFn(resp.Body) if resp.StatusCode != http.StatusOK { - return d, err + return d, fmt.Errorf("unexpected error returned by %s : status(%s)", u, resp.Status) } dec := json.NewDecoder(resp.Body) if err = dec.Decode(&d); err != nil {