diff --git a/changelog/unreleased/bump-reva.md b/changelog/unreleased/bump-reva.md index 38568efc8..5c4ca096a 100644 --- a/changelog/unreleased/bump-reva.md +++ b/changelog/unreleased/bump-reva.md @@ -6,3 +6,4 @@ https://github.com/owncloud/ocis/pull/8917 https://github.com/owncloud/ocis/pull/8795 https://github.com/owncloud/ocis/pull/8701 https://github.com/owncloud/ocis/pull/8606 +https://github.com/owncloud/ocis/pull/8937 diff --git a/go.mod b/go.mod index e4a96eccc..46e1c940b 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/cenkalti/backoff v2.2.1+incompatible github.com/coreos/go-oidc/v3 v3.10.0 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 - github.com/cs3org/reva/v2 v2.19.2-0.20240422133703-f92da96ffe67 + github.com/cs3org/reva/v2 v2.19.2-0.20240422150349-51ab7655f858 github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25 github.com/disintegration/imaging v1.6.2 github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e diff --git a/go.sum b/go.sum index 08d327598..4796527e7 100644 --- a/go.sum +++ b/go.sum @@ -1022,8 +1022,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c= github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME= github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 h1:BUdwkIlf8IS2FasrrPg8gGPHQPOrQ18MS1Oew2tmGtY= github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/reva/v2 v2.19.2-0.20240422133703-f92da96ffe67 h1:oMZvQnlnsOCbNASud6jpZOmSINgGumoNSOD2LGOafQk= -github.com/cs3org/reva/v2 v2.19.2-0.20240422133703-f92da96ffe67/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E= +github.com/cs3org/reva/v2 v2.19.2-0.20240422150349-51ab7655f858 h1:cohKwOI/6UXXYhrjrZMYxw5GlM8wFS5445TZr/jmSzs= +github.com/cs3org/reva/v2 v2.19.2-0.20240422150349-51ab7655f858/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= diff --git a/vendor/github.com/cs3org/reva/v2/pkg/conversions/role.go b/vendor/github.com/cs3org/reva/v2/pkg/conversions/role.go index 29621c4aa..52a860bd1 100644 --- a/vendor/github.com/cs3org/reva/v2/pkg/conversions/role.go +++ b/vendor/github.com/cs3org/reva/v2/pkg/conversions/role.go @@ -52,6 +52,8 @@ const ( RoleUploader = "uploader" // RoleManager grants manager permissions on a resource. Semantically equivalent to co-owner. RoleManager = "manager" + // RoleSecureViewer grants secure view permissions on a resource or space. + RoleSecureViewer = "secure-viewer" // RoleUnknown is used for unknown roles. RoleUnknown = "unknown" @@ -159,6 +161,8 @@ func RoleFromName(name string) *Role { return NewUploaderRole() case RoleManager: return NewManagerRole() + case RoleSecureViewer: + return NewSecureViewerRole() default: return NewUnknownRole() } @@ -363,6 +367,18 @@ func NewManagerRole() *Role { } } +// NewSecureViewerRole creates a secure viewer role +func NewSecureViewerRole() *Role { + return &Role{ + Name: RoleSecureViewer, + cS3ResourcePermissions: &provider.ResourcePermissions{ + GetPath: true, + ListContainer: true, + Stat: true, + }, + } +} + // RoleFromOCSPermissions tries to map ocs permissions to a role // TODO: rethink using this. ocs permissions cannot be assigned 1:1 to roles func RoleFromOCSPermissions(p Permissions, ri *provider.ResourceInfo) *Role { diff --git a/vendor/modules.txt b/vendor/modules.txt index 84b94abf4..1c36c8d19 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -366,7 +366,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1 github.com/cs3org/go-cs3apis/cs3/types/v1beta1 -# github.com/cs3org/reva/v2 v2.19.2-0.20240422133703-f92da96ffe67 +# github.com/cs3org/reva/v2 v2.19.2-0.20240422150349-51ab7655f858 ## explicit; go 1.21 github.com/cs3org/reva/v2/cmd/revad/internal/grace github.com/cs3org/reva/v2/cmd/revad/runtime