Brendan Abolivier
78b737ff71
Merge pull request #5577 from matrix-org/babolivier/3pid-invite-ratelimit
...
Port #5576 to dinsic
2019-06-28 18:23:53 +01:00
Brendan Abolivier
a7a8bbf502
Only ratelimit when sending the email
...
If we do the opposite, an event can arrive after or while sending the email and the 3PID invite event will get ratelimited.
2019-06-28 17:47:38 +01:00
Brendan Abolivier
f304996c61
Changelog
2019-06-28 17:44:28 +01:00
Brendan Abolivier
7c644198c8
Don't update the ratelimiter before sending a 3PID invite
...
This would cause emails being sent, but Synapse responding with a 429 when creating the event. The client would then retry, and with bad timing the same scenario would happen again. Some testing I did ended up sending me 10 emails for one single invite because of this.
2019-06-28 17:44:28 +01:00
Brendan Abolivier
ee0ee97447
Add test case for #5574
...
There's no test that makes sure #5574 didn't break things or works correctly (my bad), so this PR adds a test case that makes sure of it.
2019-06-28 10:29:02 +01:00
Brendan Abolivier
f370fd01ec
Merge pull request #5574 from matrix-org/babolivier/fix-3pid-bind
...
Fix new 3PID bindings being associated with rewritten IS's server names instead of the original one
2019-06-27 15:17:15 +01:00
Brendan Abolivier
1ef3627b05
Fix new 3PID bindings being associated with rewritten IS's server names instead of the original one
...
This would make unbind requests fail because Synapse is using the server name it has in DB as destination_is to generate signature, and Sydent uses its own server name there when verifying it, so if a mismatch happens, which is the case if the name gets rewritten for routing purposes, the unbind requests fail on the signature verification.
2019-06-27 14:53:10 +01:00
Brendan Abolivier
fbc5b58d21
Merge pull request #5542 from matrix-org/babolivier/federation-publicrooms
...
Port "Split public rooms directory auth config in two" to dinsic
2019-06-24 16:42:21 +01:00
Brendan Abolivier
84875301b6
Split public rooms directory auth config in two
2019-06-24 16:41:48 +01:00
Brendan Abolivier
18f0b69c49
Merge pull request #5495 from matrix-org/babolivier/deactivate_bg_job_typo
...
Port "Fix typo in deactivation background job" to dinsic
2019-06-19 11:58:52 +01:00
Brendan Abolivier
4875746d82
Fix typo in deactivation background job
2019-06-19 11:39:18 +01:00
Brendan Abolivier
fa4efb5967
Merge pull request #5484 from matrix-org/babolivier/dinsic_access_rules
...
Implement custom access rules
2019-06-19 10:41:37 +01:00
Brendan Abolivier
c1bc48f9d4
Add tests for constraints on changing the rule for a room
2019-06-18 18:07:05 +01:00
Brendan Abolivier
9b3c69f661
Add tests for 3PID invites
2019-06-18 17:59:07 +01:00
Brendan Abolivier
7157276124
Don't process 3PIDs in _apply_restricted
2019-06-18 17:43:34 +01:00
Brendan Abolivier
1532369dcd
Remove unused import
2019-06-18 16:46:57 +01:00
Brendan Abolivier
145291108d
Add tests for inviting with access rules
2019-06-18 16:32:54 +01:00
Brendan Abolivier
cefc5542fb
Lint
2019-06-18 14:59:05 +01:00
Brendan Abolivier
2a1f35193b
Remove unused imports
2019-06-18 14:57:04 +01:00
Brendan Abolivier
a09767d57d
Lint
2019-06-18 14:55:24 +01:00
Brendan Abolivier
bc0fd8f170
Add tests for room creation hook
2019-06-18 14:54:19 +01:00
Brendan Abolivier
d36a876d2d
Incorporate review
2019-06-18 14:53:33 +01:00
Brendan Abolivier
f7339d42ee
Fixes
2019-06-18 11:28:33 +01:00
Brendan Abolivier
8aea2c3be1
Docstrings
2019-06-17 20:24:36 +01:00
Brendan Abolivier
1cd0ecc1f2
Rename into RoomAccessRules
2019-06-17 20:24:30 +01:00
Brendan Abolivier
19a4298a51
Fix function call
2019-06-17 20:24:26 +01:00
Brendan Abolivier
073dd7778e
Implement rules change
2019-06-17 20:24:22 +01:00
Brendan Abolivier
00736c8935
Improve doc
2019-06-17 20:24:16 +01:00
Brendan Abolivier
112a48a5aa
Implement 3PID invite hook
2019-06-17 20:24:07 +01:00
Brendan Abolivier
53aff08ebe
Implement restricted rules and room creation hook
2019-06-17 20:22:53 +01:00
Brendan Abolivier
8b2f655589
Implement rules for direct
2019-06-17 20:22:27 +01:00
Brendan Abolivier
bd8448ccb2
Backbone
2019-06-17 20:19:12 +01:00
Brendan Abolivier
110608d1d6
Base
2019-06-17 20:19:08 +01:00
Brendan Abolivier
5a28504c08
Merge pull request #5481 from matrix-org/babolivier/third_party_rules_3pid
...
Port "Add third party rules hook for 3PID invites" to dinsic
2019-06-17 18:35:54 +01:00
Brendan Abolivier
9bb7cec90f
Make check_threepid_can_be_invited async
2019-06-17 18:10:00 +01:00
Brendan Abolivier
8a8644045f
Changelog
2019-06-17 18:10:00 +01:00
Brendan Abolivier
08d4534771
Add third party rules hook for 3PID invites
2019-06-17 18:10:00 +01:00
Erik Johnston
c8349787b7
Merge pull request #5474 from matrix-org/erikj/add_create_room_hook
...
Add third party rules hook into create room
2019-06-17 17:30:08 +01:00
Erik Johnston
e5e690041d
Newsfile
2019-06-17 15:52:15 +01:00
Erik Johnston
fb1b76ff4c
Add third party rules hook into create room
2019-06-17 15:48:57 +01:00
Brendan Abolivier
40ea934de0
Merge pull request #5471 from matrix-org/erikj/3pid_remote_invite_state
...
Port "Fix 3PID invite room state over federation" to dinsic
2019-06-17 11:43:02 +01:00
Brendan Abolivier
5c4296b47a
Merge branch 'babolivier/third_party_event_rules' into dinsic
2019-06-14 19:38:44 +01:00
Brendan Abolivier
8b2543c0ec
Merge pull request #5466 from matrix-org/babolivier/fix_deactivation_bg_job
...
Port "Fix background job for deactivated flag" to dinsic
2019-06-14 19:22:56 +01:00
Brendan Abolivier
bd59e154c1
Fix changelog
2019-06-14 18:29:13 +01:00
Brendan Abolivier
66378d13ce
Changelog
2019-06-14 18:29:13 +01:00
Brendan Abolivier
65d3652cb7
Fix background job for deactivated flag
2019-06-14 18:29:13 +01:00
Brendan Abolivier
f874b16b2e
Add plugin APIs for implementations of custom event rules.
2019-06-14 18:16:03 +01:00
Brendan Abolivier
c644755123
Merge pull request #5463 from matrix-org/babolivier/account_validity_deactivated_accounts_2
...
Port "Don't send renewal emails to deactivated users" to dinsic
2019-06-14 17:19:57 +01:00
Brendan Abolivier
c7964e7430
Fix test
2019-06-14 16:25:18 +01:00
Erik Johnston
3c9bb86fde
Newsfile
2019-06-14 16:19:11 +01:00
