Merge pull request #489 from tucksaun/fix/open-local-wildcard

fabpot · web-flow · commit 570fd66ffc17 · 2024-06-14T19:54:35.000+02:00
Don't try to use a wildcard domain in `open:local`
diff --git a/commands/openers.go b/commands/openers.go
@@ -54,7 +54,7 @@ var projectLocalOpenCmd = &console.Command{
 		}
 		host := fmt.Sprintf("127.0.0.1:%d", pidFile.Port)
 		if proxyConf, err := proxy.Load(util.GetHomeDir()); err == nil {
-			domains := proxyConf.GetDomains(projectDir)
+			domains := proxyConf.GetReachableDomains(projectDir)
 			if len(domains) > 0 {
 				host = domains[0]
 			}
diff --git a/local/proxy/config.go b/local/proxy/config.go
@@ -158,6 +158,23 @@ func (c *Config) GetDomains(dir string) []string {
 	return domains
 }
 
+func (c *Config) GetReachableDomains(dir string) []string {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	domains := []string{}
+	for domain, d := range c.domains {
+		// domain is defined using a wildcard: we don't know the exact domain,
+		// so we can't use it directly as-is to reach the project
+		if strings.Contains(domain, "*") {
+			continue
+		}
+		if d == dir {
+			domains = append(domains, domain+"."+c.TLD)
+		}
+	}
+	return domains
+}
+
 func (c *Config) SetDomains(domains map[string]string) {
 	c.mu.Lock()
 	c.domains = domains
diff --git a/local/proxy/config_test.go b/local/proxy/config_test.go
@@ -43,3 +43,16 @@ func (s *ProxySuite) TestGetDir(c *C) {
 	c.Assert(p.GetDir("foo.symfony.com"), Equals, "any_symfony_com")
 	c.Assert(p.GetDir("foo.live.symfony.com"), Equals, "any_live_symfony_com")
 }
+
+func (s *ProxySuite) TestGetReachableDomains(c *C) {
+	p := &Config{
+		TLD: "wip",
+		domains: map[string]string{
+			"*.symfony":        "symfony_com",
+			"symfony":          "symfony_com",
+			"custom.*.symfony": "symfony_com",
+			"*.live.symfony":   "symfony_com",
+		},
+	}
+	c.Assert(p.GetReachableDomains("symfony_com"), DeepEquals, []string{"symfony.wip"})
+}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ var projectLocalOpenCmd = &console.Command{`
`54`	`54`	`}`
`55`	`55`	`host := fmt.Sprintf("127.0.0.1:%d", pidFile.Port)`
`56`	`56`	`if proxyConf, err := proxy.Load(util.GetHomeDir()); err == nil {`
`57`		`- domains := proxyConf.GetDomains(projectDir)`
	`57`	`+ domains := proxyConf.GetReachableDomains(projectDir)`
`58`	`58`	`if len(domains) > 0 {`
`59`	`59`	`host = domains[0]`
`60`	`60`	`}`