feat: Setting for enabling files encryption and fix whitelist media types stopping E2EE uploads #33003
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks like this PR is ready to merge! 🎉 |
🦋 Changeset detectedLatest commit: 9d755af The changes in this PR will be included in the next version bump. This PR includes changesets to release 34 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #33003 +/- ##
========================================
Coverage 59.43% 59.43%
========================================
Files 2546 2546
Lines 63257 63257
Branches 14236 14236
========================================
Hits 37596 37596
Misses 22941 22941
Partials 2720 2720
Flags with carried forward coverage won't be shown. Click here to find out more. |
csuadev
reviewed
Aug 9, 2024
matheusbsilva137
suggested changes
Aug 12, 2024
matheusbsilva137
suggested changes
Aug 12, 2024
matheusbsilva137
suggested changes
Aug 13, 2024
matheusbsilva137
previously approved these changes
Aug 13, 2024
jessicaschelly
added
the
stat: QA assured
matheusbsilva137
approved these changes
Aug 15, 2024
dionisio-bot
bot
added
the
stat: ready to merge
rodrigok
reviewed
Aug 22, 2024
Merged
diegolmello
reviewed
Aug 26, 2024
| } | ||
|
|
||
| // E2EE files are of type - application/octet-stream, application/octet-stream is whitelisted for E2EE files. | ||
| if (!fileUploadIsValidContentType(file?.type, isE2EEUpload(file) ? 'application/octet-stream' : undefined)) { |
There was a problem hiding this comment.
This line is breaking uploads on mobile
10 tasks
gabriellsh
added a commit
that referenced
this pull request
Sep 2, 2024
…ove/threadMetrics * 'develop' of github.com:RocketChat/Rocket.Chat: (49 commits) feat: add `sidepanelNavigation` to Feature preview list (#33156) refactor: Realtime Monitoring Counters to TS (#33182) fix: restore tooltips to units Multiselect (#33174) test: Add unit test for RoomMenu options (#32891) chore: remove notifyListener call that was causing startup issues (#33154) fix: Multi-step modals closing unexpectedly (#33158) Revert "refactor: Realtime Monitoring Counters to TS" (#33170) refactor: Realtime Monitoring Counters to TS (#33166) refactor: Uses `source` instead of `room` to render the `OmnichannelRoomIcon` (#33118) refactor: Realtime Monitoring Overviews to TS (#33167) test: Add e2e tests for teams multi-step modals (#33168) feat: add Advanced settings accordion to `EditRoomInfo` (#33114) chore: Revive Livechat Storybook (#33137) refactor: Realtime `Doughnout Charts` to TS (#33092) feat: create contact endpoint (#32693) chore: remove left streaming code (#33039) fix: show only relevant userInfoActions for mentioned non-members (#31525) feat: Setting for enabling files encryption and fix whitelist media types stopping E2EE uploads (#33003) refactor: Replace proxy functions from `LivechatTyped` class with direct calls (#33110) Revert "fix: Inconsistent Markdown Formatting in Custom Status Field" (#33127) ...
abhinavkrin
pushed a commit
that referenced
this pull request
Oct 25, 2024
…ypes stopping E2EE uploads (#33003) Co-authored-by: Kevin Aleman <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes (including videos or screenshots)
E2EE files and uploads are uploaded as files of mime type
application/octet-streamas we can't reveal the mime type of actual content since it is encrypted.The server resolves the mime type of file as
application/octet-streambut currently this doesn't play nicely with existing settings related to whitelisted and blacklisted media types.E2EE files upload gets blocked if
application/octet-streamis not a whitelisted media type.This PR solves this issue by always accepting E2EE uploads even if
application/octet-streamis not whitelisted but it will block the upload ifapplication/octet-streamis black listed.We also created a new setting for enabling/disabling encrypted uploads and mention this limitation in our settings description.
Issue(s)
Closes #32963
Steps to test or reproduce
Further comments
CORE-614