[#XX] Remove http2 test

Signed-off-by: Nikita Zinkevich <n.zinkevich@yadro.com>
[#XX] Remove http2 forcing
2025-02-18 12:53:42 +03:00 · 2025-02-18 12:53:04 +03:00
21 changed files with 228 additions and 1383 deletions
--- a/cmd/http-gw/app.go
+++ b/cmd/http-gw/app.go
@ -17,7 +17,6 @@ import (
 	"time"

 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/cache"
-	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/data"
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/handler"
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/handler/middleware"
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/logs"
@ -31,7 +30,6 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/utils"
 	"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
 	v2container "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/api/container"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool"
 	treepool "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool/tree"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
@ -67,8 +65,6 @@ type (
 		settings       *appSettings
 		loggerSettings *loggerSettings
 		bucketCache    *cache.BucketCache
-		handle         *handler.Handler
-		corsCnrID      cid.ID

 		servers       []Server
 		unbindServers []ServerInfo
@ -109,7 +105,12 @@ type (
 		bufferMaxSizeForPut    uint64
 		namespaceHeader        string
 		defaultNamespaces      []string
-		cors                   *data.CORSRule
+		corsAllowOrigin        string
+		corsAllowMethods       []string
+		corsAllowHeaders       []string
+		corsExposeHeaders      []string
+		corsAllowCredentials   bool
+		corsMaxAge             int
 		enableFilepathFallback bool
 	}

@ -121,6 +122,15 @@ type (
 		logLevel   zap.AtomicLevel
 		tagsConfig *tagsConfig
 	}
+
+	CORS struct {
+		AllowOrigin      string
+		AllowMethods     []string
+		AllowHeaders     []string
+		ExposeHeaders    []string
+		AllowCredentials bool
+		MaxAge           int
+	}
 )

 func newLogLevel(v *viper.Viper) zap.AtomicLevel {
@ -241,7 +251,6 @@ func newApp(ctx context.Context, cfg *appCfg) App {
 	a.initResolver()
 	a.initMetrics()
 	a.initTracing(ctx)
-	a.initContainers(ctx)

 	return a
 }
@ -250,14 +259,6 @@ func (a *app) config() *viper.Viper {
 	return a.cfg.config()
 }

-func (a *app) initContainers(ctx context.Context) {
-	corsCnrID, err := a.fetchContainerID(ctx, cfgContainersCORS)
-	if err != nil {
-		a.log.Fatal(logs.CouldNotFetchCORSContainerInfo, zap.Error(err), logs.TagField(logs.TagApp))
-	}
-	a.corsCnrID = *corsCnrID
-}
-
 func (a *app) initAppSettings(lc *logLevelConfig) {
 	a.settings = &appSettings{
 		reconnectInterval: fetchReconnectInterval(a.config()),
@ -277,7 +278,12 @@ func (s *appSettings) update(v *viper.Viper, l *zap.Logger) {
 	namespaceHeader := v.GetString(cfgResolveNamespaceHeader)
 	defaultNamespaces := fetchDefaultNamespaces(v)
 	indexPage, indexEnabled := fetchIndexPageTemplate(v, l)
-	cors := fetchCORSConfig(v)
+	corsAllowOrigin := v.GetString(cfgCORSAllowOrigin)
+	corsAllowMethods := v.GetStringSlice(cfgCORSAllowMethods)
+	corsAllowHeaders := v.GetStringSlice(cfgCORSAllowHeaders)
+	corsExposeHeaders := v.GetStringSlice(cfgCORSExposeHeaders)
+	corsAllowCredentials := v.GetBool(cfgCORSAllowCredentials)
+	corsMaxAge := fetchCORSMaxAge(v)
 	enableFilepathFallback := v.GetBool(cfgFeaturesEnableFilepathFallback)

 	s.mu.Lock()
@ -292,7 +298,12 @@ func (s *appSettings) update(v *viper.Viper, l *zap.Logger) {
 	s.defaultNamespaces = defaultNamespaces
 	s.returnIndexPage = indexEnabled
 	s.indexPageTemplate = indexPage
-	s.cors = cors
+	s.corsAllowOrigin = corsAllowOrigin
+	s.corsAllowMethods = corsAllowMethods
+	s.corsAllowHeaders = corsAllowHeaders
+	s.corsExposeHeaders = corsExposeHeaders
+	s.corsAllowCredentials = corsAllowCredentials
+	s.corsMaxAge = corsMaxAge
 	s.enableFilepathFallback = enableFilepathFallback
 }

@ -339,33 +350,26 @@ func (s *appSettings) IndexPageTemplate() string {
 	return s.indexPageTemplate
 }

-func (s *appSettings) CORS() *data.CORSRule {
+func (s *appSettings) CORS() CORS {
 	s.mu.RLock()
 	defer s.mu.RUnlock()

-	if s.cors == nil {
-		return nil
-	}
+	allowMethods := make([]string, len(s.corsAllowMethods))
+	copy(allowMethods, s.corsAllowMethods)

-	allowMethods := make([]string, len(s.cors.AllowedMethods))
-	copy(allowMethods, s.cors.AllowedMethods)
+	allowHeaders := make([]string, len(s.corsAllowHeaders))
+	copy(allowHeaders, s.corsAllowHeaders)

-	allowHeaders := make([]string, len(s.cors.AllowedHeaders))
-	copy(allowHeaders, s.cors.AllowedHeaders)
+	exposeHeaders := make([]string, len(s.corsExposeHeaders))
+	copy(exposeHeaders, s.corsExposeHeaders)

-	exposeHeaders := make([]string, len(s.cors.ExposeHeaders))
-	copy(exposeHeaders, s.cors.ExposeHeaders)
-
-	allowOrigins := make([]string, len(s.cors.AllowedOrigins))
-	copy(allowOrigins, s.cors.AllowedOrigins)
-
-	return &data.CORSRule{
-		AllowedOrigins:     allowOrigins,
-		AllowedMethods:     allowMethods,
-		AllowedHeaders:     allowHeaders,
-		ExposeHeaders:      exposeHeaders,
-		AllowedCredentials: s.cors.AllowedCredentials,
-		MaxAgeSeconds:      s.cors.MaxAgeSeconds,
+	return CORS{
+		AllowOrigin:      s.corsAllowOrigin,
+		AllowMethods:     allowMethods,
+		AllowHeaders:     allowHeaders,
+		ExposeHeaders:    exposeHeaders,
+		AllowCredentials: s.corsAllowCredentials,
+		MaxAge:           s.corsMaxAge,
 	}
 }

@ -387,15 +391,15 @@ func (s *appSettings) NamespaceHeader() string {
 	return s.namespaceHeader
 }

-func (s *appSettings) FormContainerZone(ns string) string {
+func (s *appSettings) FormContainerZone(ns string) (zone string, isDefault bool) {
 	s.mu.RLock()
 	namespaces := s.defaultNamespaces
 	s.mu.RUnlock()
 	if slices.Contains(namespaces, ns) {
-		return v2container.SysAttributeZoneDefault
+		return v2container.SysAttributeZoneDefault, true
 	}

-	return ns + ".ns"
+	return ns + ".ns", false
 }

 func (s *appSettings) EnableFilepathFallback() bool {
@ -416,6 +420,7 @@ func (a *app) getResolverConfig() ([]string, *resolver.Config) {
 	resolveCfg := &resolver.Config{
 		FrostFS:    frostfs.NewResolverFrostFS(a.pool),
 		RPCAddress: a.config().GetString(cfgRPCEndpoint),
+		Settings:   a.settings,
 	}

 	order := a.config().GetStringSlice(cfgResolveOrder)
@ -601,8 +606,10 @@ func (a *app) Serve() {
 		close(a.webDone)
 	}()

+	handle := handler.New(a.AppParams(), a.settings, tree.NewTree(frostfs.NewPoolWrapper(a.treePool)), workerPool)
+
 	// Configure router.
-	a.configureRouter(workerPool)
+	a.configureRouter(handle)

 	a.startServices()
 	a.initServers(a.ctx)
@ -723,9 +730,7 @@ func (a *app) stopServices() {
 	}
 }

-func (a *app) configureRouter(workerPool *ants.Pool) {
-	a.handle = handler.New(a.AppParams(), a.settings, tree.NewTree(frostfs.NewPoolWrapper(a.treePool)), workerPool)
-
+func (a *app) configureRouter(h *handler.Handler) {
 	r := router.New()
 	r.RedirectTrailingSlash = true
 	r.NotFound = func(r *fasthttp.RequestCtx) {
@ -735,21 +740,21 @@ func (a *app) configureRouter(workerPool *ants.Pool) {
 		handler.ResponseError(r, "Method Not Allowed", fasthttp.StatusMethodNotAllowed)
 	}

-	r.POST("/upload/{cid}", a.addMiddlewares(a.handle.Upload))
-	r.OPTIONS("/upload/{cid}", a.addPreflight(a.handle.Preflight))
+	r.POST("/upload/{cid}", a.addMiddlewares(h.Upload))
+	r.OPTIONS("/upload/{cid}", a.addPreflight())
 	a.log.Info(logs.AddedPathUploadCid, logs.TagField(logs.TagApp))
-	r.GET("/get/{cid}/{oid:*}", a.addMiddlewares(a.handle.DownloadByAddressOrBucketName))
-	r.HEAD("/get/{cid}/{oid:*}", a.addMiddlewares(a.handle.HeadByAddressOrBucketName))
-	r.OPTIONS("/get/{cid}/{oid:*}", a.addPreflight(a.handle.Preflight))
+	r.GET("/get/{cid}/{oid:*}", a.addMiddlewares(h.DownloadByAddressOrBucketName))
+	r.HEAD("/get/{cid}/{oid:*}", a.addMiddlewares(h.HeadByAddressOrBucketName))
+	r.OPTIONS("/get/{cid}/{oid:*}", a.addPreflight())
 	a.log.Info(logs.AddedPathGetCidOid, logs.TagField(logs.TagApp))
-	r.GET("/get_by_attribute/{cid}/{attr_key}/{attr_val:*}", a.addMiddlewares(a.handle.DownloadByAttribute))
-	r.HEAD("/get_by_attribute/{cid}/{attr_key}/{attr_val:*}", a.addMiddlewares(a.handle.HeadByAttribute))
-	r.OPTIONS("/get_by_attribute/{cid}/{attr_key}/{attr_val:*}", a.addPreflight(a.handle.Preflight))
+	r.GET("/get_by_attribute/{cid}/{attr_key}/{attr_val:*}", a.addMiddlewares(h.DownloadByAttribute))
+	r.HEAD("/get_by_attribute/{cid}/{attr_key}/{attr_val:*}", a.addMiddlewares(h.HeadByAttribute))
+	r.OPTIONS("/get_by_attribute/{cid}/{attr_key}/{attr_val:*}", a.addPreflight())
 	a.log.Info(logs.AddedPathGetByAttributeCidAttrKeyAttrVal, logs.TagField(logs.TagApp))
-	r.GET("/zip/{cid}/{prefix:*}", a.addMiddlewares(a.handle.DownloadZip))
-	r.OPTIONS("/zip/{cid}/{prefix:*}", a.addPreflight(a.handle.Preflight))
-	r.GET("/tar/{cid}/{prefix:*}", a.addMiddlewares(a.handle.DownloadTar))
-	r.OPTIONS("/tar/{cid}/{prefix:*}", a.addPreflight(a.handle.Preflight))
+	r.GET("/zip/{cid}/{prefix:*}", a.addMiddlewares(h.DownloadZip))
+	r.OPTIONS("/zip/{cid}/{prefix:*}", a.addPreflight())
+	r.GET("/tar/{cid}/{prefix:*}", a.addMiddlewares(h.DownloadTar))
+	r.OPTIONS("/tar/{cid}/{prefix:*}", a.addPreflight())
 	a.log.Info(logs.AddedPathZipCidPrefix, logs.TagField(logs.TagApp))

 	a.webServer.Handler = r.Handler
@ -772,14 +777,14 @@ func (a *app) addMiddlewares(h fasthttp.RequestHandler) fasthttp.RequestHandler
 	return h
 }

-func (a *app) addPreflight(h fasthttp.RequestHandler) fasthttp.RequestHandler {
+func (a *app) addPreflight() fasthttp.RequestHandler {
 	list := []func(fasthttp.RequestHandler) fasthttp.RequestHandler{
 		a.tracer,
 		a.logger,
-		a.canonicalizer,
 		a.reqNamespace,
 	}

+	h := a.preflightHandler
 	for i := len(list) - 1; i >= 0; i-- {
 		h = list[i](h)
 	}
@ -787,16 +792,46 @@ func (a *app) addPreflight(h fasthttp.RequestHandler) fasthttp.RequestHandler {
 	return h
 }

+func (a *app) preflightHandler(c *fasthttp.RequestCtx) {
+	cors := a.settings.CORS()
+	setCORSHeaders(c, cors)
+}
+
 func (a *app) cors(h fasthttp.RequestHandler) fasthttp.RequestHandler {
 	return func(c *fasthttp.RequestCtx) {
 		h(c)
 		code := c.Response.StatusCode()
 		if code >= fasthttp.StatusOK && code < fasthttp.StatusMultipleChoices {
-			a.handle.SetCORSHeaders(c)
+			cors := a.settings.CORS()
+			setCORSHeaders(c, cors)
 		}
 	}
 }

+func setCORSHeaders(c *fasthttp.RequestCtx, cors CORS) {
+	c.Response.Header.Set(fasthttp.HeaderAccessControlMaxAge, strconv.Itoa(cors.MaxAge))
+
+	if len(cors.AllowOrigin) != 0 {
+		c.Response.Header.Set(fasthttp.HeaderAccessControlAllowOrigin, cors.AllowOrigin)
+	}
+
+	if len(cors.AllowMethods) != 0 {
+		c.Response.Header.Set(fasthttp.HeaderAccessControlAllowMethods, strings.Join(cors.AllowMethods, ","))
+	}
+
+	if len(cors.AllowHeaders) != 0 {
+		c.Response.Header.Set(fasthttp.HeaderAccessControlAllowHeaders, strings.Join(cors.AllowHeaders, ","))
+	}
+
+	if len(cors.ExposeHeaders) != 0 {
+		c.Response.Header.Set(fasthttp.HeaderAccessControlExposeHeaders, strings.Join(cors.ExposeHeaders, ","))
+	}
+
+	if cors.AllowCredentials {
+		c.Response.Header.Set(fasthttp.HeaderAccessControlAllowCredentials, "true")
+	}
+}
+
 func (a *app) logger(h fasthttp.RequestHandler) fasthttp.RequestHandler {
 	return func(req *fasthttp.RequestCtx) {
 		requiredFields := []zap.Field{zap.Uint64("id", req.ID())}
@ -895,13 +930,11 @@ func (a *app) reqNamespace(h fasthttp.RequestHandler) fasthttp.RequestHandler {

 func (a *app) AppParams() *handler.AppParams {
 	return &handler.AppParams{
-		Logger:    a.log,
-		FrostFS:   frostfs.NewFrostFS(a.pool),
-		Owner:     a.owner,
-		Resolver:  a.resolver,
-		Cache:     a.bucketCache,
-		CORSCnrID: a.corsCnrID,
-		CORSCache: cache.NewCORSCache(getCORSCacheOptions(a.config(), a.log)),
+		Logger:   a.log,
+		FrostFS:  frostfs.NewFrostFS(a.pool),
+		Owner:    a.owner,
+		Resolver: a.resolver,
+		Cache:    a.bucketCache,
 	}
 }

@ -1102,44 +1135,3 @@ func (a *app) tryReconnect(ctx context.Context, sr *fasthttp.Server) bool {

 	return len(a.unbindServers) == 0
 }
-
-func (a *app) fetchContainerID(ctx context.Context, cfgKey string) (id *cid.ID, err error) {
-	cnrID, err := a.resolveContainerID(ctx, cfgKey)
-	if err != nil {
-		return nil, err
-	}
-
-	err = checkContainerExists(ctx, *cnrID, a.pool)
-	if err != nil {
-		return nil, err
-	}
-
-	return cnrID, nil
-}
-
-func (a *app) resolveContainerID(ctx context.Context, cfgKey string) (*cid.ID, error) {
-	containerString := a.config().GetString(cfgKey)
-
-	id := new(cid.ID)
-	if err := id.DecodeString(containerString); err != nil {
-		i := strings.Index(containerString, ".")
-		if i < 0 {
-			return nil, fmt.Errorf("invalid container address: %s", containerString)
-		}
-
-		if id, err = a.resolver.Resolve(ctx, containerString[i+1:], containerString[:i]); err != nil {
-			return nil, fmt.Errorf("resolve container address %s: %w", containerString, err)
-		}
-	}
-
-	return id, nil
-}
-
-func checkContainerExists(ctx context.Context, id cid.ID, frostFSPool *pool.Pool) error {
-	prm := pool.PrmContainerGet{
-		ContainerID: id,
-	}
-
-	_, err := frostFSPool.GetContainer(ctx, prm)
-	return err
-}
--- a/cmd/http-gw/integration_test.go
+++ b/cmd/http-gw/integration_test.go
@ -43,10 +43,9 @@ type putResponse struct {
 }

 const (
-	testContainerName     = "friendly"
-	testListenAddress     = "localhost:8082"
-	testHost              = "http://" + testListenAddress
-	testCORSContainerName = "cors"
+	testContainerName = "friendly"
+	testListenAddress = "localhost:8082"
+	testHost          = "http://" + testListenAddress
 )

 func TestIntegration(t *testing.T) {
@ -77,14 +76,10 @@ func TestIntegration(t *testing.T) {
 			registerUser(t, ctx, aioContainer, file.Name())
 		}

-		// Creating CORS container
-		clientPool := getPool(ctx, t, key)
-		_, err = createContainer(ctx, t, clientPool, ownerID, testCORSContainerName)
-		require.NoError(t, err, version)
-
 		// See the logs from the command execution.
 		server, cancel := runServer(file.Name())
-		CID, err := createContainer(ctx, t, clientPool, ownerID, testContainerName)
+		clientPool := getPool(ctx, t, key)
+		CID, err := createContainer(ctx, t, clientPool, ownerID)
 		require.NoError(t, err, version)

 		jsonToken, binaryToken := makeBearerTokens(t, key, ownerID, version)
@ -115,8 +110,6 @@ func runServer(pathToWallet string) (App, context.CancelFunc) {
 	v.config().Set(cfgWalletPath, pathToWallet)
 	v.config().Set(cfgWalletPassphrase, "")

-	v.config().Set(cfgContainersCORS, testCORSContainerName+"."+containerv2.SysAttributeZoneDefault)
-
 	application := newApp(cancelCtx, v)
 	go application.Serve()

@ -484,7 +477,7 @@ func getPool(ctx context.Context, t *testing.T, key *keys.PrivateKey) *pool.Pool
 	return clientPool
 }

-func createContainer(ctx context.Context, t *testing.T, clientPool *pool.Pool, ownerID user.ID, name string) (cid.ID, error) {
+func createContainer(ctx context.Context, t *testing.T, clientPool *pool.Pool, ownerID user.ID) (cid.ID, error) {
 	var policy netmap.PlacementPolicy
 	err := policy.DecodeString("REP 1")
 	require.NoError(t, err)
@ -498,7 +491,7 @@ func createContainer(ctx context.Context, t *testing.T, clientPool *pool.Pool, o
 	container.SetCreationTime(&cnr, time.Now())

 	var domain container.Domain
-	domain.SetName(name)
+	domain.SetName(testContainerName)

 	cnr.SetAttribute(containerv2.SysAttributeName, domain.Name())
 	cnr.SetAttribute(containerv2.SysAttributeZone, domain.Zone())
--- a/cmd/http-gw/server_test.go
+++ b/cmd/http-gw/server_test.go
@ -1,112 +0,0 @@
-package main
-
-import (
-	"context"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/tls"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/pem"
-	"fmt"
-	"math/big"
-	"net"
-	"net/http"
-	"os"
-	"path"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"github.com/valyala/fasthttp"
-)
-
-const (
-	expHeaderKey   = "Foo"
-	expHeaderValue = "Bar"
-)
-
-func TestHTTP_TLS(t *testing.T) {
-	ctx := context.Background()
-	certPath, keyPath := prepareTestCerts(t)
-
-	tlsListener, err := newServer(ctx, ServerInfo{
-		Address: ":0",
-		TLS: ServerTLSInfo{
-			Enabled:  true,
-			CertFile: certPath,
-			KeyFile:  keyPath,
-		},
-	})
-	require.NoError(t, err)
-	port := tlsListener.Listener().Addr().(*net.TCPAddr).Port
-	addr := fmt.Sprintf("https://localhost:%d", port)
-
-	go func() {
-		_ = fasthttp.Serve(tlsListener.Listener(), testHandler)
-	}()
-
-	tlsClientConfig := &tls.Config{
-		InsecureSkipVerify: true,
-	}
-
-	cliHTTP := http.Client{Transport: &http.Transport{}}
-	cliHTTPS := http.Client{Transport: &http.Transport{TLSClientConfig: tlsClientConfig}}
-
-	req, err := http.NewRequest("GET", addr, nil)
-	require.NoError(t, err)
-	req.Header[expHeaderKey] = []string{expHeaderValue}
-
-	resp, err := cliHTTPS.Do(req)
-	require.NoError(t, err)
-	require.Equal(t, http.StatusOK, resp.StatusCode)
-
-	_, err = cliHTTP.Do(req)
-	require.ErrorContains(t, err, "failed to verify certificate")
-}
-
-func testHandler(ctx *fasthttp.RequestCtx) {
-	hdr := ctx.Request.Header.Peek(expHeaderKey)
-	if len(hdr) == 0 || string(hdr) != expHeaderValue {
-		ctx.Response.SetStatusCode(http.StatusBadRequest)
-	} else {
-		ctx.Response.SetStatusCode(http.StatusOK)
-	}
-}
-
-func prepareTestCerts(t *testing.T) (certPath, keyPath string) {
-	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
-	require.NoError(t, err)
-
-	template := x509.Certificate{
-		SerialNumber:          big.NewInt(1),
-		Subject:               pkix.Name{CommonName: "localhost"},
-		NotBefore:             time.Now(),
-		NotAfter:              time.Now().Add(time.Hour * 24 * 365),
-		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-		BasicConstraintsValid: true,
-	}
-
-	derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, &privateKey.PublicKey, privateKey)
-	require.NoError(t, err)
-
-	dir := t.TempDir()
-	certPath = path.Join(dir, "cert.pem")
-	keyPath = path.Join(dir, "key.pem")
-
-	certFile, err := os.Create(certPath)
-	require.NoError(t, err)
-	defer certFile.Close()
-
-	keyFile, err := os.Create(keyPath)
-	require.NoError(t, err)
-	defer keyFile.Close()
-
-	err = pem.Encode(certFile, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
-	require.NoError(t, err)
-
-	err = pem.Encode(keyFile, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(privateKey)})
-	require.NoError(t, err)
-
-	return certPath, keyPath
-}
--- a/cmd/http-gw/settings.go
+++ b/cmd/http-gw/settings.go
@ -16,13 +16,11 @@ import (
 	"time"

 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/cache"
-	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/data"
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/logs"
 	internalnet "git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/net"
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/service/frostfs"
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/resolver"
 	grpctracing "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing/grpc"
-	qostagging "git.frostfs.info/TrueCloudLab/frostfs-qos/tagging"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool"
 	treepool "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool/tree"
 	"github.com/spf13/pflag"
@ -156,21 +154,18 @@ const (
 	cfgBucketsCacheLifetime = "cache.buckets.lifetime"
 	cfgBucketsCacheSize     = "cache.buckets.size"
 	cfgNetmapCacheLifetime  = "cache.netmap.lifetime"
-	cfgCORSCacheLifetime    = "cache.cors.lifetime"
-	cfgCORSCacheSize        = "cache.cors.size"

 	// Bucket resolving options.
 	cfgResolveNamespaceHeader   = "resolve_bucket.namespace_header"
 	cfgResolveDefaultNamespaces = "resolve_bucket.default_namespaces"

 	// CORS.
-	cfgCORS                 = "cors"
-	cfgCORSAllowOrigin      = cfgCORS + ".allow_origin"
-	cfgCORSAllowMethods     = cfgCORS + ".allow_methods"
-	cfgCORSAllowHeaders     = cfgCORS + ".allow_headers"
-	cfgCORSExposeHeaders    = cfgCORS + ".expose_headers"
-	cfgCORSAllowCredentials = cfgCORS + ".allow_credentials"
-	cfgCORSMaxAge           = cfgCORS + ".max_age"
+	cfgCORSAllowOrigin      = "cors.allow_origin"
+	cfgCORSAllowMethods     = "cors.allow_methods"
+	cfgCORSAllowHeaders     = "cors.allow_headers"
+	cfgCORSExposeHeaders    = "cors.expose_headers"
+	cfgCORSAllowCredentials = "cors.allow_credentials"
+	cfgCORSMaxAge           = "cors.max_age"

 	// Multinet.
 	cfgMultinetEnabled       = "multinet.enabled"
@ -183,9 +178,6 @@ const (
 	cfgFeaturesEnableFilepathFallback = "features.enable_filepath_fallback"
 	cfgFeaturesTreePoolNetmapSupport  = "features.tree_pool_netmap_support"

-	// Containers.
-	cfgContainersCORS = "containers.cors"
-
 	// Command line args.
 	cmdHelp          = "help"
 	cmdVersion       = "version"
@ -678,8 +670,6 @@ func (a *app) initPools(ctx context.Context) {
 		grpc.WithUnaryInterceptor(grpctracing.NewUnaryClientInteceptor()),
 		grpc.WithStreamInterceptor(grpctracing.NewStreamClientInterceptor()),
 		grpc.WithContextDialer(a.settings.dialerSource.GrpcContextDialer()),
-		grpc.WithChainUnaryInterceptor(qostagging.NewUnaryClientInteceptor()),
-		grpc.WithChainStreamInterceptor(qostagging.NewStreamClientInterceptor()),
 	}
 	prm.SetGRPCDialOptions(interceptors...)
 	prmTree.SetGRPCDialOptions(interceptors...)
@ -766,15 +756,6 @@ func getNetmapCacheOptions(v *viper.Viper, l *zap.Logger) *cache.NetmapCacheConf
 	return cacheCfg
 }

-func getCORSCacheOptions(v *viper.Viper, l *zap.Logger) *cache.Config {
-	cacheCfg := cache.DefaultCORSConfig(l)
-
-	cacheCfg.Lifetime = fetchCacheLifetime(v, l, cfgCORSCacheLifetime, cacheCfg.Lifetime)
-	cacheCfg.Size = fetchCacheSize(v, l, cfgCORSCacheSize, cacheCfg.Size)
-
-	return cacheCfg
-}
-
 func fetchCacheLifetime(v *viper.Viper, l *zap.Logger, cfgEntry string, defaultValue time.Duration) time.Duration {
 	if v.IsSet(cfgEntry) {
 		lifetime := v.GetDuration(cfgEntry)
@ -870,18 +851,3 @@ func fetchArchiveCompression(v *viper.Viper) bool {
 	}
 	return v.GetBool(cfgArchiveCompression)
 }
-
-func fetchCORSConfig(v *viper.Viper) *data.CORSRule {
-	if !v.IsSet(cfgCORS) {
-		return nil
-	}
-
-	return &data.CORSRule{
-		AllowedOrigins:     []string{v.GetString(cfgCORSAllowOrigin)},
-		AllowedMethods:     v.GetStringSlice(cfgCORSAllowMethods),
-		AllowedHeaders:     v.GetStringSlice(cfgCORSAllowHeaders),
-		ExposeHeaders:      v.GetStringSlice(cfgCORSExposeHeaders),
-		AllowedCredentials: v.GetBool(cfgCORSAllowCredentials),
-		MaxAgeSeconds:      fetchCORSMaxAge(v),
-	}
-}
--- a/config/config.env
+++ b/config/config.env
@ -129,9 +129,6 @@ HTTP_GW_CACHE_BUCKETS_LIFETIME=1m
 HTTP_GW_CACHE_BUCKETS_SIZE=1000
 # Cache which stores netmap
 HTTP_GW_CACHE_NETMAP_LIFETIME=1m
-# Cache which stores container CORS configurations
-HTTP_GW_CACHE_CORS_LIFETIME=5m
-HTTP_GW_CACHE_CORS_SIZE=1000

 # Header to determine zone to resolve bucket name
 HTTP_GW_RESOLVE_BUCKET_NAMESPACE_HEADER=X-Frostfs-Namespace
@ -175,6 +172,3 @@ HTTP_GW_INDEX_PAGE_TEMPLATE_PATH=internal/handler/templates/index.gotmpl
 HTTP_GW_FEATURES_ENABLE_FILEPATH_FALLBACK=false
 # Enable using new version of tree pool, which uses netmap to select nodes, for requests to tree service
 HTTP_GW_FEATURES_TREE_POOL_NETMAP_SUPPORT=true
-
-# Containers properties
-HTTP_GW_CONTAINERS_CORS=AZjLTXfK4vs4ovxMic2xEJKSymMNLqdwq9JT64ASFCRj
--- a/config/config.yaml
+++ b/config/config.yaml
@ -156,10 +156,6 @@ cache:
  # Cache which stores netmap
  netmap:
    lifetime: 1m
-  # Cache which stores container CORS configurations
-  cors:
-    lifetime: 5m
-    size: 1000

 resolve_bucket:
  namespace_header: X-Frostfs-Namespace
@ -195,6 +191,3 @@ features:
  enable_filepath_fallback: false
  # Enable using new version of tree pool, which uses netmap to select nodes, for requests to tree service
  tree_pool_netmap_support: true
-
-containers:
-  cors: AZjLTXfK4vs4ovxMic2xEJKSymMNLqdwq9JT64ASFCRj
--- a/docs/gate-configuration.md
+++ b/docs/gate-configuration.md
@ -60,7 +60,6 @@ $ cat http.log
 | `index_page`     | [Index page configuration](#index_page-section)                |
 | `multinet`       | [Multinet configuration](#multinet-section)                    |
 | `features`       | [Features configuration](#features-section)                    |
-| `containers`     | [Containers configuration](#containers-section)                |

 # General section

@ -383,16 +382,12 @@ cache:
    size: 1000
  netmap:
    lifetime: 1m
-  cors:
-    lifetime: 5m
-    size: 1000
 ```

 | Parameter | Type                              | Default value                   | Description                                                               |
 |-----------|-----------------------------------|---------------------------------|---------------------------------------------------------------------------|
 | `buckets` | [Cache config](#cache-subsection) | `lifetime: 60s`<br>`size: 1000` | Cache which contains mapping of bucket name to bucket info.               |
 | `netmap`  | [Cache config](#cache-subsection) | `lifetime: 1m`                  | Cache which stores netmap. `netmap.size` isn't applicable for this cache. |
-| `cors`    | [Cache config](#cache-subsection) | `lifetime: 5m`<br>`size: 1000`  | Cache which stores container CORS configurations.                         |


 #### `cache` subsection
@ -446,7 +441,7 @@ index_page:
 # `cors` section

 Parameters for CORS (used in OPTIONS requests and responses in all handlers).
-If values are not set, settings from CORS container will be used.
+If values are not set, headers will not be included to response.

 ```yaml
 cors:
@ -520,16 +515,3 @@ features:
 |-------------------------------------|--------|---------------|---------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `features.enable_filepath_fallback` | `bool` | yes           | `false`       | Enable using fallback path to search for a object by attribute. If the value of the `FilePath` attribute in the request contains no `/` symbols or single leading `/` symbol and the object was not found, then an attempt is made to search for the object by the attribute `FileName`. |
 | `features.tree_pool_netmap_support` | `bool` | no            | `false`       | Enable using new version of tree pool, which uses netmap to select nodes, for requests to tree service.                                                                                                                                                                                  |
-
-# `containers` section
-
-Section for well-known containers to store data and settings.
-
-```yaml
-containers:
-  cors: AZjLTXfK4vs4ovxMic2xEJKSymMNLqdwq9JT64ASFCRj
-```
-
-| Parameter   | Type     | SIGHUP reload | Default value | Description                             |
-|-------------|----------|---------------|---------------|-----------------------------------------|
-| `cors`      | `string` | no            |               | Container name for CORS configurations. |
--- a/go.mod
+++ b/go.mod
@ -4,7 +4,6 @@ go 1.22

 require (
 	git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20241125133852-37bd75821121
-	git.frostfs.info/TrueCloudLab/frostfs-qos v0.0.0-20250128150313-cfbca7fa1dfe
 	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20250130095343-593dd77d841a
 	git.frostfs.info/TrueCloudLab/multinet v0.0.0-20241015075604-6cb0d80e0972
 	git.frostfs.info/TrueCloudLab/zapjournald v0.0.0-20240124114243-cb2e66427d02
@ -27,6 +26,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.31.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
+	golang.org/x/net v0.30.0
 	golang.org/x/sys v0.28.0
 	google.golang.org/grpc v1.69.2
 )
@ -125,7 +125,6 @@ require (
 	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/term v0.27.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
--- a/go.sum
+++ b/go.sum
@ -42,12 +42,10 @@ git.frostfs.info/TrueCloudLab/frostfs-contract v0.19.3-0.20240621131249-49e5270f
 git.frostfs.info/TrueCloudLab/frostfs-contract v0.19.3-0.20240621131249-49e5270f673e/go.mod h1:F/fe1OoIDKr5Bz99q4sriuHDuf3aZefZy9ZsCqEtgxc=
 git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 h1:FxqFDhQYYgpe41qsIHVOcdzSVCB8JNSfPG7Uk4r2oSk=
 git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0/go.mod h1:RUIKZATQLJ+TaYQa60X2fTDwfuhMfm8Ar60bQ5fr+vU=
-git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20241125133852-37bd75821121 h1:/Z8DfbLZXp7exUQWUKoG/9tbFdI9d5lV1qSReaYoG8I=
-git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20241125133852-37bd75821121/go.mod h1:kbwB4v2o6RyOfCo9kEFeUDZIX3LKhmS0yXPrtvzkQ1g=
-git.frostfs.info/TrueCloudLab/frostfs-qos v0.0.0-20250128150313-cfbca7fa1dfe h1:81gDNdWNLP24oMQukRiCE9R1wGSh0l0dRq3F1W+Oesc=
-git.frostfs.info/TrueCloudLab/frostfs-qos v0.0.0-20250128150313-cfbca7fa1dfe/go.mod h1:PCijYq4oa8vKtIEcUX6jRiszI6XAW+nBwU+T1kB4d1U=
 git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20250130095343-593dd77d841a h1:Ud+3zz4WP9HPxEQxDPJZPpiPdm30nDNSKucsWP9L54M=
 git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20250130095343-593dd77d841a/go.mod h1:aQpPWfG8oyfJ2X+FenPTJpSRWZjwcP5/RAtkW+/VEX8=
+git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20241125133852-37bd75821121 h1:/Z8DfbLZXp7exUQWUKoG/9tbFdI9d5lV1qSReaYoG8I=
+git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20241125133852-37bd75821121/go.mod h1:kbwB4v2o6RyOfCo9kEFeUDZIX3LKhmS0yXPrtvzkQ1g=
 git.frostfs.info/TrueCloudLab/hrw v1.2.1 h1:ccBRK21rFvY5R1WotI6LNoPlizk7qSvdfD8lNIRudVc=
 git.frostfs.info/TrueCloudLab/hrw v1.2.1/go.mod h1:C1Ygde2n843yTZEQ0FP69jYiuaYV0kriLvP4zm8JuvM=
 git.frostfs.info/TrueCloudLab/multinet v0.0.0-20241015075604-6cb0d80e0972 h1:/960fWeyn2AFHwQUwDsWB3sbP6lTEnFnMzLMM6tx6N8=
--- a/internal/cache/cors.go
+++ b/internal/cache/cors.go
@ -1,62 +0,0 @@
-package cache
-
-import (
-	"fmt"
-	"time"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/data"
-	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/logs"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"github.com/bluele/gcache"
-	"go.uber.org/zap"
-)
-
-// CORSCache contains cache with CORS objects.
-type CORSCache struct {
-	cache  gcache.Cache
-	logger *zap.Logger
-}
-
-const (
-	// DefaultCORSCacheSize is a default maximum number of entries in cache.
-	DefaultCORSCacheSize = 1e3
-	// DefaultCORSCacheLifetime is a default lifetime of entries in cache.
-	DefaultCORSCacheLifetime = 5 * time.Minute
-)
-
-// DefaultCORSConfig returns new default cache expiration values.
-func DefaultCORSConfig(logger *zap.Logger) *Config {
-	return &Config{
-		Size:     DefaultCORSCacheSize,
-		Lifetime: DefaultCORSCacheLifetime,
-		Logger:   logger,
-	}
-}
-
-// NewCORSCache creates an object of CORSCache.
-func NewCORSCache(config *Config) *CORSCache {
-	gc := gcache.New(config.Size).LRU().Expiration(config.Lifetime).Build()
-	return &CORSCache{cache: gc, logger: config.Logger}
-}
-
-// Get returns a cached object.
-func (o *CORSCache) Get(cnrID cid.ID) *data.CORSConfiguration {
-	entry, err := o.cache.Get(cnrID)
-	if err != nil {
-		return nil
-	}
-
-	result, ok := entry.(*data.CORSConfiguration)
-	if !ok {
-		o.logger.Warn(logs.InvalidCacheEntryType, zap.String("actual", fmt.Sprintf("%T", entry)),
-			zap.String("expected", fmt.Sprintf("%T", result)), logs.TagField(logs.TagDatapath))
-		return nil
-	}
-
-	return result
-}
-
-// Put puts an object to cache.
-func (o *CORSCache) Put(cnrID cid.ID, cors *data.CORSConfiguration) error {
-	return o.cache.Set(cnrID, cors)
-}
--- a/internal/data/cors.go
+++ b/internal/data/cors.go
@ -1,18 +0,0 @@
-package data
-
-type (
-	// CORSConfiguration stores CORS configuration of a request.
-	CORSConfiguration struct {
-		CORSRules []CORSRule `xml:"CORSRule" json:"CORSRules"`
-	}
-
-	// CORSRule stores rules for CORS configuration.
-	CORSRule struct {
-		AllowedHeaders     []string `xml:"AllowedHeader" json:"AllowedHeaders"`
-		AllowedMethods     []string `xml:"AllowedMethod" json:"AllowedMethods"`
-		AllowedOrigins     []string `xml:"AllowedOrigin" json:"AllowedOrigins"`
-		ExposeHeaders      []string `xml:"ExposeHeader" json:"ExposeHeaders"`
-		MaxAgeSeconds      int      `xml:"MaxAgeSeconds,omitempty" json:"MaxAgeSeconds,omitempty"`
-		AllowedCredentials bool     `xml:"AllowedCredentials,omitempty" json:"AllowedCredentials,omitempty"`
-	}
-)
--- a/internal/handler/cors.go
+++ b/internal/handler/cors.go
@ -1,342 +0,0 @@
-package handler
-
-import (
-	"context"
-	"encoding/xml"
-	"errors"
-	"fmt"
-	"sort"
-	"strconv"
-	"strings"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/data"
-	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/logs"
-	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/tokens"
-	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/utils"
-	"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
-	qostagging "git.frostfs.info/TrueCloudLab/frostfs-qos/tagging"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
-	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
-	"github.com/valyala/fasthttp"
-	"go.uber.org/zap"
-)
-
-const (
-	internalIOTag        = "internal"
-	corsFilePathTemplate = "/%s.cors"
-	wildcard             = "*"
-)
-
-var errNoCORS = errors.New("no CORS objects found")
-
-func (h *Handler) Preflight(c *fasthttp.RequestCtx) {
-	ctx, span := tracing.StartSpanFromContext(utils.GetContextFromRequest(c), "handler.Preflight")
-	defer span.End()
-
-	ctx = qostagging.ContextWithIOTag(ctx, internalIOTag)
-	cidParam, _ := c.UserValue("cid").(string)
-	reqLog := utils.GetReqLogOrDefault(ctx, h.log)
-	log := reqLog.With(zap.String("cid", cidParam))
-
-	origin := c.Request.Header.Peek(fasthttp.HeaderOrigin)
-	if len(origin) == 0 {
-		log.Error(logs.EmptyOriginRequestHeader, logs.TagField(logs.TagDatapath))
-		ResponseError(c, "Origin request header needed", fasthttp.StatusBadRequest)
-		return
-	}
-
-	method := c.Request.Header.Peek(fasthttp.HeaderAccessControlRequestMethod)
-	if len(method) == 0 {
-		log.Error(logs.EmptyAccessControlRequestMethodHeader, logs.TagField(logs.TagDatapath))
-		ResponseError(c, "Access-Control-Request-Method request header needed", fasthttp.StatusBadRequest)
-		return
-	}
-
-	corsRule := h.config.CORS()
-	if corsRule != nil {
-		setCORSHeadersFromRule(c, corsRule)
-		return
-	}
-
-	corsConfig, err := h.getCORSConfig(ctx, log, cidParam)
-	if err != nil {
-		log.Error(logs.CouldNotGetCORSConfiguration, zap.Error(err), logs.TagField(logs.TagDatapath))
-		status := fasthttp.StatusInternalServerError
-		if errors.Is(err, errNoCORS) {
-			status = fasthttp.StatusNotFound
-		}
-		ResponseError(c, "could not get CORS configuration: "+err.Error(), status)
-		return
-	}
-
-	var headers []string
-	requestHeaders := c.Request.Header.Peek(fasthttp.HeaderAccessControlRequestHeaders)
-	if len(requestHeaders) > 0 {
-		headers = strings.Split(string(requestHeaders), ", ")
-	}
-
-	for _, rule := range corsConfig.CORSRules {
-		for _, o := range rule.AllowedOrigins {
-			if o == string(origin) || o == wildcard {
-				for _, m := range rule.AllowedMethods {
-					if m == string(method) {
-						if !checkSubslice(rule.AllowedHeaders, headers) {
-							continue
-						}
-						c.Response.Header.Set(fasthttp.HeaderAccessControlAllowOrigin, string(origin))
-						c.Response.Header.Set(fasthttp.HeaderAccessControlAllowMethods, strings.Join(rule.AllowedMethods, ", "))
-						if headers != nil {
-							c.Response.Header.Set(fasthttp.HeaderAccessControlAllowHeaders, string(requestHeaders))
-						}
-						if rule.ExposeHeaders != nil {
-							c.Response.Header.Set(fasthttp.HeaderAccessControlExposeHeaders, strings.Join(rule.ExposeHeaders, ", "))
-						}
-						if rule.MaxAgeSeconds > 0 || rule.MaxAgeSeconds == -1 {
-							c.Response.Header.Set(fasthttp.HeaderAccessControlMaxAge, strconv.Itoa(rule.MaxAgeSeconds))
-						}
-						if o != wildcard {
-							c.Response.Header.Set(fasthttp.HeaderAccessControlAllowCredentials, "true")
-						}
-						return
-					}
-				}
-			}
-		}
-	}
-	log.Error(logs.CORSRuleWasNotMatched, logs.TagField(logs.TagDatapath))
-	ResponseError(c, "Forbidden", fasthttp.StatusForbidden)
-}
-
-func (h *Handler) SetCORSHeaders(c *fasthttp.RequestCtx) {
-	ctx, span := tracing.StartSpanFromContext(utils.GetContextFromRequest(c), "handler.SetCORSHeaders")
-	defer span.End()
-
-	origin := c.Request.Header.Peek(fasthttp.HeaderOrigin)
-	if len(origin) == 0 {
-		return
-	}
-
-	ctx = qostagging.ContextWithIOTag(ctx, internalIOTag)
-	cidParam, _ := c.UserValue("cid").(string)
-	reqLog := utils.GetReqLogOrDefault(ctx, h.log)
-	log := reqLog.With(zap.String("cid", cidParam))
-
-	corsRule := h.config.CORS()
-	if corsRule != nil {
-		setCORSHeadersFromRule(c, corsRule)
-		return
-	}
-
-	corsConfig, err := h.getCORSConfig(ctx, log, cidParam)
-	if err != nil {
-		log.Error(logs.CouldNotGetCORSConfiguration, zap.Error(err), logs.TagField(logs.TagDatapath))
-		return
-	}
-
-	var withCredentials bool
-	if tkn, err := tokens.LoadBearerToken(ctx); err == nil && tkn != nil {
-		withCredentials = true
-	}
-
-	for _, rule := range corsConfig.CORSRules {
-		for _, o := range rule.AllowedOrigins {
-			if o == string(origin) {
-				for _, m := range rule.AllowedMethods {
-					if m == string(c.Method()) {
-						c.Response.Header.Set(fasthttp.HeaderAccessControlAllowOrigin, string(origin))
-						c.Response.Header.Set(fasthttp.HeaderAccessControlAllowMethods, strings.Join(rule.AllowedMethods, ", "))
-						c.Response.Header.Set(fasthttp.HeaderAccessControlAllowCredentials, "true")
-						c.Response.Header.Set(fasthttp.HeaderVary, fasthttp.HeaderOrigin)
-						return
-					}
-				}
-			}
-			if o == wildcard {
-				for _, m := range rule.AllowedMethods {
-					if m == string(c.Method()) {
-						if withCredentials {
-							c.Response.Header.Set(fasthttp.HeaderAccessControlAllowOrigin, string(origin))
-							c.Response.Header.Set(fasthttp.HeaderAccessControlAllowCredentials, "true")
-							c.Response.Header.Set(fasthttp.HeaderVary, fasthttp.HeaderOrigin)
-						} else {
-							c.Response.Header.Set(fasthttp.HeaderAccessControlAllowOrigin, o)
-						}
-						c.Response.Header.Set(fasthttp.HeaderAccessControlAllowMethods, strings.Join(rule.AllowedMethods, ", "))
-						return
-					}
-				}
-			}
-		}
-	}
-}
-
-func (h *Handler) getCORSConfig(ctx context.Context, log *zap.Logger, cidStr string) (*data.CORSConfiguration, error) {
-	cnrID, err := h.resolveContainer(ctx, cidStr)
-	if err != nil {
-		return nil, fmt.Errorf("resolve container '%s': %w", cidStr, err)
-	}
-
-	if cors := h.corsCache.Get(*cnrID); cors != nil {
-		return cors, nil
-	}
-
-	objID, err := h.getLastCORSObject(ctx, *cnrID)
-	if err != nil {
-		return nil, fmt.Errorf("get last cors object: %w", err)
-	}
-
-	var addr oid.Address
-	addr.SetContainer(h.corsCnrID)
-	addr.SetObject(objID)
-	corsObj, err := h.frostfs.GetObject(ctx, PrmObjectGet{
-		PrmAuth: PrmAuth{
-			BearerToken: bearerToken(ctx),
-		},
-		Address: addr,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("get cors object '%s': %w", addr.EncodeToString(), err)
-	}
-
-	corsConfig := &data.CORSConfiguration{}
-	if err = xml.NewDecoder(corsObj.Payload).Decode(corsConfig); err != nil {
-		return nil, fmt.Errorf("decode cors object: %w", err)
-	}
-
-	if err = h.corsCache.Put(*cnrID, corsConfig); err != nil {
-		log.Warn(logs.CouldntCacheCors, zap.Error(err), logs.TagField(logs.TagDatapath))
-	}
-
-	return corsConfig, nil
-}
-
-func (h *Handler) getLastCORSObject(ctx context.Context, cnrID cid.ID) (oid.ID, error) {
-	filters := object.NewSearchFilters()
-	filters.AddRootFilter()
-	filters.AddFilter(object.AttributeFilePath, fmt.Sprintf(corsFilePathTemplate, cnrID), object.MatchStringEqual)
-
-	prmAuth := PrmAuth{
-		BearerToken: bearerToken(ctx),
-	}
-	res, err := h.frostfs.SearchObjects(ctx, PrmObjectSearch{
-		PrmAuth:   prmAuth,
-		Container: h.corsCnrID,
-		Filters:   filters,
-	})
-	if err != nil {
-		return oid.ID{}, fmt.Errorf("search cors versions: %w", err)
-	}
-	defer res.Close()
-
-	var (
-		addr    oid.Address
-		obj     *object.Object
-		headErr error
-		objs    = make([]*object.Object, 0)
-	)
-	addr.SetContainer(h.corsCnrID)
-	err = res.Iterate(func(id oid.ID) bool {
-		addr.SetObject(id)
-		obj, headErr = h.frostfs.HeadObject(ctx, PrmObjectHead{
-			PrmAuth: prmAuth,
-			Address: addr,
-		})
-		if headErr != nil {
-			headErr = fmt.Errorf("head cors object '%s': %w", addr.EncodeToString(), headErr)
-			return true
-		}
-
-		objs = append(objs, obj)
-		return false
-	})
-	if err != nil {
-		return oid.ID{}, fmt.Errorf("iterate cors objects: %w", err)
-	}
-
-	if headErr != nil {
-		return oid.ID{}, headErr
-	}
-
-	if len(objs) == 0 {
-		return oid.ID{}, errNoCORS
-	}
-
-	sort.Slice(objs, func(i, j int) bool {
-		versionID1, _ := objs[i].ID()
-		versionID2, _ := objs[j].ID()
-		timestamp1 := utils.GetAttributeValue(objs[i].Attributes(), object.AttributeTimestamp)
-		timestamp2 := utils.GetAttributeValue(objs[j].Attributes(), object.AttributeTimestamp)
-
-		if objs[i].CreationEpoch() != objs[j].CreationEpoch() {
-			return objs[i].CreationEpoch() < objs[j].CreationEpoch()
-		}
-
-		if len(timestamp1) > 0 && len(timestamp2) > 0 && timestamp1 != timestamp2 {
-			unixTime1, err := strconv.ParseInt(timestamp1, 10, 64)
-			if err != nil {
-				return versionID1.EncodeToString() < versionID2.EncodeToString()
-			}
-
-			unixTime2, err := strconv.ParseInt(timestamp2, 10, 64)
-			if err != nil {
-				return versionID1.EncodeToString() < versionID2.EncodeToString()
-			}
-
-			return unixTime1 < unixTime2
-		}
-
-		return versionID1.EncodeToString() < versionID2.EncodeToString()
-	})
-
-	objID, _ := objs[len(objs)-1].ID()
-	return objID, nil
-}
-
-func setCORSHeadersFromRule(c *fasthttp.RequestCtx, cors *data.CORSRule) {
-	c.Response.Header.Set(fasthttp.HeaderAccessControlMaxAge, strconv.Itoa(cors.MaxAgeSeconds))
-
-	if len(cors.AllowedOrigins) != 0 {
-		c.Response.Header.Set(fasthttp.HeaderAccessControlAllowOrigin, cors.AllowedOrigins[0])
-	}
-
-	if len(cors.AllowedMethods) != 0 {
-		c.Response.Header.Set(fasthttp.HeaderAccessControlAllowMethods, strings.Join(cors.AllowedMethods, ", "))
-	}
-
-	if len(cors.AllowedHeaders) != 0 {
-		c.Response.Header.Set(fasthttp.HeaderAccessControlAllowHeaders, strings.Join(cors.AllowedHeaders, ", "))
-	}
-
-	if len(cors.ExposeHeaders) != 0 {
-		c.Response.Header.Set(fasthttp.HeaderAccessControlExposeHeaders, strings.Join(cors.ExposeHeaders, ", "))
-	}
-
-	if cors.AllowedCredentials {
-		c.Response.Header.Set(fasthttp.HeaderAccessControlAllowCredentials, "true")
-	}
-}
-
-func checkSubslice(slice []string, subSlice []string) bool {
-	if sliceContains(slice, wildcard) {
-		return true
-	}
-	if len(subSlice) > len(slice) {
-		return false
-	}
-	for _, r := range subSlice {
-		if !sliceContains(slice, r) {
-			return false
-		}
-	}
-	return true
-}
-
-func sliceContains(slice []string, str string) bool {
-	for _, s := range slice {
-		if s == str {
-			return true
-		}
-	}
-	return false
-}
--- a/internal/handler/cors_test.go
+++ b/internal/handler/cors_test.go
@ -1,440 +0,0 @@
-package handler
-
-import (
-	"encoding/base64"
-	"encoding/xml"
-	"fmt"
-	"testing"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/data"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
-	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
-	oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test"
-	"github.com/stretchr/testify/require"
-	"github.com/valyala/fasthttp"
-)
-
-func TestPreflight(t *testing.T) {
-	hc := prepareHandlerContext(t)
-
-	bktName := "bucket-preflight"
-	cnrID, cnr, err := hc.prepareContainer(bktName, acl.Private)
-	require.NoError(t, err)
-	hc.frostfs.SetContainer(cnrID, cnr)
-
-	var epoch uint64
-
-	t.Run("CORS object", func(t *testing.T) {
-		for _, tc := range []struct {
-			name            string
-			corsConfig      *data.CORSConfiguration
-			requestHeaders  map[string]string
-			expectedHeaders map[string]string
-			status          int
-		}{
-			{
-				name: "no CORS configuration",
-				expectedHeaders: map[string]string{
-					fasthttp.HeaderAccessControlAllowOrigin:      "",
-					fasthttp.HeaderAccessControlAllowMethods:     "",
-					fasthttp.HeaderAccessControlAllowHeaders:     "",
-					fasthttp.HeaderAccessControlExposeHeaders:    "",
-					fasthttp.HeaderAccessControlMaxAge:           "",
-					fasthttp.HeaderAccessControlAllowCredentials: "",
-				},
-				requestHeaders: map[string]string{
-					fasthttp.HeaderOrigin:                     "http://example.com",
-					fasthttp.HeaderAccessControlRequestMethod: "HEAD",
-				},
-				status: fasthttp.StatusNotFound,
-			},
-			{
-				name: "specific allowed origin",
-				corsConfig: &data.CORSConfiguration{
-					CORSRules: []data.CORSRule{
-						{
-							AllowedOrigins: []string{"http://example.com"},
-							AllowedMethods: []string{"GET", "HEAD"},
-							AllowedHeaders: []string{"Content-Type"},
-							ExposeHeaders:  []string{"x-amz-*", "X-Amz-*"},
-							MaxAgeSeconds:  900,
-						},
-					},
-				},
-				requestHeaders: map[string]string{
-					fasthttp.HeaderOrigin:                      "http://example.com",
-					fasthttp.HeaderAccessControlRequestMethod:  "HEAD",
-					fasthttp.HeaderAccessControlRequestHeaders: "Content-Type",
-				},
-				expectedHeaders: map[string]string{
-					fasthttp.HeaderAccessControlAllowOrigin:      "http://example.com",
-					fasthttp.HeaderAccessControlAllowMethods:     "GET, HEAD",
-					fasthttp.HeaderAccessControlAllowHeaders:     "Content-Type",
-					fasthttp.HeaderAccessControlExposeHeaders:    "x-amz-*, X-Amz-*",
-					fasthttp.HeaderAccessControlMaxAge:           "900",
-					fasthttp.HeaderAccessControlAllowCredentials: "true",
-				},
-				status: fasthttp.StatusOK,
-			},
-			{
-				name: "wildcard allowed origin",
-				corsConfig: &data.CORSConfiguration{
-					CORSRules: []data.CORSRule{
-						{
-							AllowedOrigins: []string{"*"},
-							AllowedMethods: []string{"GET", "HEAD"},
-							AllowedHeaders: []string{"Content-Type"},
-							ExposeHeaders:  []string{"x-amz-*", "X-Amz-*"},
-							MaxAgeSeconds:  900,
-						},
-					},
-				},
-				requestHeaders: map[string]string{
-					fasthttp.HeaderOrigin:                     "http://example.com",
-					fasthttp.HeaderAccessControlRequestMethod: "HEAD",
-				},
-				expectedHeaders: map[string]string{
-					fasthttp.HeaderAccessControlAllowOrigin:      "http://example.com",
-					fasthttp.HeaderAccessControlAllowMethods:     "GET, HEAD",
-					fasthttp.HeaderAccessControlAllowHeaders:     "",
-					fasthttp.HeaderAccessControlExposeHeaders:    "x-amz-*, X-Amz-*",
-					fasthttp.HeaderAccessControlMaxAge:           "900",
-					fasthttp.HeaderAccessControlAllowCredentials: "",
-				},
-				status: fasthttp.StatusOK,
-			},
-			{
-				name: "not allowed header",
-				corsConfig: &data.CORSConfiguration{
-					CORSRules: []data.CORSRule{
-						{
-							AllowedOrigins: []string{"*"},
-							AllowedMethods: []string{"GET", "HEAD"},
-							AllowedHeaders: []string{"Content-Type"},
-						},
-					},
-				},
-				requestHeaders: map[string]string{
-					fasthttp.HeaderOrigin:                      "http://example.com",
-					fasthttp.HeaderAccessControlRequestMethod:  "GET",
-					fasthttp.HeaderAccessControlRequestHeaders: "Authorization",
-				},
-				expectedHeaders: map[string]string{
-					fasthttp.HeaderAccessControlAllowOrigin:      "",
-					fasthttp.HeaderAccessControlAllowMethods:     "",
-					fasthttp.HeaderAccessControlAllowHeaders:     "",
-					fasthttp.HeaderAccessControlExposeHeaders:    "",
-					fasthttp.HeaderAccessControlMaxAge:           "",
-					fasthttp.HeaderAccessControlAllowCredentials: "",
-				},
-				status: fasthttp.StatusForbidden,
-			},
-			{
-				name: "empty Origin header",
-				corsConfig: &data.CORSConfiguration{
-					CORSRules: []data.CORSRule{
-						{
-							AllowedOrigins: []string{"*"},
-							AllowedMethods: []string{"GET", "HEAD"},
-						},
-					},
-				},
-				expectedHeaders: map[string]string{
-					fasthttp.HeaderAccessControlAllowOrigin:      "",
-					fasthttp.HeaderAccessControlAllowMethods:     "",
-					fasthttp.HeaderAccessControlAllowHeaders:     "",
-					fasthttp.HeaderAccessControlExposeHeaders:    "",
-					fasthttp.HeaderAccessControlMaxAge:           "",
-					fasthttp.HeaderAccessControlAllowCredentials: "",
-				},
-				status: fasthttp.StatusBadRequest,
-			},
-			{
-				name: "empty Access-Control-Request-Method header",
-				corsConfig: &data.CORSConfiguration{
-					CORSRules: []data.CORSRule{
-						{
-							AllowedOrigins: []string{"*"},
-							AllowedMethods: []string{"GET", "HEAD"},
-						},
-					},
-				},
-				requestHeaders: map[string]string{
-					fasthttp.HeaderOrigin: "http://example.com",
-				},
-				expectedHeaders: map[string]string{
-					fasthttp.HeaderAccessControlAllowOrigin:      "",
-					fasthttp.HeaderAccessControlAllowMethods:     "",
-					fasthttp.HeaderAccessControlAllowHeaders:     "",
-					fasthttp.HeaderAccessControlExposeHeaders:    "",
-					fasthttp.HeaderAccessControlMaxAge:           "",
-					fasthttp.HeaderAccessControlAllowCredentials: "",
-				},
-				status: fasthttp.StatusBadRequest,
-			},
-		} {
-			t.Run(tc.name, func(t *testing.T) {
-				if tc.corsConfig != nil {
-					epoch++
-					setCORSObject(t, hc, cnrID, tc.corsConfig, epoch)
-				}
-
-				r := prepareCORSRequest(t, bktName, tc.requestHeaders)
-				hc.Handler().Preflight(r)
-
-				require.Equal(t, tc.status, r.Response.StatusCode())
-				for k, v := range tc.expectedHeaders {
-					require.Equal(t, v, string(r.Response.Header.Peek(k)))
-				}
-			})
-		}
-	})
-
-	t.Run("CORS config", func(t *testing.T) {
-		hc.cfg.cors = &data.CORSRule{
-			AllowedOrigins:     []string{"*"},
-			AllowedMethods:     []string{"GET", "HEAD"},
-			AllowedHeaders:     []string{"Content-Type", "Content-Encoding"},
-			ExposeHeaders:      []string{"x-amz-*", "X-Amz-*"},
-			MaxAgeSeconds:      900,
-			AllowedCredentials: true,
-		}
-
-		r := prepareCORSRequest(t, bktName, map[string]string{
-			fasthttp.HeaderOrigin:                     "http://example.com",
-			fasthttp.HeaderAccessControlRequestMethod: "GET",
-		})
-		hc.Handler().Preflight(r)
-
-		require.Equal(t, fasthttp.StatusOK, r.Response.StatusCode())
-		require.Equal(t, "900", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlMaxAge)))
-		require.Equal(t, "*", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlAllowOrigin)))
-		require.Equal(t, "GET, HEAD", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlAllowMethods)))
-		require.Equal(t, "Content-Type, Content-Encoding", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlAllowHeaders)))
-		require.Equal(t, "x-amz-*, X-Amz-*", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlExposeHeaders)))
-		require.Equal(t, "true", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlAllowCredentials)))
-	})
-}
-
-func TestSetCORSHeaders(t *testing.T) {
-	hc := prepareHandlerContext(t)
-
-	bktName := "bucket-set-cors-headers"
-	cnrID, cnr, err := hc.prepareContainer(bktName, acl.Private)
-	require.NoError(t, err)
-	hc.frostfs.SetContainer(cnrID, cnr)
-
-	var epoch uint64
-
-	t.Run("CORS object", func(t *testing.T) {
-		for _, tc := range []struct {
-			name            string
-			corsConfig      *data.CORSConfiguration
-			requestHeaders  map[string]string
-			expectedHeaders map[string]string
-		}{
-			{
-				name: "empty Origin header",
-				expectedHeaders: map[string]string{
-					fasthttp.HeaderAccessControlAllowOrigin:      "",
-					fasthttp.HeaderAccessControlAllowMethods:     "",
-					fasthttp.HeaderVary:                          "",
-					fasthttp.HeaderAccessControlAllowCredentials: "",
-				},
-			},
-			{
-				name: "no CORS configuration",
-				expectedHeaders: map[string]string{
-					fasthttp.HeaderAccessControlAllowOrigin:      "",
-					fasthttp.HeaderAccessControlAllowMethods:     "",
-					fasthttp.HeaderVary:                          "",
-					fasthttp.HeaderAccessControlAllowCredentials: "",
-				},
-				requestHeaders: map[string]string{
-					fasthttp.HeaderOrigin: "http://example.com",
-				},
-			},
-			{
-				name: "specific allowed origin",
-				corsConfig: &data.CORSConfiguration{
-					CORSRules: []data.CORSRule{
-						{
-							AllowedOrigins: []string{"http://example.com"},
-							AllowedMethods: []string{"GET", "HEAD"},
-						},
-					},
-				},
-				requestHeaders: map[string]string{
-					fasthttp.HeaderOrigin: "http://example.com",
-				},
-				expectedHeaders: map[string]string{
-					fasthttp.HeaderAccessControlAllowOrigin:      "http://example.com",
-					fasthttp.HeaderAccessControlAllowMethods:     "GET, HEAD",
-					fasthttp.HeaderVary:                          fasthttp.HeaderOrigin,
-					fasthttp.HeaderAccessControlAllowCredentials: "true",
-				},
-			},
-			{
-				name: "wildcard allowed origin, with credentials",
-				corsConfig: &data.CORSConfiguration{
-					CORSRules: []data.CORSRule{
-						{
-							AllowedOrigins: []string{"*"},
-							AllowedMethods: []string{"GET", "HEAD"},
-						},
-					},
-				},
-				requestHeaders: func() map[string]string {
-					tkn := new(bearer.Token)
-					err = tkn.Sign(hc.key.PrivateKey)
-					require.NoError(t, err)
-
-					t64 := base64.StdEncoding.EncodeToString(tkn.Marshal())
-					require.NotEmpty(t, t64)
-
-					return map[string]string{
-						fasthttp.HeaderOrigin:        "http://example.com",
-						fasthttp.HeaderAuthorization: "Bearer " + t64,
-					}
-				}(),
-				expectedHeaders: map[string]string{
-					fasthttp.HeaderAccessControlAllowOrigin:      "http://example.com",
-					fasthttp.HeaderAccessControlAllowMethods:     "GET, HEAD",
-					fasthttp.HeaderVary:                          fasthttp.HeaderOrigin,
-					fasthttp.HeaderAccessControlAllowCredentials: "true",
-				},
-			},
-			{
-				name: "wildcard allowed origin, without credentials",
-				corsConfig: &data.CORSConfiguration{
-					CORSRules: []data.CORSRule{
-						{
-							AllowedOrigins: []string{"*"},
-							AllowedMethods: []string{"GET", "HEAD"},
-						},
-					},
-				},
-				requestHeaders: map[string]string{
-					fasthttp.HeaderOrigin: "http://example.com",
-				},
-				expectedHeaders: map[string]string{
-					fasthttp.HeaderAccessControlAllowOrigin:      "*",
-					fasthttp.HeaderAccessControlAllowMethods:     "GET, HEAD",
-					fasthttp.HeaderVary:                          "",
-					fasthttp.HeaderAccessControlAllowCredentials: "",
-				},
-			},
-		} {
-			t.Run(tc.name, func(t *testing.T) {
-				epoch++
-				setCORSObject(t, hc, cnrID, tc.corsConfig, epoch)
-				r := prepareCORSRequest(t, bktName, tc.requestHeaders)
-				hc.Handler().SetCORSHeaders(r)
-
-				require.Equal(t, fasthttp.StatusOK, r.Response.StatusCode())
-				for k, v := range tc.expectedHeaders {
-					require.Equal(t, v, string(r.Response.Header.Peek(k)))
-				}
-			})
-		}
-	})
-
-	t.Run("CORS config", func(t *testing.T) {
-		hc.cfg.cors = &data.CORSRule{
-			AllowedOrigins:     []string{"*"},
-			AllowedMethods:     []string{"GET", "HEAD"},
-			AllowedHeaders:     []string{"Content-Type", "Content-Encoding"},
-			ExposeHeaders:      []string{"x-amz-*", "X-Amz-*"},
-			MaxAgeSeconds:      900,
-			AllowedCredentials: true,
-		}
-
-		r := prepareCORSRequest(t, bktName, map[string]string{fasthttp.HeaderOrigin: "http://example.com"})
-		hc.Handler().SetCORSHeaders(r)
-
-		require.Equal(t, "900", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlMaxAge)))
-		require.Equal(t, "*", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlAllowOrigin)))
-		require.Equal(t, "GET, HEAD", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlAllowMethods)))
-		require.Equal(t, "Content-Type, Content-Encoding", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlAllowHeaders)))
-		require.Equal(t, "x-amz-*, X-Amz-*", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlExposeHeaders)))
-		require.Equal(t, "true", string(r.Response.Header.Peek(fasthttp.HeaderAccessControlAllowCredentials)))
-	})
-}
-
-func TestCheckSubslice(t *testing.T) {
-	for _, tc := range []struct {
-		name     string
-		allowed  []string
-		actual   []string
-		expected bool
-	}{
-		{
-			name:     "empty allowed slice",
-			allowed:  []string{},
-			actual:   []string{"str1", "str2", "str3"},
-			expected: false,
-		},
-		{
-			name:     "empty actual slice",
-			allowed:  []string{"str1", "str2", "str3"},
-			actual:   []string{},
-			expected: true,
-		},
-		{
-			name:     "allowed wildcard",
-			allowed:  []string{"str", "*"},
-			actual:   []string{"str1", "str2", "str3"},
-			expected: true,
-		},
-		{
-			name:     "similar allowed and actual",
-			allowed:  []string{"str1", "str2", "str3"},
-			actual:   []string{"str1", "str2", "str3"},
-			expected: true,
-		},
-		{
-			name:     "allowed actual",
-			allowed:  []string{"str", "str1", "str2", "str4"},
-			actual:   []string{"str1", "str2"},
-			expected: true,
-		},
-		{
-			name:     "not allowed actual",
-			allowed:  []string{"str", "str1", "str2", "str4"},
-			actual:   []string{"str1", "str5"},
-			expected: false,
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			require.Equal(t, tc.expected, checkSubslice(tc.allowed, tc.actual))
-		})
-	}
-}
-
-func setCORSObject(t *testing.T, hc *handlerContext, cnrID cid.ID, corsConfig *data.CORSConfiguration, epoch uint64) {
-	payload, err := xml.Marshal(corsConfig)
-	require.NoError(t, err)
-
-	a := object.NewAttribute()
-	a.SetKey(object.AttributeFilePath)
-	a.SetValue(fmt.Sprintf(corsFilePathTemplate, cnrID))
-
-	objID := oidtest.ID()
-	obj := object.New()
-	obj.SetAttributes(*a)
-	obj.SetOwnerID(hc.owner)
-	obj.SetPayload(payload)
-	obj.SetPayloadSize(uint64(len(payload)))
-	obj.SetContainerID(hc.corsCnr)
-	obj.SetID(objID)
-	obj.SetCreationEpoch(epoch)
-
-	var addr oid.Address
-	addr.SetObject(objID)
-	addr.SetContainer(hc.corsCnr)
-
-	hc.frostfs.SetObject(addr, obj)
-}
--- a/internal/handler/frostfs_mock.go
+++ b/internal/handler/frostfs_mock.go
@ -52,10 +52,6 @@ func (t *TestFrostFS) SetContainer(cnrID cid.ID, cnr *container.Container) {
 	t.containers[cnrID.EncodeToString()] = cnr
 }

-func (t *TestFrostFS) SetObject(addr oid.Address, obj *object.Object) {
-	t.objects[addr.EncodeToString()] = obj
-}
-
 // AllowUserOperation grants access to object operations.
 // Empty userID and objID means any user and object respectively.
 func (t *TestFrostFS) AllowUserOperation(cnrID cid.ID, userID user.ID, op acl.Op, objID oid.ID) {
--- a/internal/handler/handler.go
+++ b/internal/handler/handler.go
@ -36,8 +36,6 @@ type Config interface {
 	BufferMaxSizeForPut() uint64
 	NamespaceHeader() string
 	EnableFilepathFallback() bool
-	FormContainerZone(string) string
-	CORS() *data.CORSRule
 }

 // PrmContainer groups parameters of FrostFS.Container operation.
@ -160,7 +158,7 @@ type FrostFS interface {
 }

 type ContainerResolver interface {
-	Resolve(ctx context.Context, zone, name string) (*cid.ID, error)
+	Resolve(ctx context.Context, name string) (*cid.ID, error)
 }

 type Handler struct {
@ -172,18 +170,14 @@ type Handler struct {
 	tree              layer.TreeService
 	cache             *cache.BucketCache
 	workerPool        *ants.Pool
-	corsCnrID         cid.ID
-	corsCache         *cache.CORSCache
 }

 type AppParams struct {
-	Logger    *zap.Logger
-	FrostFS   FrostFS
-	Owner     *user.ID
-	Resolver  ContainerResolver
-	Cache     *cache.BucketCache
-	CORSCnrID cid.ID
-	CORSCache *cache.CORSCache
+	Logger   *zap.Logger
+	FrostFS  FrostFS
+	Owner    *user.ID
+	Resolver ContainerResolver
+	Cache    *cache.BucketCache
 }

 func New(params *AppParams, config Config, tree layer.TreeService, workerPool *ants.Pool) *Handler {
@ -196,8 +190,6 @@ func New(params *AppParams, config Config, tree layer.TreeService, workerPool *a
 		tree:              tree,
 		cache:             params.Cache,
 		workerPool:        workerPool,
-		corsCnrID:         params.CORSCnrID,
-		corsCache:         params.CORSCache,
 	}
 }

@ -261,7 +253,9 @@ func (h *Handler) byAttribute(c *fasthttp.RequestCtx, handler func(context.Conte
 		return
 	}

-	val = prepareAtribute(key, val)
+	if key == attrFileName {
+		val = prepareFileName(val)
+	}

 	log = log.With(zap.String("cid", cidParam), zap.String("attr_key", key), zap.String("attr_val", val))

@ -304,8 +298,7 @@ func (h *Handler) findObjectByAttribute(ctx context.Context, log *zap.Logger, cn
 		switch {
 		case errors.Is(err, io.EOF) && h.needSearchByFileName(attrKey, attrVal):
 			log.Debug(logs.ObjectNotFoundByFilePathTrySearchByFileName, logs.TagField(logs.TagExternalStorage))
-			attrVal = prepareAtribute(attrFileName, attrVal)
-			return h.findObjectByAttribute(ctx, log, cnrID, attrFileName, attrVal)
+			return h.findObjectByAttribute(ctx, log, cnrID, attrFileName, prepareFileName(attrVal))
 		case errors.Is(err, io.EOF):
 			log.Error(logs.ObjectNotFound, zap.Error(err), logs.TagField(logs.TagExternalStorage))
 			return oid.ID{}, fmt.Errorf("object not found: %w", err)
@ -326,18 +319,6 @@ func (h *Handler) needSearchByFileName(key, val string) bool {
 	return strings.HasPrefix(val, "/") && strings.Count(val, "/") == 1 || !strings.Contains(val, "/")
 }

-func prepareAtribute(attrKey, attrVal string) string {
-	if attrKey == attrFileName {
-		return prepareFileName(attrVal)
-	}
-
-	if attrKey == attrFilePath {
-		return prepareFilePath(attrVal)
-	}
-
-	return attrVal
-}
-
 func prepareFileName(fileName string) string {
 	if strings.HasPrefix(fileName, "/") {
 		return fileName[1:]
@ -346,28 +327,13 @@ func prepareFileName(fileName string) string {
 	return fileName
 }

-func prepareFilePath(filePath string) string {
-	if !strings.HasPrefix(filePath, "/") {
-		return "/" + filePath
-	}
-
-	return filePath
-}
-
 // resolveContainer decode container id, if it's not a valid container id
 // then trey to resolve name using provided resolver.
 func (h *Handler) resolveContainer(ctx context.Context, containerID string) (*cid.ID, error) {
 	cnrID := new(cid.ID)
 	err := cnrID.DecodeString(containerID)
 	if err != nil {
-		var namespace string
-		namespace, err = middleware.GetNamespace(ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		zone := h.config.FormContainerZone(namespace)
-		cnrID, err = h.containerResolver.Resolve(ctx, zone, containerID)
+		cnrID, err = h.containerResolver.Resolve(ctx, containerID)
 		if err != nil && strings.Contains(err.Error(), "not found") {
 			err = fmt.Errorf("%w: %s", new(apistatus.ContainerNotFound), err.Error())
 		}
--- a/internal/handler/handler_fuzz_test.go
+++ b/internal/handler/handler_fuzz_test.go
@ -21,7 +21,6 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	go_fuzz_utils "github.com/trailofbits/go-fuzz-utils"
 	"github.com/valyala/fasthttp"
-	"go.uber.org/zap"
 )

 const (
@ -126,7 +125,7 @@ func maybeFillRandom(tp *go_fuzz_utils.TypeProvider, initValue string) (string,
 }

 func upload(tp *go_fuzz_utils.TypeProvider) (context.Context, *handlerContext, cid.ID, *fasthttp.RequestCtx, string, string, string, error) {
-	hc, err := prepareHandlerContextBase(zap.NewExample())
+	hc, err := prepareHandlerContext()
 	if err != nil {
 		return nil, nil, cid.ID{}, nil, "", "", "", err
 	}
--- a/internal/handler/handler_test.go
+++ b/internal/handler/handler_test.go
@ -16,9 +16,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/handler/middleware"
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/layer"
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/resolver"
-	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/tokens"
 	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/utils"
-	v2container "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/api/container"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
@ -32,7 +30,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/valyala/fasthttp"
 	"go.uber.org/zap"
-	"go.uber.org/zap/zaptest"
 )

 type treeServiceMock struct {
@ -63,7 +60,6 @@ func (t *treeServiceMock) GetLatestVersion(context.Context, *cid.ID, string) (*d

 type configMock struct {
 	additionalSearch bool
-	cors             *data.CORSRule
 }

 func (c *configMock) DefaultTimestamp() bool {
@ -102,18 +98,9 @@ func (c *configMock) EnableFilepathFallback() bool {
 	return c.additionalSearch
 }

-func (c *configMock) FormContainerZone(string) string {
-	return v2container.SysAttributeZoneDefault
-}
-
-func (c *configMock) CORS() *data.CORSRule {
-	return c.cors
-}
-
 type handlerContext struct {
-	key     *keys.PrivateKey
-	owner   user.ID
-	corsCnr cid.ID
+	key   *keys.PrivateKey
+	owner user.ID

 	h       *Handler
 	frostfs *TestFrostFS
@ -125,13 +112,12 @@ func (hc *handlerContext) Handler() *Handler {
 	return hc.h
 }

-func prepareHandlerContext(t *testing.T) *handlerContext {
-	hc, err := prepareHandlerContextBase(zaptest.NewLogger(t))
-	require.NoError(t, err)
-	return hc
-}
+func prepareHandlerContext() (*handlerContext, error) {
+	logger, err := zap.NewDevelopment()
+	if err != nil {
+		return nil, err
+	}

-func prepareHandlerContextBase(logger *zap.Logger) (*handlerContext, error) {
 	key, err := keys.NewPrivateKey()
 	if err != nil {
 		return nil, err
@ -143,12 +129,10 @@ func prepareHandlerContextBase(logger *zap.Logger) (*handlerContext, error) {
 	testFrostFS := NewTestFrostFS(key)

 	testResolver := &resolver.Resolver{Name: "test_resolver"}
-	testResolver.SetResolveFunc(func(_ context.Context, _, name string) (*cid.ID, error) {
+	testResolver.SetResolveFunc(func(_ context.Context, name string) (*cid.ID, error) {
 		return testFrostFS.ContainerID(name)
 	})

-	cnrID := createCORSContainer(owner, testFrostFS)
-
 	params := &AppParams{
 		Logger:   logger,
 		FrostFS:  testFrostFS,
@ -159,12 +143,6 @@ func prepareHandlerContextBase(logger *zap.Logger) (*handlerContext, error) {
 			Lifetime: 1,
 			Logger:   logger,
 		}, false),
-		CORSCnrID: cnrID,
-		CORSCache: cache.NewCORSCache(&cache.Config{
-			Size:     1,
-			Lifetime: 1,
-			Logger:   logger,
-		}),
 	}

 	treeMock := newTreeService()
@ -179,7 +157,6 @@ func prepareHandlerContextBase(logger *zap.Logger) (*handlerContext, error) {
 	return &handlerContext{
 		key:     key,
 		owner:   owner,
-		corsCnr: cnrID,
 		h:       handler,
 		frostfs: testFrostFS,
 		tree:    treeMock,
@ -187,20 +164,6 @@ func prepareHandlerContextBase(logger *zap.Logger) (*handlerContext, error) {
 	}, nil
 }

-func createCORSContainer(owner user.ID, frostfs *TestFrostFS) cid.ID {
-	var cnr container.Container
-	cnr.Init()
-	cnr.SetOwner(owner)
-
-	cnrID := cidtest.ID()
-	frostfs.SetContainer(cnrID, &cnr)
-	frostfs.AllowUserOperation(cnrID, owner, acl.OpObjectSearch, oid.ID{})
-	frostfs.AllowUserOperation(cnrID, owner, acl.OpObjectHead, oid.ID{})
-	frostfs.AllowUserOperation(cnrID, owner, acl.OpObjectGet, oid.ID{})
-
-	return cnrID
-}
-
 func (hc *handlerContext) prepareContainer(name string, basicACL acl.Basic) (cid.ID, *container.Container, error) {
 	var pp netmap.PlacementPolicy
 	err := pp.DecodeString("REP 1")
@ -233,7 +196,8 @@ func (hc *handlerContext) prepareContainer(name string, basicACL acl.Basic) (cid
 }

 func TestBasic(t *testing.T) {
-	hc := prepareHandlerContext(t)
+	hc, err := prepareHandlerContext()
+	require.NoError(t, err)

 	bktName := "bucket"
 	cnrID, cnr, err := hc.prepareContainer(bktName, acl.PublicRWExtended)
@ -255,10 +219,8 @@ func TestBasic(t *testing.T) {
 	require.NoError(t, err)

 	obj := hc.frostfs.objects[putRes.ContainerID+"/"+putRes.ObjectID]
-	fileName := prepareObjectAttributes(object.AttributeFileName, objFileName)
-	filePath := prepareObjectAttributes(object.AttributeFilePath, objFilePath)
-	obj.SetAttributes(append(obj.Attributes(), fileName)...)
-	obj.SetAttributes(append(obj.Attributes(), filePath)...)
+	attr := prepareObjectAttributes(object.AttributeFilePath, objFileName)
+	obj.SetAttributes(append(obj.Attributes(), attr)...)

 	t.Run("get", func(t *testing.T) {
 		r = prepareGetRequest(ctx, cnrID.EncodeToString(), putRes.ObjectID)
@ -278,11 +240,7 @@ func TestBasic(t *testing.T) {
 		hc.Handler().DownloadByAttribute(r)
 		require.Equal(t, content, string(r.Response.Body()))

-		r = prepareGetByAttributeRequest(ctx, bktName, attrFileName, objFilePath)
-		hc.Handler().DownloadByAttribute(r)
-		require.Equal(t, content, string(r.Response.Body()))
-
-		r = prepareGetByAttributeRequest(ctx, bktName, attrFilePath, objFileName)
+		r = prepareGetByAttributeRequest(ctx, bktName, attrFileName, "/"+objFileName)
 		hc.Handler().DownloadByAttribute(r)
 		require.Equal(t, content, string(r.Response.Body()))
 	})
@ -293,12 +251,7 @@ func TestBasic(t *testing.T) {
 		require.Equal(t, putRes.ObjectID, string(r.Response.Header.Peek(hdrObjectID)))
 		require.Equal(t, putRes.ContainerID, string(r.Response.Header.Peek(hdrContainerID)))

-		r = prepareGetByAttributeRequest(ctx, bktName, attrFileName, objFilePath)
-		hc.Handler().HeadByAttribute(r)
-		require.Equal(t, putRes.ObjectID, string(r.Response.Header.Peek(hdrObjectID)))
-		require.Equal(t, putRes.ContainerID, string(r.Response.Header.Peek(hdrContainerID)))
-
-		r = prepareGetByAttributeRequest(ctx, bktName, attrFilePath, objFileName)
+		r = prepareGetByAttributeRequest(ctx, bktName, attrFileName, "/"+objFileName)
 		hc.Handler().HeadByAttribute(r)
 		require.Equal(t, putRes.ObjectID, string(r.Response.Header.Peek(hdrObjectID)))
 		require.Equal(t, putRes.ContainerID, string(r.Response.Header.Peek(hdrContainerID)))
@ -312,7 +265,7 @@ func TestBasic(t *testing.T) {
 		zipReader, err := zip.NewReader(readerAt, int64(len(r.Response.Body())))
 		require.NoError(t, err)
 		require.Len(t, zipReader.File, 1)
-		require.Equal(t, objFilePath, zipReader.File[0].Name)
+		require.Equal(t, objFileName, zipReader.File[0].Name)
 		f, err := zipReader.File[0].Open()
 		require.NoError(t, err)
 		defer func() {
@ -326,7 +279,8 @@ func TestBasic(t *testing.T) {
 }

 func TestFindObjectByAttribute(t *testing.T) {
-	hc := prepareHandlerContext(t)
+	hc, err := prepareHandlerContext()
+	require.NoError(t, err)
 	hc.cfg.additionalSearch = true

 	bktName := "bucket"
@ -423,7 +377,8 @@ func TestFindObjectByAttribute(t *testing.T) {
 }

 func TestNeedSearchByFileName(t *testing.T) {
-	hc := prepareHandlerContext(t)
+	hc, err := prepareHandlerContext()
+	require.NoError(t, err)

 	for _, tc := range []struct {
 		name             string
@ -495,17 +450,6 @@ func TestPrepareFileName(t *testing.T) {
 	require.Equal(t, expected, actual)
 }

-func TestPrepareFilePath(t *testing.T) {
-	filePath := "cat.jpg"
-	expected := "/cat.jpg"
-	actual := prepareFilePath(filePath)
-	require.Equal(t, expected, actual)
-
-	filePath = "/cat.jpg"
-	actual = prepareFilePath(filePath)
-	require.Equal(t, expected, actual)
-}
-
 func prepareUploadRequest(ctx context.Context, bucket, content string) (*fasthttp.RequestCtx, error) {
 	r := new(fasthttp.RequestCtx)
 	utils.SetContextToRequest(ctx, r)
@ -521,25 +465,6 @@ func prepareGetRequest(ctx context.Context, bucket, objID string) *fasthttp.Requ
 	return r
 }

-func prepareCORSRequest(t *testing.T, bucket string, headers map[string]string) *fasthttp.RequestCtx {
-	ctx := context.Background()
-	ctx = middleware.SetNamespace(ctx, "")
-
-	r := new(fasthttp.RequestCtx)
-	r.SetUserValue("cid", bucket)
-
-	for k, v := range headers {
-		r.Request.Header.Set(k, v)
-	}
-
-	ctx, err := tokens.StoreBearerTokenAppCtx(ctx, r)
-	require.NoError(t, err)
-
-	utils.SetContextToRequest(ctx, r)
-
-	return r
-}
-
 func prepareGetByAttributeRequest(ctx context.Context, bucket, attrKey, attrVal string) *fasthttp.RequestCtx {
 	r := new(fasthttp.RequestCtx)
 	utils.SetContextToRequest(ctx, r)
@ -568,7 +493,6 @@ const (
 	keyAttr     = "User-Attribute"
 	valAttr     = "user value"
 	objFileName = "newFile.txt"
-	objFilePath = "/newFile.txt"
 )

 func fillMultipartBody(r *fasthttp.RequestCtx, content string) error {
--- a/internal/handler/multipart_test.go
+++ b/internal/handler/multipart_test.go
@ -60,7 +60,12 @@ func BenchmarkAll(b *testing.B) {
 func defaultMultipart(filename string) error {
 	r, bound := multipartFile(filename)

-	file, err := fetchMultipartFileDefault(zap.NewNop(), r, bound)
+	logger, err := zap.NewProduction()
+	if err != nil {
+		return err
+	}
+
+	file, err := fetchMultipartFileDefault(logger, r, bound)
 	if err != nil {
 		return err
 	}
@ -82,7 +87,12 @@ func TestName(t *testing.T) {
 func customMultipart(filename string) error {
 	r, bound := multipartFile(filename)

-	file, err := fetchMultipartFile(zap.NewNop(), r, bound)
+	logger, err := zap.NewProduction()
+	if err != nil {
+		return err
+	}
+
+	file, err := fetchMultipartFile(logger, r, bound)
 	if err != nil {
 		return err
 	}
--- a/internal/logs/logs.go
+++ b/internal/logs/logs.go
@ -72,47 +72,41 @@ const (
 	TagsLogConfigWontBeUpdated                                            = "tags log config won't be updated"
 	FailedToReadIndexPageTemplate                                         = "failed to read index page template"
 	SetCustomIndexPageTemplate                                            = "set custom index page template"
-	CouldNotFetchCORSContainerInfo                                        = "couldn't fetch CORS container info"
 )

 // Log messages with the "datapath" tag.
 const (
-	CouldntParseCreationDate              = "couldn't parse creation date"
-	CouldNotDetectContentTypeFromPayload  = "could not detect Content-Type from payload"
-	FailedToAddObjectToArchive            = "failed to add object to archive"
-	CloseZipWriter                        = "close zip writer"
-	IgnorePartEmptyFormName               = "ignore part, empty form name"
-	IgnorePartEmptyFilename               = "ignore part, empty filename"
-	CouldNotParseClientTime               = "could not parse client time"
-	CouldNotPrepareExpirationHeader       = "could not prepare expiration header"
-	CouldNotEncodeResponse                = "could not encode response"
-	AddAttributeToResultObject            = "add attribute to result object"
-	Request                               = "request"
-	CouldNotFetchAndStoreBearerToken      = "could not fetch and store bearer token"
-	CouldntPutBucketIntoCache             = "couldn't put bucket info into cache"
-	FailedToIterateOverResponse           = "failed to iterate over search response"
-	InvalidCacheEntryType                 = "invalid cache entry type"
-	FailedToUnescapeQuery                 = "failed to unescape query"
-	CouldntCacheNetmap                    = "couldn't cache netmap"
-	FailedToCloseReader                   = "failed to close reader"
-	FailedToFilterHeaders                 = "failed to filter headers"
-	FailedToReadFileFromTar               = "failed to read file from tar"
-	FailedToGetAttributes                 = "failed to get attributes"
-	CloseGzipWriter                       = "close gzip writer"
-	CloseTarWriter                        = "close tar writer"
-	FailedToCreateGzipReader              = "failed to create gzip reader"
-	GzipReaderSelected                    = "gzip reader selected"
-	CouldNotReceiveMultipartForm          = "could not receive multipart/form"
-	ObjectsNotFound                       = "objects not found"
-	IteratingOverSelectedObjectsFailed    = "iterating over selected objects failed"
-	CouldNotGetBucket                     = "could not get bucket"
-	CouldNotResolveContainerID            = "could not resolve container id"
-	FailedToSumbitTaskToPool              = "failed to submit task to pool"
-	CouldNotGetCORSConfiguration          = "could not get cors configuration"
-	EmptyOriginRequestHeader              = "empty Origin request header"
-	EmptyAccessControlRequestMethodHeader = "empty Access-Control-Request-Method request header"
-	CORSRuleWasNotMatched                 = "cors rule was not matched"
-	CouldntCacheCors                      = "couldn't cache cors"
+	CouldntParseCreationDate             = "couldn't parse creation date"
+	CouldNotDetectContentTypeFromPayload = "could not detect Content-Type from payload"
+	FailedToAddObjectToArchive           = "failed to add object to archive"
+	CloseZipWriter                       = "close zip writer"
+	IgnorePartEmptyFormName              = "ignore part, empty form name"
+	IgnorePartEmptyFilename              = "ignore part, empty filename"
+	CouldNotParseClientTime              = "could not parse client time"
+	CouldNotPrepareExpirationHeader      = "could not prepare expiration header"
+	CouldNotEncodeResponse               = "could not encode response"
+	AddAttributeToResultObject           = "add attribute to result object"
+	Request                              = "request"
+	CouldNotFetchAndStoreBearerToken     = "could not fetch and store bearer token"
+	CouldntPutBucketIntoCache            = "couldn't put bucket info into cache"
+	FailedToIterateOverResponse          = "failed to iterate over search response"
+	InvalidCacheEntryType                = "invalid cache entry type"
+	FailedToUnescapeQuery                = "failed to unescape query"
+	CouldntCacheNetmap                   = "couldn't cache netmap"
+	FailedToCloseReader                  = "failed to close reader"
+	FailedToFilterHeaders                = "failed to filter headers"
+	FailedToReadFileFromTar              = "failed to read file from tar"
+	FailedToGetAttributes                = "failed to get attributes"
+	CloseGzipWriter                      = "close gzip writer"
+	CloseTarWriter                       = "close tar writer"
+	FailedToCreateGzipReader             = "failed to create gzip reader"
+	GzipReaderSelected                   = "gzip reader selected"
+	CouldNotReceiveMultipartForm         = "could not receive multipart/form"
+	ObjectsNotFound                      = "objects not found"
+	IteratingOverSelectedObjectsFailed   = "iterating over selected objects failed"
+	CouldNotGetBucket                    = "could not get bucket"
+	CouldNotResolveContainerID           = "could not resolve container id"
+	FailedToSumbitTaskToPool             = "failed to submit task to pool"
 )

 // Log messages with the "external_storage" tag.
--- a/resolver/resolver.go
+++ b/resolver/resolver.go
@ -6,7 +6,7 @@ import (
 	"fmt"
 	"sync"

-	v2container "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/api/container"
+	"git.frostfs.info/TrueCloudLab/frostfs-http-gw/internal/handler/middleware"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/ns"
@ -29,9 +29,14 @@ type FrostFS interface {
 	SystemDNS(context.Context) (string, error)
 }

+type Settings interface {
+	FormContainerZone(ns string) (zone string, isDefault bool)
+}
+
 type Config struct {
 	FrostFS    FrostFS
 	RPCAddress string
+	Settings   Settings
 }

 type ContainerResolver struct {
@ -41,15 +46,15 @@ type ContainerResolver struct {

 type Resolver struct {
 	Name    string
-	resolve func(context.Context, string, string) (*cid.ID, error)
+	resolve func(context.Context, string) (*cid.ID, error)
 }

-func (r *Resolver) SetResolveFunc(fn func(context.Context, string, string) (*cid.ID, error)) {
+func (r *Resolver) SetResolveFunc(fn func(context.Context, string) (*cid.ID, error)) {
 	r.resolve = fn
 }

-func (r *Resolver) Resolve(ctx context.Context, zone, name string) (*cid.ID, error) {
-	return r.resolve(ctx, zone, name)
+func (r *Resolver) Resolve(ctx context.Context, name string) (*cid.ID, error) {
+	return r.resolve(ctx, name)
 }

 func NewContainerResolver(resolverNames []string, cfg *Config) (*ContainerResolver, error) {
@ -76,13 +81,13 @@ func createResolvers(resolverNames []string, cfg *Config) ([]*Resolver, error) {
 	return resolvers, nil
 }

-func (r *ContainerResolver) Resolve(ctx context.Context, cnrZone, cnrName string) (*cid.ID, error) {
+func (r *ContainerResolver) Resolve(ctx context.Context, cnrName string) (*cid.ID, error) {
 	r.mu.RLock()
 	defer r.mu.RUnlock()

 	var err error
 	for _, resolver := range r.resolvers {
-		cnrID, resolverErr := resolver.Resolve(ctx, cnrZone, cnrName)
+		cnrID, resolverErr := resolver.Resolve(ctx, cnrName)
 		if resolverErr != nil {
 			resolverErr = fmt.Errorf("%s: %w", resolver.Name, resolverErr)
 			if err == nil {
@ -136,25 +141,34 @@ func (r *ContainerResolver) equals(resolverNames []string) bool {
 func newResolver(name string, cfg *Config) (*Resolver, error) {
 	switch name {
 	case DNSResolver:
-		return NewDNSResolver(cfg.FrostFS)
+		return NewDNSResolver(cfg.FrostFS, cfg.Settings)
 	case NNSResolver:
-		return NewNNSResolver(cfg.RPCAddress)
+		return NewNNSResolver(cfg.RPCAddress, cfg.Settings)
 	default:
 		return nil, fmt.Errorf("unknown resolver: %s", name)
 	}
 }

-func NewDNSResolver(frostFS FrostFS) (*Resolver, error) {
+func NewDNSResolver(frostFS FrostFS, settings Settings) (*Resolver, error) {
 	if frostFS == nil {
 		return nil, fmt.Errorf("pool must not be nil for DNS resolver")
 	}
+	if settings == nil {
+		return nil, fmt.Errorf("resolver settings must not be nil for DNS resolver")
+	}

 	var dns ns.DNS

-	resolveFunc := func(ctx context.Context, zone, name string) (*cid.ID, error) {
+	resolveFunc := func(ctx context.Context, name string) (*cid.ID, error) {
 		var err error

-		if zone == v2container.SysAttributeZoneDefault {
+		namespace, err := middleware.GetNamespace(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		zone, isDefault := settings.FormContainerZone(namespace)
+		if isDefault {
 			zone, err = frostFS.SystemDNS(ctx)
 			if err != nil {
 				return nil, fmt.Errorf("read system DNS parameter of the FrostFS: %w", err)
@ -176,10 +190,13 @@ func NewDNSResolver(frostFS FrostFS) (*Resolver, error) {
 	}, nil
 }

-func NewNNSResolver(rpcAddress string) (*Resolver, error) {
+func NewNNSResolver(rpcAddress string, settings Settings) (*Resolver, error) {
 	if rpcAddress == "" {
 		return nil, fmt.Errorf("rpc address must not be empty for NNS resolver")
 	}
+	if settings == nil {
+		return nil, fmt.Errorf("resolver settings must not be nil for NNS resolver")
+	}

 	var nns ns.NNS

@ -187,9 +204,16 @@ func NewNNSResolver(rpcAddress string) (*Resolver, error) {
 		return nil, fmt.Errorf("could not dial nns: %w", err)
 	}

-	resolveFunc := func(_ context.Context, zone, name string) (*cid.ID, error) {
+	resolveFunc := func(ctx context.Context, name string) (*cid.ID, error) {
 		var d container.Domain
 		d.SetName(name)
+
+		namespace, err := middleware.GetNamespace(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		zone, _ := settings.FormContainerZone(namespace)
 		d.SetZone(zone)

 		cnrID, err := nns.ResolveContainerDomain(d)
--- a/utils/attributes.go
+++ b/utils/attributes.go
@ -11,8 +11,6 @@ import (
 	"time"
 	"unicode"
 	"unicode/utf8"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 )

 type EpochDurations struct {
@ -258,12 +256,3 @@ func (t systemTransformer) updateExpirationHeader(headers map[string]string, dur

 	headers[t.expirationEpochAttr()] = strconv.FormatUint(expirationEpoch, 10)
 }
-
-func GetAttributeValue(attrs []object.Attribute, key string) string {
-	for _, attr := range attrs {
-		if attr.Key() == key {
-			return attr.Value()
-		}
-	}
-	return ""
-}
Author	SHA1	Message	Date
Nikita Zinkevich	a54f870b72	[#XX] Remove http2 test Some checks failed / DCO (pull_request) Failing after 30s Details / Vulncheck (pull_request) Successful in 52s Details / Builds (pull_request) Failing after 59s Details / OCI image (pull_request) Successful in 1m16s Details / Lint (pull_request) Successful in 2m28s Details / Tests (pull_request) Successful in 1m3s Details / Integration tests (pull_request) Successful in 5m47s Details Signed-off-by: Nikita Zinkevich <n.zinkevich@yadro.com>	2025-02-18 12:53:42 +03:00
Nikita Zinkevich	70e2353071	[#XX] Remove http2 forcing fasthttp doesn't support http2 which causes errors when we enable it Signed-off-by: Nikita Zinkevich <n.zinkevich@yadro.com>	2025-02-18 12:53:04 +03:00