Andrew Morgan
e0eef47315
Fix existing v2 identity server calls (MSC2140) ( #6013 )
...
Two things I missed while implementing [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R80 ).
1. Access tokens should be provided to the identity server as `access_token`, not `id_access_token`, even though the homeserver may accept the tokens as `id_access_token`.
2. Access tokens must be sent to the identity server in a query parameter, the JSON body is not allowed.
We now send the access token as part of an `Authorization: ...` header, which fixes both things.
The breaking code was added in https://github.com/matrix-org/synapse/pull/5892
Sytest PR: https://github.com/matrix-org/sytest/pull/697
2019-09-13 14:08:26 +01:00
Erik Johnston
44d2ca2990
Merge branch 'anoa/fix_3pid_validation' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-10 18:15:24 +01:00
Erik Johnston
9240622c1a
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-06 14:10:53 +01:00
Erik Johnston
0dbba85e95
Merge branch 'anoa/worker_store_reg' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-06 13:02:12 +01:00
Andrew Morgan
1ceeccb769
Move get_threepid_validation_session into RegistrationWorkerStore
2019-09-06 13:00:34 +01:00
Erik Johnston
39883e85bd
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-06 12:50:28 +01:00
Erik Johnston
68f53b7a0e
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-06 09:53:37 +01:00
Erik Johnston
e679b008ff
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-05 15:23:40 +01:00
Erik Johnston
e80a5b7492
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-04 13:13:30 +01:00
Richard van der Hoff
b272e7345f
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2019-08-30 12:01:24 +01:00
Erik Johnston
a81e0233e9
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-08-29 11:18:57 +01:00
Richard van der Hoff
80898481ab
Merge branch 'release-v1.3.1' into matrix-org-hotfixes
2019-08-17 09:22:30 +01:00
Brendan Abolivier
9d4c716d85
Merge branch 'release-v1.3.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-08-15 11:36:00 +01:00
Brendan Abolivier
d90b0946ed
Temporary fix to ensure kde can contact matrix.org if stuff breaks
2019-08-13 18:05:06 +01:00
Brendan Abolivier
8d5762b0dc
Merge branch 'release-v1.3.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-08-13 17:39:30 +01:00
Brendan Abolivier
a7efbc5416
Merge branch 'release-v1.3.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-08-13 15:54:01 +01:00
Richard van der Hoff
be362cb8f8
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2019-08-13 10:52:19 +01:00
Erik Johnston
873ff9522b
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-08-01 14:46:09 +01:00
Erik Johnston
c1ee2999a0
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-07-31 10:01:56 +01:00
Erik Johnston
9b2b386f76
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-07-30 13:26:19 +01:00
Erik Johnston
65fe31786d
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-07-30 10:12:13 +01:00
Andrew Morgan
70b6d1dfd6
Merge branch 'release-v1.2.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-07-24 13:32:41 +01:00
Erik Johnston
ee62aed72e
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-07-23 10:23:40 +01:00
Erik Johnston
c02f26319d
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-07-23 09:20:26 +01:00
Andrew Morgan
fdd182870c
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-07-22 10:19:16 +01:00
Richard van der Hoff
4102cb220a
Merge branch 'release-v1.2.0' into matrix-org-hotfixes
2019-07-18 15:20:00 +01:00
Erik Johnston
5299707329
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-07-17 10:56:55 +01:00
Richard van der Hoff
43e01be158
Merge remote-tracking branch 'origin/release-v1.1.0' into matrix-org-hotfixes
2019-07-03 09:49:35 +01:00
Richard van der Hoff
589e080c6b
Merge branch 'release-v1.1.0' into matrix-org-hotfixes
2019-07-03 09:47:55 +01:00
Richard van der Hoff
24e48bc9ff
Merge branch 'release-v1.1.0' into matrix-org-hotfixes
2019-07-02 12:05:33 +01:00
Erik Johnston
576b62a6a3
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-28 10:04:54 +01:00
Erik Johnston
ad2ba70959
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-24 15:31:36 +01:00
Erik Johnston
a330505025
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-21 14:36:13 +01:00
Erik Johnston
67b73fd147
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-21 13:27:04 +01:00
Erik Johnston
c08e4dbadc
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-17 14:10:28 +01:00
Erik Johnston
6dbd498772
Merge branch 'master' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-11 17:25:54 +01:00
Erik Johnston
03b09b32d6
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-11 14:00:50 +01:00
Erik Johnston
8f1711da0e
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-11 00:23:54 +01:00
Erik Johnston
6fb6c98f71
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-10 18:34:45 +01:00
Erik Johnston
aad993f24d
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-10 16:05:10 +01:00
Erik Johnston
544e101c24
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-06-04 16:58:38 +01:00
Richard van der Hoff
8699f380f0
hotfix RetryLimiter
2019-06-04 12:14:41 +01:00
Richard van der Hoff
e91a68ef3a
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2019-06-04 11:59:55 +01:00
Richard van der Hoff
9f5048c198
Merge branch 'rav/limit_displayname_length' into matrix-org-hotfixes
2019-06-01 11:15:43 +01:00
Erik Johnston
b3c40ba58a
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-05-31 10:58:47 +01:00
Erik Johnston
8d69193a42
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-05-30 14:33:44 +01:00
Erik Johnston
bbcd19f2d0
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-05-24 10:53:01 +01:00
Erik Johnston
3cd598135f
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-05-23 15:54:13 +01:00
Richard van der Hoff
1c8f2c34ff
Merge branch 'develop' into matrix-org-hotfixes
2019-05-21 16:29:25 +01:00
Richard van der Hoff
ca03f90ee7
Merge branch 'develop' into matrix-org-hotfixes
2019-05-20 15:55:39 +01:00
Richard van der Hoff
9feee29d76
v0.99.4rc1
...
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEdVkXOgzrGzds0jtrHgFcFF8ZFs0FAlzZihYACgkQHgFcFF8Z
Fs325w/8DOsFbrvITIYNpHKB8fZ4udrzwL/R+PRV+G5e/piJBumvnCtGqWFIKzwO
FiF7M+7xPfATxI8sKHcFE7HAbG7/5zCFTp4vgVul6vzt2lhGR6uY0ZmBn7LizIiR
++eXAqfsqO4p6PepS5X3Mv17EiIQl+PFfN81va7/t4pk3YXtaucVAzYmlNWmHPiD
KwyH9OsXdgu00/9QIBh+h2gCeB19e++6b+Ry2ZcMJAOgv8bgRisnjy35d0bN8uGR
XSGFz9VEH4B8yvCOI9l9L4S+BvRmM+uL8qD5BSq5NIRqKt+YgdE9ioVscy461Xag
lFjDqjkZxLRDHtLP2gGCM6iLaMIt1wZ3czC2P8YObgtVeskHaqK6rxKs1tP/jz+M
fd7vXQpqA9zSmNJZ2p/nDFpcP1FRw6/gnYxqemcFOhSCmUeZcznaAkMBOCqW7XFF
w9EOC5WIWmjHROsOdU59XgWai4igc2kTpflvM8jGWDYTdH4XOnGrde2MKCY+hYc4
J/dII0sOKlMJzS9cqXkoWhARt+E+OeCbgDjnPnYvLX3AHZJcySGdQMzl+o2TKkYG
MBGm6DDYsuKMx0Uv18b8WM1dWPbAyOXzxgBYFNuNOZLCZI81LE1jZf86rUnLvDqQ
JTWBIQJhFiX6YxHMr5Enbtc1qoWp0rhlmCxnXpATSJQMc8pXVPY=
=9pbU
-----END PGP SIGNATURE-----
Merge tag 'v0.99.4rc1' into matrix-org-hotfixes
v0.99.4rc1
2019-05-14 11:12:22 +01:00
Richard van der Hoff
e7dcee13da
Merge commit 'a845abbf3' into matrix-org-hotfixes
2019-05-03 17:12:28 +01:00
Richard van der Hoff
7467738834
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2019-05-02 13:37:35 +01:00
Erik Johnston
d75fb8ae22
Merge branch 'erikj/ratelimit_3pid_invite' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-04-26 18:12:33 +01:00
Erik Johnston
ae25a8efef
Merge branch 'erikj/postpath' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-04-17 10:14:57 +01:00
Richard van der Hoff
fc5be50d56
skip send without trailing slash
2019-04-16 15:16:57 +01:00
Erik Johnston
aadba440da
Point pusher to new box
2019-04-15 19:23:21 +01:00
Erik Johnston
ec94d6a590
VersionRestServlet doesn't take a param
2019-04-15 19:21:32 +01:00
Erik Johnston
42ce90c3f7
Merge branch 'erikj/move_endpoints' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-04-15 18:56:46 +01:00
Erik Johnston
8467756dc1
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-04-04 14:43:57 +01:00
Erik Johnston
613b443ff0
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-04-02 18:25:45 +01:00
Richard van der Hoff
233b61ac61
Remove spurious changelog files from hotfixes
...
The relevant patches are now in develop thanks to
https://github.com/matrix-org/synapse/pull/4816 .
2019-04-02 13:51:37 +01:00
Richard van der Hoff
f41c9d37d6
Merge branch 'develop' into matrix-org-hotfixes
2019-04-02 13:47:08 +01:00
Neil Johnson
1048e2ca6a
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-03-27 09:18:35 +00:00
Richard van der Hoff
ce0ce1add3
Merge branch 'develop' into matrix-org-hotfixes
2019-03-25 16:48:56 +00:00
Erik Johnston
b0bf1ea7bd
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-03-21 14:10:31 +00:00
Richard van der Hoff
2561b628af
Merge branch 'develop' into matrix-org-hotfixes
2019-03-19 12:19:20 +00:00
Richard van der Hoff
73c6630718
Revert "Reinstate EDU-batching hacks"
...
This reverts commit ed8ccc3737
.
2019-03-19 12:17:28 +00:00
Erik Johnston
a189bb03ab
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-03-14 14:39:06 +00:00
Erik Johnston
404a2d70be
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-03-14 13:55:29 +00:00
Richard van der Hoff
ed8ccc3737
Reinstate EDU-batching hacks
...
This reverts commit c7285607a3
.
2019-03-13 14:42:11 +00:00
Erik Johnston
18b1a92162
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-03-08 09:56:17 +00:00
Amber Brown
199aa72d35
Merge branch 'develop' of ssh://github.com/matrix-org/synapse into
...
matrix-org-hotfixes
2019-03-07 21:43:10 +11:00
Erik Johnston
8f7dbbc14a
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-03-06 19:30:30 +00:00
Erik Johnston
27dbc9ac42
Reenable presence tests and remove pointless change
2019-03-06 17:12:45 +00:00
Richard van der Hoff
e9aa401994
Remove redundant changes from synapse/replication/tcp/streams.py ( #4813 )
...
This was some hacky code (introduced in c10c71e70d
) to make the presence stream
do nothing on hotfixes. We now ensure that no replication clients subscribe to
the presence stream, so this is redundant.
2019-03-06 13:21:32 +00:00
Richard van der Hoff
9e9572c79e
Run black
on synapse/handlers/user_directory.py ( #4812 )
...
This got done on the develop branch in #4635 , but the subsequent merge to
hotfixes (88af0317a
) discarded the changes for some reason.
Fixing this here and now means (a) there are fewer differences between
matrix-org-hotfixes and develop, making future patches easier to merge, and (b)
fixes some pep8 errors on the hotfixes branch which have been annoying me for
some time.
2019-03-06 11:56:03 +00:00
Richard van der Hoff
c7285607a3
Revert EDU-batching hacks from matrix-org-hotfixes
...
Firstly: we want to do this in a better way, which is the intention of
too many RRs, which means we need to make it happen again.
This reverts commits: 8d7c0264b
000d23090
eb0334b07
4d07dc0d1
2019-03-06 11:04:53 +00:00
Erik Johnston
a6e2546980
Fix outbound federation
2019-03-05 14:50:37 +00:00
Erik Johnston
dc510e0e43
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-03-05 14:41:13 +00:00
Richard van der Hoff
ed12338f35
Remove #4733 debug ( #4767 )
...
We don't need any of this stuff now; this brings protocol.py back into line
with develop for the hotfixes branch.
2019-03-04 14:00:03 +00:00
Richard van der Hoff
bf3f8b8855
Add more debug for #4422 ( #4769 )
2019-02-28 17:46:22 +00:00
Richard van der Hoff
67acd1aa1b
Merge branch 'develop' into matrix-org-hotfixes
2019-02-27 10:29:24 +00:00
Erik Johnston
75c924430e
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-02-26 09:36:29 +00:00
Richard van der Hoff
6087c53830
Add more debug for membership syncing issues ( #4719 )
2019-02-25 17:00:18 +00:00
Erik Johnston
b50fe65a22
Add logging when sending error
2019-02-25 15:55:21 +00:00
Erik Johnston
17009e689b
Merge pull request #4734 from matrix-org/rav/repl_debug
...
Add some debug to help with #4733
2019-02-25 15:52:45 +00:00
Richard van der Hoff
5d2f755d3f
Add some debug to help with #4733
2019-02-25 14:37:23 +00:00
Richard van der Hoff
8d7c0264bc
more fix edu batching hackery
2019-02-24 23:27:52 +00:00
Richard van der Hoff
000d230901
fix edu batching hackery
2019-02-24 23:19:37 +00:00
Richard van der Hoff
eb0334b07c
more edu batching hackery
2019-02-24 23:15:09 +00:00
Richard van der Hoff
4d07dc0d18
Add a delay to the federation loop for EDUs
2019-02-24 22:24:36 +00:00
Erik Johnston
0ea52872ab
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-02-22 15:29:41 +00:00
Richard van der Hoff
6868d53fe9
bail out early in on_new_receipts if no pushers
2019-02-21 15:58:15 +00:00
Richard van der Hoff
68af15637b
Merge branch 'develop' into matrix-org-hotfixes
2019-02-20 14:24:17 +00:00
Richard van der Hoff
4da63d9f6f
Merge branch 'develop' into matrix-org-hotfixes
2019-02-20 14:15:56 +00:00
Richard van der Hoff
085d69b0bd
Apply the pusher http hack in the right place ( #4692 )
...
Do it in the constructor, so that it works for badge updates as well as pushes
2019-02-20 11:25:10 +00:00
Erik Johnston
776fe6c184
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-02-20 09:52:24 +00:00
Erik Johnston
0e07d2c7d5
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-02-19 13:24:37 +00:00
Erik Johnston
90ec885805
Revert "Merge pull request #4654 from matrix-org/hawkowl/registration-worker"
...
This reverts commit 5bd2e2c31d
, reversing
changes made to d97c3a6ce6
.
2019-02-19 13:23:17 +00:00
Erik Johnston
5a28154c4d
Revert "Merge pull request #4655 from matrix-org/hawkowl/registration-worker"
...
This reverts commit 93555af5c9
, reversing
changes made to 5bd2e2c31d
.
2019-02-19 13:23:14 +00:00
Erik Johnston
2fcb51e703
Merge branch 'matthew/well-known-cors' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-02-18 18:38:49 +00:00
Erik Johnston
26f524872f
Revert change that cached connection factory
2019-02-18 18:36:54 +00:00
Erik Johnston
88af0317a2
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-02-15 22:39:13 +00:00
Erik Johnston
c10c71e70d
Emergency changes
2019-02-15 18:15:21 +00:00
Erik Johnston
93555af5c9
Merge pull request #4655 from matrix-org/hawkowl/registration-worker
...
Device replication
2019-02-15 18:12:49 +00:00
Amber Brown
06622e4110
fix
2019-02-16 05:11:09 +11:00
Amber Brown
155efa9e36
fix
2019-02-16 05:10:48 +11:00
Amber Brown
3175edc5d8
maybe
2019-02-16 05:09:08 +11:00
Amber Brown
d95252c01f
use a device replication thingy
2019-02-16 05:08:58 +11:00
Erik Johnston
5bd2e2c31d
Merge pull request #4654 from matrix-org/hawkowl/registration-worker
...
Registration worker
2019-02-15 17:51:34 +00:00
Amber Brown
84528e4fb2
cleanup
2019-02-16 04:49:09 +11:00
Amber Brown
e4381ed514
pep8
2019-02-16 04:42:04 +11:00
Amber Brown
d9235b9e29
fix appservice, add to frontend proxy
2019-02-16 04:39:49 +11:00
Amber Brown
ce5f3b1ba5
add all the files
2019-02-16 04:35:58 +11:00
Amber Brown
7b5c04312e
isort
2019-02-16 04:35:27 +11:00
Amber Brown
f5bafd70f4
add cache remover endpoint and wire it up
2019-02-16 04:34:23 +11:00
Richard van der Hoff
d97c3a6ce6
Merge remote-tracking branch 'origin/release-v0.99.1' into matrix-org-hotfixes
2019-02-13 14:29:05 +00:00
Erik Johnston
341c35614a
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-02-13 10:29:31 +00:00
Richard van der Hoff
fecf28319c
Merge branch 'release-v0.99.0' into matrix-org-hotfixes
2019-02-01 13:29:31 +00:00
Richard van der Hoff
345d8cfb69
Merge branch 'release-v0.99.0' into matrix-org-hotfixes
2019-02-01 13:21:42 +00:00
Richard van der Hoff
b60d005156
Merge branch 'develop' into matrix-org-hotfixes
2019-01-31 18:44:04 +00:00
Richard van der Hoff
6c232a69df
Revert "Break infinite loop on redaction in v3 rooms"
...
We've got a better fix of this now.
This reverts commit decb5698b3
.
2019-01-31 18:43:49 +00:00
Amber Brown
e97c1df30c
remove slow code on userdir ( #4534 )
2019-01-31 13:26:38 +00:00
Richard van der Hoff
decb5698b3
Break infinite loop on redaction in v3 rooms
2019-01-31 00:23:58 +00:00
Erik Johnston
62962e30e4
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-01-30 17:04:08 +00:00
Erik Johnston
05413d4e20
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-01-30 14:27:19 +00:00
Erik Johnston
ca46dcf683
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-01-30 13:11:25 +00:00
Erik Johnston
d351be1567
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-01-30 11:48:29 +00:00
Andrew Morgan
c7f2eaf4f4
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-01-29 10:07:13 +00:00
Andrew Morgan
53d25116df
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-01-25 14:33:14 +00:00
Andrew Morgan
08e25ffa0c
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-01-24 15:51:59 +00:00
Andrew Morgan
1c148e442b
Merge branch 'anoa/room_dir_quick_fix' into matrix-org-hotfixes
2019-01-24 15:37:16 +00:00
Andrew Morgan
acaca1b4e9
Merge branch 'anoa/room_dir_quick_fix' into matrix-org-hotfixes
2019-01-24 14:51:35 +00:00
Andrew Morgan
4777836b83
Fix missing synapse metrics import
2019-01-23 15:26:03 +00:00
Andrew Morgan
7da659dd6d
Use existing stream position counter metric
2019-01-23 15:04:12 +00:00
Andrew Morgan
77dfe51aba
Name metric consistently
2019-01-23 15:04:05 +00:00
Andrew Morgan
ef7865e2f2
Track user_dir current event stream position
2019-01-23 15:03:54 +00:00
Matthew Hodgson
5cb15c0443
warn if we ignore device lists
2019-01-15 22:11:46 +00:00
Matthew Hodgson
b43172ffbc
Merge pull request #4396 from matrix-org/matthew/bodge_device_update_dos
...
limit remote device lists to 10000 entries per user
2019-01-15 21:47:00 +00:00
Matthew Hodgson
b4796d1814
drop the limit to 1K as e2e will be hosed beyond that point anyway
2019-01-15 21:46:29 +00:00
Matthew Hodgson
482d06774a
don't store remote device lists if they have more than 10K devices
2019-01-15 21:38:07 +00:00
Matthew Hodgson
046d731fbd
limit remote device lists to 1000 entries per user
2019-01-15 21:07:12 +00:00
Richard van der Hoff
892f6c98ec
Synapse 0.34.1.1 (2019-01-11)
...
=============================
This release fixes CVE-2019-5885 and is recommended for all users of Synapse 0.34.1.
This release is compatible with Python 2.7 and 3.5+. Python 3.7 is fully supported.
Bugfixes
--------
- Fix spontaneous logout on upgrade
([\#4374](https://github.com/matrix-org/synapse/issues/4374 ))
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEIQBQJ4l+yK4dlKkFIwi0edOSShEFAlw3XecACgkQIwi0edOS
ShGS5gf+OQ7JajiAKnNP7EcWgl2yXislV8ho5366sIgpfcmsMduOQm7VF6qUrHvz
vge/uip4Xghk0Qs5MPW38RqWw+dC4UziaEyJ99jVitPQNrvJziWvpayIvzfmr8XQ
SUD+vpp6iZeHhFoVontVSOCCldD1Sn/KRK3anBARH4Lw1ajOVUT566nQBoJFMgGq
PdSg5MgwsvqS4mPp/YutEvWHiB3OZdfOzmUwrq9TZXUK93zHbR1zyq4EEcTT2HoE
2Lv4YP7lbINqa47KwTo8x3lsPY1PGP5KRMGF+DcNG1i8FCD5HpVXnx83mFH6bQx9
Znm6pR6215R+Q8IHQgNA5MJ35UxtdQ==
=N5tR
-----END PGP SIGNATURE-----
Merge tag 'v0.34.1.1' into matrix-org-hotfixes
Synapse 0.34.1.1 (2019-01-11)
=============================
This release fixes CVE-2019-5885 and is recommended for all users of Synapse 0.34.1.
This release is compatible with Python 2.7 and 3.5+. Python 3.7 is fully supported.
Bugfixes
--------
- Fix spontaneous logout on upgrade
([\#4374](https://github.com/matrix-org/synapse/issues/4374 ))
2019-01-11 10:21:18 +00:00
Erik Johnston
7fafa2d954
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-01-09 09:13:16 +00:00
Richard van der Hoff
1d63046542
Synapse 0.34.1rc1 (2019-01-08)
...
==============================
Features
--------
- Special-case a support user for use in verifying behaviour of a given server. The support user does not appear in user directory or monthly active user counts. ([\#4141](https://github.com/matrix-org/synapse/issues/4141 ), [\#4344](https://github.com/matrix-org/synapse/issues/4344 ))
- Support for serving .well-known files ([\#4262](https://github.com/matrix-org/synapse/issues/4262 ))
- Rework SAML2 authentication ([\#4265](https://github.com/matrix-org/synapse/issues/4265 ), [\#4267](https://github.com/matrix-org/synapse/issues/4267 ))
- SAML2 authentication: Initialise user display name from SAML2 data ([\#4272](https://github.com/matrix-org/synapse/issues/4272 ))
- Synapse can now have its conditional/extra dependencies installed by pip. This functionality can be used by using `pip install matrix-synapse[feature]`, where feature is a comma separated list with the possible values `email.enable_notifs`, `matrix-synapse-ldap3`, `postgres`, `resources.consent`, `saml2`, `url_preview`, and `test`. If you want to install all optional dependencies, you can use "all" instead. ([\#4298](https://github.com/matrix-org/synapse/issues/4298 ), [\#4325](https://github.com/matrix-org/synapse/issues/4325 ), [\#4327](https://github.com/matrix-org/synapse/issues/4327 ))
- Add routes for reading account data. ([\#4303](https://github.com/matrix-org/synapse/issues/4303 ))
- Add opt-in support for v2 rooms ([\#4307](https://github.com/matrix-org/synapse/issues/4307 ))
- Add a script to generate a clean config file ([\#4315](https://github.com/matrix-org/synapse/issues/4315 ))
- Return server data in /login response ([\#4319](https://github.com/matrix-org/synapse/issues/4319 ))
Bugfixes
--------
- Fix contains_url check to be consistent with other instances in code-base and check that value is an instance of string. ([\#3405](https://github.com/matrix-org/synapse/issues/3405 ))
- Fix CAS login when username is not valid in an MXID ([\#4264](https://github.com/matrix-org/synapse/issues/4264 ))
- Send CORS headers for /media/config ([\#4279](https://github.com/matrix-org/synapse/issues/4279 ))
- Add 'sandbox' to CSP for media reprository ([\#4284](https://github.com/matrix-org/synapse/issues/4284 ))
- Make the new landing page prettier. ([\#4294](https://github.com/matrix-org/synapse/issues/4294 ))
- Fix deleting E2E room keys when using old SQLite versions. ([\#4295](https://github.com/matrix-org/synapse/issues/4295 ))
- The metric synapse_admin_mau:current previously did not update when config.mau_stats_only was set to True ([\#4305](https://github.com/matrix-org/synapse/issues/4305 ))
- Fixed per-room account data filters ([\#4309](https://github.com/matrix-org/synapse/issues/4309 ))
- Fix indentation in default config ([\#4313](https://github.com/matrix-org/synapse/issues/4313 ))
- Fix synapse:latest docker upload ([\#4316](https://github.com/matrix-org/synapse/issues/4316 ))
- Fix test_metric.py compatibility with prometheus_client 0.5. Contributed by Maarten de Vries <maarten@de-vri.es>. ([\#4317](https://github.com/matrix-org/synapse/issues/4317 ))
- Avoid packaging _trial_temp directory in -py3 debian packages ([\#4326](https://github.com/matrix-org/synapse/issues/4326 ))
- Check jinja version for consent resource ([\#4327](https://github.com/matrix-org/synapse/issues/4327 ))
- fix NPE in /messages by checking if all events were filtered out ([\#4330](https://github.com/matrix-org/synapse/issues/4330 ))
- Fix `python -m synapse.config` on Python 3. ([\#4356](https://github.com/matrix-org/synapse/issues/4356 ))
Deprecations and Removals
-------------------------
- Remove the deprecated v1/register API on Python 2. It was never ported to Python 3. ([\#4334](https://github.com/matrix-org/synapse/issues/4334 ))
Internal Changes
----------------
- Getting URL previews of IP addresses no longer fails on Python 3. ([\#4215](https://github.com/matrix-org/synapse/issues/4215 ))
- drop undocumented dependency on dateutil ([\#4266](https://github.com/matrix-org/synapse/issues/4266 ))
- Update the example systemd config to use a virtualenv ([\#4273](https://github.com/matrix-org/synapse/issues/4273 ))
- Update link to kernel DCO guide ([\#4274](https://github.com/matrix-org/synapse/issues/4274 ))
- Make isort tox check print diff when it fails ([\#4283](https://github.com/matrix-org/synapse/issues/4283 ))
- Log room_id in Unknown room errors ([\#4297](https://github.com/matrix-org/synapse/issues/4297 ))
- Documentation improvements for coturn setup. Contributed by Krithin Sitaram. ([\#4333](https://github.com/matrix-org/synapse/issues/4333 ))
- Update pull request template to use absolute links ([\#4341](https://github.com/matrix-org/synapse/issues/4341 ))
- Update README to not lie about required restart when updating TLS certificates ([\#4343](https://github.com/matrix-org/synapse/issues/4343 ))
- Update debian packaging for compatibility with transitional package ([\#4349](https://github.com/matrix-org/synapse/issues/4349 ))
- Fix command hint to generate a config file when trying to start without a config file ([\#4353](https://github.com/matrix-org/synapse/issues/4353 ))
- Add better logging for unexpected errors while sending transactions ([\#4358](https://github.com/matrix-org/synapse/issues/4358 ))
-----BEGIN PGP SIGNATURE-----
iQFHBAABCgAxFiEEQlNDQm4FMsm53u1sih+T1XW16NUFAlw0iaYTHHJpY2hhcmRA
bWF0cml4Lm9yZwAKCRCKH5PVdbXo1V1HB/0b/AB8QQ/9oIcwMpKI+SDY9RL9Ltzk
IUv/5RoyNZtHlTWYXRlMQoev95tM4ej2l5EkHUpfCdUMbRif9M6Q4EgAJQDvxKYf
eSqqv9Uk2FMHgv/zwsQO59b0cPfVUMdsUFZNrIjgnszuGVtjmUe2w3Bka+DYtA2O
vYRx88bjcqTra6UnII6yVt66Dgk/kxeP6TmboMJGuVWxkvjQdRCvcdEbLAVHW47j
Dc050mL/5oTpUBNa+yks28QcNbXLZV+4UDoBMja78izXZnaLH8nbJT7cF8mwt0oT
6q5DisF8MLc2fEAUtjFeLkyDkfjzSlSSH6hfoqp51KKN8wn78/Zl662Z
=5ID1
-----END PGP SIGNATURE-----
Merge tag 'v0.34.1rc1' into matrix-org-hotfixes
Synapse 0.34.1rc1 (2019-01-08)
==============================
Features
--------
- Special-case a support user for use in verifying behaviour of a given server. The support user does not appear in user directory or monthly active user counts. ([\#4141](https://github.com/matrix-org/synapse/issues/4141 ), [\#4344](https://github.com/matrix-org/synapse/issues/4344 ))
- Support for serving .well-known files ([\#4262](https://github.com/matrix-org/synapse/issues/4262 ))
- Rework SAML2 authentication ([\#4265](https://github.com/matrix-org/synapse/issues/4265 ), [\#4267](https://github.com/matrix-org/synapse/issues/4267 ))
- SAML2 authentication: Initialise user display name from SAML2 data ([\#4272](https://github.com/matrix-org/synapse/issues/4272 ))
- Synapse can now have its conditional/extra dependencies installed by pip. This functionality can be used by using `pip install matrix-synapse[feature]`, where feature is a comma separated list with the possible values `email.enable_notifs`, `matrix-synapse-ldap3`, `postgres`, `resources.consent`, `saml2`, `url_preview`, and `test`. If you want to install all optional dependencies, you can use "all" instead. ([\#4298](https://github.com/matrix-org/synapse/issues/4298 ), [\#4325](https://github.com/matrix-org/synapse/issues/4325 ), [\#4327](https://github.com/matrix-org/synapse/issues/4327 ))
- Add routes for reading account data. ([\#4303](https://github.com/matrix-org/synapse/issues/4303 ))
- Add opt-in support for v2 rooms ([\#4307](https://github.com/matrix-org/synapse/issues/4307 ))
- Add a script to generate a clean config file ([\#4315](https://github.com/matrix-org/synapse/issues/4315 ))
- Return server data in /login response ([\#4319](https://github.com/matrix-org/synapse/issues/4319 ))
Bugfixes
--------
- Fix contains_url check to be consistent with other instances in code-base and check that value is an instance of string. ([\#3405](https://github.com/matrix-org/synapse/issues/3405 ))
- Fix CAS login when username is not valid in an MXID ([\#4264](https://github.com/matrix-org/synapse/issues/4264 ))
- Send CORS headers for /media/config ([\#4279](https://github.com/matrix-org/synapse/issues/4279 ))
- Add 'sandbox' to CSP for media reprository ([\#4284](https://github.com/matrix-org/synapse/issues/4284 ))
- Make the new landing page prettier. ([\#4294](https://github.com/matrix-org/synapse/issues/4294 ))
- Fix deleting E2E room keys when using old SQLite versions. ([\#4295](https://github.com/matrix-org/synapse/issues/4295 ))
- The metric synapse_admin_mau:current previously did not update when config.mau_stats_only was set to True ([\#4305](https://github.com/matrix-org/synapse/issues/4305 ))
- Fixed per-room account data filters ([\#4309](https://github.com/matrix-org/synapse/issues/4309 ))
- Fix indentation in default config ([\#4313](https://github.com/matrix-org/synapse/issues/4313 ))
- Fix synapse:latest docker upload ([\#4316](https://github.com/matrix-org/synapse/issues/4316 ))
- Fix test_metric.py compatibility with prometheus_client 0.5. Contributed by Maarten de Vries <maarten@de-vri.es>. ([\#4317](https://github.com/matrix-org/synapse/issues/4317 ))
- Avoid packaging _trial_temp directory in -py3 debian packages ([\#4326](https://github.com/matrix-org/synapse/issues/4326 ))
- Check jinja version for consent resource ([\#4327](https://github.com/matrix-org/synapse/issues/4327 ))
- fix NPE in /messages by checking if all events were filtered out ([\#4330](https://github.com/matrix-org/synapse/issues/4330 ))
- Fix `python -m synapse.config` on Python 3. ([\#4356](https://github.com/matrix-org/synapse/issues/4356 ))
Deprecations and Removals
-------------------------
- Remove the deprecated v1/register API on Python 2. It was never ported to Python 3. ([\#4334](https://github.com/matrix-org/synapse/issues/4334 ))
Internal Changes
----------------
- Getting URL previews of IP addresses no longer fails on Python 3. ([\#4215](https://github.com/matrix-org/synapse/issues/4215 ))
- drop undocumented dependency on dateutil ([\#4266](https://github.com/matrix-org/synapse/issues/4266 ))
- Update the example systemd config to use a virtualenv ([\#4273](https://github.com/matrix-org/synapse/issues/4273 ))
- Update link to kernel DCO guide ([\#4274](https://github.com/matrix-org/synapse/issues/4274 ))
- Make isort tox check print diff when it fails ([\#4283](https://github.com/matrix-org/synapse/issues/4283 ))
- Log room_id in Unknown room errors ([\#4297](https://github.com/matrix-org/synapse/issues/4297 ))
- Documentation improvements for coturn setup. Contributed by Krithin Sitaram. ([\#4333](https://github.com/matrix-org/synapse/issues/4333 ))
- Update pull request template to use absolute links ([\#4341](https://github.com/matrix-org/synapse/issues/4341 ))
- Update README to not lie about required restart when updating TLS certificates ([\#4343](https://github.com/matrix-org/synapse/issues/4343 ))
- Update debian packaging for compatibility with transitional package ([\#4349](https://github.com/matrix-org/synapse/issues/4349 ))
- Fix command hint to generate a config file when trying to start without a config file ([\#4353](https://github.com/matrix-org/synapse/issues/4353 ))
- Add better logging for unexpected errors while sending transactions ([\#4358](https://github.com/matrix-org/synapse/issues/4358 ))
2019-01-08 11:37:25 +00:00
Richard van der Hoff
4c238a9a91
Merge remote-tracking branch 'origin/release-v0.34.0' into matrix-org-hotfixes
2018-12-19 10:24:26 +00:00
Richard van der Hoff
002db39a36
Synapse 0.34.0rc1 (2018-12-04)
...
==============================
Synapse 0.34 is the first release to fully support Python 3. We recommend
upgrading to Python 3, but make sure to read the
[upgrade notes](UPGRADE.rst#upgrading-to-v0340) when doing so.
Features
--------
- Add option to track MAU stats (but not limit people) ([\#3830](https://github.com/matrix-org/synapse/issues/3830 ))
- Add an option to enable recording IPs for appservice users ([\#3831](https://github.com/matrix-org/synapse/issues/3831 ))
- Rename login type m.login.cas to m.login.sso ([\#4220](https://github.com/matrix-org/synapse/issues/4220 ))
- Add an option to disable search for homeservers that may not be interested in it. ([\#4230](https://github.com/matrix-org/synapse/issues/4230 ))
Bugfixes
--------
- Pushrules can now again be made with non-ASCII rule IDs. ([\#4165](https://github.com/matrix-org/synapse/issues/4165 ))
- The media repository now no longer fails to decode UTF-8 filenames when downloading remote media. ([\#4176](https://github.com/matrix-org/synapse/issues/4176 ))
- URL previews now correctly decode non-UTF-8 text if the header contains a `<meta http-equiv="Content-Type"` header. ([\#4183](https://github.com/matrix-org/synapse/issues/4183 ))
- Fix an issue where public consent URLs had two slashes. ([\#4192](https://github.com/matrix-org/synapse/issues/4192 ))
- Fallback auth now accepts the session parameter on Python 3. ([\#4197](https://github.com/matrix-org/synapse/issues/4197 ))
- Remove riot.im from the list of trusted Identity Servers in the default configuration ([\#4207](https://github.com/matrix-org/synapse/issues/4207 ))
- fix start up failure when mau_limit_reserved_threepids set and db is postgres ([\#4211](https://github.com/matrix-org/synapse/issues/4211 ))
- Fix auto join failures for servers that require user consent ([\#4223](https://github.com/matrix-org/synapse/issues/4223 ))
- Fix exception caused by non-ascii event IDs ([\#4241](https://github.com/matrix-org/synapse/issues/4241 ))
- Pushers can now be unsubscribed from on Python 3. ([\#4250](https://github.com/matrix-org/synapse/issues/4250 ))
- Fix UnicodeDecodeError when postgres is configured to give non-English errors ([\#4253](https://github.com/matrix-org/synapse/issues/4253 ))
Internal Changes
----------------
- A coveragerc file, as well as the py36-coverage tox target, have been added. ([\#4180](https://github.com/matrix-org/synapse/issues/4180 ))
- Add a GitHub pull request template and add multiple issue templates ([\#4182](https://github.com/matrix-org/synapse/issues/4182 ))
- Update README to reflect the fact that #1491 is fixed ([\#4188](https://github.com/matrix-org/synapse/issues/4188 ))
- Run the AS senders as background processes to fix warnings ([\#4189](https://github.com/matrix-org/synapse/issues/4189 ))
- Add some diagnostics to the tests to detect logcontext problems ([\#4190](https://github.com/matrix-org/synapse/issues/4190 ))
- Add missing `jpeg` package prerequisite for OpenBSD in README. ([\#4193](https://github.com/matrix-org/synapse/issues/4193 ))
- Add a note saying you need to manually reclaim disk space after using the Purge History API ([\#4200](https://github.com/matrix-org/synapse/issues/4200 ))
- More logcontext checking in unittests ([\#4205](https://github.com/matrix-org/synapse/issues/4205 ))
- Ignore __pycache__ directories in the database schema folder ([\#4214](https://github.com/matrix-org/synapse/issues/4214 ))
- Add note to UPGRADE.rst about removing riot.im from list of trusted identity servers ([\#4224](https://github.com/matrix-org/synapse/issues/4224 ))
- Added automated coverage reporting to CI. ([\#4225](https://github.com/matrix-org/synapse/issues/4225 ))
- Garbage-collect after each unit test to fix logcontext leaks ([\#4227](https://github.com/matrix-org/synapse/issues/4227 ))
- add more detail to logging regarding "More than one row matched" error ([\#4234](https://github.com/matrix-org/synapse/issues/4234 ))
- Drop sent_transactions table ([\#4244](https://github.com/matrix-org/synapse/issues/4244 ))
- Add a basic .editorconfig ([\#4257](https://github.com/matrix-org/synapse/issues/4257 ))
- Update README.rst and UPGRADE.rst for Python 3. ([\#4260](https://github.com/matrix-org/synapse/issues/4260 ))
- Remove obsolete `verbose` and `log_file` settings from `homeserver.yaml` for Docker image. ([\#4261](https://github.com/matrix-org/synapse/issues/4261 ))
-----BEGIN PGP SIGNATURE-----
iQFHBAABCgAxFiEEQlNDQm4FMsm53u1sih+T1XW16NUFAlwGiNcTHHJpY2hhcmRA
bWF0cml4Lm9yZwAKCRCKH5PVdbXo1VlPCACUm4y2xcK/QziI0VF4q8dzsctwwOkP
hTqWeCkQtCkC2igSiP6XFhXlW8AjP1yQ7s4Hk30ekM67BJUdXjnyvlrhpKBsnDgh
FWnwTjAeZ2nuE7Cp4/R1AvVGB4X4mGVlUNHW7NtPmUkhxxV829FicaPIkPXLicZw
EMoqCkyEmToWkI8juX+TOR2S4MV/nh4qvIKe/fMK4KGiAdAp4dZjFM+BimqcrmJW
QfdvmZma+iZ1CTiHkBYOpofXXmuqftpSJup6gUvSskJjESlgGi2qeJ9I6Ck/fskB
Rllxwva4DzamcwqQeEinS3hPojxxdWYxd7A3SmX+s3dvikKSN/UTmgrV
=lb0d
-----END PGP SIGNATURE-----
Merge tag 'v0.34.0rc1' into matrix-org-hotfixes
2018-12-04 14:07:28 +00:00
Richard van der Hoff
c4074e4ab6
Revert "Merge branch 'rav/timestamp_patch' into matrix-org-hotfixes"
...
This reverts commit 7960e814e5
, reversing
changes made to 3dd704ee9a
.
We no longer need this; please redo it as a proper MSC & synapse PR if you want
to keep it...
2018-12-03 10:15:39 +00:00
Richard van der Hoff
7960e814e5
Merge branch 'rav/timestamp_patch' into matrix-org-hotfixes
2018-11-30 12:10:30 +00:00
Richard van der Hoff
080025e533
Fix buglet and remove thread_id stuff
2018-11-30 12:09:33 +00:00
Richard van der Hoff
9accd63a38
Initial patch from Erik
2018-11-30 12:04:38 +00:00
Richard van der Hoff
3dd704ee9a
Merge branch 'develop' into matrix-org-hotfixes
2018-11-20 11:29:45 +00:00
Richard van der Hoff
28e28a1974
Merge branch 'develop' into matrix-org-hotfixes
2018-11-20 11:03:35 +00:00
Richard van der Hoff
b699178aa1
Merge branch 'develop' into matrix-org-hotfixes
2018-11-14 11:54:29 +00:00
Richard van der Hoff
c08c649fa1
Merge remote-tracking branch 'origin/erikj/fix_device_comparison' into matrix-org-hotfixes
2018-11-08 12:48:19 +00:00
hera
5c0c4b4079
Fix encoding error for consent form on python3
...
The form was rendering this as "b'01234....'".
-- richvdh
2018-11-08 11:03:39 +00:00
Richard van der Hoff
b55cdfaa31
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-11-08 10:47:56 +00:00
Richard van der Hoff
34406cf22c
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-11-06 10:49:20 +00:00
Amber Brown
f91aefd245
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-10-31 04:41:03 +11:00
Erik Johnston
f8281f42c8
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-10-29 18:16:58 +00:00
Amber Brown
7171bdf279
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-10-29 23:14:47 +11:00
Erik Johnston
9f2d14ee26
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-10-26 09:52:23 +01:00
Amber Brown
ead471e72d
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-10-22 22:18:02 +11:00
Richard van der Hoff
9a4011de46
Merge branch 'develop' into matrix-org-hotfixes
2018-10-18 16:37:01 +01:00
Amber Brown
33551be61b
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-10-15 20:15:27 +11:00
Richard van der Hoff
eeb29d99fd
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-10-09 09:49:08 +01:00
Richard van der Hoff
1a0c407e6b
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-10-09 09:47:37 +01:00
Erik Johnston
c4b37cbf18
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-10-02 16:44:57 +01:00
Erik Johnston
7fa156af80
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-10-02 14:39:30 +01:00
Richard van der Hoff
78825f4f1c
Merge branch 'develop' into matrix-org-hotfixes
2018-09-26 13:27:33 +01:00
Richard van der Hoff
6e15b5debe
Revert "Actuall set cache factors in workers"
...
This reverts commit e21c312e16
.
2018-09-26 13:25:52 +01:00
Matthew Hodgson
2e0d2879d0
Merge branch 'develop' into matrix-org-hotfixes
2018-09-26 11:00:26 +01:00
Michael Kaye
128043072b
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-09-24 11:20:10 +01:00
Erik Johnston
b2fda9d20e
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-09-20 11:00:14 +01:00
Erik Johnston
3c8c5eabc2
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-09-15 11:40:37 +01:00
Erik Johnston
2da2041e2e
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-09-14 19:56:33 +01:00
Erik Johnston
b5eef203f4
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-09-14 18:25:55 +01:00
Erik Johnston
df73da691f
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-09-13 16:15:56 +01:00
Matthew Hodgson
30d054e0bb
Merge branch 'develop' into matrix-org-hotfixes
2018-09-12 17:16:21 +01:00
Erik Johnston
ebb3cc4ab6
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-09-12 11:22:06 +01:00
Erik Johnston
17201abd53
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-09-11 14:17:33 +01:00
Erik Johnston
2f141f4c41
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-08-22 11:47:08 +01:00
Richard van der Hoff
638c0bf49b
Merge branch 'rav/fix_gdpr_consent' into matrix-org-hotfixes
2018-08-21 22:54:35 +01:00
hera
d1065e6f51
Bugfixes
...
--------
- Fix bug in v0.33.3rc1 which caused infinite loops and OOMs
([\#3723](https://github.com/matrix-org/synapse/issues/3723 ))
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEIQBQJ4l+yK4dlKkFIwi0edOSShEFAlt6/yMACgkQIwi0edOS
ShFrzAgAhLA74fClydGLfhPNCXIw12Amv2ASA6+r0ukqjYQ/9MZ0CRsL+PMZJTk6
Z75PK3TkX38zSpPaUx9HdMQO/yE+rpI99ZxlBM+8jzsf1jyF8ljqxSfixXUlaXX9
698PQQ3f+IDoSs59NKrHvoWhUThaBpf/1GwRxG5mUcm2oKJItNMHk/uLurNCaIIZ
YSwWcxvZdluOMX0WrlF/S524DqtgULcRf3E9x3mumobkVGxI3UH73hXgGUcPi7XV
ttLuy7fVbV2Cun/wvjBqD7kc8LNbKwSaT9y+/xS0D5QYjph4rpQiTG7S5rtPLPMU
Z2lL1C5ggBCkD43g3orDvehbNWCL5g==
=0vEe
-----END PGP SIGNATURE-----
Merge tag 'v0.33.3rc2' into matrix-org-hotfixes
Bugfixes
--------
- Fix bug in v0.33.3rc1 which caused infinite loops and OOMs
([\#3723](https://github.com/matrix-org/synapse/issues/3723 ))
2018-08-21 19:12:14 +00:00
Erik Johnston
567863127a
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-08-20 13:34:47 +01:00
Erik Johnston
f5abc10724
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-08-20 11:12:18 +01:00
Erik Johnston
bb795b56da
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-08-16 15:51:16 +01:00
Erik Johnston
4dd0604f61
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-08-15 15:37:05 +01:00
Richard van der Hoff
c05d278ba0
Merge branch 'rav/federation_metrics' into matrix-org-hotfixes
2018-08-07 19:11:29 +01:00
Erik Johnston
49a3163958
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-08-06 13:33:54 +01:00
Erik Johnston
1a568041fa
Merge branch 'release-v0.33.1' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-08-02 15:28:32 +01:00
Erik Johnston
c9db8b0c32
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-07-24 17:22:23 +01:00
Erik Johnston
aa1bf10b91
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-07-24 15:49:38 +01:00
Erik Johnston
5222907bea
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-07-23 17:54:41 +01:00
Erik Johnston
e1eb147f2a
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-07-23 16:45:22 +01:00
hera
e43eb47c5f
Fixup limiter
2018-07-23 15:22:47 +00:00
hera
27eb4c45cd
Lower hacky timeout for member limiter
2018-07-23 15:16:36 +00:00
Erik Johnston
b136d7ff8f
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-07-23 16:09:40 +01:00
Richard van der Hoff
9e56e1ab30
Merge branch 'develop' into matrix-org-hotfixes
2018-07-19 16:40:28 +01:00
Erik Johnston
742f757337
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-07-19 10:26:13 +01:00
Richard van der Hoff
2f5dfe299c
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-07-17 15:26:47 +01:00
Erik Johnston
e4eec87c6a
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-07-17 11:18:39 +01:00
Erik Johnston
f793ff4571
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-07-17 10:04:33 +01:00
Richard van der Hoff
195aae2f16
Merge branch 'develop' into matrix-org-hotfixes
2018-07-12 12:09:25 +01:00
Erik Johnston
7c79f2cb72
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-07-12 09:59:58 +01:00
Richard van der Hoff
f04e35c170
Merge branch 'develop' into matrix-org-hotfixes
2018-07-10 18:04:03 +01:00
Matthew Hodgson
36bbac05bd
Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into matrix-org-hotfixes
2018-07-06 19:21:09 +01:00
Erik Johnston
e2a4b7681e
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-07-05 10:29:32 +01:00
Erik Johnston
957944eee4
Merge pull request #3476 from matrix-org/erikj/timeout_memberships
...
Timeout membership requests after 90s
2018-07-03 10:18:39 +01:00
Erik Johnston
bf425e533e
Fix PEP8
2018-07-03 10:11:09 +01:00
Erik Johnston
ca21957b8a
Timeout membership requests after 90s
...
This is a hacky fix to try and stop in flight requests from building up
2018-07-02 13:56:08 +01:00
Erik Johnston
6a95270671
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-06-29 14:10:29 +01:00
hera
82781f5838
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
2018-06-28 21:09:28 +00:00
Matthew Hodgson
aae6d3ff69
Merge remote-tracking branch 'origin/revert-3451-hawkowl/sorteddict-api' into matrix-org-hotfixes
2018-06-26 18:36:29 +01:00
Matthew Hodgson
9175225adf
Merge remote-tracking branch 'origin/hawkowl/sorteddict-api' into matrix-org-hotfixes
2018-06-26 17:52:37 +01:00
David Baker
7a32fa0101
Fix error on deleting users pending deactivation
...
Use simple_delete instead of simple_delete_one as commented
2018-06-26 11:57:44 +01:00
Erik Johnston
d46450195b
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-06-25 20:14:34 +01:00
Erik Johnston
c0128c1021
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-06-25 20:12:13 +01:00
Erik Johnston
3320b7c9a4
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-06-25 15:23:18 +01:00
Erik Johnston
4c22c9b0b6
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2018-06-25 14:37:13 +01:00
Richard van der Hoff
6d6ea1bb40
Merge branch 'develop' into matrix-org-hotfixes
2018-06-22 16:35:37 +01:00
aphrodite
9e38981ae4
Send HTTP pushes direct to http-priv rather than via clouldflare
...
(This is a heinous hack that ought to be made more generic and pushed back to develop)
2018-06-22 15:58:15 +01:00
hera
463e7c2709
Lower member limiter
2018-06-22 15:58:15 +01:00
Richard van der Hoff
ce9d0b1d0c
Fix earlier logging patch
...
`@cached` doesn't work on decorated functions, because it uses inspection on
the target to calculate the number of arguments.
2018-06-22 15:58:15 +01:00
Richard van der Hoff
80786d5caf
Logging for get_users_in_room
2018-06-22 15:58:15 +01:00
Richard van der Hoff
e18378c3e2
Increase member limiter to 20
...
Let's see if this makes the bridges go faster, or if it kills the synapse
master.
2018-06-22 15:58:15 +01:00
hera
0ca2857baa
increase sync cache to 2 minutes
...
to give synchrotrons being hammered by repeating initial /syncs to get more
chance to actually complete and avoid a DoS
2018-06-22 15:58:15 +01:00
Erik Johnston
e21c312e16
Actuall set cache factors in workers
2018-06-22 15:58:15 +01:00
Richard van der Hoff
1031bd25f8
Avoid doing presence updates on replication reconnect
...
Presence is supposed to be disabled on matrix.org, so we shouldn't send a load
of USER_SYNC commands every time the synchrotron reconnects to the master.
2018-06-22 15:58:15 +01:00
hera
fae708c0e8
Disable auth on room_members for now
...
because the moznet bridge is broken (https://github.com/matrix-org/matrix-appservice-irc/issues/506 )
2018-06-22 15:58:15 +01:00
Erik Johnston
8f8ea91eef
Bump LAST_SEEN_GRANULARITY in client_ips
2018-06-22 15:58:15 +01:00
Erik Johnston
7a1406d144
Prefill client_ip_last_seen in replication
2018-06-22 15:58:15 +01:00
Erik Johnston
6373874833
Move event sending to end in shutdown room admin api
2018-06-22 15:58:15 +01:00
Erik Johnston
a79823e64b
Add dummy presence REST handler to frontend proxy
...
The handler no-ops all requests as presence is disabled.
2018-06-22 15:58:15 +01:00
Erik Johnston
1766a5fdc0
Increase MAX_EVENTS_BEHIND for replication clients
2018-06-22 15:58:14 +01:00
Erik Johnston
e6b1ea3eb2
Disable presence in txn queue
2018-06-22 15:58:14 +01:00
Erik Johnston
e5537cf983
Limit concurrent AS joins
2018-06-22 15:58:14 +01:00
Erik Johnston
43bb12e640
Disable presence
...
This reverts commit 0ebd376a53
and
disables presence a bit more
2018-06-22 15:58:14 +01:00
Erik Johnston
66dcbf47a3
Disable auto search for prefixes in event search
2018-06-22 15:58:14 +01:00
Erik Johnston
a285fe05fd
Add timeout to ResponseCache of /public_rooms
2018-06-22 15:58:14 +01:00