Style fixes from code review.
This commit is contained in:
parent
142ee7d313
commit
28ecab90f2
@ -36,9 +36,9 @@ func (credWrapper CredentialHelperWrapper) FillCreds() error {
|
||||
if creds == nil || len(creds) < 1 {
|
||||
errmsg := fmt.Sprintf("Git credentials for %s not found", credWrapper.Url)
|
||||
if err != nil {
|
||||
errmsg = errmsg + ":\n" + err.Error()
|
||||
errmsg = fmt.Sprintf("%s:\n%s", errmsg, err.Error())
|
||||
} else {
|
||||
errmsg = errmsg + "."
|
||||
errmsg = fmt.Sprintf("%s.", errmsg)
|
||||
}
|
||||
err = errors.New(errmsg)
|
||||
}
|
||||
@ -118,8 +118,7 @@ func (ctxt *CredentialHelperContext) GetCredentialHelper(helper CredentialHelper
|
||||
}
|
||||
|
||||
if helper != nil {
|
||||
result := CredentialHelperWrapper{CredentialHelper: helper, Input: input, Url: u}
|
||||
return result
|
||||
return CredentialHelperWrapper{CredentialHelper: helper, Input: input, Url: u}
|
||||
}
|
||||
|
||||
helpers := make([]CredentialHelper, 0, 4)
|
||||
@ -135,8 +134,7 @@ func (ctxt *CredentialHelperContext) GetCredentialHelper(helper CredentialHelper
|
||||
helpers = append(helpers, ctxt.askpassCredHelper)
|
||||
}
|
||||
}
|
||||
result := CredentialHelperWrapper{CredentialHelper: NewCredentialHelpers(append(helpers, ctxt.commandCredHelper)), Input: input, Url: u}
|
||||
return result
|
||||
return CredentialHelperWrapper{CredentialHelper: NewCredentialHelpers(append(helpers, ctxt.commandCredHelper)), Input: input, Url: u}
|
||||
}
|
||||
|
||||
// AskPassCredentialHelper implements the CredentialHelper type for GIT_ASKPASS
|
||||
|
@ -136,19 +136,16 @@ func (c *Client) getCreds(remote string, access Access, req *http.Request) (cred
|
||||
|
||||
if access.Mode() != NTLMAccess {
|
||||
if requestHasAuth(req) || access.Mode() == NoneAccess {
|
||||
helper := creds.CredentialHelperWrapper{CredentialHelper: creds.NullCreds, Input: nil, Url: nil, Creds: nil}
|
||||
return helper, nil
|
||||
return creds.CredentialHelperWrapper{CredentialHelper: creds.NullCreds, Input: nil, Url: nil, Creds: nil}, nil
|
||||
}
|
||||
|
||||
credsURL, err := getCredURLForAPI(ef, operation, remote, apiEndpoint, req)
|
||||
if err != nil {
|
||||
helper := creds.CredentialHelperWrapper{CredentialHelper: creds.NullCreds, Input: nil, Url: nil, Creds: nil}
|
||||
return helper, errors.Wrap(err, "creds")
|
||||
return creds.CredentialHelperWrapper{CredentialHelper: creds.NullCreds, Input: nil, Url: nil, Creds: nil}, errors.Wrap(err, "creds")
|
||||
}
|
||||
|
||||
if credsURL == nil {
|
||||
helper := creds.CredentialHelperWrapper{CredentialHelper: creds.NullCreds, Input: nil, Url: nil, Creds: nil}
|
||||
return helper, nil
|
||||
return creds.CredentialHelperWrapper{CredentialHelper: creds.NullCreds, Input: nil, Url: nil, Creds: nil}, nil
|
||||
}
|
||||
|
||||
credWrapper := c.getGitCredsWrapper(ef, req, credsURL)
|
||||
@ -164,8 +161,7 @@ func (c *Client) getCreds(remote string, access Access, req *http.Request) (cred
|
||||
|
||||
credsURL, err := url.Parse(apiEndpoint.Url)
|
||||
if err != nil {
|
||||
helper := creds.CredentialHelperWrapper{CredentialHelper: creds.NullCreds, Input: nil, Url: nil, Creds: nil}
|
||||
return helper, errors.Wrap(err, "creds")
|
||||
return creds.CredentialHelperWrapper{CredentialHelper: creds.NullCreds, Input: nil, Url: nil, Creds: nil}, errors.Wrap(err, "creds")
|
||||
}
|
||||
|
||||
// NTLM uses creds to create the session
|
||||
@ -174,8 +170,7 @@ func (c *Client) getCreds(remote string, access Access, req *http.Request) (cred
|
||||
}
|
||||
|
||||
func (c *Client) getGitCredsWrapper(ef EndpointFinder, req *http.Request, u *url.URL) creds.CredentialHelperWrapper {
|
||||
credWrapper := c.credContext.GetCredentialHelper(c.Credentials, u)
|
||||
return credWrapper
|
||||
return c.credContext.GetCredentialHelper(c.Credentials, u)
|
||||
}
|
||||
|
||||
func getCredURLForAPI(ef EndpointFinder, operation, remote string, apiEndpoint lfshttp.Endpoint, req *http.Request) (*url.URL, error) {
|
||||
|
@ -39,31 +39,34 @@ func (c *Client) ntlmReAuth(req *http.Request, credWrapper creds.CredentialHelpe
|
||||
return res, err
|
||||
}
|
||||
|
||||
// If SSPI succeeded, then we can move on.
|
||||
if res.StatusCode < 300 && res.StatusCode > 199 {
|
||||
return res, nil
|
||||
}
|
||||
|
||||
// If SSPI failed, then we need to try the normal.
|
||||
if res.StatusCode >= 300 || res.StatusCode < 199 {
|
||||
credWrapper.FillCreds()
|
||||
ntmlCreds, err := ntlmGetCredentials(credWrapper.Creds)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
credWrapper.FillCreds()
|
||||
ntmlCreds, err := ntlmGetCredentials(credWrapper.Creds)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
res, err := c.ntlmAuthenticateRequest(req, ntmlCreds)
|
||||
if err != nil && !errors.IsAuthError(err) {
|
||||
return res, err
|
||||
}
|
||||
res, err := c.ntlmAuthenticateRequest(req, ntmlCreds)
|
||||
if err != nil && !errors.IsAuthError(err) {
|
||||
return res, err
|
||||
}
|
||||
|
||||
switch res.StatusCode {
|
||||
case 401:
|
||||
credWrapper.CredentialHelper.Reject(credWrapper.Creds)
|
||||
if retry {
|
||||
return c.ntlmReAuth(req, credWrapper, false)
|
||||
}
|
||||
case 403:
|
||||
credWrapper.CredentialHelper.Reject(credWrapper.Creds)
|
||||
default:
|
||||
if res.StatusCode < 300 && res.StatusCode > 199 {
|
||||
credWrapper.CredentialHelper.Approve(credWrapper.Creds)
|
||||
}
|
||||
switch res.StatusCode {
|
||||
case 401:
|
||||
credWrapper.CredentialHelper.Reject(credWrapper.Creds)
|
||||
if retry {
|
||||
return c.ntlmReAuth(req, credWrapper, false)
|
||||
}
|
||||
case 403:
|
||||
credWrapper.CredentialHelper.Reject(credWrapper.Creds)
|
||||
default:
|
||||
if res.StatusCode < 300 && res.StatusCode > 199 {
|
||||
credWrapper.CredentialHelper.Approve(credWrapper.Creds)
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user