Fixup server based consideration for multiple hosts validation #59

config/runtime/server.go

@@ -296,8 +296,18 @@ func validatePortHosts(conf *config.Gateway, configuredPort int) error {
 	// validate the format, validating for a valid host or port is out of scope.
 	validFormat := regexp.MustCompile(`^([a-z0-9.-]+|\*)(:\*|:\d{1,5})?$`)
 
-	portMap := map[int]string{}
+	type hosts map[string]bool
+	type ports map[int]hosts
+
+	portMap := make(ports)
+	isHostsMandatory := len(conf.Server) > 1
+
 	for _, srv := range conf.Server {
+		if isHostsMandatory && len(srv.Hosts) == 0 {
+			return fmt.Errorf("hosts attribute is mandatory for multiple servers: %q", srv.Name)
+		}
+
+		srvPortMap := make(ports)
 		for _, host := range srv.Hosts {
 			if !validFormat.MatchString(host) {
 				return fmt.Errorf("host format is invalid: %q", host)
@@ -308,11 +318,27 @@ func validatePortHosts(conf *config.Gateway, configuredPort int) error {
 				return err
 			}
 
-			if h, ok := portMap[po]; ok && h == ho {
-				return fmt.Errorf("conflict: host %q already defined for port: %d", ho, po)
+			if _, ok := srvPortMap[po]; !ok {
+				srvPortMap[po] = make(hosts)
 			}
 
-			portMap[po] = ho
+			srvPortMap[po][ho] = true
+		}
+
+		// srvPortsMap contains all unique host port combinations
+		// of current server and should not exist multiple.
+		for po, ho := range srvPortMap {
+			if _, ok := portMap[po]; !ok {
+				portMap[po] = make(hosts)
+			}
+
+			for h := range ho {
+				if _, ok := portMap[po][h]; ok {
+					return fmt.Errorf("conflict: host %q already defined for port: %d", h, po)
+				}
+
+				portMap[po][h] = true
+			}
 		}
 	}
 

config/runtime/server_internal_test.go

@@ -55,7 +55,7 @@ func TestServer_validatePortHosts(t *testing.T) {
 					},
 				}, 8080,
 			},
-			true,
+			false,
 		},
 		{
 			"Same host/port in two servers with *",
@@ -86,8 +86,8 @@ func TestServer_validatePortHosts(t *testing.T) {
 			args{
 				&config.Gateway{
 					Server: []*config.Server{
-						{Hosts: []string{"example.com"}},
-						{Hosts: []string{"example.com"}},
+						{Hosts: []string{"example.com", "couper.io"}},
+						{Hosts: []string{"example.com", "couper.io"}},
 					},
 				}, 8080,
 			},
@@ -105,6 +105,18 @@ func TestServer_validatePortHosts(t *testing.T) {
 			},
 			true,
 		},
+		{
+			"Same port /w different host in two servers",
+			args{
+				&config.Gateway{
+					Server: []*config.Server{
+						{Hosts: []string{"*", "example.com:9090"}},
+						{Hosts: []string{"couper.io:9090"}},
+					},
+				}, 8080,
+			},
+			false,
+		},
 		{
 			"Host is mandatory for multiple servers",
 			args{

server/mux.go

@@ -178,7 +178,7 @@ func (m *Mux) FindHandler(req *http.Request) http.Handler {
 
 func (m *Mux) match(root *pathpattern.Node, req *http.Request) (*pathpattern.Node, []string) {
 	matchPath := req.Method + " " + req.URL.Path
-	// no hosts are configured, lookup /wo hostPath first
+	// no hosts are configured, lookup w/o hostPath first
 	node, paramValues := root.Match(matchPath)
 	if node == nil {
 		hostPath := pathpattern.PathFromHost(req.Host, false)