feat: handle extra headers when serving from compressed zip archive

Related to https://gitlab.com/gitlab-org/gitlab-pages/-/issues/466

Changelog: added

1 files changed, 54 insertions, 0 deletions

diff --git a/test/acceptance/zip_test.go b/test/acceptance/zip_test.go
index 97a35e2b..f7623340 100644
--- a/test/acceptance/zip_test.go
+++ b/test/acceptance/zip_test.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 )
@@ -96,6 +97,59 @@ func TestZipServing(t *testing.T) {
 	}
 }
 
+func TestZipServingCache(t *testing.T) {
+	_, cleanup := newZipFileServerURL(t, "../../shared/pages/group/zip.gitlab.io/public.zip")
+	t.Cleanup(cleanup)
+
+	RunPagesProcess(t,
+		withListeners([]ListenSpec{httpListener}),
+	)
+
+	tests := map[string]struct {
+		host               string
+		urlSuffix          string
+		expectedStatusCode int
+		expectedContent    string
+		extraHeaders       http.Header
+	}{
+		"base_domain_if_modified": {
+			host:               "zip.gitlab.io",
+			urlSuffix:          "/",
+			expectedStatusCode: http.StatusNotModified,
+			extraHeaders: http.Header{
+				"If-Modified-Since": {time.Now().Format(http.TimeFormat)},
+			},
+		},
+		"base_domain_if_unmodified": {
+			host:               "zip.gitlab.io",
+			urlSuffix:          "/",
+			expectedStatusCode: http.StatusPreconditionFailed,
+			extraHeaders: http.Header{
+				"If-Unmodified-Since": {time.Now().AddDate(-10, 0, 0).Format(http.TimeFormat)},
+			},
+		},
+	}
+
+	for name, tt := range tests {
+		t.Run(name, func(t *testing.T) {
+			response, err := GetPageFromListenerWithHeaders(t, httpListener, tt.host, tt.urlSuffix, tt.extraHeaders)
+			require.NoError(t, err)
+			defer response.Body.Close()
+
+			require.Equal(t, tt.expectedStatusCode, response.StatusCode)
+
+			if tt.expectedStatusCode == http.StatusOK {
+				require.NotEmpty(t, response.Header.Get("Last-Modified"))
+			}
+
+			body, err := io.ReadAll(response.Body)
+			require.NoError(t, err)
+
+			require.Contains(t, string(body), tt.expectedContent, "content mismatch")
+		})
+	}
+}
+
 func TestZipServingFromDisk(t *testing.T) {
 	RunPagesProcess(t,
 		withListeners([]ListenSpec{httpListener}),