kaslo/synapse
1
0
Fork 0
Code Wiki Activity
14,727 Commits 1,047 Branches 805 Tags
e6f0536de17c625d627a5288581ee404400a533a
Commit Graph

14727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brendan Abolivier
e6f0536de1 Remove python TAP script 2019-10-31 16:16:25 +00:00
Brendan Abolivier
0559c87007 Don't use test image 2019-10-31 15:49:15 +00:00
Brendan Abolivier
7467a8090c Remove CircleCI configuration 2019-10-23 17:37:50 +01:00
Brendan Abolivier
0263c044ff Move sytest jobs to the right location 2019-10-23 17:37:28 +01:00
Brendan Abolivier
a4e4a9c93b Try running the workers job on bigger agents 2019-10-21 17:35:16 +01:00
Brendan Abolivier
73147f44fc Add py3 jobs on BuildKite 2019-10-18 15:25:45 +01:00
Brendan Abolivier
c3c1add9f3 Add TAP formatting script 2019-10-18 14:52:57 +01:00
Brendan Abolivier
7a50b07bb4 Add workers to buildkite 2019-10-09 11:34:20 +01:00
Brendan Abolivier
1a58f6196f Try to run stuff on buildkite 2019-10-09 11:17:36 +01:00
Brendan Abolivier
d6371916cc Actually use the right image 2019-10-09 11:08:30 +01:00
Brendan Abolivier
c29182ce8a Add python3 jobs 2019-10-09 11:06:29 +01:00
Brendan Abolivier
7123f50c44 fix 2019-10-08 18:15:47 +01:00
Brendan Abolivier
9398f55982 Try to fix CircleCI 2019-10-08 17:38:03 +01:00
Brendan Abolivier
4d52ccf41f peek 2019-10-08 17:09:14 +01:00
Brendan Abolivier
b77d92514e peek 2019-10-08 17:07:58 +01:00
Brendan Abolivier
60b4585403 peek 2019-10-08 16:51:18 +01:00
Brendan Abolivier
6bf5dbc5f2 peek 2019-10-08 16:47:18 +01:00
Brendan Abolivier
4150508759 peek 2019-10-08 16:45:04 +01:00
Brendan Abolivier
a093ac6d86 peek 2019-10-08 16:40:15 +01:00
Brendan Abolivier
9ec8072a87 Temporarily move the sytest job before the wait 2019-10-08 16:35:08 +01:00
Brendan Abolivier
078c0638e3 peek 2019-10-08 16:33:17 +01:00
Brendan Abolivier
c5eb8342b2 Try adding workers to CircleCI instead 2019-10-07 15:35:49 +01:00
Brendan Abolivier
f38ad87384 Use mainline's merge_base_branch.sh 2019-10-07 13:03:08 +01:00
Brendan Abolivier
90f1eb3ee5 Changelog 2019-10-07 12:54:20 +01:00
Brendan Abolivier
9e1e5f8ed5 First attempt at running SyTest in buildkite 2019-10-07 12:52:02 +01:00
Brendan Abolivier
6b59493dfa Merge pull request #8 from matrix-org/babolivier/3pid-invite-revoked 
Don't 500 when trying to exchange a revoked 3PID invite
 2019-10-04 13:12:01 +01:00
Brendan Abolivier
c49ba3677c Fixup tests 2019-10-04 12:21:33 +01:00
Brendan Abolivier
04d4fff806 Typo 2019-10-04 12:10:20 +01:00
Brendan Abolivier
b0a350ef48 Lint 2019-10-04 12:10:20 +01:00
Brendan Abolivier
eaec1d4ce7 Incorporate review 2019-10-04 12:10:20 +01:00
Brendan Abolivier
d694546453 Lint (again) 2019-10-04 12:10:19 +01:00
Brendan Abolivier
06159a0ee7 Lint 2019-10-04 12:10:19 +01:00
Brendan Abolivier
a6a55039a4 Add test case 2019-10-04 12:10:19 +01:00
Brendan Abolivier
1a01ca0774 Changelog 2019-10-04 12:10:19 +01:00
Brendan Abolivier
78d9b4a6e6 Lint 2019-10-04 12:10:19 +01:00
Brendan Abolivier
dfcf4ba406 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-04 12:10:14 +01:00
Brendan Abolivier
cd858afea6 Merge pull request #7 from matrix-org/babolivier/deactivation-invite 
Reject pending invites on deactivation
 2019-09-27 17:52:41 +01:00
Brendan Abolivier
ce2448efbe Fix git messing up 2019-09-27 17:18:10 +01:00
Brendan Abolivier
04b779a6ac s/return/defer.returnValue/ 2019-09-27 17:06:12 +01:00
Brendan Abolivier
42409b3022 Incorporate review 2019-09-27 17:03:34 +01:00
Brendan Abolivier
5a207c1113 Update synapse/handlers/deactivate_account.py 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-09-27 17:03:34 +01:00
Brendan Abolivier
0ae6c8efc1 Update synapse/handlers/deactivate_account.py 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-09-27 17:03:34 +01:00
Brendan Abolivier
318fed18da Update changelog.d/6125.feature 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2019-09-27 17:03:10 +01:00
Brendan Abolivier
97672c03e2 ok 2019-09-27 16:57:19 +01:00
Brendan Abolivier
acf6b2388e Lint 2019-09-27 16:57:19 +01:00
Brendan Abolivier
4c6d9408d3 Merge pull request #6 from matrix-org/babolivier/access-rules-membership 
Allow membership events which membership isn't join or invite in restricted rooms
 2019-09-26 12:07:54 +01:00
Brendan Abolivier
0d069e4407 Changelog 2019-09-26 11:15:49 +01:00
Brendan Abolivier
e6a7f8964f Allow membership events which membership isn't join or invite in restricted rooms 2019-09-26 11:12:21 +01:00
Michael Kaye
efaf8038e2 Merge pull request #5 from matrix-org/babolivier/get-retention-worker 
Fix room retention policy management in worker mode
 2019-09-25 12:43:46 +01:00
Brendan Abolivier
f3dfbc82d5 Typo 2019-09-24 17:25:13 +01:00