peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Add many error checks around authorization
All checks were successful
the build was successful
Details

Browse Source
This commit is contained in:
Peter Stuifzand 2018-12-27 19:28:51 +01:00
parent dd14b103e3
commit 4708c89c25
Signed by: peter
GPG Key ID: 374322D56E5209E8
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/indieauth/auth.go
View File

@ -29,6 +29,8 @@ type TokenResponse struct {
AccessToken string `json:"access_token"` AccessToken string `json:"access_token"`
TokenType string `json:"token_type"` TokenType string `json:"token_type"`
Scope string `json:"scope"` Scope string `json:"scope"`
Error string `json:"error"`
ErrorDescription string `json:"error_description"`
} }
func GetEndpoints(me *url.URL) (Endpoints, error) { func GetEndpoints(me *url.URL) (Endpoints, error) {
@ -156,6 +158,8 @@ func Authorize(me *url.URL, endpoints Endpoints, clientID, scope string) (TokenR
if err != nil { if err != nil {
return tokenResponse, err return tokenResponse, err
} }
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
req.Header.Add("Accept", "application/json")
res, err := http.DefaultClient.Do(req) res, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {
@ -173,6 +177,9 @@ func Authorize(me *url.URL, endpoints Endpoints, clientID, scope string) (TokenR
if err != nil { if err != nil {
return tokenResponse, fmt.Errorf("error while parsing response body with content-type %s as json: %s", res.Header.Get("content-type"), err) return tokenResponse, fmt.Errorf("error while parsing response body with content-type %s as json: %s", res.Header.Get("content-type"), err)
} }
if tokenResponse.Me == "" && tokenResponse.Error != "" {
return tokenResponse, fmt.Errorf("received error from endpoint: %s, %s", tokenResponse.Error, tokenResponse.ErrorDescription)
}
} else if strings.HasPrefix(res.Header.Get("content-type"), "application/x-www-form-urlencoded") { } else if strings.HasPrefix(res.Header.Get("content-type"), "application/x-www-form-urlencoded") {
body, err := ioutil.ReadAll(res.Body) body, err := ioutil.ReadAll(res.Body)
if err != nil { if err != nil {
@ -181,9 +188,14 @@ func Authorize(me *url.URL, endpoints Endpoints, clientID, scope string) (TokenR
values, err := url.ParseQuery(string(body)) values, err := url.ParseQuery(string(body))
if err != nil { if err != nil {
return tokenResponse, fmt.Errorf("error while parsing response body with content-type %s as application/x-www-form-urlencoded: %s", res.Header.Get("content-type"), err) return tokenResponse, fmt.Errorf("error while parsing response body with content-type %s as application/x-www-form-urlencoded: %s\nbody was: %q\n", res.Header.Get("content-type"), err, body)
} }
if values.Get("me") == "" {
if errTxt := values.Get("error"); errTxt != "" {
return tokenResponse, fmt.Errorf("received error from endpoint: %s, %s", errTxt, values.Get("error_description"))
}
}
tokenResponse.Me = values.Get("me") tokenResponse.Me = values.Get("me")
tokenResponse.AccessToken = values.Get("token") tokenResponse.AccessToken = values.Get("token")
tokenResponse.TokenType = values.Get("token_type") tokenResponse.TokenType = values.Get("token_type")