Unconditionally resolve "ssh.github.com" to "github.com"

mislav · mislav · commit c240ab9137db · 2021-12-20T16:09:46.000+01:00
Previously, only "github.com" mapped to "ssh.github.com" via ssh config
was treated as "github.com". Now, any "ssh.github.com" host is treated
as "github.com", even if it was initially aliased as something else in
the user's ssh hostname mappings.
diff --git a/git/ssh_config.go b/git/ssh_config.go
@@ -30,9 +30,8 @@ func (m SSHAliasMap) Translator() func(*url.URL) *url.URL {
 		if !ok {
 			return u
 		}
-		// FIXME: cleanup domain logic
-		if strings.EqualFold(u.Hostname(), "github.com") && strings.EqualFold(resolvedHost, "ssh.github.com") {
-			return u
+		if strings.EqualFold(resolvedHost, "ssh.github.com") {
+			resolvedHost = "github.com"
 		}
 		newURL, _ := url.Parse(u.String())
 		newURL.Host = resolvedHost
diff --git a/git/ssh_config_test.go b/git/ssh_config_test.go
@@ -128,12 +128,14 @@ func Test_Translator(t *testing.T) {
 	m := SSHAliasMap{
 		"gh":         "github.com",
 		"github.com": "ssh.github.com",
+		"my.gh.com":  "ssh.github.com",
 	}
 	tr := m.Translator()
 
 	cases := [][]string{
 		{"ssh://gh/o/r", "ssh://github.com/o/r"},
 		{"ssh://github.com/o/r", "ssh://github.com/o/r"},
+		{"ssh://my.gh.com", "ssh://github.com"},
 		{"https://gh/o/r", "https://gh/o/r"},
 	}
 	for _, c := range cases {

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,8 @@ func (m SSHAliasMap) Translator() func(url.URL) url.URL {`
`30`	`30`	`if !ok {`
`31`	`31`	`return u`
`32`	`32`	`}`
`33`		`- // FIXME: cleanup domain logic`
`34`		`- if strings.EqualFold(u.Hostname(), "github.com") && strings.EqualFold(resolvedHost, "ssh.github.com") {`
`35`		`- return u`
	`33`	`+ if strings.EqualFold(resolvedHost, "ssh.github.com") {`
	`34`	`+ resolvedHost = "github.com"`
`36`	`35`	`}`
`37`	`36`	`newURL, _ := url.Parse(u.String())`
`38`	`37`	`newURL.Host = resolvedHost`
Original file line number	Diff line number	Diff line change
`@@ -128,12 +128,14 @@ func Test_Translator(t *testing.T) {`
`128`	`128`	`m := SSHAliasMap{`
`129`	`129`	`"gh": "github.com",`
`130`	`130`	`"github.com": "ssh.github.com",`
	`131`	`+ "my.gh.com": "ssh.github.com",`
`131`	`132`	`}`
`132`	`133`	`tr := m.Translator()`
`133`	`134`
`134`	`135`	`cases := [][]string{`
`135`	`136`	`{"ssh://gh/o/r", "ssh://github.com/o/r"},`
`136`	`137`	`{"ssh://github.com/o/r", "ssh://github.com/o/r"},`
	`138`	`+ {"ssh://my.gh.com", "ssh://github.com"},`
`137`	`139`	`{"https://gh/o/r", "https://gh/o/r"},`
`138`	`140`	`}`
`139`	`141`	`for _, c := range cases {`