36adfaedab
Merge branch 'develop' into cross-signing_sig_upload
2019-10-18 18:34:42 +01:00
cfc28325a6
Merge branch 'develop' into uhoreg/e2e_cross-signing_merged
2019-10-18 11:39:40 +01:00
f0f6a2b360
use the right function for when we're already in runInteraction
2019-10-18 10:56:54 +01:00
132b251e29
expand on comment
2019-10-11 14:24:52 -04:00
7a0dce9259
make sure we actually return something
2019-10-10 20:31:30 -04:00
4908fb3b30
make storage layer in charge of interpreting the device key data
2019-10-10 19:15:30 -04:00
26113fb7de
make changes based on PR feedback
2019-09-24 14:12:20 -04:00
7d6c70fc7a
make black happy
2019-09-04 22:04:12 -04:00
ac4746ac4b
allow uploading signatures of master key signed by devices
2019-09-04 22:03:41 -04:00
4bb4544784
implement device signature uploading/fetching
2019-09-04 20:02:56 -04:00
e3d3fbf63f
Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys
2019-08-28 17:36:46 -07:00
72d296a7f3
Merge branch 'develop' into uhoreg/e2e_cross-signing_merged
2019-08-28 17:33:44 -07:00
3b0b22cb05
use stream ID generator instead of timestamp
2019-08-28 17:17:21 -07:00
9a6f2be572
Opentrace e2e keys ( #5855 )
...
Add opentracing tags and logs for e2e keys
2019-08-22 11:28:12 +01:00
7c3abc6572
apply PR review suggestions
2019-08-21 13:19:35 -07:00
f63ba7a795
Cross-signing [1/4] -- hidden devices ( #5759 )
...
* allow devices to be marked as "hidden"
This is a prerequisite for cross-signing, as it allows us to create other things
that live within the device namespace, so they can be used for signatures.
2019-08-12 15:14:37 -07:00
336c546d6a
Merge branch 'cross-signing_hidden' into cross-signing_keys
2019-08-01 16:31:40 -04:00
c1f0a5636c
Merge branch 'develop' into cross-signing_hidden
2019-07-30 23:33:06 -04:00
bc95890822
Merge branch 'cross-signing_hidden' into cross-signing_keys
2019-07-30 23:21:26 -04:00
781ade836b
apply changes from PR review
2019-07-30 23:09:50 -04:00
c659b9f94f
allow uploading keys for cross-signing
2019-07-25 11:08:24 -04:00
4806651744
Replace returnValue with return ( #5736 )
2019-07-23 23:00:55 +10:00
7efd1d87c2
Run black on the rest of the storage module ( #4996 )
2019-04-03 10:07:29 +01:00
a84b8d56c2
Fixup slave stores
2019-03-04 18:04:57 +00:00
5ebed18692
Lets convert bytes to unicode instead
2018-11-08 12:33:13 +00:00
b1a22b24ab
Fix noop checks when updating device keys
...
Clients often reupload their device keys (for some reason) so its
important for the server to check for no-ops before sending out device
list update notifications.
The check is broken in python 3 due to the fact comparing bytes and
unicode always fails, and that we write bytes to the DB but get unicode
when we read.
2018-11-08 12:18:38 +00:00
14e4d4f4bf
Port storage/ to Python 3 ( #3725 )
2018-08-31 00:19:58 +10:00
c1bf2b587e
add trailing comma
2018-07-23 09:56:23 +01:00
c0685f67c0
spell out that include_deleted_devices requires include_all_devices
2018-07-19 10:59:02 +01:00
12ec58301f
shift to using an explicit deleted flag on m.device_list_update EDUs
...
and generally make it work.
2018-07-12 11:39:43 +01:00
5797f5542b
WIP to announce deleted devices over federation
...
Previously we queued up the poke correctly when the device was deleted,
but then the actual EDU wouldn't get sent, as the device was no longer known.
Instead, we now send EDUs for deleted devices too if there's a poke for them.
2018-07-12 01:32:39 +01:00
49af402019
run isort
2018-07-09 16:09:20 +10:00
6350bf925e
Attempt to be more performant on PyPy ( #3462 )
2018-06-28 14:49:57 +01:00
933bf2dd35
replace some iteritems with six
...
Signed-off-by: Adrian Tschira <nota@notafile.com>
2018-05-19 17:59:26 +02:00
926ba76e23
Replace ujson with simplejson
2018-03-15 23:43:31 +00:00
8cf9f0a3e7
Remove redundant invalidation
2017-05-23 09:46:59 +01:00
e6618ece2d
Missed an invalidation
2017-05-23 09:36:52 +01:00
74bf4ee7bf
Stream count_e2e_one_time_keys cache invalidation
2017-05-22 16:19:22 +01:00
a7e9d8762d
Allow clients to upload one-time-keys with new sigs
...
When a client retries a key upload, don't give an error if the signature has
changed (but the key is the same).
Fixes https://github.com/vector-im/riot-android/issues/1208 , hopefully.
2017-05-09 19:04:56 +01:00
8571f864d2
Cache one time key counts
2017-05-08 15:34:27 +01:00
e4df0e189d
Decrank last commit
2017-03-29 11:02:35 +01:00
4ad613f6be
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/e2e_one_time_upsert
2017-03-29 10:57:19 +01:00
ac6bc55512
Correctly look up key
2017-03-29 10:56:26 +01:00
58a35366be
The algorithm is part of the key id
2017-03-28 11:34:37 +01:00
00957d1aa4
User Cursor.__iter__ instead of fetchall
...
This prevents unnecessary construction of lists
2017-03-23 17:53:49 +00:00
6ebe2d23b1
Raise a more helpful exception
2017-03-23 13:48:30 +00:00
e64655c25d
Don't user upsert to persist new one time keys
...
Instead we no-op duplicate one time key uploads, an error if the key_id
already exists but encodes a different key.
2017-03-23 13:17:00 +00:00
52cd019a54
Make None check explicit
2017-02-08 16:04:29 +00:00
c7a26b7c32
Fix unit tests
2017-01-30 17:11:24 +00:00
c2c9a78db9
Noop device key changes if they're the same
2017-01-30 16:55:04 +00:00
Hubert Chathi