Generate host acl correctly for * host

voyagermesh · Dec 28, 2017 · bea0796 · bea0796
1 parent e89ad35
commit bea0796
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/hack/docker/voyager/templates/http-frontend.cfg b/hack/docker/voyager/templates/http-frontend.cfg
@@ -73,10 +73,11 @@ frontend {{ .FrontendName }}
 	acl is_proxy_https hdr(X-Forwarded-Proto) https
 
 	{{ range $host := .Hosts }}
-	{{ if  and (or (eq $.Port 80) (eq $.Port 443)) ( or $.ForceMatchServicePort (not $.NodePort)) }}
-	{{ if $host.Host }}acl host_acl_{{ $host.Host | acl_name }} {{ $host.Host | host_name }}{{ end }}
+	{{ with $conditions := (host_acls $host.Host $.Port $.NodePort $.ForceMatchServicePort ) }}
+	{{ range $cond := $conditions }}
+	{{ if $cond }}acl host_acl_{{ $host.Host | acl_name }} {{ $cond }}{{ end }}
+	{{ end }}
 	{{ end }}
-	{{ if $host.Host }}acl host_acl_{{ $host.Host | acl_name }} {{ $host.Host | host_name }}{{ if and (not $.ForceMatchServicePort) $.NodePort }}:{{ $.NodePort }}{{ else }}:{{ $.Port }}{{ end }}{{ end }}
 	{{ range $path := $host.Paths }}
 	{{ if $path.Path }}acl url_acl_{{ $host.Host | acl_name }}_{{ $path.Path | acl_name }} path_beg {{ $path.Path }}{{ end }}
 	{{ if $path.SSLRedirect }}

diff --git a/pkg/haproxy/template.go b/pkg/haproxy/template.go
@@ -35,6 +35,36 @@ func HeaderName(v string) string {
 	return v[:index]
 }
 
+func HostACLs(host string, port, nodePort int, forceSvcPort bool) []string {
+	/*
+		{{ if  and (or (eq $.Port 80) (eq $.Port 443)) ( or $.ForceMatchServicePort (not $.NodePort)) }}
+		{{ if $host.Host }}acl host_acl_{{ $host.Host | acl_name }} {{ $host.Host | host_name }}{{ end }}
+		{{ end }}
+		{{ if $host.Host }}acl host_acl_{{ $host.Host | acl_name }} {{ $host.Host | host_name }}{{ if and (not $.ForceMatchServicePort) $.NodePort }}:{{ $.NodePort }}{{ else }}:{{ $.Port }}{{ end }}{{ end }}
+	*/
+	var conditions []string
+
+	if (port == 80 || port == 443) && forceSvcPort {
+		hostname := hostName(host)
+		if hostname != "" {
+			conditions = append(conditions, hostname)
+		}
+	}
+	if forceSvcPort && port > 0 {
+		hostname := hostName(fmt.Sprintf("host:%d", port))
+		if hostname != "" {
+			conditions = append(conditions, hostname)
+		}
+	}
+	if !forceSvcPort && nodePort > 0 {
+		hostname := hostName(fmt.Sprintf("host:%d", nodePort))
+		if hostname != "" {
+			conditions = append(conditions, hostname)
+		}
+	}
+	return conditions
+}
+
 func HostName(v string) string {
 	v = strings.TrimSpace(v)
 	if v == "" || v == `*` {
@@ -64,6 +94,7 @@ var (
 		"acl_name":     ACLName,
 		"header_name":  HeaderName,
 		"host_name":    HostName,
+		"host_acls":    HostACLs,
 		"backend_hash": BackendHash,
 	}