From 7284d8628ac7fdca3b7ed2f3e4479aefd992d507 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 29 Sep 2015 09:14:14 -0400 Subject: Fixing some SSO errors --- api/user.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/api/user.go b/api/user.go index 9718d534e..4240a795e 100644 --- a/api/user.go +++ b/api/user.go @@ -1420,7 +1420,7 @@ func GetAuthorizationCode(c *Context, w http.ResponseWriter, r *http.Request, te func AuthorizeOAuthUser(service, code, state, redirectUri string) (io.ReadCloser, *model.Team, *model.AppError) { sso := utils.Cfg.GetSSOService(service) - if sso != nil && !sso.Enable { + if sso == nil || !sso.Enable { return nil, nil, model.NewAppError("AuthorizeOAuthUser", "Unsupported OAuth service provider", "service="+service) } @@ -1462,6 +1462,9 @@ func AuthorizeOAuthUser(service, code, state, redirectUri string) (io.ReadCloser return nil, nil, model.NewAppError("AuthorizeOAuthUser", "Token request failed", err.Error()) } else { ar = model.AccessResponseFromJson(resp.Body) + if ar == nil { + return nil, nil, model.NewAppError("AuthorizeOAuthUser", "Bad response from token request", "") + } } if strings.ToLower(ar.TokenType) != model.ACCESS_TOKEN_TYPE { -- cgit v1.2.3-1-g7c22