Ensure that we not do return nil serving.Request

1 files changed, 6 insertions, 2 deletions

diff --git a/internal/domain/domain.go b/internal/domain/domain.go
index af238668..9ac668a5 100644
--- a/internal/domain/domain.go
+++ b/internal/domain/domain.go
@@ -8,6 +8,7 @@ import (
 
 	"gitlab.com/gitlab-org/gitlab-pages/internal/httperrors"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
+	"gitlab.com/gitlab-org/gitlab-pages/internal/serving/disk"
 )
 
 // Domain is a domain that gitlab-pages can serve.
@@ -37,9 +38,12 @@ func (d *Domain) isUnconfigured() bool {
 }
 
 func (d *Domain) resolve(r *http.Request) *serving.Request {
-	// Current implementation does not return errors in any case
 	request, _ := d.Resolver.Resolve(r)
 
+	if request == nil {
+		return &serving.Request{Serving: disk.New()}
+	}
+
 	return request
 }
 
@@ -52,7 +56,7 @@ func (d *Domain) GetLookupPath(r *http.Request) *serving.LookupPath {
 		return nil
 	}
 
-	return d.resolve(r).LookupPath
+	return request.LookupPath
 }
 
 // IsHTTPSOnly figures out if the request should be handled with HTTPS