e01026d84d
Revert "Fix existing v2 identity server calls (MSC2140) ( #6013 )"
...
This has now been merged into develop (3505ffcdae0eef47315
2019-09-18 13:53:37 +01:00
ee91c69ef7
Fix m.federate bug
2019-09-13 14:44:48 +01:00
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
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
b5833a2abf
Add changelog
2019-09-10 17:56:10 +01:00
60d3c57bd0
Use account_threepid_delegate for 3pid validation
2019-09-10 17:56:10 +01:00
9240622c1a
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-06 14:10:53 +01:00
30b67e0f63
Merge pull request #5993 from matrix-org/anoa/worker_store_reg
...
Move get_threepid_validation_session and delete_threepid_session into RegistrationWorkerStore
2019-09-06 14:10:02 +01:00
5624d0f2ec
Merge pull request #5994 from matrix-org/anoa/html_template_fix
...
Fix destructuring assumption bug with using load_jinja2_templates
2019-09-06 13:54:25 +01:00
cf5a420c8a
Apply suggestions from code review
...
Co-Authored-By: Erik Johnston <erik@matrix.org>
2019-09-06 13:34:42 +01:00
5d833f0923
Add changelog
2019-09-06 13:27:55 +01:00
ca74b140f2
Fix destructuring assumption bug
2019-09-06 13:25:06 +01:00
6ddda8152e
Move delete_threepid_session into RegistrationWorkerStore
2019-09-06 13:23:10 +01:00
5a7e9fdd84
Change changelog
2019-09-06 13:18:03 +01:00
e059c5e648
Move get_threepid_validation_session into RegistrationWorkerStore
2019-09-06 13:10:11 +01:00
1ab1479a92
Add changelog
2019-09-06 13:08:52 +01:00
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
1ceeccb769
Move get_threepid_validation_session into RegistrationWorkerStore
2019-09-06 13:00:34 +01:00
39883e85bd
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-06 12:50:28 +01:00
146af7b47f
Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcs
...
Don't assume there is a 'self' arg in @trace decorator
2019-09-06 11:42:45 +01:00
0c0b82b6d1
Allow Synapse to send registration emails + choose Synapse or an external server to handle 3pid validation ( #5987 )
...
This is a combination of a few different PRs, finally all being merged into `develop`:
* #5875
* #5876
* #5868 (This one added the `/versions` flag but the flag itself was actually [backed out](891afb57cb (diff-e591d42d30690ffb79f63bb726200891)#5969 . What's left is just giving /versions access to the config file, which could be useful in the future)
* #5835
* #5969
* #5940
Clients should not actually use the new registration functionality until https://github.com/matrix-org/synapse/pull/5972 is merged.
UPGRADE.rst, changelog entries and config file changes should all be reviewed closely before this PR is merged.
2019-09-06 11:35:28 +01:00
e5baf80237
Update changelog
2019-09-06 10:53:05 +01:00
4bc6b7130d
Newsfile
2019-09-06 10:13:10 +01:00
d8517da85b
Don't assume there is a 'self' arg in @trace decorator
2019-09-06 10:07:12 +01:00
68f53b7a0e
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-06 09:53:37 +01:00
f7c873a643
Trace how long it takes for the send trasaction to complete, including retrys ( #5986 )
2019-09-05 17:44:55 +01:00
bc604e7f94
Gracefully handle log context slips and missing opentracing import errors. ( #5988 )
2019-09-05 17:33:29 +01:00
e679b008ff
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-05 15:23:40 +01:00
1a6ae33309
Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_contexts
...
Link the send loop with the edus contexts
2019-09-05 15:22:24 +01:00
ef20aa52eb
use access methods (duh..)
...
Co-Authored-By: Erik Johnston <erik@matrix.org>
2019-09-05 15:07:17 +01:00
7093790fbc
Bugfix phrasing
...
Co-Authored-By: Erik Johnston <erik@matrix.org>
2019-09-05 15:07:00 +01:00
5ade977d08
Opentracing context cannot be none
2019-09-05 15:06:13 +01:00
909827b422
Add opentracing to all client servlets ( #5983 )
2019-09-05 14:46:04 +01:00
93bc9d73bf
newsfile
2019-09-05 14:45:07 +01:00
1d65292e94
Link the send loop with the edus contexts
...
The contexts were being filtered too early so the send loop wasn't
being linked to them unless the destination
was whitelisted.
2019-09-05 14:42:37 +01:00
a0d294c306
Switch to using v2 Identity Service APIs other than lookup (MSC 2140) ( #5892 )
2019-09-05 14:31:22 +01:00
b9cfd3c375
Fix opentracing contexts missing from outbound replication requests ( #5982 )
2019-09-05 14:22:15 +01:00
90d17a3d28
Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) ( #5980 )
...
Implements `POST /_matrix/client/r0/account/3pid/unbind` from [MSC2140](https://github.com/matrix-org/matrix-doc/blob/dbkr/tos_2/proposals/2140-terms-of-service-2.md#post-_matrixclientr0account3pidunbind ).
2019-09-05 14:00:30 +01:00
b736c6cd3a
Remove bind_email and bind_msisdn ( #5964 )
...
Removes the `bind_email` and `bind_msisdn` parameters from the `/register` C/S API endpoint as per [MSC2140: Terms of Service for ISes and IMs](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R107 ).
2019-09-04 18:24:23 +01:00
b09d443632
Cleanup event auth type initialisation ( #5975 )
...
Very small code cleanup.
2019-09-04 16:16:56 +01:00
e80a5b7492
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
2019-09-04 13:13:30 +01:00
6e834e94fc
Fix and refactor room and user stats ( #5971 )
...
Previously the stats were not being correctly populated.
2019-09-04 13:04:27 +01:00
ea128a3e8e
code cleanups
2019-09-03 21:05:06 +01:00
2f416fc997
Ensure the list media admin API is always available ( #5966 )
...
* Ensure the list media admin API is always available
This API is required for some external media repo implementations to operate (mostly for doing quarantine operations on a room).
* changelog
2019-09-03 13:35:20 -06:00
6b6086b8bf
Fix docstring
2019-09-03 20:00:09 +01:00
a98b8583c6
Remove unnecessary variable declaration
2019-09-03 19:58:51 +01:00
894c1a5759
Docker packaging should not su-exec or chmod if already running as UID/GID ( #5970 )
...
Adjust su-exec to only be used if needed.
If UID == getuid() and GID == getgid() then we do not need to su-exec, and chmod will not work.
2019-09-03 16:36:01 +01:00
0eac7077c9
Ensure an auth instance is available to ListMediaInRoom ( #5967 )
...
* Ensure an auth instance is available to ListMediaInRoom
Fixes https://github.com/matrix-org/synapse/issues/5737
* Changelog
2019-09-03 09:01:30 -06:00
8401bcd206
fix typo
2019-09-03 12:44:14 +01:00
2a44782666
Remove double return statements ( #5962 )
...
Remove all the "double return" statements which were a result of us removing all the instances of
```
defer.returnValue(...)
return
```
statements when we switched to python3 fully.
2019-09-03 11:42:45 +01:00
Richard van der Hoff