10671 Commits

Author	SHA1	Message	Date
Brendan Abolivier	21d51ab598	Typo	2019-10-04 11:21:24 +01:00
Brendan Abolivier	4676732ca0	Lint	2019-10-04 11:18:28 +01:00
Brendan Abolivier	81d51ce48b	Incorporate review	2019-10-04 11:16:19 +01:00
Brendan Abolivier	6527fa18c1	Add test case	2019-10-03 11:24:36 +01:00
Brendan Abolivier	972c9f65d7	Lint	2019-10-02 12:17:46 +01:00
Brendan Abolivier	5705ecaec6	Don't 500 code when trying to exchange a revoked 3PID invite ... While this is not documented in the spec (but should be), Riot (and other clients) revoke 3PID invites by sending a m.room.third_party_invite event with an empty ({}) content to the room's state. When the invited 3PID gets associated with a MXID, the identity server (which doesn't know about revocations) sends down to the MXID's homeserver all of the undelivered invites it has for this 3PID. The homeserver then tries to talk to the inviting homeserver in order to exchange these invite for m.room.member events. When one of the invite is revoked, the inviting homeserver responds with a 500 error because it tries to extract a 'display_name' property from the content, which is empty. This might cause the invited server to consider that the server is down and not try to exchange other, valid invites (or at least delay it). This fix handles the case of revoked invites by avoiding trying to fetch a 'display_name' from the original invite's content, and letting the m.room.member event fail the auth rules (because, since the original invite's content is empty, it doesn't have public keys), which results in sending a 403 with the correct error message to the invited server.	2019-10-02 11:19:43 +01:00
Erik Johnston	1d349fb159	Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/synapse into develop	2019-10-01 10:17:24 +01:00
Erik Johnston	9267741a5f	Fix devices_last_seen background update. ... Fixes #6134.	2019-09-30 11:58:36 +01:00
Richard van der Hoff	16cb9a71b8	Drop unused tables (#6115) ... These tables are unused since #5893 (as amended by #6047), so we can now drop them. Fixes #6048.	2019-09-30 09:38:41 +01:00
Andrew Morgan	f3451118a6	Edit SimpleHttpClient to reference that header keys can be passed as str or bytes (#6077)	2019-09-27 17:59:18 +01:00
Brendan Abolivier	3e42d47a5a	Incorporate review	2019-09-27 16:15:01 +01:00
Brendan Abolivier	af92110c46	Update synapse/handlers/deactivate_account.py ... Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>	2019-09-27 16:12:15 +01:00
Brendan Abolivier	bbe2a0f339	Update synapse/handlers/deactivate_account.py ... Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>	2019-09-27 16:10:36 +01:00
Brendan Abolivier	873fe7883c	Lint	2019-09-27 15:21:03 +01:00
Brendan Abolivier	72a2708ac6	Fixup and add some logging	2019-09-27 15:13:39 +01:00
Brendan Abolivier	5257a2fb1c	Reject pending invites on deactivation	2019-09-27 14:49:53 +01:00
Andrew Morgan	8c27bc8b60	Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978) ... Just to have all the methods that make calls to identity services in one place.	2019-09-27 10:36:20 +01:00
Erik Johnston	67ee18daea	Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-span ... Add some helpful opentracing tags and remove get_user_by_req span	2019-09-27 10:02:57 +01:00
Erik Johnston	3423633d50	Fix 'redaction_retention_period' sampel config to match guidelines	2019-09-26 16:43:52 +01:00
Richard van der Hoff	54569c787b	Kill off half-implemented password-reset via sms (#6101) ... Doing a password reset via SMS has never worked, and in any case is a silly idea because msisdn recycling is a thing. See also matrix-org/matrix-doc#2303.	2019-09-26 15:38:25 +01:00
Neil Johnson	8b8f8c7b3c	Explicitly log when a homeserver does not have a trusted key server configured (#6090)	2019-09-26 12:57:01 +01:00
Richard van der Hoff	2927c6bc4c	bump version	2019-09-26 12:29:59 +01:00
Neil Johnson	034db2ba21	Fix dummy event insertion consent bug (#6053) ... Fixes #5905	2019-09-26 11:47:53 +01:00
Richard van der Hoff	a96318127d	Update comments and docstring	2019-09-25 18:17:39 +01:00
Erik Johnston	4fb3c129aa	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips_2	2019-09-25 17:53:13 +01:00
Erik Johnston	9614d3c9d1	Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips ... Move last seen info into devices table	2019-09-25 17:42:39 +01:00
Neil Johnson	a4f3ca48b5	Enable cleaning up extremities with dummy events by default to prevent undue build up of forward extremities. (#5884)	2019-09-25 17:27:35 +01:00
Erik Johnston	39b50ad42a	Review comments	2019-09-25 17:22:33 +01:00
Erik Johnston	d2bd0bc6b1	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips	2019-09-25 17:16:28 +01:00
Erik Johnston	50572db837	Use if is not None ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-09-25 17:00:23 +01:00
Neil Johnson	77dc7093a7	Threepid validity checks on msisdns should not be dependent on 'threepid_behaviour_email'. (#6104) ... Fixes #6103	2019-09-25 12:29:35 +01:00
Richard van der Hoff	990928abde	Stop advertising unsupported flows for registration (#6107) ... If email or msisdn verification aren't supported, let's stop advertising them for registration. Fixes #6100.	2019-09-25 12:10:26 +01:00
Erik Johnston	dc2c97e1a3	isort	2019-09-25 11:59:05 +01:00
Erik Johnston	dc01cad690	Add device and appservice tags	2019-09-25 11:59:00 +01:00
Erik Johnston	5d99713854	Add tags for event_id and txn_id in event sending ... This will make it easier to search for sending event requests.	2019-09-25 11:39:15 +01:00
Richard van der Hoff	2cd98812ba	Refactor the user-interactive auth handling (#6105) ... Pull the checkers out to their own classes, rather than having them lost in a massive 1000-line class which does everything. This is also preparation for some more intelligent advertising of flows, as per #6100	2019-09-25 11:33:03 +01:00
Erik Johnston	fde4ce2213	Don't create new span for get_user_by_req ... We don't actually care about what happens in `get_user_by_req` and having it as a separate span means that the entity tag isn't added to the servlet spans, making it harder to search.	2019-09-25 11:32:41 +01:00
Richard van der Hoff	8004d6ca2f	Refactor code for calculating registration flows (#6106) ... because, frankly, it looked like it was written by an axe-murderer. This should be a non-functional change, except that where `m.login.dummy` was previously advertised *before* `m.login.terms`, it will now be advertised afterwards. AFAICT that should have no effect, and will be more consistent with the flows that involve passing a 3pid.	2019-09-25 11:32:05 +01:00
Brendan Abolivier	f99a9c9cb0	Merge pull request #6092 from matrix-org/babolivier/background_update_deactivated_return ... Fix the return value in the users_set_deactivated_flag background job	2019-09-24 17:11:12 +01:00
Richard van der Hoff	9b7c4f4078	Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work	2019-09-24 17:03:50 +01:00
Richard van der Hoff	566ac40939	remove unused parameter to get_user_id_by_threepid (#6099) ... Added in #5377, apparently in error	2019-09-24 17:01:09 +01:00
Erik Johnston	242017db8b	Prune rows in user_ips older than configured period ... Defaults to pruning everything older than 28d.	2019-09-24 15:53:17 +01:00
Erik Johnston	2135c198d1	Add has_completed_background_update ... This allows checking if a specific background update has completed.	2019-09-24 15:53:17 +01:00
Erik Johnston	367158a609	Add wrap_as_background_process decorator. ... This does the same thing as `run_as_background_process` but means we don't need to create superfluous functions.	2019-09-24 15:53:17 +01:00
Richard van der Hoff	bb82be9851	Merge pull request #6069 from matrix-org/rav/fix_attribute_mapping ... Fix a bug with saml attribute maps.	2019-09-24 15:07:26 +01:00
Brendan Abolivier	12fe2a29bc	Incorporate review	2019-09-24 14:43:38 +01:00
J. Ryan Stinnett	40fb00f5b7	Add sid to next_link for email validation (#6097)	2019-09-24 14:39:50 +01:00
Brendan Abolivier	f02f14e09a	Fix logging	2019-09-24 14:39:07 +01:00
Richard van der Hoff	ed8b92f0d2	Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work	2019-09-24 12:57:32 +01:00
Richard van der Hoff	a25b66d3f9	docstrings and comments	2019-09-24 11:15:08 +01:00