Use git-lfs version of go-ntlm

The upstream of go-ntlm has archived its repository and is no longer
doing releases. Because this dependency is required for Git LFS, we've
created our own fork to ensure that the upstream repo doesn't disappear
on us. Use our own copy of go-ntlm within Git LFS.
This commit is contained in:
brian m. carlson 2019-04-01 19:00:38 +00:00
parent 141093398e
commit fe2fa6746b
No known key found for this signature in database
GPG Key ID: 2D0C9BC12F82B3A1
26 changed files with 13 additions and 13 deletions

2
go.mod

@ -1,10 +1,10 @@
module github.com/git-lfs/git-lfs
require (
github.com/ThomsonReutersEikon/go-ntlm v0.0.0-20151030004737-b00ec39bbdd0
github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858
github.com/git-lfs/gitobj v1.1.0
github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18
github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066
github.com/git-lfs/wildmatch v1.0.2
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/kr/pty v0.0.0-20150511174710-5cf931ef8f76

4
go.sum

@ -1,5 +1,3 @@
github.com/ThomsonReutersEikon/go-ntlm v0.0.0-20151030004737-b00ec39bbdd0 h1:iBnLwXNz+Mz2K6MndIM9a4sLBb+TouHB8s0tvx16s4s=
github.com/ThomsonReutersEikon/go-ntlm v0.0.0-20151030004737-b00ec39bbdd0/go.mod h1:0eFwySJYxbNw/r8cJ01IeztpJfwrgrmiLtYig80Yvrc=
github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858 h1:OZQyEhf4BviydsRdmK4ryeJHotDLd7vL1X8+nnxXkfk=
github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858/go.mod h1:976q2ETgjT2snVCf2ZaBnyBbVoPERGjUz+0sofzEfro=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@ -8,6 +6,8 @@ github.com/git-lfs/gitobj v1.1.0 h1:XRUyk5nKYTWiO8U4cokO5QeoNUNBL8LKS+jXxXZdCTA=
github.com/git-lfs/gitobj v1.1.0/go.mod h1:EdPNGHVxXe1jTuNXzZT1+CdJCuASoDSLPQuvNOo9nGM=
github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18 h1:7Th0eBA4rT8WJNiM1vppjaIv9W5WJinhpbCJvRJxloI=
github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18/go.mod h1:70O4NAtvWn1jW8V8V+OKrJJYcxDLTmIozfi2fmSz5SI=
github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066 h1:j7JwIEwLNQ/kBdKpHO3U1jjMXIPjSq7eCFvQIF3e8Fs=
github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066/go.mod h1:YnCP1lAyul0ITv9nT/OqXseZmGeaqvMVa2uvl8ssQvE=
github.com/git-lfs/wildmatch v1.0.2 h1:Bt8fjbL2OjfhSTsmLPXSalpXgX9twSIFSVvupY2IdbE=
github.com/git-lfs/wildmatch v1.0.2/go.mod h1:SdHAGnApDpnFYQ0vAxbniWR0sn7yLJ3QXo9RRfhn2ew=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=

@ -4,10 +4,10 @@ import (
"fmt"
"sync"
"github.com/ThomsonReutersEikon/go-ntlm/ntlm"
"github.com/git-lfs/git-lfs/creds"
"github.com/git-lfs/git-lfs/errors"
"github.com/git-lfs/git-lfs/lfshttp"
"github.com/git-lfs/go-ntlm/ntlm"
)
type Client struct {

@ -7,7 +7,7 @@ import (
"fmt"
"net/http"
"github.com/ThomsonReutersEikon/go-ntlm/ntlm"
"github.com/git-lfs/go-ntlm/ntlm"
)
func (c *Client) ntlmAuthenticateRequest(req *http.Request, creds *ntmlCredentials) (*http.Response, error) {

@ -10,9 +10,9 @@ import (
"sync/atomic"
"testing"
"github.com/ThomsonReutersEikon/go-ntlm/ntlm"
"github.com/git-lfs/git-lfs/creds"
"github.com/git-lfs/git-lfs/lfshttp"
"github.com/git-lfs/go-ntlm/ntlm"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

@ -65,7 +65,7 @@ export SKIPAPITESTCOMPILE=1
pushd src/github.com/git-lfs/%{name}
make test
go get github.com/ThomsonReutersEikon/go-ntlm/ntlm
go get github.com/git-lfs/go-ntlm/ntlm
make -C t PROVE_EXTRA_ARGS=-j4 test
popd

@ -34,7 +34,7 @@ import (
"sync"
"time"
"github.com/ThomsonReutersEikon/go-ntlm/ntlm"
"github.com/git-lfs/go-ntlm/ntlm"
)
var (

@ -10,7 +10,7 @@ import (
rc4P "crypto/rc4"
crc32P "hash/crc32"
md4P "github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4"
md4P "github.com/git-lfs/go-ntlm/ntlm/md4"
)
func md4(data []byte) []byte {

@ -75,7 +75,7 @@ type ServerSession interface {
GetUserInfo() (string, string, string)
SetMode(mode Mode)
SetServerChallenge(challege []byte)
SetServerChallenge(challenge []byte)
ProcessNegotiateMessage(*NegotiateMessage) error
GenerateChallengeMessage() (*ChallengeMessage, error)

6
vendor/modules.txt vendored

@ -1,6 +1,3 @@
# github.com/ThomsonReutersEikon/go-ntlm v0.0.0-20151030004737-b00ec39bbdd0
github.com/ThomsonReutersEikon/go-ntlm/ntlm
github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4
# github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858
github.com/alexbrainman/sspi
github.com/alexbrainman/sspi/ntlm
@ -13,6 +10,9 @@ github.com/git-lfs/gitobj/pack
github.com/git-lfs/gitobj/storage
# github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18
github.com/git-lfs/go-netrc/netrc
# github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066
github.com/git-lfs/go-ntlm/ntlm
github.com/git-lfs/go-ntlm/ntlm/md4
# github.com/git-lfs/wildmatch v1.0.2
github.com/git-lfs/wildmatch
# github.com/inconshreveable/mousetrap v1.0.0