diff --git a/acceptance_test.go b/acceptance_test.go index 87cd307cf43a01ceaceb221e5ece85ed0b5cc024..951ac015aad2384520a5c8d379c45010a1bd6446 100644 --- a/acceptance_test.go +++ b/acceptance_test.go @@ -501,31 +501,10 @@ func TestPrometheusMetricsCanBeScraped(t *testing.T) { require.Contains(t, string(body), "gitlab_pages_zip_opened_entries_count") } -func TestDisabledRedirects(t *testing.T) { - skipUnlessEnabled(t) - - teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{"FF_ENABLE_REDIRECTS=false"}) - defer teardown() - - // Test that redirects status page is forbidden - rsp, err := GetPageFromListener(t, httpListener, "group.redirects.gitlab-example.com", "/project-redirects/_redirects") - require.NoError(t, err) - defer rsp.Body.Close() - - require.Equal(t, http.StatusForbidden, rsp.StatusCode) - - // Test that redirects are disabled - rsp, err = GetRedirectPage(t, httpListener, "group.redirects.gitlab-example.com", "/project-redirects/redirect-portal.html") - require.NoError(t, err) - defer rsp.Body.Close() - - require.Equal(t, http.StatusNotFound, rsp.StatusCode) -} - func TestRedirectStatusPage(t *testing.T) { skipUnlessEnabled(t) - teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{"FF_ENABLE_REDIRECTS=true"}) + teardown := RunPagesProcess(t, *pagesBinary, listeners, "") defer teardown() rsp, err := GetPageFromListener(t, httpListener, "group.redirects.gitlab-example.com", "/project-redirects/_redirects") @@ -542,7 +521,7 @@ func TestRedirectStatusPage(t *testing.T) { func TestRedirect(t *testing.T) { skipUnlessEnabled(t) - teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{"FF_ENABLE_REDIRECTS=true"}) + teardown := RunPagesProcess(t, *pagesBinary, listeners, "") defer teardown() // Test that serving a file still works with redirects enabled diff --git a/internal/serving/disk/reader.go b/internal/serving/disk/reader.go index 559d332c4d9f970832c873d5f24acabd9e8fa05f..93b5145a30ec377599df4d57fa0d75dab61baec8 100644 --- a/internal/serving/disk/reader.go +++ b/internal/serving/disk/reader.go @@ -5,7 +5,6 @@ import ( "fmt" "io" "net/http" - "os" "strconv" "strings" "time" @@ -95,13 +94,8 @@ func (reader *Reader) tryFile(h serving.Handler) error { // Serve status of `_redirects` under `_redirects` // We check if the final resolved path is `_redirects` after symlink traversal if fullPath == redirects.ConfigFile { - if os.Getenv("FF_ENABLE_REDIRECTS") == "true" { - r := redirects.ParseRedirects(ctx, root) - return reader.serveRedirectsStatus(h, r) - } - - h.Writer.WriteHeader(http.StatusForbidden) - return nil + r := redirects.ParseRedirects(ctx, root) + return reader.serveRedirectsStatus(h, r) } return reader.serveFile(ctx, h.Writer, h.Request, root, fullPath, h.LookupPath.HasAccessControl) diff --git a/internal/serving/disk/serving.go b/internal/serving/disk/serving.go index bb9b40d2fde7328c7790a5075d63608439348ef6..55167d6acd7c8bbd76dfda890ccdad5320c89fda 100644 --- a/internal/serving/disk/serving.go +++ b/internal/serving/disk/serving.go @@ -1,8 +1,6 @@ package disk import ( - "os" - "gitlab.com/gitlab-org/gitlab-pages/internal/httperrors" "gitlab.com/gitlab-org/gitlab-pages/internal/serving" "gitlab.com/gitlab-org/gitlab-pages/internal/vfs" @@ -19,12 +17,8 @@ type Disk struct { func (s *Disk) ServeFileHTTP(h serving.Handler) bool { if s.reader.tryFile(h) == nil { return true - } - - if os.Getenv("FF_ENABLE_REDIRECTS") == "true" { - if s.reader.tryRedirects(h) == nil { - return true - } + } else if s.reader.tryRedirects(h) == nil { + return true } return false