Skip to content

Commit

Permalink
Merge pull request #9188 from rhafer/issue/9128
Browse files Browse the repository at this point in the history 
[full-ci] Bump reva for: cs3org/reva#4685
  • Loading branch information
@butonic
butonic authored May 21, 2024
2 parents 58bd67b + 72a6ea3 commit 2faa7fa
Show file tree
Hide file tree
Showing 15 changed files with 213 additions and 46 deletions.
1 change: 1 addition & 0 deletions changelog/unreleased/bump-reva.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Enhancement: Bump Reva

bumps reva version

https://github.com/owncloud/ocis/pull/9188
https://github.com/owncloud/ocis/pull/9132
https://github.com/owncloud/ocis/pull/9041
https://github.com/owncloud/ocis/pull/9002
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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.20240510133919-1732d68a5591
github.com/cs3org/reva/v2 v2.19.2-0.20240521134642-8fb71adbe500
github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25
github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e
github.com/egirna/icap-client v0.1.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1025,8 +1025,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.20240510133919-1732d68a5591 h1:6rfzawhTzz96p8ifzcjNiMknAfAdVpfqdyzmpp3+6w8=
github.com/cs3org/reva/v2 v2.19.2-0.20240510133919-1732d68a5591/go.mod h1:BOlJApKFrWRiaOoBCRxCTG5bghTTMlYaEZrRxOzKaS8=
github.com/cs3org/reva/v2 v2.19.2-0.20240521134642-8fb71adbe500 h1:BsbDsBAnEJlCN8PU6XhDgQNX9/aSrVcyDocrBR6GI5g=
github.com/cs3org/reva/v2 v2.19.2-0.20240521134642-8fb71adbe500/go.mod h1:BOlJApKFrWRiaOoBCRxCTG5bghTTMlYaEZrRxOzKaS8=
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=
Expand Down
18 changes: 9 additions & 9 deletions services/graph/pkg/unifiedrole/unifiedrole.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const (
UnifiedRoleSpaceEditorID = "58c63c02-1d89-4572-916a-870abc5a1b7d"
// UnifiedRoleFileEditorID Unified role file editor id.
UnifiedRoleFileEditorID = "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
// UnifiedRoleUploaderID Unified role uploader id.
UnifiedRoleUploaderID = "1c996275-f1c9-4e71-abdf-a42f6495e960"
// UnifiedRoleEditorLiteID Unified role editor-lite id.
UnifiedRoleEditorLiteID = "1c996275-f1c9-4e71-abdf-a42f6495e960"
// UnifiedRoleManagerID Unified role manager id.
UnifiedRoleManagerID = "312c0871-5ef7-4b3a-85b6-0e4074c64049"
// UnifiedRoleSecureViewerID Unified role secure viewer id.
Expand Down Expand Up @@ -66,7 +66,7 @@ var legacyNames map[string]string = map[string]string{
UnifiedRoleSpaceEditorID: "editor",
UnifiedRoleEditorID: conversions.RoleEditor,
UnifiedRoleFileEditorID: conversions.RoleFileEditor,
UnifiedRoleUploaderID: conversions.RoleUploader,
UnifiedRoleEditorLiteID: conversions.RoleEditorLite,
UnifiedRoleManagerID: conversions.RoleManager,
UnifiedRoleSecureViewerID: conversions.RoleSecureViewer,
}
Expand Down Expand Up @@ -160,11 +160,11 @@ func NewFileEditorUnifiedRole() *libregraph.UnifiedRoleDefinition {
}
}

// NewUploaderUnifiedRole creates an uploader role
func NewUploaderUnifiedRole() *libregraph.UnifiedRoleDefinition {
r := conversions.NewUploaderRole()
// NewEditorLiteUnifiedRole creates an editor-lite role
func NewEditorLiteUnifiedRole() *libregraph.UnifiedRoleDefinition {
r := conversions.NewEditorLiteRole()
return &libregraph.UnifiedRoleDefinition{
Id: proto.String(UnifiedRoleUploaderID),
Id: proto.String(UnifiedRoleEditorLiteID),
Description: proto.String("View, download and upload."),
DisplayName: displayName(r),
RolePermissions: []libregraph.UnifiedRolePermission{
Expand Down Expand Up @@ -239,7 +239,7 @@ func GetBuiltinRoleDefinitionList() []*libregraph.UnifiedRoleDefinition {
NewEditorUnifiedRole(),
NewSpaceEditorUnifiedRole(),
NewFileEditorUnifiedRole(),
NewUploaderUnifiedRole(),
NewEditorLiteUnifiedRole(),
NewManagerUnifiedRole(),
NewSecureViewerUnifiedRole(),
}
Expand Down Expand Up @@ -501,7 +501,7 @@ func displayName(role *conversions.Role) *string {
displayName = canEdit
case conversions.RoleFileEditor:
displayName = canEdit
case conversions.RoleUploader:
case conversions.RoleEditorLite:
displayName = "Can upload"
case conversions.RoleManager:
displayName = "Can manage"
Expand Down
9 changes: 5 additions & 4 deletions services/graph/pkg/unifiedrole/unifiedrole_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ var _ = Describe("unifiedroles", func() {
unifiedrole.UnifiedRoleConditionFolder,
[]*libregraph.UnifiedRoleDefinition{
unifiedrole.NewSecureViewerUnifiedRole(),
unifiedrole.NewUploaderUnifiedRole(),
unifiedrole.NewViewerUnifiedRole(),
unifiedrole.NewEditorLiteUnifiedRole(),
unifiedrole.NewEditorUnifiedRole(),
},
),
Expand All @@ -194,8 +194,8 @@ var _ = Describe("unifiedroles", func() {
unifiedrole.UnifiedRoleConditionFolder,
[]*libregraph.UnifiedRoleDefinition{
unifiedrole.NewSecureViewerUnifiedRole(),
unifiedrole.NewUploaderUnifiedRole(),
unifiedrole.NewViewerUnifiedRole(),
unifiedrole.NewEditorLiteUnifiedRole(),
unifiedrole.NewEditorUnifiedRole(),
},
),
Expand All @@ -221,10 +221,11 @@ var _ = Describe("unifiedroles", func() {

Entry(
"mixed",
append(rolesToAction(unifiedrole.NewUploaderUnifiedRole()), unifiedrole.DriveItemQuotaRead),
append(rolesToAction(unifiedrole.NewEditorLiteUnifiedRole()), unifiedrole.DriveItemQuotaRead),
unifiedrole.UnifiedRoleConditionFolder,
[]*libregraph.UnifiedRoleDefinition{
unifiedrole.NewUploaderUnifiedRole(),
unifiedrole.NewSecureViewerUnifiedRole(),
unifiedrole.NewEditorLiteUnifiedRole(),
},
),
)
Expand Down
24 changes: 12 additions & 12 deletions tests/acceptance/features/apiSharingNg/listPermissions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,19 +106,19 @@ Feature: List a sharing permissions
"description": {
"type": "string",
"enum": [
"View, download and upload."
"View and download."
]
},
"displayName": {
"type": "string",
"enum": [
"Can upload"
"Can view"
]
},
"id": {
"type": "string",
"enum": [
"1c996275-f1c9-4e71-abdf-a42f6495e960"
"b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5"
]
}
}
Expand All @@ -141,19 +141,19 @@ Feature: List a sharing permissions
"description": {
"type": "string",
"enum": [
"View and download."
"View, download and upload."
]
},
"displayName": {
"type": "string",
"enum": [
"Can view"
"Can upload"
]
},
"id": {
"type": "string",
"enum": [
"b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5"
"1c996275-f1c9-4e71-abdf-a42f6495e960"
]
}
}
Expand Down Expand Up @@ -855,13 +855,13 @@ Feature: List a sharing permissions
"const": 2
},
"description": {
"const": "View, download and upload."
"const": "View and download."
},
"displayName": {
"const": "Can upload"
"const": "Can view"
},
"id": {
"const": "1c996275-f1c9-4e71-abdf-a42f6495e960"
"const": "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5"
}
}
},
Expand All @@ -878,13 +878,13 @@ Feature: List a sharing permissions
"const": 3
},
"description": {
"const": "View and download."
"const": "View, download and upload."
},
"displayName": {
"const": "Can view"
"const": "Can upload"
},
"id": {
"const": "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5"
"const": "1c996275-f1c9-4e71-abdf-a42f6495e960"
}
}
},
Expand Down
48 changes: 43 additions & 5 deletions vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/appprovider.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/dav.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2faa7fa

Please sign in to comment.