[#240] Fix s3 index page

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

internal/handler/browse.go

@@ -150,8 +150,11 @@ func urlencode(path string) string {
 	var res strings.Builder
 
 	prefixParts := strings.Split(path, "/")
-	for _, prefixPart := range prefixParts {
+	for i, prefixPart := range prefixParts {
-		prefixPart = "/" + url.PathEscape(prefixPart)
+		prefixPart = url.PathEscape(prefixPart)
+		if i != 0 {
+			prefixPart = "/" + prefixPart
+		}
 		if prefixPart == "/." || prefixPart == "/.." {
 			prefixPart = url.PathEscape(prefixPart)
 		}
@@ -168,11 +171,16 @@ type GetObjectsResponse struct {
 }
 
 func (h *Handler) getDirObjectsS3(ctx context.Context, bucketInfo *data.BucketInfo, prefix string) (*GetObjectsResponse, error) {
-	if prefix != "" && prefix[len(prefix)-1] == '/' {
+	var treePrefix *string
-		prefix = prefix[:len(prefix)-1]
+	if prefix != "" {
+		if prefix[len(prefix)-1] == '/' {
+			treePrefix = ptr(prefix[:len(prefix)-1])
+		} else {
+			treePrefix = &prefix
+		}
 	}
 
-	nodes, err := h.tree.GetSubTreeByPrefix(ctx, bucketInfo, prefix, true)
+	nodes, err := h.tree.GetSubTreeByPrefix(ctx, bucketInfo, treePrefix, true)
 	if err != nil {
 		return nil, err
 	}
@@ -193,14 +201,18 @@ func (h *Handler) getDirObjectsS3(ctx context.Context, bucketInfo *data.BucketIn
 		if obj.IsDeleteMarker {
 			continue
 		}
-		obj.FilePath = prefix + "/" + obj.FileName
+		obj.FilePath = prefix + obj.FileName
-		obj.GetURL = "/get/" + bucketInfo.Name + urlencode(obj.FilePath)
+		obj.GetURL = "/get/" + bucketInfo.Name + "/" + urlencode(obj.FilePath)
 		result.objects = append(result.objects, obj)
 	}
 
 	return result, nil
 }
 
+func ptr(s string) *string {
+	return &s
+}
+
 func (h *Handler) getDirObjectsNative(ctx context.Context, bucketInfo *data.BucketInfo, prefix string) (*GetObjectsResponse, error) {
 	basePath := prefix
 	if basePath != "" && basePath[len(basePath)-1] != '/' {

internal/handler/handler.go

@@ -325,11 +325,12 @@ func (h *Handler) browseIndexMiddleware(fn ListFunc) MiddlewareFunc {
 		ctx, span := tracing.StartSpanFromContext(prm.Context, "handler.browseIndex")
 		defer span.End()
 
-		ctx = utils.SetReqLog(ctx, h.reqLogger(ctx).With(
+		h.reqLogger(ctx).Info(logs.BrowseIndex,
 			zap.String("bucket", prm.BktInfo.Name),
 			zap.String("container", prm.BktInfo.CID.EncodeToString()),
 			zap.String("prefix", prm.Path),
-		))
+			logs.TagField(logs.TagDatapath),
+		)
 
 		objects, err := fn(ctx, prm.BktInfo, prm.Path)
 		if err != nil {

internal/logs/logs.go

@@ -127,6 +127,7 @@ const (
 	EmptyAccessControlRequestMethodHeader = "empty Access-Control-Request-Method request header"
 	CORSRuleWasNotMatched                 = "cors rule was not matched"
 	CouldntCacheCors                      = "couldn't cache cors"
+	BrowseIndex                           = "browse index"
 )
 
 // Log messages with the "external_storage" tag.

tree/tree.go

@@ -323,17 +323,23 @@ func pathFromName(objectName string) []string {
 	return strings.Split(objectName, separator)
 }
 
-func (c *Tree) GetSubTreeByPrefix(ctx context.Context, bktInfo *data.BucketInfo, prefix string, latestOnly bool) ([]data.NodeInfo, error) {
+func (c *Tree) GetSubTreeByPrefix(ctx context.Context, bktInfo *data.BucketInfo, prefix *string, latestOnly bool) ([]data.NodeInfo, error) {
 	ctx, span := tracing.StartSpanFromContext(ctx, "tree.GetSubTreeByPrefix")
 	defer span.End()
 
-	rootID, err := c.getPrefixNodeID(ctx, bktInfo, versionTree, strings.Split(prefix, separator))
+	rootID := []uint64{0}
-	if err != nil {
+	var err error
-		if errors.Is(err, ErrNodeNotFound) {
+
-			return nil, nil
+	if prefix != nil {
+		rootID, err = c.getPrefixNodeID(ctx, bktInfo, versionTree, strings.Split(*prefix, separator))
+		if err != nil {
+			if errors.Is(err, ErrNodeNotFound) {
+				return nil, nil
+			}
+			return nil, err
 		}
-		return nil, err
 	}
+
 	subTree, err := c.service.GetSubTree(ctx, bktInfo, versionTree, rootID, 2, false)
 	if err != nil {
 		if errors.Is(err, ErrNodeNotFound) {