Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reworked List() to support version folder fileid tricks #4321

Merged
merged 6 commits into from
Nov 9, 2023
Merged

Reworked List() to support version folder fileid tricks #4321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d492059
Reworked List() to support version folder tricks
Nov 8, 2023
86fd57d
Adding changelog
Nov 8, 2023
9d0906c
Very useful fix
Nov 8, 2023
f234480
Update pkg/eosclient/eosgrpc/eosgrpc.go
ffurano Nov 8, 2023
792c54d
Update pkg/eosclient/eosgrpc/eosgrpc.go
ffurano Nov 8, 2023
564e864
Update pkg/eosclient/eosgrpc/eosgrpc.go
ffurano Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/unreleased/fileid-versionfolder.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Bugfix: Reworked List() to support version folder tricks

https://github.com/cs3org/reva/pull/4321
61 changes: 51 additions & 10 deletions pkg/eosclient/eosgrpc/eosgrpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ func (c *Client) getACLForPath(ctx context.Context, auth eosclient.Authorization
// GetFileInfoByInode returns the FileInfo by the given inode.
func (c *Client) GetFileInfoByInode(ctx context.Context, auth eosclient.Authorization, inode uint64) (*eosclient.FileInfo, error) {
log := appctx.GetLogger(ctx)
log.Info().Str("func", "GetFileInfoByInode").Str("uid,gid", auth.Role.UID+","+auth.Role.GID).Uint64("inode", inode).Msg("")
log.Debug().Str("func", "GetFileInfoByInode").Str("uid,gid", auth.Role.UID+","+auth.Role.GID).Uint64("inode", inode).Msg("entering")

// Initialize the common fields of the MDReq
mdrq, err := c.initMDRequest(ctx, auth)
Expand Down Expand Up @@ -480,7 +480,7 @@ func (c *Client) GetFileInfoByInode(ctx context.Context, auth eosclient.Authoriz
info.Inode = inode
}

log.Debug().Str("func", "GetFileInfoByInode").Uint64("inode", inode).Uint64("info.Inode", info.Inode).Str("file", info.File).Uint64("size", info.Size).Str("etag", info.ETag).Msg("")
log.Info().Str("func", "GetFileInfoByInode").Uint64("inode", inode).Uint64("info.Inode", info.Inode).Str("file", info.File).Uint64("size", info.Size).Str("etag", info.ETag).Msg("result")
return c.fixupACLs(ctx, auth, info), nil
}

Expand Down Expand Up @@ -660,7 +660,7 @@ func getAttribute(key, val string) (*eosclient.Attribute, error) {
// GetFileInfoByPath returns the FilInfo at the given path.
func (c *Client) GetFileInfoByPath(ctx context.Context, auth eosclient.Authorization, path string) (*eosclient.FileInfo, error) {
log := appctx.GetLogger(ctx)
log.Info().Str("func", "GetFileInfoByPath").Str("uid,gid", auth.Role.UID+","+auth.Role.GID).Str("path", path).Msg("")
log.Debug().Str("func", "GetFileInfoByPath").Str("uid,gid", auth.Role.UID+","+auth.Role.GID).Str("path", path).Msg("entering")

// Initialize the common fields of the MDReq
mdrq, err := c.initMDRequest(ctx, auth)
Expand Down Expand Up @@ -710,7 +710,7 @@ func (c *Client) GetFileInfoByPath(ctx context.Context, auth eosclient.Authoriza
info.Inode = inode
}

log.Debug().Str("func", "GetFileInfoByPath").Str("path", path).Uint64("info.Inode", info.Inode).Uint64("size", info.Size).Str("etag", info.ETag).Msg("")
log.Info().Str("func", "GetFileInfoByPath").Str("path", path).Uint64("info.Inode", info.Inode).Uint64("size", info.Size).Str("etag", info.ETag).Msg("result")
return c.fixupACLs(ctx, auth, info), nil
}

Expand Down Expand Up @@ -1175,7 +1175,10 @@ func (c *Client) List(ctx context.Context, auth eosclient.Authorization, dpath s
}

var mylst []*eosclient.FileInfo
versionFolders := map[string]*eosclient.FileInfo{}
var parent *eosclient.FileInfo
var ownerAuth *eosclient.Authorization

i := 0
for {
rsp, err := resp.Recv()
Expand Down Expand Up @@ -1216,17 +1219,55 @@ func (c *Client) List(ctx context.Context, auth eosclient.Authorization, dpath s
continue
}

// If it's a version folder, store it in a map, so that for the corresponding file,
// we can return its inode instead
if isVersionFolder(myitem.File) {
versionFolders[myitem.File] = myitem
}

if ownerAuth == nil {
ownerAuth = &eosclient.Authorization{
Role: eosclient.Role{
UID: strconv.FormatUint(myitem.UID, 10),
GID: strconv.FormatUint(myitem.GID, 10),
},
}
}

mylst = append(mylst, myitem)
}

if parent.SysACL != nil {
for _, info := range mylst {
if !info.IsDir && parent != nil {
if info.SysACL == nil {
for _, fi := range mylst {
// For files, inherit ACLs from the parent
// And set the inode to that of their version folder
if !fi.IsDir && !isVersionFolder(dpath) {
if parent != nil && parent.SysACL != nil {
if fi.SysACL == nil {
log.Warn().Str("func", "List").Str("path", dpath).Str("SysACL is nil, taking parent", "").Msg("grpc response")
info.SysACL.Entries = parent.SysACL.Entries
fi.SysACL.Entries = parent.SysACL.Entries
} else {
fi.SysACL.Entries = append(fi.SysACL.Entries, parent.SysACL.Entries...)
}
}

// If there is a version folder then use its info
// to emulate the invariability of the fileid
// If there is no version folder then create one
versionFolderPath := getVersionFolder(fi.File)
if vf, ok := versionFolders[versionFolderPath]; ok {
fi.Inode = vf.Inode
if vf.SysACL != nil {
log.Debug().Str("func", "List").Str("path", dpath).Msg("vf.SysACL is nil")
fi.SysACL.Entries = append(fi.SysACL.Entries, vf.SysACL.Entries...)
}
for k, v := range vf.Attrs {
fi.Attrs[k] = v
}
} else if err := c.CreateDir(ctx, *ownerAuth, versionFolderPath); err == nil { // Create the version folder if it doesn't exist
if md, err := c.GetFileInfoByPath(ctx, auth, versionFolderPath); err == nil {
fi.Inode = md.Inode
} else {
info.SysACL.Entries = append(info.SysACL.Entries, parent.SysACL.Entries...)
log.Error().Err(err).Interface("auth", ownerAuth).Str("path", versionFolderPath).Msg("got error creating version folder")
}
}
}
Expand Down