dandri/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2026-05-15 01:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,026 Commits 1,110 Branches 829 Tags
d3f2fbcfe577f42d0208d15a57bd66e56186742a
Commit Graph

15026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hubert Chathi d3f2fbcfe5 add function docs 2019-09-07 14:13:18 -04:00
Hubert Chathi b6e3decd2b Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_sig_upload 2019-09-07 13:21:25 -04:00
Hubert Chathi 8e86f5b65c Merge branch 'develop' into uhoreg/e2e_cross-signing_merged 2019-09-07 13:20:34 -04:00
Hubert Chathi 0d61d1d735 Merge branch 'develop' into cross-signing_sig_upload 2019-09-07 13:14:45 -04:00
Hubert Chathi ab729e31cf use something that's the right type for user_id 2019-09-06 17:52:37 -04:00
Hubert Chathi 415d0a00e0 run black 2019-09-06 16:46:45 -04:00
Hubert Chathi 561cbba057 split out signature processing into separate functions 2019-09-06 16:44:24 -04:00
Amber Brown 55d5b3af88 Servers-known-about statistic (#5981) 2019-09-07 01:45:51 +10:00
Andrew Morgan 78801e7f9e Ensure a sid parameter is passed to bind_threepid (#5995) 
`sid` is required to be part of `three_pid_creds`. We were 500'ing if it wasn't provided instead of returning `M_MISSING_PARAM`.
 2019-09-06 15:36:50 +01:00
Erik Johnston a2a695b7ec Merge pull request #5998 from matrix-org/erikj/fixup_federate_flag 
Correctly handle non-bool m.federate flag
 2019-09-06 15:32:43 +01:00
Erik Johnston 85275c89d7 Newsfile 2019-09-06 14:21:14 +01:00
Erik Johnston 142c9325c2 Correctly handle non-bool m.federate flag 2019-09-06 14:21:06 +01:00
Erik Johnston 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
Erik Johnston 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
Andrew Morgan cf5a420c8a Apply suggestions from code review 
Co-Authored-By: Erik Johnston <erik@matrix.org>
 2019-09-06 13:34:42 +01:00
Andrew Morgan 5d833f0923 Add changelog 2019-09-06 13:27:55 +01:00
Andrew Morgan ca74b140f2 Fix destructuring assumption bug 2019-09-06 13:25:06 +01:00
Andrew Morgan 6ddda8152e Move delete_threepid_session into RegistrationWorkerStore 2019-09-06 13:23:10 +01:00
Andrew Morgan 5a7e9fdd84 Change changelog 2019-09-06 13:18:03 +01:00
Andrew Morgan e059c5e648 Move get_threepid_validation_session into RegistrationWorkerStore 2019-09-06 13:10:11 +01:00
Andrew Morgan 1ab1479a92 Add changelog 2019-09-06 13:08:52 +01:00
Erik Johnston 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
Andrew Morgan 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](https://github.com/matrix-org/synapse/commit/891afb57cbdf9867f2848341b29c75d6f35eef5a#diff-e591d42d30690ffb79f63bb726200891) in #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
Erik Johnston e5baf80237 Update changelog 2019-09-06 10:53:05 +01:00
Erik Johnston 4bc6b7130d Newsfile 2019-09-06 10:13:10 +01:00
Erik Johnston d8517da85b Don't assume there is a 'self' arg in @trace decorator 2019-09-06 10:07:12 +01:00
Hubert Chathi 369462da74 avoid modifying input parameter 2019-09-05 17:03:31 -04:00
Hubert Chathi e47af0f086 fix test 2019-09-05 17:03:14 -04:00
Jorik Schellekens f7c873a643 Trace how long it takes for the send trasaction to complete, including retrys (#5986) 2019-09-05 17:44:55 +01:00
Jorik Schellekens bc604e7f94 Gracefully handle log context slips and missing opentracing import errors. (#5988) 2019-09-05 17:33:29 +01:00
Erik Johnston 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
Jorik Schellekens ef20aa52eb use access methods (duh..) 
Co-Authored-By: Erik Johnston <erik@matrix.org>
 2019-09-05 15:07:17 +01:00
Jorik Schellekens 7093790fbc Bugfix phrasing 
Co-Authored-By: Erik Johnston <erik@matrix.org>
 2019-09-05 15:07:00 +01:00
Jorik Schellekens 5ade977d08 Opentracing context cannot be none 2019-09-05 15:06:13 +01:00
Jorik Schellekens 909827b422 Add opentracing to all client servlets (#5983) 2019-09-05 14:46:04 +01:00
Jorik Schellekens 93bc9d73bf newsfile 2019-09-05 14:45:07 +01:00
Jorik Schellekens 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
Andrew Morgan a0d294c306 Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892) 2019-09-05 14:31:22 +01:00
Jorik Schellekens b9cfd3c375 Fix opentracing contexts missing from outbound replication requests (#5982) 2019-09-05 14:22:15 +01:00
Andrew Morgan 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
Hubert Chathi c8dc740a94 update with newer coding style 2019-09-04 22:30:45 -04:00
Hubert Chathi 5914fd09c7 add test 2019-09-04 22:05:02 -04:00
Hubert Chathi 9061b4198a make isort happy 2019-09-04 22:04:41 -04:00
Hubert Chathi 7d6c70fc7a make black happy 2019-09-04 22:04:12 -04:00
Hubert Chathi ac4746ac4b allow uploading signatures of master key signed by devices 2019-09-04 22:03:41 -04:00
Hubert Chathi 4bb4544784 implement device signature uploading/fetching 2019-09-04 20:02:56 -04:00
Hubert Chathi 19bb5c8024 Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1 
Cross-signing [2/4] - upload/download keys
 2019-09-04 16:56:29 -07:00
Hubert Chathi a22d58c96c add user signature stream change cache to slaved device store 2019-09-04 19:32:35 -04:00
Hubert Chathi faf72a4c40 Merge branch 'develop' into cross-signing_keys 2019-09-04 19:12:29 -04:00
Andrew Morgan 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