93247a424a
Only pull out local media that were for url cache
2017-09-28 13:48:14 +01:00
5f501ec7e2
Fix typo in url cache expiry timer
2017-09-28 12:59:01 +01:00
761d255fdf
Merge pull request #2479 from matrix-org/erikj/expire_url_cache_thumbnails
...
Support new and old style media id formats
2017-09-28 12:58:13 +01:00
ace8079086
Support new and old style media id formats
2017-09-28 12:52:51 +01:00
7a44c01d89
Fix typo
2017-09-28 12:46:04 +01:00
c9bc4b7031
Merge pull request #2478 from matrix-org/erikj/expire_url_cache_thumbnails
...
Delete expired url cache data
2017-09-28 12:42:33 +01:00
ae79764fe5
Change expires column to expires_ts
2017-09-28 12:37:53 +01:00
77f1d24de3
More brackets
2017-09-28 12:23:15 +01:00
9ccb4226ba
Delete expired url cache data
2017-09-28 12:18:06 +01:00
bf86a41ef1
Merge pull request #2476 from matrix-org/erikj/joined_members_auth
...
Fix /joined_members to work with AS users
2017-09-28 10:44:44 +01:00
8090fd4664
Fix /joined_members to work with AS users
2017-09-28 10:09:32 +01:00
3a743f649c
Merge pull request #2475 from matrix-org/erikj/joined_members_auth
...
Fix bug where /joined_members didn't check user was in room
2017-09-27 16:42:23 +01:00
adec03395d
Fix bug where /joined_members didn't check user was in room
2017-09-27 15:14:39 +01:00
74e494b010
Merge pull request #2474 from matrix-org/dbkr/spam_check_module
...
Make the spam checker a module
2017-09-27 11:31:00 +01:00
ef3a5ae787
Don't test is spam_checker not None
...
Sometimes it's a Mock object which is not none but is still not
what we're after
2017-09-27 11:24:19 +01:00
8c06dd6071
Remove unintentional debugging
2017-09-27 10:31:14 +01:00
60c78666ab
pep8
2017-09-27 10:26:13 +01:00
1786b0e768
Forgot the new file again :(
2017-09-27 10:22:54 +01:00
8ad5f34908
pep8
2017-09-26 19:21:41 +01:00
6cd5fcd536
Make the spam checker a module
2017-09-26 19:20:23 +01:00
ccc67d445b
Merge pull request #2473 from matrix-org/dbkr/factor_out_module_loading
...
Factor out module loading to a separate place
2017-09-26 18:12:17 +01:00
9fd086e506
unnecessary parens
2017-09-26 17:59:46 +01:00
0b03a97708
Add module_loader.py
2017-09-26 17:56:41 +01:00
4824a33c31
Factor out module loading to a separate place
...
So it can be reused
2017-09-26 17:51:26 +01:00
1a398b19fd
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.23.0
2017-09-26 10:08:59 +01:00
f4c8cd5e85
Bump changelog and version
2017-09-26 10:02:48 +01:00
b8d832a08c
Merge pull request #2470 from matrix-org/erikj/sync_speed_fix
...
Refactor to speed up incremental syncs
2017-09-25 17:43:14 +01:00
e3edca3b5d
Refactor to speed up incremental syncs
2017-09-25 17:35:39 +01:00
cacfa04cb6
Merge pull request #2468 from maxidor/develop
...
Clarify recommended network setup
2017-09-25 16:37:33 +01:00
e591f7b3f0
Include review feedback
2017-09-25 16:42:26 +02:00
7141f1a5cc
Clarify recommended network setup
2017-09-25 16:20:23 +02:00
44edac0497
Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse into develop
2017-09-25 14:52:46 +01:00
29e1c717c3
Merge pull request #2390 from r3dey3/develop
...
Fix iteration of requests_missing_keys; list doesn't have .values()
2017-09-25 11:56:01 +01:00
94133d7ce8
Merge branch 'develop' into develop
2017-09-25 11:50:11 +01:00
b15c2b7971
Update CHANGES
2017-09-25 11:34:12 +01:00
ba8fdc925c
Bump version and changes
2017-09-25 11:01:31 +01:00
79b3cf3e02
Fix logcontxt leak in keyclient ( #2465 )
...
preserve_context_over_function doesn't do what you want it to do.
2017-09-25 09:51:39 +01:00
f65e31d22f
Do an AAAA lookup on SRV record targets ( #2462 )
...
Support SRV records which point at AAAA records, as well as A records.
Fixes https://github.com/matrix-org/synapse/issues/2405
2017-09-22 20:26:47 +01:00
f496399ac4
fix thinko'd docstring
2017-09-22 15:34:14 +01:00
3166ed55b2
Fix device list when rejoining room ( #2461 )
2017-09-22 14:44:17 +01:00
c94ab5976a
Merge pull request #2459 from matrix-org/rav/keyring_cleanups
...
Clean up Keyring code
2017-09-20 11:29:39 +01:00
6de74ea6d7
Fix logcontexts in _check_sigs_and_hashes
2017-09-20 01:32:42 +01:00
72472456d8
Add some more tests for Keyring
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
Erik Johnston