krombel/oauth2
1
0
Fork 0
forked from remote/oauth2
Code Pull Requests 1 Activity

google: manual testing fixes

Browse Source 
I found some errors while manually testing service account impersonation on Azure.  This PR includes the fixes that I made.

Change-Id: Ia2b194be6c9a7c843e615f9789c8f8203bcbc151
GitHub-Last-Rev: 5690716363
GitHub-Pull-Request: golang/oauth2#475
Reviewed-on: https://go-review.googlesource.com/c/oauth2/+/291209
Reviewed-by: Cody Oss <codyoss@google.com>
Trust: Cody Oss <codyoss@google.com>
Trust: Tyler Bui-Palsulich <tbp@google.com>
Run-TryBot: Cody Oss <codyoss@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
This commit is contained in:
Patrick Jones
2021-02-12 20:04:54 +00:00
committed by Cody Oss
parent 66670185b0
commit 16ff1888fd
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
google/internal/externalaccount/urlcredsource.go
View File

@@ -39,15 +39,18 @@ func (cs urlCredentialSource) subjectToken() (string, error) {
}
defer resp.Body.Close()
tokenBytes, err := ioutil.ReadAll(io.LimitReader(resp.Body, 1<<20))
respBody, err := ioutil.ReadAll(io.LimitReader(resp.Body, 1<<20))
if err != nil {
return "", fmt.Errorf("oauth2/google: invalid body in subject token URL query: %v", err)
}
if c := resp.StatusCode; c < 200 || c > 299 {
return "", fmt.Errorf("oauth2/google: status code %d: %s", c, respBody)
}
switch cs.Format.Type {
case "json":
jsonData := make(map[string]interface{})
err = json.Unmarshal(tokenBytes, &jsonData)
err = json.Unmarshal(respBody, &jsonData)
if err != nil {
return "", fmt.Errorf("oauth2/google: failed to unmarshal subject token file: %v", err)
}
@@ -61,9 +64,9 @@ func (cs urlCredentialSource) subjectToken() (string, error) {
}
return token, nil
case "text":
return string(tokenBytes), nil
return string(respBody), nil
case "":
return string(tokenBytes), nil
return string(respBody), nil
default:
return "", errors.New("oauth2/google: invalid credential_source file format type")
}