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

add space group grant #3574

Merged
merged 3 commits into from
Dec 29, 2022
Merged

add space group grant #3574

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b63a9c
add space group grant
fschade Dec 29, 2022
920e10e
use more clear var naming
fschade Dec 29, 2022
40984ca
update JSON variable naming
fschade Dec 29, 2022
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
5 changes: 5 additions & 0 deletions changelog/unreleased/opaque-space-group.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Enhancement: Opaque space group

extend the opaque map to contain an identifier to see if it is a user or group grant.

https://github.com/cs3org/reva/pull/3574
34 changes: 23 additions & 11 deletions pkg/storage/utils/decomposedfs/spaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ func (fs *Decomposedfs) UpdateStorageSpace(ctx context.Context, req *provider.Up
space := req.StorageSpace
_, spaceID, _, _ := storagespace.SplitID(space.Id.OpaqueId)

node, err := node.ReadNode(ctx, fs.lu, spaceID, spaceID, true) // permission to read disabled space will be checked later
spaceNode, err := node.ReadNode(ctx, fs.lu, spaceID, spaceID, true) // permission to read disabled space will be checked later
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -575,7 +575,7 @@ func (fs *Decomposedfs) UpdateStorageSpace(ctx context.Context, req *provider.Up
switch {
case space.Name != "", mapHasKey(metadata, xattrs.SpaceDescriptionAttr), restore:
// these three attributes need manager permissions
err = fs.checkManagerPermission(ctx, node)
err = fs.checkManagerPermission(ctx, spaceNode)
if err != nil {
if restore {
// a disabled space is invisible to non admins
Expand All @@ -589,7 +589,7 @@ func (fs *Decomposedfs) UpdateStorageSpace(ctx context.Context, req *provider.Up
}
case mapHasKey(metadata, xattrs.SpaceReadmeAttr), mapHasKey(metadata, xattrs.SpaceAliasAttr), mapHasKey(metadata, xattrs.SpaceImageAttr):
// these three attributes need editor permissions
err = fs.checkEditorPermission(ctx, node)
err = fs.checkEditorPermission(ctx, spaceNode)
if err != nil {
return &provider.UpdateStorageSpaceResponse{
Status: &v1beta11.Status{Code: v1beta11.Code_CODE_PERMISSION_DENIED, Message: err.Error()},
Expand All @@ -605,26 +605,26 @@ func (fs *Decomposedfs) UpdateStorageSpace(ctx context.Context, req *provider.Up
default:
// you may land here when making an update request without changes
// check if user has access to the drive before continuing
if err := fs.checkViewerPermission(ctx, node); err != nil {
if err := fs.checkViewerPermission(ctx, spaceNode); err != nil {
return &provider.UpdateStorageSpaceResponse{
Status: &v1beta11.Status{Code: v1beta11.Code_CODE_NOT_FOUND},
}, nil
}
}

err = node.SetXattrs(metadata)
err = spaceNode.SetXattrs(metadata)
if err != nil {
return nil, err
}

if restore {
if err := node.SetDTime(nil); err != nil {
if err := spaceNode.SetDTime(nil); err != nil {
return nil, err
}
}

// send back the updated data from the storage
updatedSpace, err := fs.storageSpaceFromNode(ctx, node, false)
updatedSpace, err := fs.storageSpaceFromNode(ctx, spaceNode, false)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -803,24 +803,32 @@ func (fs *Decomposedfs) storageSpaceFromNode(ctx context.Context, n *node.Node,
return nil, err
}

m := make(map[string]*provider.ResourcePermissions, len(grants))
pm := make(map[string]*provider.ResourcePermissions, len(grants))
fschade marked this conversation as resolved.
Show resolved Hide resolved
gm := make(map[string]struct{})
fschade marked this conversation as resolved.
Show resolved Hide resolved
for _, g := range grants {
var id string
switch g.Grantee.Type {
case provider.GranteeType_GRANTEE_TYPE_GROUP:
id = g.Grantee.GetGroupId().OpaqueId
gm[id] = struct{}{}
case provider.GranteeType_GRANTEE_TYPE_USER:
id = g.Grantee.GetUserId().OpaqueId
default:
continue
}

m[id] = g.Permissions
pm[id] = g.Permissions
}
marshalled, err := json.Marshal(m)
marshalledG, err := json.Marshal(gm)
fschade marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return nil, err
}

marshalledP, err := json.Marshal(pm)
fschade marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return nil, err
}

ssID, err := storagespace.FormatReference(
&provider.Reference{
ResourceId: &provider.ResourceId{
Expand All @@ -836,7 +844,11 @@ func (fs *Decomposedfs) storageSpaceFromNode(ctx context.Context, n *node.Node,
Map: map[string]*types.OpaqueEntry{
"grants": {
Decoder: "json",
Value: marshalled,
Value: marshalledP,
},
"groups": {
Decoder: "json",
Value: marshalledG,
},
},
},
Expand Down