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

remove some unnecessary helper funcs

Browse Source
This commit is contained in:
risk danger olson 2015-11-06 10:20:27 -08:00
parent a51a65542d
commit 0f54f9a91a
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lfs/ntlm.go
View File

@ -41,8 +41,7 @@ func DoNTLMRequest(request *http.Request, retry bool) (*http.Response, error) {
return nil, err
}
res, err := InitHandShake(handReq)
res, err := Config.HttpClient().Do(handReq)
if err != nil && res == nil {
return nil, err
}
@ -87,10 +86,6 @@ func DoNTLMRequest(request *http.Request, retry bool) (*http.Response, error) {
return res, nil
}
func InitHandShake(request *http.Request) (*http.Response, error) {
return Config.HttpClient().Do(request)
}
func negotiate(request *http.Request, message string) ([]byte, error) {
request.Header.Add("Authorization", message)
res, err := Config.HttpClient().Do(request)
@ -113,7 +108,6 @@ func negotiate(request *http.Request, message string) ([]byte, error) {
func challenge(request *http.Request, challengeBytes []byte, creds Creds) (*http.Response, error) {
challenge, err := ntlm.ParseChallengeMessage(challengeBytes)
if err != nil {
return nil, err
}
@ -125,13 +119,12 @@ func challenge(request *http.Request, challengeBytes []byte, creds Creds) (*http
session.ProcessChallengeMessage(challenge)
authenticate, err := session.GenerateAuthenticateMessage()
if err != nil {
return nil, err
}
authenticateMessage := concatS("NTLM ", base64.StdEncoding.EncodeToString(authenticate.Bytes()))
request.Header.Add("Authorization", authenticateMessage)
authMsg := base64.StdEncoding.EncodeToString(authenticate.Bytes())
request.Header.Add("Authorization", "NTLM "+authMsg)
return Config.HttpClient().Do(request)
}
@ -193,21 +186,6 @@ func getNegotiateMessage() string {
return "NTLM TlRMTVNTUAABAAAAB7IIogwADAAzAAAACwALACgAAAAKAAAoAAAAD1dJTExISS1NQUlOTk9SVEhBTUVSSUNB"
}
func concatS(ar ...string) string {
var buffer bytes.Buffer
for _, s := range ar {
buffer.WriteString(s)
}
return buffer.String()
}
func concat(ar ...[]byte) []byte {
return bytes.Join(ar, nil)
}
type myReader struct {
*bytes.Buffer
}