feature/index-page-filepath #233

Open

dkirillov wants to merge 4 commits from dkirillov/frostfs-http-gw:feature/index-page-filepath into master

dkirillov commented

2025-04-23 10:02:46 +00:00

Member

Beyond the scope of this PR:

Enabling slash fallback per namespace/container
Handling slash fallback for zip/tar endpoints

**Beyond the scope** of this PR: * Enabling slash fallback per namespace/container * Handling slash fallback for zip/tar endpoints

dkirillov self-assigned this 2025-04-23 10:02:46 +00:00

dkirillov added 4 commits 2025-04-23 10:02:46 +00:00

[#XX] get/head: Middleware refactor 5fd351d559

Add:
 * search index.html
 * fallback by leading slash
Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>

[#XX] Make search by attribute as it is 626a18f540

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>

[#XX] Add fallback tests 99eaae2042

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>

[#XX] Fix browsing

/ DCO (pull_request) Failing after 32s

Details

/ Vulncheck (pull_request) Successful in 56s

Details

/ Builds (pull_request) Successful in 1m17s

Details

/ OCI image (pull_request) Successful in 1m37s

Details

/ Lint (pull_request) Failing after 1m11s

Details

/ Tests (pull_request) Successful in 1m17s

Details

/ Integration tests (pull_request) Successful in 6m17s

Details

7958eb4a7d

Simplify tree listing (we need only nodes in exactly the same parent level)

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>

dkirillov force-pushed feature/index-page-filepath from 7958eb4a7d to 9750521598

2025-04-23 10:04:06 +00:00

Compare

dkirillov changed title from ~~WIP: feature/index-page-filepath~~ to feature/index-page-filepath

2025-04-23 10:04:30 +00:00

requested reviews from storage-services-committers, storage-services-developers

2025-04-23 10:04:32 +00:00

dkirillov commented

2025-04-23 10:09:54 +00:00

Author

Member

@realloc please verify this logic (and similar for head)

 	if checkS3Err == nil {
 		run(prm, h.errorMiddleware(logs.ObjectNotFound, ErrObjectNotFound),
 			Middleware{Func: h.byS3PathMiddleware(h.receiveFile, noopFormer), Enabled: true},
 			Middleware{Func: h.byS3PathMiddleware(h.receiveFile, indexFormer), Enabled: indexPageEnabled},
 			Middleware{Func: h.browseIndexMiddleware(h.getDirObjectsS3), Enabled: indexPageEnabled},
 		)
 	} else {
 		slashFallbackEnabled := h.config.EnableFilepathSlashFallback()
 		fileNameFallbackEnabled := h.config.EnableFilepathFallback()
 		run(prm, h.errorMiddleware(logs.ObjectNotFound, ErrObjectNotFound),
 			Middleware{Func: h.byAddressMiddleware(h.receiveFile), Enabled: true},
 			Middleware{Func: h.byAttributeSearchMiddleware(h.receiveFile, object.AttributeFilePath, noopFormer), Enabled: true},
 			Middleware{Func: h.byAttributeSearchMiddleware(h.receiveFile, object.AttributeFilePath, reverseLeadingSlash), Enabled: slashFallbackEnabled},
 			Middleware{Func: h.byAttributeSearchMiddleware(h.receiveFile, object.AttributeFileName, noopFormer), Enabled: fileNameFallbackEnabled},
 			Middleware{Func: h.byAttributeSearchMiddleware(h.receiveFile, object.AttributeFileName, reverseLeadingSlash), Enabled: fileNameFallbackEnabled && slashFallbackEnabled},
 			Middleware{Func: h.byAttributeSearchMiddleware(h.receiveFile, object.AttributeFilePath, indexFormer), Enabled: indexPageEnabled},
 			Middleware{Func: h.byAttributeSearchMiddleware(h.receiveFile, object.AttributeFileName, indexFormer), Enabled: fileNameFallbackEnabled && indexPageEnabled},
 			Middleware{Func: h.browseIndexMiddleware(h.getDirObjectsNative), Enabled: indexPageEnabled},
 		)
 	}

@realloc please verify this logic (and similar for head) https://git.frostfs.info/dkirillov/frostfs-http-gw/src/commit/9750521598970d893513e71f5ec7c6ca5035b709/internal/handler/download.go#L68-L88

dkirillov force-pushed feature/index-page-filepath from 9750521598 to a4991bda4e

2025-04-23 11:09:20 +00:00

Compare