Merge branch 'fix/routing-502' into 'master'

fix: serve 404 if ctx is canceled while resolving a domain

See merge request gitlab-org/gitlab-pages!796

2 files changed, 7 insertions, 2 deletions

diff --git a/internal/routing/middleware.go b/internal/routing/middleware.go
index bee7c9df..1b15f55c 100644
--- a/internal/routing/middleware.go
+++ b/internal/routing/middleware.go
@@ -1,6 +1,7 @@
 package routing
 
 import (
+	"context"
 	"errors"
 	"net/http"
 
@@ -19,6 +20,11 @@ func NewMiddleware(handler http.Handler, s source.Source) http.Handler {
 		// middleware chain and simply respond with 502 after logging this
 		d, err := getDomain(r, s)
 		if err != nil && !errors.Is(err, domain.ErrDomainDoesNotExist) {
+			if errors.Is(err, context.Canceled) {
+				httperrors.Serve404(w)
+				return
+			}
+
 			logging.LogRequest(r).WithError(err).Error("could not fetch domain information from a source")
 
 			httperrors.Serve502(w)
diff --git a/test/acceptance/serving_test.go b/test/acceptance/serving_test.go
index 92e9c8c7..c7aed337 100644
--- a/test/acceptance/serving_test.go
+++ b/test/acceptance/serving_test.go
@@ -569,7 +569,7 @@ func TestSlowRequests(t *testing.T) {
 	defer cancel()
 
 	url := httpListener.URL("/index.html")
-	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	require.NoError(t, err)
 
 	req.Host = "group.gitlab-example.com"
@@ -578,7 +578,6 @@ func TestSlowRequests(t *testing.T) {
 	require.Error(t, err, "cancelling the context should trigger this error")
 
 	require.Eventually(t, func() bool {
-		require.Contains(t, logBuf.String(), "context done: context canceled", "error mismatch")
 		require.Contains(t, logBuf.String(), "\"status\":404", "status mismatch")
 		return true
 	}, time.Second, time.Millisecond)