From c0a609c4cd26362479ed549d68b842a227e440fb Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Fri, 18 Sep 2020 15:20:11 -0500
Subject: [PATCH] Remove redirects feature toggle

Part of https://gitlab.com/gitlab-org/gitlab-pages/-/issues/24

Feature verfied in https://ops.gitlab.net/gitlab-cookbooks/chef-repo/-/merge_requests/4247#note_92527
---
 acceptance_test.go               | 25 ++-----------------------
 internal/serving/disk/reader.go  | 10 ++--------
 internal/serving/disk/serving.go | 10 ++--------
 3 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/acceptance_test.go b/acceptance_test.go
index 87cd307cf..951ac015a 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 559d332c4..93b5145a3 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 bb9b40d2f..55167d6ac 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
-- 
GitLab