505530f36a
Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_requests
...
# Conflicts:
# synapse/crypto/context_factory.py
2018-07-14 20:24:46 +02:00
8a4f05fefb
Fix develop because I broke it :( ( #3535 )
2018-07-14 09:51:00 +10:00
8532953c04
Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet
...
Use parse and asserts from http.servlet
2018-07-14 09:09:19 +10:00
33b60c01b5
Make auth & transactions more testable ( #3499 )
2018-07-14 07:34:49 +10:00
516f960ad8
add changelog
2018-07-13 22:19:19 +02:00
08546be40f
better changelog
2018-07-13 16:47:13 +01:00
b03a0e14db
changelog
2018-07-13 16:28:28 +01:00
5f263b607e
Newsfile
2018-07-13 15:47:25 +01:00
6dff49b8a9
Merge pull request #3521 from matrix-org/rav/optimise_stream_change_cache
...
Reduce set building in get_entities_changed
2018-07-12 12:08:49 +01:00
37c4fba0ac
changelog
2018-07-12 11:45:33 +01:00
38c5fa7ee4
changelog
2018-07-12 11:45:28 +01:00
c969754a91
changelog
2018-07-12 10:00:57 +01:00
0456e05977
Merge pull request #3505 from matrix-org/erikj/receipts_cahce
...
Use stream cache in get_linearized_receipts_for_room
2018-07-12 09:46:29 +01:00
1b5425527c
I failed to correctly guess the PR number
2018-07-11 16:02:29 +01:00
36f4fd3e1e
Comment dummy TURN parameters in default config
...
This default config is parsed and used a base before the actual
config is overlaid, so with these values not commented out, the
code to detect when no turn params were set and refuse to generate
credentials was never firing because the dummy default was always set.
2018-07-11 15:49:29 +01:00
129ffd7b88
Merge pull request #3498 from OlegGirko/fix_attrs_syntax
...
* Use more portable syntax using attrs package.
Newer syntax
attr.ib(factory=dict)
is just a syntactic sugar for
attr.ib(default=attr.Factory(dict))
It was introduced in newest version of attrs package (18.1.0)
and doesn't work with older versions.
We should either require minimum version of attrs to be 18.1.0,
or use older (slightly more verbose) syntax.
Requiring newest version is not a good solution because
Linux distributions may have older version of attrs (17.4.0 in Fedora 28),
and requiring to build (and package)
newer version just to use newer syntactic sugar in only one test
is just too much.
It's much better to fix that test to use older syntax.
Signed-off-by: Oleg Girko <ol@infoserver.lv>
2018-07-11 04:22:46 +10:00
85354bb18e
changelog entry
2018-07-11 03:27:03 +10:00
bb3d536087
Newsfile
2018-07-10 17:28:31 +01:00
c3c29aa196
Attempt to include db threads in cpu usage stats ( #3496 )
...
Let's try to include time spent in the DB threads in the per-request/block cpu
usage metrics.
2018-07-10 16:12:36 +01:00
55370331da
Refactor logcontext resource usage tracking ( #3501 )
...
Factor out the resource usage tracking out to a separate object, which can be
passed around and copied independently of the logcontext itself.
2018-07-10 13:56:07 +01:00
f3b3b9dd8f
changelog
2018-07-09 18:16:52 +01:00
b5e157d895
Merge branch 'develop' into send_sni_for_federation_requests
...
# Conflicts:
# synapse/http/endpoint.py
2018-07-09 08:51:11 +02:00
09477bd884
changelog
2018-07-09 16:09:37 +10:00
2ee9f1bd1a
Add an isort configuration ( #3463 )
2018-07-09 16:05:21 +10:00
1241156c82
changelog
2018-07-07 10:48:30 +10:00
e845fd41c2
Correct attrs package name in requirements ( #3492 )
2018-07-07 10:46:59 +10:00
89690aaaeb
changelog
2018-07-05 20:46:40 +10:00
be8b32dbc2
ACL changelog
2018-07-05 20:45:12 +10:00
1a88640677
Merge pull request #3483 from matrix-org/rav/more_server_name_validation
...
More server_name validation
2018-07-05 10:04:20 +01:00
546bc9e28b
More server_name validation
...
We need to do a bit more validation when we get a server name, but don't want
to be re-doing it all over the shop, so factor out a separate
parse_and_validate_server_name, and do the extra validation.
Also, use it to verify the server name in the config file.
2018-07-04 18:59:51 +01:00
f192a93875
Merge pull request #3481 from matrix-org/rav/fix_cachedescriptor_test
...
Reinstate lost run_on_reactor in unit test
2018-07-04 18:55:33 +01:00
13f7adf84b
Merge pull request #3473 from matrix-org/erikj/thread_cache
...
Invalidate cache on correct thread
2018-07-04 10:11:38 +01:00
40252d13d1
Merge pull request #3474 from matrix-org/erikj/py3_auth
...
Fix up auth check
2018-07-04 09:41:33 +01:00
ea555d5633
Reinstate lost run_on_reactor in unit test
...
a61738b
2018-07-04 09:40:01 +01:00
c4e7ad0e0f
Add changelog
2018-07-04 09:15:45 +01:00
508196e08a
Reject invalid server names ( #3480 )
...
Make sure that server_names used in auth headers are sane, and reject them with
a sensible error code, before they disappear off into the depths of the system.
2018-07-03 14:36:14 +01:00
6ec3aa2f72
news snippet
2018-07-02 13:43:34 +01:00
abb183438c
Correct newsfile
2018-07-02 13:12:38 +01:00
f88dea577d
Newsfile
2018-07-02 11:46:32 +01:00
cea4662b13
Newsfile
2018-07-02 11:46:20 +01:00
75d4986a8c
Merge pull request #3467 from matrix-org/hawkowl/contributor-requirements
...
Clarify "real name" in contributor requirements
2018-06-30 00:21:10 +01:00
7c0cdd330f
topfile
2018-06-29 14:13:15 +01:00
e3b4043800
Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking
...
Check the state of prev_events a bit more thoroughly when coming over federation
2018-06-29 13:55:02 +01:00
0d7eabeada
add towncrier snippet
2018-06-28 20:59:01 +01:00
6350bf925e
Attempt to be more performant on PyPy ( #3462 )
2018-06-28 14:49:57 +01:00
cfda61e9cd
topfile update
2018-06-28 11:13:08 +01:00
72d2143ea8
Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" ( #3454 )
2018-06-28 11:04:18 +01:00
caf07f770a
topfile
2018-06-27 15:07:16 +01:00
cd6bcdaf87
Better testing framework for homeserver-using things ( #3446 )
2018-06-27 10:37:24 +01:00
26651b0d6a
towncrier changelog
2018-06-26 21:10:45 +02:00
8057489b26
Revert "Try to not use as much CPU in the StreamChangeCache"
2018-06-26 18:09:01 +01:00
bd3d329c88
fixes
2018-06-26 17:28:12 +01:00
36cb570641
Use towncrier to build the changelog ( #3425 )
2018-06-25 14:42:27 +01:00
Jeroen