Skip to content

Commit 2ddeea5

Browse files
committed
Revert "Remove trashbin and version-related permissions from (#5364)"
This reverts commit 21c4627.
1 parent e7ca6b2 commit 2ddeea5

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

internal/grpc/services/spacesregistry/spacesregistry.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,6 @@ func (s *service) getAllPublicSpaces(ctx context.Context) ([]*provider.StorageSp
462462
QuotaMaxBytes: uint64(math.Pow10(18)),
463463
RemainingBytes: uint64(math.Pow10(18)) - resourceInfo.Size,
464464
},
465-
PermissionSet: resourceInfo.PermissionSet,
466465
}
467466

468467
if description, ok := content["description"]; ok {

internal/http/services/owncloud/ocs/conversions/role.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,20 +291,25 @@ func RoleFromResourcePermissions(rp *provider.ResourcePermissions) *Role {
291291
return r
292292
}
293293
if rp.ListContainer &&
294+
rp.ListFileVersions &&
295+
rp.ListRecycle &&
294296
rp.Stat &&
295297
rp.GetPath &&
296298
rp.InitiateFileDownload {
297299
r.ocsPermissions |= PermissionRead
298300
}
299-
if rp.InitiateFileUpload {
301+
if rp.InitiateFileUpload &&
302+
rp.RestoreFileVersion &&
303+
rp.RestoreRecycleItem {
300304
r.ocsPermissions |= PermissionWrite
301305
}
302306
if rp.ListContainer &&
303307
rp.Stat &&
304308
rp.InitiateFileUpload {
305309
r.ocsPermissions |= PermissionCreate
306310
}
307-
if rp.Delete {
311+
if rp.Delete &&
312+
rp.PurgeRecycle {
308313
r.ocsPermissions |= PermissionDelete
309314
}
310315
if rp.AddGrant &&

0 commit comments

Comments
 (0)