lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only get the access type for the auth url once

Browse Source
This commit is contained in:
risk danger olson 2016-12-20 11:53:00 -07:00
parent 8009d17bbc
commit dd3a544916
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lfsapi/auth.go
View File

@ -35,7 +35,7 @@ func (c *Client) DoWithAuth(remote string, req *http.Request) (*http.Response, e
ef = defaultEndpointFinder
}
creds, credsURL, err := getCreds(credHelper, netrcFinder, ef, remote, req)
creds, credsURL, access, err := getCreds(credHelper, netrcFinder, ef, remote, req)
if err != nil {
return nil, err
}
@ -43,18 +43,13 @@ func (c *Client) DoWithAuth(remote string, req *http.Request) (*http.Response, e
res, err := c.Do(req)
if err != nil {
if errors.IsAuthError(err) {
var existingAccess Access
access := getAuthAccess(res)
if credsURL != nil {
urlForAccess := credsURL.String()
existingAccess = c.Endpoints.AccessFor(urlForAccess)
if access != existingAccess {
c.Endpoints.SetAccess(urlForAccess, access)
}
newAccess := getAuthAccess(res)
if credsURL != nil && newAccess != access {
c.Endpoints.SetAccess(credsURL.String(), newAccess)
}
if existingAccess == NoneAccess || creds != nil {
tracerx.Printf("api: http response indicates %q authentication. Resubmitting...", access)
if access == NoneAccess || creds != nil {
tracerx.Printf("api: http response indicates %q authentication. Resubmitting...", newAccess)
req.Header.Del("Authorization")
if creds != nil {
credHelper.Reject(creds)
@ -82,31 +77,32 @@ func (c *Client) DoWithAuth(remote string, req *http.Request) (*http.Response, e
return res, err
}
func getCreds(credHelper CredentialHelper, netrcFinder NetrcFinder, ef EndpointFinder, remote string, req *http.Request) (Creds, *url.URL, error) {
func getCreds(credHelper CredentialHelper, netrcFinder NetrcFinder, ef EndpointFinder, remote string, req *http.Request) (Creds, *url.URL, Access, error) {
if skipCreds(ef, req) {
return nil, nil, nil
return nil, nil, emptyAccess, nil
}
operation := getReqOperation(req)
apiEndpoint := ef.Endpoint(operation, remote)
credsUrl, err := getCredURLForAPI(ef, operation, remote, apiEndpoint, req)
access := ef.AccessFor(apiEndpoint.Url)
credsUrl, err := getCredURLForAPI(ef, operation, remote, access, apiEndpoint, req)
if err != nil {
return nil, nil, errors.Wrap(err, "creds")
return nil, nil, access, errors.Wrap(err, "creds")
}
if credsUrl == nil {
return nil, nil, nil
return nil, nil, access, nil
}
if setAuthFromNetrc(netrcFinder, req) {
return nil, credsUrl, nil
return nil, credsUrl, access, nil
}
if ef.AccessFor(credsUrl.String()) == NoneAccess {
return nil, credsUrl, nil
return nil, credsUrl, access, nil
}
creds, err := fillCredentials(credHelper, ef, req, credsUrl)
return creds, credsUrl, err
return creds, credsUrl, access, err
}
func fillCredentials(credHelper CredentialHelper, ef EndpointFinder, req *http.Request, u *url.URL) (Creds, error) {
@ -160,7 +156,7 @@ func setAuthFromNetrc(netrcFinder NetrcFinder, req *http.Request) bool {
return false
}
func getCredURLForAPI(ef EndpointFinder, operation, remote string, e Endpoint, req *http.Request) (*url.URL, error) {
func getCredURLForAPI(ef EndpointFinder, operation, remote string, access Access, e Endpoint, req *http.Request) (*url.URL, error) {
apiUrl, err := url.Parse(e.Url)
if err != nil {
return nil, err
@ -173,7 +169,7 @@ func getCredURLForAPI(ef EndpointFinder, operation, remote string, e Endpoint, r
return req.URL, nil
}
if setRequestAuthFromUrl(ef, req, e, apiUrl) {
if setRequestAuthFromUrl(req, access, apiUrl) {
return nil, nil
}
@ -188,7 +184,7 @@ func getCredURLForAPI(ef EndpointFinder, operation, remote string, e Endpoint, r
if gitRemoteUrl.Scheme == apiUrl.Scheme &&
gitRemoteUrl.Host == apiUrl.Host {
if setRequestAuthFromUrl(ef, req, e, gitRemoteUrl) {
if setRequestAuthFromUrl(req, access, gitRemoteUrl) {
return nil, nil
}
@ -212,8 +208,8 @@ func skipCreds(ef EndpointFinder, req *http.Request) bool {
return len(req.URL.Query().Get("token")) > 0
}
func setRequestAuthFromUrl(ef EndpointFinder, req *http.Request, apiEndpoint Endpoint, u *url.URL) bool {
if ef.AccessFor(apiEndpoint.Url) == NTLMAccess || u.User == nil {
func setRequestAuthFromUrl(req *http.Request, access Access, u *url.URL) bool {
if access == NTLMAccess || u.User == nil {
return false
}

2
lfsapi/auth_test.go
View File

@ -355,7 +355,7 @@ func TestGetCredentials(t *testing.T) {
req.Header.Set(key, value)
}
creds, _, err := getCreds(credHelper, &noFinder{}, ef, check.Remote, req)
creds, _, _, err := getCreds(credHelper, &noFinder{}, ef, check.Remote, req)
if err != nil {
t.Errorf("[%s] %s", check.Desc, err)
continue