Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Encrypt attachments in encrypted rooms #548

Merged
merged 15 commits into from
Nov 11, 2016
Merged

Encrypt attachments in encrypted rooms #548

merged 15 commits into from
Nov 11, 2016

Conversation

NegativeMjark
Copy link
Contributor

Reverts #546

@NegativeMjark
Include the mimetype with the file info. Store the objectURL in state…
49b3aec 
… so that it can be used normally by the exising templates

Conflicts:
	src/ContentMessages.js
	src/components/views/messages/MImageBody.js
@NegativeMjark
Move decryptFile into a utility function so that it can be shared bet…
a4a0d02 
…ween different components

Conflicts:
	src/components/views/messages/MImageBody.js
@NegativeMjark
Decypt m.video events
95e8889
@NegativeMjark
Remove spurious TODO
b56417f
@NegativeMjark
Fix unencrypted video thumbnail
48340a2
@NegativeMjark
Decrypt m.audio attachments
4e01a4f
@NegativeMjark
Decrypt m.file attachments
b69e88d
@NegativeMjark
Use data:// URI rather than blob: URI to avoid XSS
ee1768f
@NegativeMjark
Make everything use MFileBody for downloads, ensure that encrypted at…
736ab74 
…tachments are actually downloaded

Conflicts:
	src/components/views/messages/MImageBody.js
@NegativeMjark
Pass the decryptedUrl to the MFileBody so that it doesn't need to dec…
de38448 
…rypt it itself.

Conflicts:
	src/components/views/messages/MImageBody.js
@NegativeMjark
Fix gif hoverover
734c4eb
@NegativeMjark
Review comments
bf5ecbd 
Conflicts:
	src/ContentMessages.js
@NegativeMjark
Make imports more consistent, fix m.video
9edfea3
@NegativeMjark
Make the promises be q promises
72d24f5
@matrixbot
Copy link
Member

Can one of the admins verify this patch?

@dbkr dbkr merged commit 1ff3a86 into develop Nov 11, 2016
richvdh added a commit that referenced this pull request Nov 12, 2016
@richvdh
Complete attachment-encryption patch
34df6ea 
#533 originally landed in
the wrong branch, and was reverted by
#546.
#548 attempted to land it on
the develop branch, but omitted a small amount of the patch.

This lands the final part, which got missed out.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dbkr dbkr dbkr approved these changes

Assignees

@dbkr dbkr

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@NegativeMjark @matrixbot @dbkr