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

Jump to bottom

Localfs: return file owner info in stat #750

Merged
merged 1 commit into from
May 15, 2020
Merged

Localfs: return file owner info in stat #750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions pkg/storage/fs/local/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,11 @@ func (fs *localfs) isShareFolderChild(ctx context.Context, p string) bool {

func (fs *localfs) normalize(ctx context.Context, fi os.FileInfo, fn string) *provider.ResourceInfo {
fn = fs.unwrap(ctx, path.Join("/", fn))
owner, err := getUser(ctx)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will add the current logged in user, I'm not sure this will apply for shared resources

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should rely on what the storage gives us, for example, EOS wll always tell us the owner

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I thnk in the case of local storage is okay to use it like that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, in that case, I thought we might as well return the "owner of the reference" since the reference doesn't have any info about the owner of the original file. Maybe we can pass this info about the original owner to the CreateReference method and then save that as metadata along with the reference (currently we store only the target).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO we should really get the owner, also for local storage, independent from the currently logged in user. Or did I misunderstand @labkode's comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@glpatcern yes, in case of share references, we don't have any info about the original owner in this context. That's why I suggested passing it along when the reference is created. We'll need to add this field to the cs3apis protobuf.
For cases other than the references, the logged-in user will always be the owner.

if err != nil {
return nil
}

md := &provider.ResourceInfo{
Id: &provider.ResourceId{OpaqueId: "fileid-" + strings.TrimPrefix(fn, "/")},
Path: fn,
Expand All @@ -268,6 +273,7 @@ func (fs *localfs) normalize(ctx context.Context, fi os.FileInfo, fn string) *pr
Mtime: &types.Timestamp{
Seconds: uint64(fi.ModTime().Unix()),
},
Owner: owner.Id,
}

return md
Expand Down