Skip to content
Permalink
Browse files
fix: regression in vars extract for wildcard host (#579)
Continuing from PR #447 we have to add extra
check to ignore the port as well

add tests to cover this case
  • Loading branch information
harshavardhana committed Jul 11, 2020
1 parent 948bec3 commit 98cb6bf42e086f6af920b965c38cacc07402d51b
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
@@ -260,6 +260,18 @@ var hostMatcherTests = []hostMatcherTest{
vars: map[string]string{"foo": "abc", "bar": "def", "baz": "ghi"},
result: true,
},
{
matcher: NewRouter().NewRoute().Host("{foo:[a-z][a-z][a-z]}.{bar:[a-z][a-z][a-z]}.{baz:[a-z][a-z][a-z]}:{port:.*}"),
url: "http://abc.def.ghi:65535/",
vars: map[string]string{"foo": "abc", "bar": "def", "baz": "ghi", "port": "65535"},
result: true,
},
{
matcher: NewRouter().NewRoute().Host("{foo:[a-z][a-z][a-z]}.{bar:[a-z][a-z][a-z]}.{baz:[a-z][a-z][a-z]}"),
url: "http://abc.def.ghi:65535/",
vars: map[string]string{"foo": "abc", "bar": "def", "baz": "ghi"},
result: true,
},
{
matcher: NewRouter().NewRoute().Host("{foo:[a-z][a-z][a-z]}.{bar:[a-z][a-z][a-z]}.{baz:[a-z][a-z][a-z]}"),
url: "http://a.b.c/",
@@ -365,6 +377,11 @@ var urlBuildingTests = []urlBuildingTest{
vars: []string{"subdomain", "bar"},
url: "http://bar.domain.com",
},
{
route: new(Route).Host("{subdomain}.domain.com:{port:.*}"),
vars: []string{"subdomain", "bar", "port", "65535"},
url: "http://bar.domain.com:65535",
},
{
route: new(Route).Host("foo.domain.com").Path("/articles"),
vars: []string{},
@@ -412,7 +429,11 @@ func TestHeaderMatcher(t *testing.T) {

func TestHostMatcher(t *testing.T) {
for _, v := range hostMatcherTests {
request, _ := http.NewRequest("GET", v.url, nil)
request, err := http.NewRequest("GET", v.url, nil)
if err != nil {
t.Errorf("http.NewRequest failed %#v", err)
continue
}
var routeMatch RouteMatch
result := v.matcher.Match(request, &routeMatch)
vars := routeMatch.Vars
@@ -325,6 +325,12 @@ func (v routeRegexpGroup) setMatch(req *http.Request, m *RouteMatch, r *Route) {
// Store host variables.
if v.host != nil {
host := getHost(req)
if v.host.wildcardHostPort {
// Don't be strict on the port match
if i := strings.Index(host, ":"); i != -1 {
host = host[:i]
}
}
matches := v.host.regexp.FindStringSubmatchIndex(host)
if len(matches) > 0 {
extractVars(host, matches, v.host.varsN, m.Vars)

0 comments on commit 98cb6bf

Please sign in to comment.