faff057592
crypto: remove duplicate code
...
Only call SessionStore.storeEndToEndDevicesForUser once per user, rather than
once per device.
(Probably also fixes a bug where, when a user removes all devices, the store
isn't updated)
2016-09-30 09:17:54 +01:00
1a3ee28d01
Log when we get an oh_hai message
2016-09-21 17:07:40 +01:00
669aecf4e6
E2E: Fix NPE in getEventSenderDeviceInfo
2016-09-21 15:05:27 +01:00
832559926f
Fix the ed25519 key checking
...
Finish plumbing in the Ed25519 key checks. Make sure we store the claimed key
correctly in the megolm sessions, and keep them as a separate field in
MatrixEvent rather than stuffing them into _clearEvent
2016-09-20 20:42:08 +01:00
59411353b1
Add 'keys' to *all* olm messages
...
(including ones which just carry megolm keys)
2016-09-20 20:39:40 +01:00
83bd420cd5
Return null from decryptEvent if session is unknown
...
This just makes the shape of the API a bit saner.
2016-09-20 20:39:40 +01:00
78a0aa5d47
Add MatrixClient.getEventSenderDeviceInfo()
...
- a function to get information about the device which sent an event
2016-09-20 20:39:16 +01:00
6e31319294
Handle lack of one-time keys better
...
If a device had run out of one-time keys, we would send it an empty to_device
event, which it would then fail to decrypt with a "Not included in
recipients", which is all a bit pointless.
2016-09-18 22:58:35 +01:00
cd0b19f93f
Crypto: improve console logs
...
Attempt to make the console logs more helpful by reducing noise and adding
helpful debug info.
2016-09-18 21:55:38 +01:00
4f22610499
Megolm: clarify jsdoc
...
Clarify somewhat misleading jsdoc text
2016-09-18 13:52:48 +01:00
9e57a9352a
Merge pull request #212 from matrix-org/rav/get_devicelist_on_join
...
Pull user device list on join
2016-09-17 19:21:17 +01:00
f2e10e030d
Unknown sessions: send oh_hai to all devices if device_id is unknown
2016-09-17 19:07:03 +01:00
266b7afc72
Fix sending of oh_hais on bad sessions
...
Fix a bunch of bugs in the code which tried to send an oh_hai message when we
got a message with an unknown megolm session.
2016-09-17 18:30:12 +01:00
a15dffbb3a
Pull user device list on join
...
When a new user joins a room, make sure we download their device list if we
don't already have it.
This should fix at least one cause of
https://github.com/vector-im/vector-web/issues/2249 .
2016-09-17 17:44:15 +01:00
a30c816cb6
typo
2016-09-17 15:44:55 +01:00
425f862cf8
Merge pull request #205 from matrix-org/markjh/megolm
...
Update the olm library version to 1.3.0
2016-09-16 17:30:26 +01:00
5d6256bede
Merge pull request #209 from matrix-org/markjh/comment_upload_key
...
Comment what the logic in uploadKeys does
2016-09-16 16:34:37 +01:00
ff5b923e6f
Spelling: s/cliamed/claimed/
2016-09-16 16:31:00 +01:00
af7a9a68b8
Merge pull request #210 from matrix-org/markjh/echo_keys_proved
...
Include keysProved and keysClaimed in the local echo for events we send.
2016-09-16 15:45:22 +01:00
3bc56cf3f8
More comments on the local echo
2016-09-16 15:36:56 +01:00
c2a40572a5
Include keysProved and keysClaimed in the local echo for events we send.
2016-09-16 15:30:22 +01:00
ee7d4d0521
Explain what happens to the old keys in olm
2016-09-16 14:43:22 +01:00
6ab410ef6a
Comment what the logic in uploadKeys does
2016-09-16 14:38:26 +01:00
460f20a4ce
Merge pull request #207 from matrix-org/markjh/variable_scoping
...
Reset oneTimeKey to null on each loop iteration.
2016-09-16 11:23:58 +01:00
9a98c3991a
Reset onTimeKey to null on each loop iteration.
...
Otherwise we will use a value from a previous iteration of the loop.
2016-09-16 10:44:25 +01:00
2765720b76
unbreak NPE where megolm's decryptEvent doesn't return a result
2016-09-15 20:09:41 +01:00
71f23ffce1
Merge branch 'develop' into markjh/megolm
...
Conflicts:
lib/crypto/algorithms/megolm.js
2016-09-15 17:10:02 +01:00
0d5d74674e
Remove spurious senderKey argument
2016-09-15 16:46:28 +01:00
bde6a171f6
Add getKeysProved and getKeysClaimed methods to MatrixEvent.
...
These list the keys that sender of the event must have ownership
of and the keys of that the sender claims ownership of.
All olm and megolm messages prove ownership of a curve25519 key.
All new olm and megolm message will now claim ownership of a
ed25519 key.
This allows us to detect if an attacker claims ownership of a curve25519
key they don't own when advertising their device keys, because when we
receive an event from the original user it will have a different ed25519 key
to the attackers.
2016-09-15 16:26:43 +01:00
2fbef8638f
Fix grammar
2016-09-15 14:43:23 +01:00
355b728a57
Remove unnecessary semicolon;
2016-09-15 14:23:30 +01:00
35d99564c1
Rate limit the oh hai pings
2016-09-15 14:07:40 +01:00
6f9bb38232
Include our device key in megolm messages
2016-09-15 11:56:56 +01:00
d02c205910
Rename the "content" variable to avoid shadowing
2016-09-15 11:46:49 +01:00
38681202dc
Add olm version to client. Add semicolons.
2016-09-14 20:03:31 +01:00
0d20a0acf0
Add a test to check that we have the right version of Olm
2016-09-14 19:59:32 +01:00
9277a86403
Add the accidentally deleted sessionId documentation back
2016-09-14 19:35:31 +01:00
5ec8688cf6
Semicolon
2016-09-14 19:26:44 +01:00
6ae82a9cb4
Fix syntax error
2016-09-14 19:20:46 +01:00
72a4b92022
Send a 'm.new_device' when we get a message for an unknown group session
...
This should reduce the risk of a device getting permenantly stuck unable
to receive encrypted group messages.
2016-09-14 19:16:24 +01:00
0cc68bc125
Update the olm library version to 1.3.0
2016-09-14 14:24:21 +01:00
f0274f3f26
Wrap the crypto event handlers in try/catch blocks
2016-09-12 11:44:31 +01:00
fdb640e361
Merge pull request #202 from matrix-org/rav/decryption_warnings
...
Show warnings on to-device decryption fail
2016-09-09 14:09:05 +01:00
72b4f270ff
Show warnings on to-device decryption fail
...
If we can't decrypt a to-device message, show a warning about it, rather than
swallowing the error.
2016-09-09 12:37:02 +01:00
946539e32d
s/Displayname/DisplayName/
2016-09-09 11:32:57 +01:00
1da633e28a
Handle new device announcements
...
When we see a new device, download its keys, and then add it to the list of
things waiting for a keyshare.
2016-09-08 14:35:13 +01:00
879da47f0e
Send an "oh hai" message to other e2e users
...
When we first complete an initial sync on a new device, send out an
m.new_device message for each user we share an e2e room with
2016-09-08 14:34:08 +01:00
cacafb461d
Share the current ratchet with new members
...
When a new member joins the room, we don't need to reset the megolm session;
instead we can just share the current state with the new user.
2016-09-08 14:20:54 +01:00
71c33420f6
Move crypto bits into a subdirectory
...
It was getting a bit sprawly; this should help keep things together.
2016-09-08 09:50:31 +01:00
Richard van der Hoff