netrc: consider same machine may have different login names

howardlyliao · howardlyliao · commit ad6b1878ded1 · 2021-11-04T17:31:37.000+08:00
diff --git a/config/netrc.go b/config/netrc.go
@@ -8,12 +8,12 @@ import (
 )
 
 type netrcfinder interface {
-	FindMachine(string) *netrc.Machine
+	FindMachine(string, string) *netrc.Machine
 }
 
 type noNetrc struct{}
 
-func (n *noNetrc) FindMachine(host string) *netrc.Machine {
+func (n *noNetrc) FindMachine(host string, loginName string) *netrc.Machine {
 	return nil
 }
 
diff --git a/creds/netrc.go b/creds/netrc.go
@@ -13,7 +13,7 @@ import (
 )
 
 type NetrcFinder interface {
-	FindMachine(string) *netrc.Machine
+	FindMachine(string, string) *netrc.Machine
 }
 
 func ParseNetrc(osEnv config.Environment) (NetrcFinder, string, error) {
@@ -33,7 +33,7 @@ func ParseNetrc(osEnv config.Environment) (NetrcFinder, string, error) {
 
 type noFinder struct{}
 
-func (f *noFinder) FindMachine(host string) *netrc.Machine {
+func (f *noFinder) FindMachine(host string, loginName string) *netrc.Machine {
 	return nil
 }
 
@@ -72,7 +72,7 @@ func (c *netrcCredentialHelper) Fill(what Creds) (Creds, error) {
 	if c.skip[host] {
 		return nil, credHelperNoOp
 	}
-	if machine := c.netrcFinder.FindMachine(host); machine != nil {
+	if machine := c.netrcFinder.FindMachine(host, what["username"]); machine != nil {
 		creds := make(Creds)
 		creds["username"] = machine.Login
 		creds["password"] = machine.Password
@@ -81,8 +81,8 @@ func (c *netrcCredentialHelper) Fill(what Creds) (Creds, error) {
 		creds["scheme"] = what["scheme"]
 		creds["path"] = what["path"]
 		creds["source"] = "netrc"
-		tracerx.Printf("netrc: git credential fill (%q, %q, %q)",
-			what["protocol"], what["host"], what["path"])
+		tracerx.Printf("netrc: git credential fill (%q, %q, %q, %q)",
+			what["protocol"], what["host"], machine.Login, what["path"])
 		return creds, nil
 	}
 
diff --git a/creds/netrc_test.go b/creds/netrc_test.go
@@ -74,7 +74,7 @@ func TestNetrcWithBadHost(t *testing.T) {
 
 type fakeNetrc struct{}
 
-func (n *fakeNetrc) FindMachine(host string) *netrc.Machine {
+func (n *fakeNetrc) FindMachine(host string, loginName string) *netrc.Machine {
 	if strings.Contains(host, "netrc") {
 		return &netrc.Machine{Login: "abc", Password: "def"}
 	}
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/avast/retry-go v2.4.2+incompatible
 	github.com/dpotapov/go-spnego v0.0.0-20210315154721-298b63a54430
 	github.com/git-lfs/gitobj/v2 v2.0.2
-	github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18
+	github.com/git-lfs/go-netrc v0.0.0-20210914205454-f0c862dd687a
 	github.com/git-lfs/pktline v0.0.0-20210330133718-06e9096e2825
 	github.com/git-lfs/wildmatch/v2 v2.0.1
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
diff --git a/go.sum b/go.sum
@@ -11,6 +11,8 @@ github.com/git-lfs/gitobj/v2 v2.0.2 h1:p8rWlhEyiSsC+4Qc+EdufySatf8sDtvJIrHAHgf7A
 github.com/git-lfs/gitobj/v2 v2.0.2/go.mod h1:q6aqxl6Uu3gWsip5GEKpw+7459F97er8COmU45ncAxw=
 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-netrc v0.0.0-20210914205454-f0c862dd687a h1:6pskVZacdMUL93pCpMAYnMDLjH1yDFhssPYGe32sjdk=
+github.com/git-lfs/go-netrc v0.0.0-20210914205454-f0c862dd687a/go.mod h1:70O4NAtvWn1jW8V8V+OKrJJYcxDLTmIozfi2fmSz5SI=
 github.com/git-lfs/pktline v0.0.0-20210330133718-06e9096e2825 h1:riQhgheTL7tMF4d5raz9t3+IzoR1i1wqxE1kZC6dY+U=
 github.com/git-lfs/pktline v0.0.0-20210330133718-06e9096e2825/go.mod h1:fenKRzpXDjNpsIBhuhUzvjCKlDjKam0boRAenTE0Q6A=
 github.com/git-lfs/wildmatch/v2 v2.0.1 h1:Ds+aobrV5bK0wStILUOn9irllPyf9qrFETbKzwzoER8=
diff --git a/vendor/github.com/git-lfs/go-netrc/netrc/netrc.go b/vendor/github.com/git-lfs/go-netrc/netrc/netrc.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -13,7 +13,7 @@ github.com/git-lfs/gitobj/v2
 github.com/git-lfs/gitobj/v2/errors
 github.com/git-lfs/gitobj/v2/pack
 github.com/git-lfs/gitobj/v2/storage
-# github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18
+# github.com/git-lfs/go-netrc v0.0.0-20210914205454-f0c862dd687a
 github.com/git-lfs/go-netrc/netrc
 # github.com/git-lfs/pktline v0.0.0-20210330133718-06e9096e2825
 github.com/git-lfs/pktline

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type netrcfinder interface {`
`11`		`- FindMachine(string) *netrc.Machine`
	`11`	`+ FindMachine(string, string) *netrc.Machine`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`type noNetrc struct{}`
`15`	`15`
`16`		`-func (n noNetrc) FindMachine(host string) netrc.Machine {`
	`16`	`+func (n noNetrc) FindMachine(host string, loginName string) netrc.Machine {`
`17`	`17`	`return nil`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`type NetrcFinder interface {`
`16`		`- FindMachine(string) *netrc.Machine`
	`16`	`+ FindMachine(string, string) *netrc.Machine`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`func ParseNetrc(osEnv config.Environment) (NetrcFinder, string, error) {`
`@@ -33,7 +33,7 @@ func ParseNetrc(osEnv config.Environment) (NetrcFinder, string, error) {`
`33`	`33`
`34`	`34`	`type noFinder struct{}`
`35`	`35`
`36`		`-func (f noFinder) FindMachine(host string) netrc.Machine {`
	`36`	`+func (f noFinder) FindMachine(host string, loginName string) netrc.Machine {`
`37`	`37`	`return nil`
`38`	`38`	`}`
`39`	`39`
`@@ -72,7 +72,7 @@ func (c *netrcCredentialHelper) Fill(what Creds) (Creds, error) {`
`72`	`72`	`if c.skip[host] {`
`73`	`73`	`return nil, credHelperNoOp`
`74`	`74`	`}`
`75`		`- if machine := c.netrcFinder.FindMachine(host); machine != nil {`
	`75`	`+ if machine := c.netrcFinder.FindMachine(host, what["username"]); machine != nil {`
`76`	`76`	`creds := make(Creds)`
`77`	`77`	`creds["username"] = machine.Login`
`78`	`78`	`creds["password"] = machine.Password`
`@@ -81,8 +81,8 @@ func (c *netrcCredentialHelper) Fill(what Creds) (Creds, error) {`
`81`	`81`	`creds["scheme"] = what["scheme"]`
`82`	`82`	`creds["path"] = what["path"]`
`83`	`83`	`creds["source"] = "netrc"`
`84`		`- tracerx.Printf("netrc: git credential fill (%q, %q, %q)",`
`85`		`- what["protocol"], what["host"], what["path"])`
	`84`	`+ tracerx.Printf("netrc: git credential fill (%q, %q, %q, %q)",`
	`85`	`+ what["protocol"], what["host"], machine.Login, what["path"])`
`86`	`86`	`return creds, nil`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func TestNetrcWithBadHost(t *testing.T) {`
`74`	`74`
`75`	`75`	`type fakeNetrc struct{}`
`76`	`76`
`77`		`-func (n fakeNetrc) FindMachine(host string) netrc.Machine {`
	`77`	`+func (n fakeNetrc) FindMachine(host string, loginName string) netrc.Machine {`
`78`	`78`	`if strings.Contains(host, "netrc") {`
`79`	`79`	`return &netrc.Machine{Login: "abc", Password: "def"}`
`80`	`80`	`}`