pkg/linksharing: remove tier querying for https redirects

Change-Id: Ia712d89c5ed4c911ec803fbb8e8f6919dcb91a69
storj · Dec 3, 2024 · 1136390 · 1136390
1 parent 8f996ca
commit 1136390
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 35 deletions.
diff --git a/pkg/httpserver/server_test.go b/pkg/httpserver/server_test.go
@@ -54,7 +54,7 @@ func TestServer(t *testing.T) {
 		URLBases:      []string{"https://localhost:15001"},
 	}
 	mapper := objectmap.NewIPDB(&objectmap.MockReader{})
-	handler, err := sharing.NewHandler(zaptest.NewLogger(t), mapper, nil, nil, nil, nil, handlerConfig)
+	handler, err := sharing.NewHandler(zaptest.NewLogger(t), mapper, nil, nil, nil, handlerConfig)
 	require.NoError(t, err)
 
 	tempdir := t.TempDir()

diff --git a/pkg/linksharing/peer.go b/pkg/linksharing/peer.go
@@ -91,7 +91,7 @@ func New(log *zap.Logger, config Config) (_ *Peer, err error) {
 		}
 	}
 
-	handle, err := sharing.NewHandler(log, peer.Mapper, txtRecords, authClient, tqs, &peer.inShutdown, config.Handler)
+	handle, err := sharing.NewHandler(log, peer.Mapper, txtRecords, authClient, &peer.inShutdown, config.Handler)
 	if err != nil {
 		return nil, errs.New("unable to create handler: %w", err)
 	}

diff --git a/pkg/linksharing/sharing/handler.go b/pkg/linksharing/sharing/handler.go
@@ -180,7 +180,6 @@ type Handler struct {
 	mapper                 *objectmap.IPDB
 	txtRecords             *TXTRecords
 	authClient             *authclient.AuthClient
-	tierQuerying           *TierQueryingService
 	static                 http.Handler
 	redirectHTTPS          bool
 	landingRedirect        string
@@ -198,7 +197,7 @@ type Handler struct {
 }
 
 // NewHandler creates a new link sharing HTTP handler.
-func NewHandler(log *zap.Logger, mapper *objectmap.IPDB, txtRecords *TXTRecords, authClient *authclient.AuthClient, tqs *TierQueryingService, inShutdown *int32, config Config) (*Handler, error) {
+func NewHandler(log *zap.Logger, mapper *objectmap.IPDB, txtRecords *TXTRecords, authClient *authclient.AuthClient, inShutdown *int32, config Config) (*Handler, error) {
 	if config.ListPageLimit <= 0 {
 		return nil, ErrInvalidListPageLimit
 	}
@@ -328,7 +327,6 @@ func NewHandler(log *zap.Logger, mapper *objectmap.IPDB, txtRecords *TXTRecords,
 		mapper:                 mapper,
 		txtRecords:             txtRecords,
 		authClient:             authClient,
-		tierQuerying:           tqs,
 		static:                 static,
 		landingRedirect:        config.LandingRedirectTarget,
 		redirectHTTPS:          config.RedirectHTTPS,

diff --git a/pkg/linksharing/sharing/handler_test.go b/pkg/linksharing/sharing/handler_test.go
@@ -56,7 +56,7 @@ func TestHandler_CORS(t *testing.T) {
 			URLBases:      []string{"http://test.test"},
 		}
 
-		handler, err := NewHandler(&zap.Logger{}, &objectmap.IPDB{}, nil, nil, nil, nil, cfg)
+		handler, err := NewHandler(&zap.Logger{}, &objectmap.IPDB{}, nil, nil, nil, cfg)
 		require.NoError(t, err)
 		_ = handler.serveHTTP(testcontext.New(t), rec, req)
 
@@ -93,7 +93,7 @@ func TestHandler_Shutdown(t *testing.T) {
 			URLBases:      []string{"http://test.test"},
 		}
 
-		handler, err := NewHandler(&zap.Logger{}, &objectmap.IPDB{}, nil, nil, nil, inShutdown, cfg)
+		handler, err := NewHandler(&zap.Logger{}, &objectmap.IPDB{}, nil, nil, inShutdown, cfg)
 		require.NoError(t, err)
 		err = handler.serveHTTP(testcontext.New(t), rec, req)
 		require.NoError(t, err)

diff --git a/pkg/linksharing/sharing/hosting.go b/pkg/linksharing/sharing/hosting.go
@@ -26,18 +26,11 @@ func (handler *Handler) handleHostingService(ctx context.Context, w http.Respons
 		return creds.err
 	}
 
-	// Redirect to HTTPS only custom domains that are paid-tier and with `storj-tls:true` TXT record
-	if handler.redirectHTTPS && r.TLS == nil && creds.hostingTLS && handler.tierQuerying != nil {
-		paidTier, err := handler.tierQuerying.Do(ctx, creds.access, creds.hostingHost)
-		if err != nil {
-			return errdata.WithAction(err, "query user tier")
-		}
-
-		if paidTier {
-			target := url.URL{Scheme: "https", Host: r.Host, Path: r.URL.Path, RawPath: r.URL.RawPath, RawQuery: r.URL.RawQuery}
-			http.Redirect(w, r, target.String(), http.StatusPermanentRedirect)
-			return nil
-		}
+	// Redirect to HTTPS only custom domains with `storj-tls:true` TXT record
+	if handler.redirectHTTPS && r.TLS == nil && creds.hostingTLS {
+		target := url.URL{Scheme: "https", Host: r.Host, Path: r.URL.Path, RawPath: r.URL.RawPath, RawQuery: r.URL.RawQuery}
+		http.Redirect(w, r, target.String(), http.StatusPermanentRedirect)
+		return nil
 	}
 
 	bucket, key := determineBucketAndObjectKey(creds.hostingRoot, r.URL.Path)

diff --git a/pkg/linksharing/sharing/present_test.go b/pkg/linksharing/sharing/present_test.go
@@ -56,7 +56,7 @@ func TestDownloadMetadataHeaders(t *testing.T) {
 				URLBases:      []string{"http://test.test"},
 			}
 
-			handler, err := NewHandler(&zap.Logger{}, &objectmap.IPDB{}, nil, nil, nil, nil, cfg)
+			handler, err := NewHandler(&zap.Logger{}, &objectmap.IPDB{}, nil, nil, nil, cfg)
 			require.NoError(t, err)
 
 			ctx := testcontext.New(t)
@@ -220,7 +220,7 @@ func TestContentDisposition(t *testing.T) {
 				StandardRendersContent: tc.standardRendersContent,
 			}
 
-			handler, err := NewHandler(&zap.Logger{}, nil, nil, nil, nil, nil, cfg)
+			handler, err := NewHandler(&zap.Logger{}, nil, nil, nil, nil, cfg)
 			require.NoError(t, err)
 
 			ctx := testcontext.New(t)
@@ -387,7 +387,7 @@ func TestZipArchiveContentType(t *testing.T) {
 		ListPageLimit: 1,
 		URLBases:      []string{"http://test.test"},
 	}
-	handler, err := NewHandler(&zap.Logger{}, &objectmap.IPDB{}, nil, nil, nil, nil, cfg)
+	handler, err := NewHandler(&zap.Logger{}, &objectmap.IPDB{}, nil, nil, nil, cfg)
 	require.NoError(t, err)
 	handler.archiveRanger = func(_ context.Context, _ *uplink.Project, _, _, _ string, _ bool) (ranger.Ranger, bool, error) {
 		return SimpleRanger(nil, 0), false, nil
@@ -503,7 +503,7 @@ func TestImagePreviewPath(t *testing.T) {
 }
 
 func TestIsDownloadAllowed(t *testing.T) {
-	handler, err := NewHandler(&zap.Logger{}, &objectmap.IPDB{}, nil, nil, nil, nil, Config{
+	handler, err := NewHandler(&zap.Logger{}, &objectmap.IPDB{}, nil, nil, nil, Config{
 		ListPageLimit: 1,
 		URLBases:      []string{"http://test.test"},
 	})

diff --git a/testsuite/linksharing/handler_test.go b/testsuite/linksharing/handler_test.go
@@ -107,7 +107,7 @@ func TestNewHandler(t *testing.T) {
 	for _, testCase := range testCases {
 		testCase := testCase
 		t.Run(testCase.name, func(t *testing.T) {
-			handler, err := sharing.NewHandler(zaptest.NewLogger(t), mapper, nil, nil, nil, nil, testCase.config)
+			handler, err := sharing.NewHandler(zaptest.NewLogger(t), mapper, nil, nil, nil, testCase.config)
 			if testCase.err != "" {
 				require.EqualError(t, err, testCase.err)
 				return
@@ -985,7 +985,7 @@ func testHandlerRequests(t *testing.T, ctx *testcontext.Context, planet *testpla
 				listPageLimit = testCase.listPageLimit.v
 			}
 
-			handler, err := sharing.NewHandler(zaptest.NewLogger(t), mapper, nil, nil, nil, nil, sharing.Config{
+			handler, err := sharing.NewHandler(zaptest.NewLogger(t), mapper, nil, nil, nil, sharing.Config{
 				Assets:            assets.FS(),
 				URLBases:          []string{"http://localhost"},
 				AuthServiceConfig: authConfig,

diff --git a/testsuite/linksharing/integration_test.go b/testsuite/linksharing/integration_test.go
@@ -214,15 +214,6 @@ func TestIntegration(t *testing.T) {
 			redirectHTTPS:    true,
 			wantRedirectResp: false,
 		},
-		{
-			name:      "Custom domain insecure not paid tier redirect",
-			tlsRecord: true,
-			url: func(t *testing.T, peer *linksharing.Peer, _, _, _, customDomain string) string {
-				return fmt.Sprintf("http://%s:%d", customDomain, lookupPort(t, peer.Server.Addr()))
-			},
-			redirectHTTPS:    true,
-			wantRedirectResp: false,
-		},
 		{
 			name:      "Custom domain TLS not paid tier",
 			tlsRecord: true,

diff --git a/testsuite/linksharing/zip_test.go b/testsuite/linksharing/zip_test.go
@@ -228,7 +228,7 @@ func testZipRequests(t *testing.T, ctx *testcontext.Context, planet *testplanet.
 				require.NoError(t, err)
 			}
 
-			handler, err := sharing.NewHandler(zaptest.NewLogger(t), mapper, nil, nil, nil, nil, sharing.Config{
+			handler, err := sharing.NewHandler(zaptest.NewLogger(t), mapper, nil, nil, nil, sharing.Config{
 				Assets:        assets.FS(),
 				ListPageLimit: 1,
 				URLBases:      []string{"http://localhost"},