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

Apps: fixed viewMode resolution #3805

Merged
merged 1 commit into from
Apr 20, 2023
+15 −5
Merged

Apps: fixed viewMode resolution #3805

Show file tree
Hide file tree
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 changelog/unreleased/apps-viewmode.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Apps: fixed viewMode resolution

Currently, the viewMode passed on /app/open is taken without validating
the actual user's permissions. This PR fixes this.

https://github.com/cs3org/reva/pull/3805
14 changes: 9 additions & 5 deletions internal/http/services/appprovider/appprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,19 +449,23 @@ func filterAppsByUserAgent(mimeTypes []*appregistry.MimeTypeInfo, userAgent stri
}

func resolveViewMode(res *provider.ResourceInfo, vm string) gateway.OpenInAppRequest_ViewMode {
var viewMode gateway.OpenInAppRequest_ViewMode
if vm != "" {
return utils.GetViewMode(vm)
viewMode = utils.GetViewMode(vm)
} else {
viewMode = gateway.OpenInAppRequest_VIEW_MODE_READ_WRITE
}

var viewMode gateway.OpenInAppRequest_ViewMode
canEdit := res.PermissionSet.InitiateFileUpload
canView := res.PermissionSet.InitiateFileDownload

switch {
case canEdit && canView:
viewMode = gateway.OpenInAppRequest_VIEW_MODE_READ_WRITE
// ok
case canView:
viewMode = gateway.OpenInAppRequest_VIEW_MODE_READ_ONLY
if viewMode == gateway.OpenInAppRequest_VIEW_MODE_READ_WRITE || viewMode == gateway.OpenInAppRequest_VIEW_MODE_PREVIEW {
// downgrade to the maximum permitted viewmode
viewMode = gateway.OpenInAppRequest_VIEW_MODE_READ_ONLY
}
default:
// no permissions, will return access denied
viewMode = gateway.OpenInAppRequest_VIEW_MODE_INVALID
Expand Down