matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-25 13:42:49 +03:00
Code Activity

Don't try to decrypt end-to-end messages if the client doesn't have end-to-end support enabled

Browse Source
This commit is contained in:
Mark Haines
2015-07-20 10:58:20 +01:00
parent 65d64bf223
commit 00ae144997
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/client.js
View File

@@ -662,6 +662,12 @@ function _sendEncryptedMessage(client, roomId, e2eRoomInfo, eventType, content,
} }
function _decryptMessage(client, event) { function _decryptMessage(client, event) {
if (client.sessionStore === null) {
// End to end encryption isn't enabled if we don't have a session
// store.
return _badEncryptedMessage(event, "Encryption not enabled");
}
var content = event.getContent(); var content = event.getContent();
if (content.algorithm === OLM_ALGORITHM) { if (content.algorithm === OLM_ALGORITHM) {
var sender = event.getSender(); var sender = event.getSender();
@@ -726,12 +732,12 @@ function _decryptMessage(client, event) {
user_id: event.getSender() user_id: event.getSender()
}); });
} else { } else {
return _badEncryptedMessge(event, "Bad Encrypted Message"); return _badEncryptedMessage(event, "Bad Encrypted Message");
} }
} }
} }
function _badEncryptedMessge(event, reason) { function _badEncryptedMessage(event, reason) {
return new MatrixEvent({ return new MatrixEvent({
type: "m.room.message", type: "m.room.message",
// TODO: Add rest of the event keys. // TODO: Add rest of the event keys.