Add support for the port component in the Host header

2 files changed, 4 insertions, 2 deletions

diff --git a/internal/source/gitlab/client/client_stub.go b/internal/source/gitlab/client/client_stub.go
index 6dc0af85..252ad422 100644
--- a/internal/source/gitlab/client/client_stub.go
+++ b/internal/source/gitlab/client/client_stub.go
@@ -15,10 +15,10 @@ type StubClient struct {
 // GetVirtualDomain reads a test fixture and unmarshalls it
 func (c StubClient) GetVirtualDomain(host string) (*api.VirtualDomain, error) {
 	f, err := os.Open(c.File)
-	defer f.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer f.Close()
 
 	var domain api.VirtualDomain
 	err = json.NewDecoder(f).Decode(&domain)
diff --git a/internal/source/gitlab/gitlab.go b/internal/source/gitlab/gitlab.go
index a2911e6b..6a8573e5 100644
--- a/internal/source/gitlab/gitlab.go
+++ b/internal/source/gitlab/gitlab.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"gitlab.com/gitlab-org/gitlab-pages/internal/domain"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/request"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/cache"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/client"
@@ -50,7 +51,8 @@ func (g *Gitlab) GetDomain(name string) (*domain.Domain, error) {
 // Resolve is supposed to get the serving lookup path based on the request from
 // the GitLab source
 func (g *Gitlab) Resolve(r *http.Request) (*serving.LookupPath, string, error) {
-	response, err := g.client.GetVirtualDomain(r.Host)
+	host := request.GetHostWithoutPort(r)
+	response, err := g.client.GetVirtualDomain(host)
 	if err != nil {
 		return nil, "", err
 	}