Skip to content

[stable34] fix: properly handle e2ee support #3368

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

Draft
backportbot wants to merge 1 commit into
base: stable34
Choose a base branch
from
Draft

[stable34] fix: properly handle e2ee support #3368

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
21 changes: 17 additions & 4 deletions src/files_actions/viewerAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import svgEye from '@mdi/svg/svg/eye.svg?raw'

import logger from '../services/logger.js'

// TODO: provide API to let apps register their support for e2ee
export const VIEWER_E2EE_SUPPORTED_MIMETYPES: RegExp[] = [/^audio\//i, /^image\//i, /^video\//i]

/**
* @param node The file to open
* @param view any The files view
Expand Down Expand Up @@ -106,10 +109,20 @@ export function registerViewerAction() {
return false
}

return nodes.every((node) =>
Boolean(node.permissions & Permission.READ)
&& window.OCA.Viewer.mimetypes.includes(node.mime),
)
const canReadAllNodes = nodes.every((node) => Boolean(node.permissions & Permission.READ))
if (!canReadAllNodes) {
return false
}

const isEncrypted = nodes.some((node) => node.attributes['e2ee-is-encrypted'])
const isSupportedByCore = nodes.every((node) => VIEWER_E2EE_SUPPORTED_MIMETYPES.some((regex) => regex.test(node.mime)))
if (isEncrypted && !isSupportedByCore) {
// only allow encrypted files if they are supported by the core viewer (video and image)
return false
}

const isSupportedByViewer = nodes.every((node) => window.OCA.Viewer.mimetypes.includes(node.mime))
return isSupportedByViewer
},
exec: execAction,
})
Expand Down