Brendan Abolivier
91694227b6
Bump requirement for six to 1.12
2019-08-29 16:20:21 +01:00
Brendan Abolivier
7a95d8fff9
Fix encoding for account validity HTML files on Python 2
2019-08-29 16:03:59 +01:00
Brendan Abolivier
e5df12ad16
Merge branch 'dinsic' into babolivier/dinsic-message-retention
2019-08-28 18:17:26 +01:00
Brendan Abolivier
70714595bc
Implement per-room message retention policies
2019-08-28 18:16:17 +01:00
Michael Kaye
62f5e3bc4c
Merge pull request #5812 from matrix-org/babolivier/account-validity-messages
...
Account validity: allow defining HTML templates to serve the user on account renewal attempt
2019-08-12 13:26:49 +01:00
Michael Kaye
63d0d21a28
Merge pull request #5781 from matrix-org/baboliver/loopingcall-args
...
Add ability to pass arguments to looping calls
2019-08-08 12:10:36 +01:00
Michael Kaye
8551b4f336
Merge pull request #5760 from matrix-org/babolivier/access-rules-public-restricted
...
Force the access rule to be "restricted" if the join rule is "public"
2019-08-08 12:10:22 +01:00
Brendan Abolivier
359aed4168
Lint
2019-08-01 16:08:39 +02:00
Brendan Abolivier
235271be4f
Allow defining HTML templates to serve the user on account renewal
2019-08-01 16:08:38 +02:00
Brendan Abolivier
0c6500a08b
Explain rationale
2019-08-01 10:19:04 +02:00
Brendan Abolivier
35ec13baab
Ignore redactions of redactions in get_events_as_list
2019-07-31 15:48:57 +02:00
Brendan Abolivier
c4e56a8ee9
Ignore invalid redactions in _get_event_from_row
2019-07-31 15:11:27 +02:00
Brendan Abolivier
d2bb51080e
Incorporate review
2019-07-30 16:15:01 +02:00
Brendan Abolivier
0fda4e2e50
Should now work, unless we can't find the redaction event which happens for some reason (need to investigate)
2019-07-30 15:56:02 +02:00
Brendan Abolivier
8ced9a2f58
Don't make the checks depend on recheck_redaction
2019-07-30 15:55:18 +02:00
Brendan Abolivier
bbd6208b3e
Do checks sooner
2019-07-29 17:22:42 +02:00
Brendan Abolivier
36c61df659
Check room ID and type of redacted event
2019-07-29 16:07:12 +02:00
Brendan Abolivier
bec6d9e090
Add kwargs and doc
2019-07-29 11:06:43 +02:00
Brendan Abolivier
8a47155763
Add ability to pass arguments to looping calls
2019-07-29 11:06:43 +02:00
Brendan Abolivier
2526b79ce6
Merge ifs
2019-07-25 10:15:44 +02:00
Brendan Abolivier
aea03c9d73
Doc
2019-07-25 10:14:41 +02:00
Brendan Abolivier
dd92685179
Only check the join rule on room creation if an access rule is also provided
2019-07-25 10:03:36 +02:00
Brendan Abolivier
ea5f86304e
Implement restrictions on new events
2019-07-24 17:27:07 +02:00
Brendan Abolivier
d1a78ba2a3
Implement restriction on public room creation
2019-07-24 17:06:23 +02:00
Brendan Abolivier
28803ad56a
Merge branch 'dinsic' into babolivier/3pid-invite
2019-07-17 15:06:41 +02:00
Brendan Abolivier
34dd738e4b
There's no third_party_signed property in an invite's content
2019-07-17 15:03:23 +02:00
Brendan Abolivier
048f86ef5d
Fix check of the association between a 3PID invite and the subsequent m.room.member event in the 3rd party rules
2019-07-17 14:54:58 +02:00
Brendan Abolivier
3bc4ea841d
Merge pull request #5646 from matrix-org/babolivier/profile-allow-self
...
Port #5644 to dinsic
2019-07-09 13:19:57 +01:00
Brendan Abolivier
25fff95448
Allow newly-registered users to lookup their own profiles
...
When a user creates an account and the 'require_auth_for_profile_requests' config flag is set, and a client that performed the registration wants to lookup the newly-created profile, the request will be denied because the user doesn't share a room with themselves yet.
2019-07-09 10:27:53 +01:00
Brendan Abolivier
5fe0cea37e
Merge pull request #5610 from matrix-org/babolivier/power-levels
...
Implement new restrictions on power levels
2019-07-04 11:12:47 +01:00
Brendan Abolivier
95b5d4ad54
Merge branch 'babolivier/power-levels' of github.com:matrix-org/synapse into babolivier/power-levels
2019-07-03 18:30:13 +01:00
Brendan Abolivier
4dd7de17b7
Incorporate review
2019-07-03 18:26:48 +01:00
Brendan Abolivier
8b44097771
Update synapse/third_party_rules/access_rules.py
...
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-07-03 18:21:42 +01:00
Brendan Abolivier
6b83a1826c
Incorporate review
2019-07-03 17:32:52 +01:00
Brendan Abolivier
d085e0df2a
Change the rule for applying PL restrictions
2019-07-03 15:44:22 +01:00
Brendan Abolivier
aa3ba41933
Default return value for events we're not interested in
2019-07-03 12:05:56 +01:00
Brendan Abolivier
724ddaddb3
Refactor part of the access rules module
...
Since we're not processing only membership events and 3PID invites anymore, it's nice to know which function is supposed to process what.
2019-07-03 12:03:22 +01:00
Brendan Abolivier
8636ec042b
Implement restrictions for power levels
2019-07-03 11:45:07 +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
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
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
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
7157276124
Don't process 3PIDs in _apply_restricted
2019-06-18 17:43:34 +01:00
Brendan Abolivier
cefc5542fb
Lint
2019-06-18 14:59:05 +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