Skip to content

Api/clients #1787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
technoweenie merged 8 commits into from
Dec 20, 2016
Merged

Api/clients #1787

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0d6f873
build http clients per host
technoweenie Dec 20, 2016
1ba67ca
lfsapi: add proxy support
technoweenie Dec 20, 2016
c6f56d7
Set the timeout values from the given gitEnv
technoweenie Dec 20, 2016
8009d17
lfsapi: add custom ssl cert support
technoweenie Dec 20, 2016
dd3a544
Only get the access type for the auth url once
technoweenie Dec 20, 2016
21c9759
add a spot for future ntlm support
technoweenie Dec 20, 2016
272e2d2
add ntlm file
technoweenie Dec 20, 2016
c1dbf53
fix merge
technoweenie Dec 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add a spot for future ntlm support
  • Loading branch information
@technoweenie
technoweenie committed Dec 20, 2016
commit 21c9759dc8f0b411a34cfd50b88ce7d3b2fe7bb1
9 changes: 8 additions & 1 deletion lfsapi/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func (c *Client) DoWithAuth(remote string, req *http.Request) (*http.Response, e
return nil, err
}

res, err := c.Do(req)
res, err := c.doWithCreds(req, creds, credsURL, access)
if err != nil {
if errors.IsAuthError(err) {
newAccess := getAuthAccess(res)
Expand Down Expand Up @@ -77,6 +77,13 @@ func (c *Client) DoWithAuth(remote string, req *http.Request) (*http.Response, e
return res, err
}

func (c *Client) doWithCreds(req *http.Request, creds Creds, credsURL *url.URL, access Access) (*http.Response, error) {
if access == NTLMAccess {
return c.doWithNTLM(req, creds, credsURL)
}
return c.Do(req)
}

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, emptyAccess, nil
Expand Down