ae8d4bb0f0
Keep room_id's in group summary
2017-09-21 15:55:18 +01:00
197d82dc07
Correctly return next token
2017-09-20 11:12:11 +01:00
069ae2df12
Fix initial sync
2017-09-20 10:52:12 +01:00
6de74ea6d7
Fix logcontexts in _check_sigs_and_hashes
2017-09-20 01:32:42 +01:00
c5c24c239b
Fix logcontext handling in verify_json_objects_for_server
...
preserve_context_over_fn is essentially broken, because (a) it pointlessly
drops the current logcontext before calling its wrapped function, which means
we don't get any useful logcontexts for _handle_key_deferred; (b) it wraps the
resulting deferred in a _PreservingContextDeferred, which is very dangerous
because you then can't yield on it without leaking context back into the
reactor.
Instead, let's specify that the resultant deferreds call their callbacks with
no logcontext.
2017-09-20 01:32:42 +01:00
c5b0e9f485
Turn _start_key_lookups into an inlineCallbacks function
...
... which means that logcontexts can be correctly preserved for the stuff it
does.
get_server_verify_keys is now called with the logcontext, so needs to
preserve_fn when it fires off its nested inlineCallbacks function.
Also renames get_server_verify_keys to reflect the fact it's meant to be
private.
2017-09-20 01:32:42 +01:00
abdefb8a01
Fix potential race in _start_key_lookups
...
If the verify_request.deferred has already completed, then `remove_deferreds`
will be called immediately. It therefore might resolve the server_to_deferred
deferred while there are still other requests for that server in flight.
To avoid that, we should build the complete list of requests, and *then* add the
callbacks.
2017-09-20 01:32:42 +01:00
afbd773dc6
Add some comments to _start_key_lookups
2017-09-20 01:32:42 +01:00
2a4b9ea233
Consistency for how verify_request.deferred is called
...
Define that it is run with no log context, and make sure that happens.
If we aren't careful to reset the logcontext, we can't bung the deferreds into
defer.gatherResults etc. We don't actually do that directly, but we *do*
resolve other deferreds from affected callbacks (notably the server_to_deferred
map in _start_key_lookups), and those *do* get passed into
defer.gatherResults. It turns out that this way ends up being least confusing.
2017-09-20 01:32:42 +01:00
3b98439eca
Factor out _start_key_lookups
...
... to make it easier to see what's going on.
2017-09-20 01:32:42 +01:00
fde63b880d
Replace `server_and_json` with `verify_requests`
...
This is a precursor to factoring some of this code out.
2017-09-20 01:32:42 +01:00
2d511defd9
pull out handle_key_deferred to top level
...
There's no need for this to be a nested definition; pulling it out not only
makes it more efficient, but makes it easier to check that it's not accessing
any local variables it shouldn't be.
2017-09-20 01:32:42 +01:00
dd1ea9763a
Fix incorrect key_ids in error message
2017-09-20 01:32:42 +01:00
e76d1135dd
Invalidate signing key cache when we gat an update
...
This might make the cache slightly more efficient.
2017-09-20 01:32:42 +01:00
fcf2c0fd1a
Remove redundant `preserve_fn`
...
preserve_fn is a no-op unless the wrapped function returns a
Deferred. verify_json_objects_for_server returns a list, so this is doing
nothing.
2017-09-20 01:32:42 +01:00
9864efa532
Fix concurrent server_key requests ( #2458 )
...
Fix a bug where we could end up firing off multiple requests for server_keys
for the same server at the same time.
2017-09-19 23:25:44 +01:00
aa620d09a0
Add a config option to block all room invites ( #2457 )
...
- allows sysadmins the ability to lock down their servers so that people can't
send their users room invites.
2017-09-19 16:08:14 +01:00
2eabdf3f98
add some comments to on_exchange_third_party_invite_request
2017-09-19 12:20:36 +01:00
5ed109d59f
PoC for filtering spammy events ( #2456 )
...
Demonstration of how you might add some hooks to filter out spammy events.
2017-09-19 12:20:11 +01:00
93e504d04e
Ensure that creator of group sees group down /sync
2017-09-19 11:08:16 +01:00
b5feaa5a49
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged
2017-09-19 11:07:45 +01:00
3f405b34e9
Fix overzealous kicking of guest users ( #2453 )
...
We should only kick guest users if the guest access event is authorised.
2017-09-19 08:52:52 +01:00
290777b3d9
Clean up and document handling of logcontexts in Keyring ( #2452 )
...
I'm still unclear on what the intended behaviour for
`verify_json_objects_for_server` is, but at least I now understand the
behaviour of most of the things it calls...
2017-09-18 18:31:01 +01:00
77c81ca6ea
Merge pull request #2451 from matrix-org/erikj/add_state_to_timeline
...
Don't filter out current state events from timeline
2017-09-18 17:22:33 +01:00
2d1b7955ae
Don't filter out current state events from timeline
2017-09-18 17:13:03 +01:00
862c8da560
Merge pull request #2450 from matrix-org/dbkr/push_event_id_only
...
Add support for event_id_only push format
2017-09-18 16:41:29 +01:00
436ee0a2ea
Also include the room_id
...
as really it's part of the event ID
2017-09-18 15:58:38 +01:00
b393f5db51
Use .get - it's much shorter
2017-09-18 15:50:26 +01:00
a2562f9d74
Add support for event_id_only push format
...
Param in the data dict of a pusher that tells an HTTP pusher to
send just the event_id of the event it's notifying about and the
notification counts. For clients that want to go & fetch the body
of the event themselves anyway.
2017-09-18 15:39:39 +01:00
d6dadd95ac
Correctly handle leaving room in /key/changes
2017-09-18 15:38:22 +01:00
4a94eb3ea4
Fix typo
2017-09-15 09:56:54 +01:00
3a0cee28d6
Actually hook leave notifs up
2017-09-14 11:49:37 +01:00
4f845a0713
Handle joining/leaving rooms in /keys/changes
2017-09-13 16:28:08 +01:00
473700f016
Get left rooms
2017-09-13 15:13:41 +01:00
9ce866ed4f
In sync handle device lists for newly joined/left rooms
2017-09-12 16:44:26 +01:00
69ef4987a6
Add left section to /keys/changes
2017-09-08 14:44:36 +01:00
53cc8ad35a
Send down device list change notif when member leaves/rejoins room
2017-09-07 15:08:39 +01:00
4a9b1cf253
Add user profiles to summary from group server
2017-08-25 16:23:58 +01:00
258409ef61
Fix typos and reinherit
2017-08-25 14:45:20 +01:00
bf81f3cf2c
Split out profile handler to fix tests
2017-08-25 14:34:56 +01:00
27ebc5c8f2
Add remote profile cache
2017-08-25 11:25:47 +01:00
97c544f91f
Add _simple_update
2017-08-25 11:11:37 +01:00
a7effa8400
Merge pull request #2288 from kyrias/bcrypt
...
python_dependencies: Use bcrypt module instead of py-bcrypt
2017-08-23 14:14:56 +01:00
2800983f3e
Merge pull request #2410 from matrix-org/erikj/groups_publicise
...
Add ability to publicise group membership
2017-08-21 16:51:56 +01:00
8b50fe5330
Use BOOLEAN rather than TEXT type
2017-08-21 16:37:29 +01:00
175a01f56c
Groups: Fix mising json.load in initial sync
2017-08-21 14:45:56 +01:00
692250c6be
Fix user_dir startup
...
Add missing parameter to _base.start_worker_reactor
2017-08-16 15:11:29 +01:00
d2352347cf
Fix process startup
...
escape the % that got added in 92168cb
2017-08-16 14:57:35 +01:00
92168cbbc5
explain why CPU affinity is a good idea
2017-08-15 18:27:42 +01:00
10d8b701a1
Allow configuration of CPU affinity
...
Make it possible to set the CPU affinity in the config file, so that we don't
need to remember to do it manually every time.
2017-08-15 17:08:28 +01:00
543c794a76
Factor out common application start
...
We have 10 copies of this code, and I don't really want to update each one
separately.
2017-08-15 17:04:40 +01:00
ba3ff7918b
Fixup
2017-08-11 13:42:42 +01:00
ef8e578677
Add bulk group publicised lookup API
2017-08-09 13:36:22 +01:00
b880ff190a
Allow update group publicity
2017-08-08 14:19:41 +01:00
05e21285aa
Store whether the user wants to publicise their membership of a group
2017-08-08 13:01:46 +01:00
eae04f1952
fix english
2017-08-04 23:56:42 +01:00
5699b05072
typo
2017-08-04 23:44:37 +01:00
a1e67bcb97
Remove stale TODO comments
2017-08-04 10:07:10 +01:00
09552f9d9c
Reduce spammy log line in synchrotrons
2017-08-02 17:29:51 +01:00
f18373dc5d
Fix iteration of requests_missing_keys; list doesn't have .values()
...
Signed-off-by: Kenny Keslar <r3dey3@r3dey3.com>
2017-07-26 22:44:19 -05:00
966a70f1fa
Update comment
2017-07-24 17:49:39 +01:00
629cdfb124
Use join rather than joined, etc.
2017-07-24 14:54:05 +01:00
ed666d3969
Fix all the typos
2017-07-24 14:05:09 +01:00
b76ef6ccb8
Include users membership in group in summary API
2017-07-24 13:55:39 +01:00
851aeae7c7
Check users/rooms are in group before adding to summary
2017-07-24 13:40:56 +01:00
d5e32c843f
Correctly add joins to correct segment
2017-07-24 13:31:26 +01:00
96917d5552
Merge pull request #2378 from matrix-org/erikj/group_sync_support
...
Add groups to sync stream
2017-07-21 11:05:39 +01:00
0401604222
Merge pull request #2377 from matrix-org/erikj/group_profile_update
...
Add update group profile API
2017-07-20 17:53:39 +01:00
b238cf7f6b
Remove spurious content param
2017-07-20 17:49:55 +01:00
960dae3340
Add notifier
2017-07-20 17:14:44 +01:00
2cc998fed8
Fix replication. And notify
2017-07-20 17:13:18 +01:00
139fe30f47
Remember to cast to bool
2017-07-20 16:47:35 +01:00
4d793626ff
Fix bug in generating current token
2017-07-20 16:42:44 +01:00
c544188ee3
Add groups to sync stream
2017-07-20 16:36:42 +01:00
0ab153d201
Check values are strings
2017-07-20 16:24:18 +01:00
8209b5f033
Fix a storage desc
2017-07-20 16:22:22 +01:00
57826d645b
Fix typo
2017-07-20 13:15:22 +01:00
6f443a74cf
Add update group profile API
2017-07-20 09:46:33 +01:00
14a34f12d7
Comments
2017-07-18 17:28:42 +01:00
3431ec55dc
Comments
2017-07-18 17:23:50 +01:00
6027b1992f
Fix permissions
2017-07-18 16:51:25 +01:00
e884ff31d8
Add DELETE
2017-07-18 16:41:44 +01:00
05c13f6c22
Add 'args' param to post_json
2017-07-18 16:40:21 +01:00
94ecd871a0
Fix typos
2017-07-18 16:38:54 +01:00
12ed4ee48e
Correctly parse query params
2017-07-18 15:33:09 +01:00
332839f6ea
Update federation client pokes
2017-07-18 14:45:37 +01:00
e5ea6dd021
Add client apis
2017-07-18 14:37:06 +01:00
cccfcfa7b9
Comments
2017-07-18 10:35:18 +01:00
68f34e85ce
Use transport client directly
2017-07-18 10:29:57 +01:00
3e703eb04e
Comment
2017-07-18 10:17:25 +01:00
508460f240
Remove sync stuff
2017-07-18 09:55:46 +01:00
6e9f147faa
Add GroupID type
2017-07-18 09:47:25 +01:00
4540730111
Remove unused tables
2017-07-18 09:38:15 +01:00
e96ee95a7e
Remove sync stuff
2017-07-18 09:38:08 +01:00
2f9eafdd36
Add local group server support
2017-07-17 12:03:49 +01:00
bfde076022
Increase cache hit ratio for push
...
We don't update the cache in all code paths, which causes subsequent
calls to miss the cache
2017-07-14 16:11:26 +01:00
cb3aee8219
Ensure category and role ids are non-null
2017-07-14 14:06:55 +01:00
85fda57208
Add DEFAULT_ROLE_ID
2017-07-14 14:03:54 +01:00
4b203bdba5
Correctly increment orders
2017-07-14 14:02:31 +01:00
8d26385d76
Add more metrics to push rule evaluation
2017-07-13 14:37:30 +01:00
3b0470dba5
Remove unused functions
2017-07-13 13:54:01 +01:00
8575e3160f
Comments
2017-07-13 13:52:41 +01:00
f60218ec41
Push: Don't acquire lock unless necessary
2017-07-13 11:23:53 +01:00
a78cda4baf
Remove TODO
2017-07-13 11:17:07 +01:00
7a39da8cc6
Add summary APIs to federation
2017-07-13 11:13:19 +01:00
5bbb53580a
raise NotImplementedError
2017-07-13 10:25:29 +01:00
26451a09eb
Comments
2017-07-12 14:47:18 +01:00
8d55877c9e
Simplify checking if admin
2017-07-12 11:43:39 +01:00
a62406aaa5
Add group summary APIs
2017-07-12 11:36:15 +01:00
e9aec001f4
Use less DB for device list handling in sync
2017-07-12 10:30:10 +01:00
28e8c46f29
Merge pull request #2352 from matrix-org/erikj/group_server_split
...
Initial Group Server
2017-07-12 10:26:29 +01:00
6d586dc05c
Comment
2017-07-12 09:58:37 +01:00
410b4e14a1
Move comment
2017-07-11 15:44:18 +01:00
fe4e885f54
Add federation API for adding room to group
2017-07-11 14:35:07 +01:00
bbb739d24a
Comment
2017-07-11 14:31:36 +01:00
26752df503
Typo
2017-07-11 14:29:03 +01:00
e52c391cd4
Rename column to attestation_json
2017-07-11 14:25:46 +01:00
0aac30d53b
Comments
2017-07-11 14:23:50 +01:00
0184a97dbd
Merge pull request #2354 from krombel/reduce_static_sync_reply
...
encode sync-response statically
2017-07-11 14:19:56 +01:00
85b9f76f1d
split out reducing stuff; just make encode_* static
2017-07-11 13:14:35 +02:00
6322fbbd41
Comment
2017-07-11 11:52:03 +01:00
8ba89f1050
Remove u/ requirement
2017-07-11 11:45:32 +01:00
429925a5e9
Lift out visibility parsing
2017-07-11 11:44:08 +01:00
83936293eb
Comments
2017-07-11 11:42:25 +01:00
e2cb760dcc
Merge pull request #2357 from matrix-org/erikj/push
...
Don't compute push actions for backfilled events
2017-07-11 10:53:22 +01:00
925b3638ff
Reduce log levels in tcp replication
2017-07-11 10:04:21 +01:00
9a6fd3ef29
Don't compute push actions for backfilled events
2017-07-11 10:02:21 +01:00
2f82de18ee
fix test
2017-07-10 17:34:58 +02:00
b8ca494ee9
Initial group server implementation
2017-07-10 15:44:15 +01:00
6e16aca8b0
encode sync-response statically; omit empty objects from sync-response
2017-07-10 16:42:17 +02:00
d4d12daed9
Include registration and as stores in frontend proxy
2017-07-07 18:36:45 +01:00
f467a8f66d
Merge branch 'master' of github.com:matrix-org/synapse into develop
2017-07-07 18:26:28 +01:00
1fc4a962e4
Add a frontend proxy
2017-07-07 18:19:46 +01:00
f502b0dea1
Perf: Don't filter events for push
...
We know the users are joined and we can explicitly check for if they are
ignoring the user, so lets do that.
2017-07-07 14:04:40 +01:00
76ed3476d3
Bump version and changelog
2017-07-06 18:11:22 +01:00
58dc1f2c78
Merge pull request #2342 from matrix-org/erikj/pusher_pool_instantiate
...
Fix bug where pusherpool didn't start and broke some rooms
2017-07-06 18:08:43 +01:00
5a7f561a9b
Fix bug where pusherpool didn't start and broke some rooms
...
Since we didn't instansiate the PusherPool at start time it could fail
at run time, which it did for some users.
This may or may not fix things for those users, but it should happen at
start time and stop the server from starting.
2017-07-06 17:55:51 +01:00
ed9a7f5436
Merge pull request #2309 from matrix-org/erikj/user_ip_repl
...
Fix up user_ip replication commands
2017-07-06 14:33:14 +01:00
1f64207f26
Merge branch 'master' of github.com:matrix-org/synapse into develop
2017-07-06 13:57:45 +01:00
6264cf9666
Bump version and changelog
2017-07-06 10:35:56 +01:00
f386632800
Merge pull request #2334 from matrix-org/erikj/refactor_transport_server
...
Separate federation servlet into different lists
2017-07-05 17:09:07 +01:00
5e49a57ecc
Separate federation servlet into different lists
2017-07-05 14:32:24 +01:00
3d31b39297
Merge pull request #2332 from matrix-org/rav/fix_pushes
...
Fix caching error in the push evaluator
2017-07-05 11:10:53 +01:00
73cfe48031
Fix caching error in the push evaluator
...
Initialising `result` to `{}` in the parameters meant that every call to
_flatten_dict used the *same* target dictionary.
I'm hopeful this will fix https://github.com/matrix-org/synapse/issues/2270 ,
but I suspect it won't. (This code seems to have been here since forever,
unlike the bug, and I don't really think it explains the observed
behaviour). Still, it makes it hard to investigate the problem.
2017-07-05 00:28:43 +01:00
05538587ef
Bump version and changelog
2017-07-04 14:02:21 +01:00
f92d7416d7
Merge pull request #2330 from matrix-org/erikj/cache_size_factor
...
Increase default cache size
2017-07-04 10:51:21 +01:00
495f075b41
Increase default cache factor size.
2017-07-04 09:58:32 +01:00
b5e8d529e6
Define CACHE_SIZE_FACTOR once
2017-07-04 09:56:44 +01:00
3e279411fe
Improve the error handling for bad invites received over federation
2017-06-30 16:20:30 +01:00
6ff14ddd2e
Make into list
2017-06-29 15:47:37 +01:00
Erik Johnston