Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16 from matrix-org/babolivier/dinsic-state-retrieval | Brendan Abolivier | 2019-11-29 | 3 | -7/+16 |
|\ | | | | | Discard retention policies when retrieving state | ||||
| * | Changelog | Brendan Abolivier | 2019-11-29 | 1 | -0/+1 |
| | | |||||
| * | Discard retention policies when retrieving state | Brendan Abolivier | 2019-11-29 | 2 | -7/+15 |
|/ | | | | | | | | Purge jobs don't delete the latest event in a room in order to keep the forward extremity and not break the room. On the other hand, get_state_events, when given an at_token argument calls filter_events_for_client to know if the user can see the event that matches that (sync) token. That function uses the retention policies of the events it's given to filter out those that are too old from a client's view. Some clients, such as Riot, when loading a room, request the list of members for the latest sync token it knows about, and get confused to the point of refusing to send any message if the server tells it that it can't get that information. This can happen very easily with the message retention feature turned on and a room with low activity so that the last event sent becomes too old according to the room's retention policy. An easy and clean fix for that issue is to discard the room's retention policies when retrieving state. | ||||
* | Hide expired users from user directory, optionally show on renewal (#13) | Andrew Morgan | 2019-11-14 | 4 | -0/+191 |
| | |||||
* | Add a /user/:user_id/info servlet to give user deactivated/expired ↵ | Andrew Morgan | 2019-11-14 | 3 | -6/+93 |
| | | | | information (#12) | ||||
* | Create configurable ratelimiter for 3pid invites (#11) | Andrew Morgan | 2019-11-12 | 5 | -8/+33 |
| | |||||
* | Merge pull request #10 from matrix-org/babolivier/dinsic-retention-visibility | Brendan Abolivier | 2019-11-11 | 3 | -6/+20 |
|\ | | | | | Don't apply retention policy based filtering on state events | ||||
| * | Changelog | Brendan Abolivier | 2019-11-06 | 1 | -0/+1 |
| | | |||||
| * | Don't apply retention policy based filtering on state events | Brendan Abolivier | 2019-11-06 | 2 | -6/+19 |
|/ | | | | As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy. | ||||
* | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 16 | -15/+813 |
| | | | | | | | | | | | | | | | | | | | | | The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198. | ||||
* | Merge pull request #9 from matrix-org/babolivier/ci | Brendan Abolivier | 2019-10-31 | 5 | -59/+138 |
|\ | | | | | Add SyTest to the BuildKite CI | ||||
| * | Remove python TAP script | Brendan Abolivier | 2019-10-31 | 1 | -48/+0 |
| | | |||||
| * | Don't use test image | Brendan Abolivier | 2019-10-31 | 1 | -2/+2 |
| | | |||||
| * | Remove CircleCI configuration | Brendan Abolivier | 2019-10-23 | 2 | -111/+0 |
| | | |||||
| * | Move sytest jobs to the right location | Brendan Abolivier | 2019-10-23 | 1 | -102/+103 |
| | | |||||
| * | Try running the workers job on bigger agents | Brendan Abolivier | 2019-10-21 | 1 | -2/+2 |
| | | |||||
| * | Add py3 jobs on BuildKite | Brendan Abolivier | 2019-10-18 | 1 | -2/+53 |
| | | |||||
| * | Add TAP formatting script | Brendan Abolivier | 2019-10-18 | 1 | -0/+48 |
| | | |||||
| * | Add workers to buildkite | Brendan Abolivier | 2019-10-09 | 1 | -0/+25 |
| | | |||||
| * | Try to run stuff on buildkite | Brendan Abolivier | 2019-10-09 | 1 | -6/+1 |
| | | |||||
| * | Actually use the right image | Brendan Abolivier | 2019-10-09 | 1 | -2/+2 |
| | | |||||
| * | Add python3 jobs | Brendan Abolivier | 2019-10-09 | 1 | -4/+34 |
| | | |||||
| * | fix | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 |
| | | |||||
| * | Try to fix CircleCI | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 |
| | | |||||
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+1 |
| | | |||||
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 |
| | | |||||
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+1 |
| | | |||||
| * | peek | Brendan Abolivier | 2019-10-08 | 2 | -0/+2 |
| | | |||||
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+2 |
| | | |||||
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+2 |
| | | |||||
| * | Temporarily move the sytest job before the wait | Brendan Abolivier | 2019-10-08 | 1 | -26/+27 |
| | | |||||
| * | peek | Brendan Abolivier | 2019-10-08 | 1 | -0/+1 |
| | | |||||
| * | Try adding workers to CircleCI instead | Brendan Abolivier | 2019-10-07 | 1 | -0/+18 |
| | | |||||
| * | Use mainline's merge_base_branch.sh | Brendan Abolivier | 2019-10-07 | 1 | -11/+10 |
| | | |||||
| * | Changelog | Brendan Abolivier | 2019-10-07 | 1 | -0/+1 |
| | | |||||
| * | First attempt at running SyTest in buildkite | Brendan Abolivier | 2019-10-07 | 2 | -0/+60 |
|/ | |||||
* | Merge pull request #8 from matrix-org/babolivier/3pid-invite-revoked | Brendan Abolivier | 2019-10-04 | 4 | -5/+100 |
|\ | | | | | Don't 500 when trying to exchange a revoked 3PID invite | ||||
| * | Fixup tests | Brendan Abolivier | 2019-10-04 | 2 | -4/+12 |
| | | |||||
| * | Typo | Brendan Abolivier | 2019-10-04 | 1 | -1/+1 |
| | | |||||
| * | Lint | Brendan Abolivier | 2019-10-04 | 1 | -3/+1 |
| | | |||||
| * | Incorporate review | Brendan Abolivier | 2019-10-04 | 1 | -14/+8 |
| | | |||||
| * | Lint (again) | Brendan Abolivier | 2019-10-04 | 1 | -3/+1 |
| | | |||||
| * | Lint | Brendan Abolivier | 2019-10-04 | 1 | -5/+5 |
| | | |||||
| * | Add test case | Brendan Abolivier | 2019-10-04 | 2 | -1/+84 |
| | | |||||
| * | Changelog | Brendan Abolivier | 2019-10-04 | 1 | -0/+1 |
| | | |||||
| * | Lint | Brendan Abolivier | 2019-10-04 | 1 | -1/+3 |
| | | |||||
| * | Don't 500 code when trying to exchange a revoked 3PID invite | Brendan Abolivier | 2019-10-04 | 1 | -2/+13 |
|/ | | | | | | | | 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. | ||||
* | Merge pull request #7 from matrix-org/babolivier/deactivation-invite | Brendan Abolivier | 2019-09-27 | 3 | -2/+94 |
|\ | | | | | Reject pending invites on deactivation | ||||
| * | Fix git messing up | Brendan Abolivier | 2019-09-27 | 1 | -2/+3 |
| | | |||||
| * | s/return/defer.returnValue/ | Brendan Abolivier | 2019-09-27 | 1 | -1/+1 |
| | | |||||
| * | Incorporate review | Brendan Abolivier | 2019-09-27 | 1 | -4/+2 |
| | | |||||
| * | Update synapse/handlers/deactivate_account.py | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 |
| | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | ||||
| * | Update synapse/handlers/deactivate_account.py | Brendan Abolivier | 2019-09-27 | 1 | -0/+4 |
| | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | ||||
| * | Update changelog.d/6125.feature | Brendan Abolivier | 2019-09-27 | 1 | -0/+1 |
| | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | ||||
| * | ok | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 |
| | | |||||
| * | Lint | Brendan Abolivier | 2019-09-27 | 2 | -1/+85 |
| | | |||||
* | | Merge pull request #6 from matrix-org/babolivier/access-rules-membership | Brendan Abolivier | 2019-09-26 | 2 | -1/+10 |
|\ \ | |/ |/| | Allow membership events which membership isn't join or invite in restricted rooms | ||||
| * | Changelog | Brendan Abolivier | 2019-09-26 | 1 | -0/+1 |
| | | |||||
| * | Allow membership events which membership isn't join or invite in restricted ↵ | Brendan Abolivier | 2019-09-26 | 1 | -1/+9 |
|/ | | | | rooms | ||||
* | Merge pull request #5 from matrix-org/babolivier/get-retention-worker | Michael Kaye | 2019-09-25 | 2 | -55/+64 |
|\ | | | | | Fix room retention policy management in worker mode | ||||
| * | Typo | Brendan Abolivier | 2019-09-24 | 1 | -1/+1 |
| | | |||||
| * | Consider every room as having no retention policy if the feature is disabled | Brendan Abolivier | 2019-09-24 | 1 | -0/+8 |
| | | |||||
| * | Changelog | Brendan Abolivier | 2019-09-24 | 1 | -0/+1 |
| | | |||||
| * | Move get_retention_policy_for_room to RoomWorkerStore | Brendan Abolivier | 2019-09-24 | 1 | -55/+55 |
|/ | |||||
* | Merge pull request #4 from matrix-org/babolivier/strip_invalid_mxid_characters | Brendan Abolivier | 2019-09-20 | 3 | -2/+26 |
|\ | | | | | Fix handling of filtered strings in Python 3 when processing MXIDs | ||||
| * | Remove unnecessary cast to list | Brendan Abolivier | 2019-09-20 | 1 | -1/+1 |
| | | |||||
| * | Changelog | Brendan Abolivier | 2019-09-19 | 1 | -0/+1 |
| | | |||||
| * | Lint | Brendan Abolivier | 2019-09-19 | 1 | -1/+2 |
| | | |||||
| * | Use six.moves.filter when filtering out from MXID | Brendan Abolivier | 2019-09-19 | 1 | -1/+3 |
| | | | | | | | | Python 2's filter() function and Python 3's don't return the same type when processing a string (respectively str and filter), therefore use six's compatibility mapping (which resolves to itertools.ifilter() if using Python2), then generate a string from the filtered list, in order to ensure consistent behaviour between Python 2 and Python 3. | ||||
| * | Add unit tests for strip_invalid_mxid_characters | Brendan Abolivier | 2019-09-19 | 1 | -1/+21 |
|/ | |||||
* | Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-invite | Brendan Abolivier | 2019-09-10 | 3 | -9/+79 |
|\ | | | | | Don't treat 3PID revocation as a new 3PID invite | ||||
| * | Update changelog.d/2.bugfix | Brendan Abolivier | 2019-09-10 | 1 | -1/+1 |
| | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | Process revocations in _on_membership_or_invite_direct | Brendan Abolivier | 2019-09-09 | 1 | -18/+11 |
| | | |||||
| * | Typo | Brendan Abolivier | 2019-09-06 | 1 | -1/+1 |
| | | |||||
| * | Lint | Brendan Abolivier | 2019-09-06 | 1 | -1/+0 |
| | | |||||
| * | Changelog | Brendan Abolivier | 2019-09-06 | 1 | -0/+1 |
| | | |||||
| * | Only filter on 3PID invite tokens | Brendan Abolivier | 2019-09-06 | 1 | -6/+6 |
| | | |||||
| * | Fix bogus conflict resolution | Brendan Abolivier | 2019-09-06 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'dinsic' into babolivier/dinsic-3pid-invite | Brendan Abolivier | 2019-09-06 | 6 | -13/+166 |
| |\ | |||||
| * | | Don't process revoked/redacted events as part of the room's membership info | Brendan Abolivier | 2019-09-06 | 2 | -2/+12 |
| | | | |||||
| * | | Don't treat 3PID revokation as a new 3PID invite | Brendan Abolivier | 2019-09-06 | 2 | -7/+74 |
| | | | |||||
* | | | Merge pull request #3 from matrix-org/babolivier/password-reset-template-unicode | Brendan Abolivier | 2019-09-09 | 5 | -8/+7 |
|\ \ \ | |_|/ |/| | | Ensure the password reset template is correctly converted to binary | ||||
| * | | Rename io.open import to limite side-effects | Brendan Abolivier | 2019-09-09 | 1 | -2/+2 |
| | | | |||||
| * | | Lint | Brendan Abolivier | 2019-09-09 | 1 | -1/+1 |
| | | | |||||
| * | | Revert "Merge pull request #5932 from ↵ | Brendan Abolivier | 2019-09-09 | 3 | -7/+4 |
| | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_template_encode" This reverts commit 84e695f506faf54982b9e19dceb9c02acffad95f, reversing changes made to 99eec6d2d5cc76e645c3fd7ca6cda85b2bab6feb. | ||||
| * | | Read all files as UTF-8 | Brendan Abolivier | 2019-09-09 | 1 | -1/+2 |
| | | | |||||
| * | | Revert "Ensure the password reset template is correctly converted to binary" | Brendan Abolivier | 2019-09-09 | 1 | -2/+1 |
| | | | | | | | | | | | | This reverts commit 665dd9f7f8db2f8d38f454d4d5b96efcf163a5db. | ||||
| * | | Changelog | Brendan Abolivier | 2019-09-09 | 1 | -0/+1 |
| | | | |||||
| * | | Ensure the password reset template is correctly converted to binary | Brendan Abolivier | 2019-09-09 | 1 | -1/+2 |
|/ / | | | | | | | Regardless of the Python version | ||||
* | | Merge pull request #1 from matrix-org/babolivier/direct-avatar-name | Brendan Abolivier | 2019-09-06 | 6 | -5/+159 |
|\ \ | |/ |/| | Forbid changing the name, avatar or topic of a direct room | ||||
| * | Fix CI | Brendan Abolivier | 2019-09-05 | 3 | -5/+5 |
| | | |||||
| * | Lint | Brendan Abolivier | 2019-09-05 | 1 | -2/+0 |
| | | |||||
| * | Changelog | Brendan Abolivier | 2019-09-05 | 1 | -0/+1 |
| | | |||||
| * | Add tests | Brendan Abolivier | 2019-09-05 | 1 | -0/+105 |
| | | |||||
| * | Forbid changing the name, avatar or topic of a direct room | Brendan Abolivier | 2019-09-05 | 1 | -0/+50 |
|/ | |||||
* | Merge pull request #5932 from ↵ dinsic_2019-08-30 github/dinsic dinsic | Brendan Abolivier | 2019-08-29 | 3 | -4/+7 |
|\ | | | | | | | | | matrix-org/babolivier/account_validity_template_encode Fix encoding for account validity HTML files on Python 2 | ||||
| * | Bump requirement for six to 1.12 | Brendan Abolivier | 2019-08-29 | 1 | -1/+1 |
| | | |||||
| * | Fix encoding for account validity HTML files on Python 2 | Brendan Abolivier | 2019-08-29 | 2 | -3/+6 |
|/ | |||||
* | Merge pull request #5815 from matrix-org/babolivier/dinsic-message-retention dinsic_2019-08-29 | Brendan Abolivier | 2019-08-28 | 13 | -7/+1072 |
|\ | | | | | Message retention policies at the room and server levels | ||||
| * | Merge branch 'dinsic' into babolivier/dinsic-message-retention | Brendan Abolivier | 2019-08-28 | 14 | -44/+344 |
| |\ | |/ |/| | |||||
* | | Merge pull request #5812 from matrix-org/babolivier/account-validity-messages dinsic_2019-08-12 | Michael Kaye | 2019-08-12 | 8 | -9/+117 |
|\ \ | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt | ||||
| * | | Lint | Brendan Abolivier | 2019-08-01 | 3 | -14/+9 |
| | | | |||||
| * | | Sample config | Brendan Abolivier | 2019-08-01 | 1 | -0/+10 |
| | | | |||||
| * | | Changelog | Brendan Abolivier | 2019-08-01 | 1 | -0/+1 |
| | | | |||||
| * | | Add tests | Brendan Abolivier | 2019-08-01 | 1 | -0/+37 |
| | | | |||||
| * | | Allow defining HTML templates to serve the user on account renewal | Brendan Abolivier | 2019-08-01 | 5 | -9/+74 |
| | | | |||||
* | | | Merge pull request #5781 from matrix-org/baboliver/loopingcall-args dinsic_2019-08-08 | Michael Kaye | 2019-08-08 | 2 | -2/+5 |
|\ \ \ | | | | | | | | | Add ability to pass arguments to looping calls | ||||
| * | | | Changelog | Brendan Abolivier | 2019-07-29 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add kwargs and doc | Brendan Abolivier | 2019-07-29 | 1 | -2/+4 |
| | | | | |||||
| * | | | Add ability to pass arguments to looping calls | Brendan Abolivier | 2019-07-29 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #5760 from ↵ | Michael Kaye | 2019-08-08 | 3 | -16/+190 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | matrix-org/babolivier/access-rules-public-restricted Force the access rule to be "restricted" if the join rule is "public" | ||||
| * | | | Explain rationale | Brendan Abolivier | 2019-08-01 | 1 | -0/+4 |
| | | | | |||||
| * | | | Incorporate review | Brendan Abolivier | 2019-07-30 | 1 | -15/+13 |
| | | | | |||||
| * | | | Fix changelog | Brendan Abolivier | 2019-07-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Changelog | Brendan Abolivier | 2019-07-25 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge ifs | Brendan Abolivier | 2019-07-25 | 1 | -5/+4 |
| | | | | |||||
| * | | | Doc | Brendan Abolivier | 2019-07-25 | 1 | -2/+14 |
| | | | | |||||
| * | | | Fix status code for forbidden events | Brendan Abolivier | 2019-07-25 | 1 | -6/+6 |
| | | | | |||||
| * | | | Only check the join rule on room creation if an access rule is also provided | Brendan Abolivier | 2019-07-25 | 1 | -12/+12 |
| | | | | |||||
| * | | | Turns out the default preset is public_chat | Brendan Abolivier | 2019-07-24 | 1 | -5/+3 |
| | | | | |||||
| * | | | Implement restrictions on new events | Brendan Abolivier | 2019-07-24 | 1 | -1/+40 |
| | | | | |||||
| * | | | Implement restriction on public room creation | Brendan Abolivier | 2019-07-24 | 1 | -11/+30 |
| | | | | |||||
| * | | | Add test case | Brendan Abolivier | 2019-07-24 | 1 | -2/+106 |
| |/ / | |||||
* | | | Check room ID and type of redacted event (#5784) dinsic_2019-07-31 | Brendan Abolivier | 2019-07-31 | 1 | -17/+32 |
|\ \ \ | |/ / |/| | | Check room ID and type of redacted event | ||||
| * | | Ignore redactions of redactions in get_events_as_list | Brendan Abolivier | 2019-07-31 | 1 | -4/+1 |
| | | | |||||
| * | | Ignore invalid redactions in _get_event_from_row | Brendan Abolivier | 2019-07-31 | 1 | -0/+5 |
| | | | |||||
| * | | Should now work, unless we can't find the redaction event which happens for ↵ | Brendan Abolivier | 2019-07-30 | 1 | -18/+18 |
| | | | | | | | | | | | | some reason (need to investigate) | ||||
| * | | Don't make the checks depend on recheck_redaction | Brendan Abolivier | 2019-07-30 | 1 | -20/+23 |
| | | | |||||
| * | | Do checks sooner | Brendan Abolivier | 2019-07-29 | 1 | -21/+19 |
| | | | |||||
| * | | Check room ID and type of redacted event | Brendan Abolivier | 2019-07-29 | 1 | -10/+22 |
|/ / | |||||
| * | Implement per-room message retention policies | Brendan Abolivier | 2019-08-28 | 13 | -7/+1072 |
|/ | |||||
* | Merge pull request #5702 from matrix-org/babolivier/3pid-invite dinsic_2019-07-18 | Brendan Abolivier | 2019-07-18 | 2 | -1/+5 |
|\ | | | | | Fix check of the association between a 3PID invite and the subsequent m.room.member event in the 3rd party rules | ||||
| * | Fix changelog | Brendan Abolivier | 2019-07-17 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dinsic' into babolivier/3pid-invite | Brendan Abolivier | 2019-07-17 | 5 | -152/+59 |
| |\ | |/ |/| | |||||
* | | Merge pull request #5646 from matrix-org/babolivier/profile-allow-self dinsic_2019-07-09 | Brendan Abolivier | 2019-07-09 | 5 | -152/+59 |
|\ \ | | | | | | | Port #5644 to dinsic | ||||
| * | | make the base branch dinsic for dinsic dinsic_2019-06-27_1 | Amber H. Brown | 2019-07-09 | 1 | -4/+5 |
| | | | |||||
| * | | cut down circleci config to just what dinsic needs | Amber H. Brown | 2019-07-09 | 1 | -148/+2 |
| | | | |||||
| * | | Lint | Brendan Abolivier | 2019-07-09 | 1 | -2/+2 |
| | | | |||||
| * | | Add test case | Brendan Abolivier | 2019-07-09 | 1 | -0/+47 |
| | | | |||||
| * | | Changelog | Brendan Abolivier | 2019-07-09 | 1 | -0/+1 |
| | | | |||||
| * | | Allow newly-registered users to lookup their own profiles | Brendan Abolivier | 2019-07-09 | 1 | -0/+4 |
| | | | | | | | | | | | | 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. | ||||
| | * | Changelog | Brendan Abolivier | 2019-07-17 | 1 | -0/+1 |
| | | | |||||
| | * | There's no third_party_signed property in an invite's content | Brendan Abolivier | 2019-07-17 | 1 | -6/+3 |
| | | | |||||
| | * | Fix check of the association between a 3PID invite and the subsequent ↵ | Brendan Abolivier | 2019-07-17 | 1 | -1/+7 |
| |/ |/| | | | | | m.room.member event in the 3rd party rules | ||||
* | | Merge pull request #5610 from matrix-org/babolivier/power-levels dinsic_2019-07-04 | Brendan Abolivier | 2019-07-04 | 3 | -38/+173 |
|\ \ | | | | | | | Implement new restrictions on power levels | ||||
| * \ | Merge branch 'babolivier/power-levels' of github.com:matrix-org/synapse into ↵ | Brendan Abolivier | 2019-07-03 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | babolivier/power-levels | ||||
| | * | | Update synapse/third_party_rules/access_rules.py | Brendan Abolivier | 2019-07-03 | 1 | -0/+1 |
| | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | | | Incorporate review | Brendan Abolivier | 2019-07-03 | 1 | -6/+10 |
| |/ / | |||||
| * | | Incorporate review | Brendan Abolivier | 2019-07-03 | 1 | -8/+12 |
| | | | |||||
| * | | Changelog | Brendan Abolivier | 2019-07-03 | 1 | -0/+1 |
| | | | |||||
| * | | Change the rule for applying PL restrictions | Brendan Abolivier | 2019-07-03 | 1 | -3/+7 |
| | | | |||||
| * | | Add tests | Brendan Abolivier | 2019-07-03 | 1 | -4/+52 |
| | | | |||||
| * | | Default return value for events we're not interested in | Brendan Abolivier | 2019-07-03 | 1 | -0/+2 |
| | | | |||||
| * | | Refactor part of the access rules module | Brendan Abolivier | 2019-07-03 | 1 | -33/+47 |
| | | | | | | | | | | | | Since we're not processing only membership events and 3PID invites anymore, it's nice to know which function is supposed to process what. | ||||
| * | | Implement restrictions for power levels | Brendan Abolivier | 2019-07-03 | 1 | -0/+57 |
| | | | |||||
* | | | Merge pull request #5577 from matrix-org/babolivier/3pid-invite-ratelimit dinsic_2019-06-28 | Brendan Abolivier | 2019-06-28 | 2 | -0/+2 |
|\ \ \ | |/ / |/| | | Port #5576 to dinsic | ||||
| * | | Only ratelimit when sending the email | Brendan Abolivier | 2019-06-28 | 1 | -1/+2 |
| | | | | | | | | | | | | If we do the opposite, an event can arrive after or while sending the email and the 3PID invite event will get ratelimited. | ||||
| * | | Changelog | Brendan Abolivier | 2019-06-28 | 1 | -0/+1 |
| | | | |||||
| * | | Don't update the ratelimiter before sending a 3PID invite | Brendan Abolivier | 2019-06-28 | 1 | -1/+1 |
|/ / | | | | | | | 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. | ||||
* / | Add test case for #5574 | Brendan Abolivier | 2019-06-28 | 1 | -0/+108 |
|/ | | | | 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. | ||||
* | Merge pull request #5574 from matrix-org/babolivier/fix-3pid-bind dinsic_2019-06-27 | Brendan Abolivier | 2019-06-27 | 1 | -3/+8 |
|\ | | | | | Fix new 3PID bindings being associated with rewritten IS's server names instead of the original one | ||||
| * | Fix new 3PID bindings being associated with rewritten IS's server names ↵ | Brendan Abolivier | 2019-06-27 | 1 | -3/+8 |
| | | | | | | | | | | | | 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. | ||||
* | | Merge pull request #5542 from matrix-org/babolivier/federation-publicrooms dinsic_2019-06-24 | Brendan Abolivier | 2019-06-24 | 6 | -20/+49 |
|\ \ | | | | | | | Port "Split public rooms directory auth config in two" to dinsic | ||||
| * | | Split public rooms directory auth config in two | Brendan Abolivier | 2019-06-24 | 6 | -20/+49 |
|/ / | |||||
* | | Merge pull request #5495 from matrix-org/babolivier/deactivate_bg_job_typo dinsic_2019-06-19 | Brendan Abolivier | 2019-06-19 | 2 | -1/+2 |
|\ \ | | | | | | | Port "Fix typo in deactivation background job" to dinsic | ||||
| * | | Fix typo in deactivation background job | Brendan Abolivier | 2019-06-19 | 2 | -1/+2 |
| | | | |||||
* | | | Merge pull request #5484 from matrix-org/babolivier/dinsic_access_rules | Brendan Abolivier | 2019-06-19 | 3 | -0/+812 |
|\ \ \ | |/ / |/| | | Implement custom access rules | ||||
| * | | Add tests for constraints on changing the rule for a room | Brendan Abolivier | 2019-06-18 | 1 | -0/+60 |
| | | | |||||
| * | | Add tests for 3PID invites | Brendan Abolivier | 2019-06-18 | 1 | -12/+146 |
| | | | |||||
| * | | Don't process 3PIDs in _apply_restricted | Brendan Abolivier | 2019-06-18 | 1 | -1/+3 |
| | | | |||||
| * | | Remove unused import | Brendan Abolivier | 2019-06-18 | 1 | -1/+0 |
| | | | |||||
| * | | Add tests for inviting with access rules | Brendan Abolivier | 2019-06-18 | 1 | -2/+102 |
| | | | |||||
| * | | Lint | Brendan Abolivier | 2019-06-18 | 1 | -1/+0 |
| | | | |||||
| * | | Remove unused imports | Brendan Abolivier | 2019-06-18 | 1 | -3/+0 |
| | | | |||||
| * | | Lint | Brendan Abolivier | 2019-06-18 | 1 | -1/+1 |
| | | | |||||
| * | | Add tests for room creation hook | Brendan Abolivier | 2019-06-18 | 1 | -0/+136 |
| | | | |||||
| * | | Incorporate review | Brendan Abolivier | 2019-06-18 | 1 | -78/+69 |
| | | | |||||
| * | | Fixes | Brendan Abolivier | 2019-06-18 | 1 | -0/+5 |
| | | | |||||
| * | | Docstrings | Brendan Abolivier | 2019-06-17 | 1 | -27/+154 |
| | | | |||||
| * | | Rename into RoomAccessRules | Brendan Abolivier | 2019-06-17 | 2 | -1/+1 |
| | | | |||||
| * | | Fix function call | Brendan Abolivier | 2019-06-17 | 1 | -1/+1 |
| | | | |||||
| * | | Implement rules change | Brendan Abolivier | 2019-06-17 | 1 | -1/+40 |
| | | | |||||
| * | | Improve doc | Brendan Abolivier | 2019-06-17 | 1 | -3/+8 |
| | | | |||||
| * | | Implement 3PID invite hook | Brendan Abolivier | 2019-06-17 | 1 | -7/+49 |
| | | | |||||
| * | | Implement restricted rules and room creation hook | Brendan Abolivier | 2019-06-17 | 1 | -11/+43 |
| | | | |||||
| * | | Implement rules for direct | Brendan Abolivier | 2019-06-17 | 1 | -12/+100 |
| | | | |||||
| * | | Backbone | Brendan Abolivier | 2019-06-17 | 1 | -0/+11 |
| | | | |||||
| * | | Base | Brendan Abolivier | 2019-06-17 | 2 | -0/+45 |
|/ / | |||||
* | | Merge pull request #5481 from matrix-org/babolivier/third_party_rules_3pid | Brendan Abolivier | 2019-06-17 | 3 | -1/+43 |
|\ \ | | | | | | | Port "Add third party rules hook for 3PID invites" to dinsic | ||||
| * | | Make check_threepid_can_be_invited async | Brendan Abolivier | 2019-06-17 | 1 | -0/+1 |
| | | | |||||
| * | | Changelog | Brendan Abolivier | 2019-06-17 | 1 | -0/+1 |
| | | | |||||
| * | | Add third party rules hook for 3PID invites | Brendan Abolivier | 2019-06-17 | 2 | -1/+41 |
| | | | |||||
* | | | Merge pull request #5474 from matrix-org/erikj/add_create_room_hook | Erik Johnston | 2019-06-17 | 3 | -6/+38 |
|\ \ \ | | | | | | | | | Add third party rules hook into create room | ||||
| * | | | Newsfile | Erik Johnston | 2019-06-17 | 1 | -0/+1 |
| |/ / | |||||
| * / | Add third party rules hook into create room | Erik Johnston | 2019-06-17 | 2 | -6/+37 |
|/ / | |||||
* | | Merge pull request #5471 from matrix-org/erikj/3pid_remote_invite_state | Brendan Abolivier | 2019-06-17 | 3 | -7/+2 |
|\ \ | | | | | | | Port "Fix 3PID invite room state over federation" to dinsic | ||||
| * | | Newsfile | Erik Johnston | 2019-06-14 | 1 | -0/+1 |
| | | | |||||
| * | | Fix 3PID invite room state over federation. | Erik Johnston | 2019-06-14 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | Fixes that when a user exchanges a 3PID invite for a proper invite over federation it does not include the `invite_room_state` key. This was due to synapse incorrectly sending out two invite requests. | ||||
| * | | Change to absolute path for contrib/docker | Neil Johnson | 2019-06-13 | 1 | -1/+1 |
| | | | | | | | | | because this file is reproduced on dockerhub and relative paths don't work | ||||
* | | | Merge branch 'babolivier/third_party_event_rules' into dinsic | Brendan Abolivier | 2019-06-14 | 9 | -4/+282 |
|\ \ \ | |||||
| * | | | Add plugin APIs for implementations of custom event rules. | Brendan Abolivier | 2019-06-14 | 9 | -4/+284 |
| | | | | |||||
* | | | | Merge pull request #5466 from matrix-org/babolivier/fix_deactivation_bg_job | Brendan Abolivier | 2019-06-14 | 2 | -2/+6 |
|\ \ \ \ | | | | | | | | | | | Port "Fix background job for deactivated flag" to dinsic | ||||
| * | | | | Fix changelog | Brendan Abolivier | 2019-06-14 | 2 | -1/+2 |
| | | | | | |||||
| * | | | | Changelog | Brendan Abolivier | 2019-06-14 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fix background job for deactivated flag | Brendan Abolivier | 2019-06-14 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | Merge pull request #5463 from ↵ | Brendan Abolivier | 2019-06-14 | 6 | -27/+69 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_deactivated_accounts_2 Port "Don't send renewal emails to deactivated users" to dinsic | ||||
| * | | | | Fix test | Brendan Abolivier | 2019-06-14 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Don't send renewal emails to deactivated users | Brendan Abolivier | 2019-06-14 | 6 | -27/+68 |
|/ / / / | |||||
* | | | | Track deactivated accounts in the database (#5378) | Brendan Abolivier | 2019-06-14 | 5 | -0/+183 |
| | | | | |||||
* | | | | Merge pull request #5420 from matrix-org/babolivier/userdir_hide_users | Brendan Abolivier | 2019-06-14 | 5 | -0/+78 |
|\ \ \ \ | | | | | | | | | | | Add configuration option to hide new users from the user directory | ||||
| * \ \ \ | Merge branch 'dinsic' into babolivier/userdir_hide_users | Brendan Abolivier | 2019-06-14 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Make index unique | Brendan Abolivier | 2019-06-14 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #5416 from matrix-org/babolivier/fix_profile_replication | Brendan Abolivier | 2019-06-13 | 5 | -3/+32 |
|\ \ \ \ \ | | | | | | | | | | | | | Add unique index to the profile_replication_status table. | ||||
| | * \ \ \ | Merge branch 'babolivier/fix_profile_replication' into ↵ | Brendan Abolivier | 2019-06-13 | 2 | -2/+15 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | babolivier/userdir_hide_users | ||||
| * | | | | | Lint | Brendan Abolivier | 2019-06-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix snafu | Brendan Abolivier | 2019-06-13 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Create the index in a background update | Brendan Abolivier | 2019-06-13 | 2 | -3/+15 |
| | | | | | | |||||
| * | | | | | Fix bogus changelog | Brendan Abolivier | 2019-06-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Lint | Brendan Abolivier | 2019-06-12 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'dinsic' into babolivier/fix_profile_replication | Brendan Abolivier | 2019-06-12 | 187 | -1929/+11277 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | Fix bogus changelog | Brendan Abolivier | 2019-06-12 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Lint | Brendan Abolivier | 2019-06-12 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Merge branch 'dinsic' into babolivier/userdir_hide_users | Brendan Abolivier | 2019-06-12 | 188 | -1929/+11277 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Regenerate full schemas | Brendan Abolivier | 2019-06-12 | 2 | -2/+17 |
| | | | | | | |||||
* | | | | | | Fix path for password policy endpoints | Brendan Abolivier | 2019-06-12 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into dinsic | Brendan Abolivier | 2019-06-12 | 151 | -1604/+8497 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | 1.0.0 v1.0.0 | Erik Johnston | 2019-06-11 | 6 | -4/+28 |
| | | | | | | |||||
| * | | | | | Merge pull request #5424 from matrix-org/erikj/change_password_reset_links | Erik Johnston | 2019-06-11 | 12 | -32/+262 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Change password reset links to /_matrix. | ||||
| | * | | | | | Bump bleach version so that tests can run on old deps. | Erik Johnston | 2019-06-11 | 5 | -25/+1 |
| | | | | | | | |||||
| | * | | | | | Newsfile | Erik Johnston | 2019-06-11 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Change password reset links to /_matrix. | Erik Johnston | 2019-06-11 | 6 | -7/+260 |
| | | |_|/ / | | |/| | | | |||||
| * / | | | | Neilj/improve federation docs (#5419) | Neil Johnson | 2019-06-11 | 4 | -16/+106 |
| |/ / / / | | | | | | | | | | | | | | | | Add FAQ questions to federate.md. Add a health warning making it clear that the 1711 upgrade FAQ is now out of date. | ||||
| * | | | | 1.0.0rc3 v1.0.0rc3 | Erik Johnston | 2019-06-11 | 2 | -1/+7 |
| | | | | | |||||
| * | | | | Fix defaults on checking threepids | Erik Johnston | 2019-06-10 | 2 | -1/+2 |
| | | | | | |||||
| * | | | | Merge pull request #5418 from matrix-org/erikj/fix_send_fed_with_limit_zero | Erik Johnston | 2019-06-10 | 2 | -0/+5 |
| |\ \ \ \ | | | | | | | | | | | | | Fix bug sending federation transactions with lots of EDUs | ||||
| | * | | | | Update changelog.d/5418.bugfix | Erik Johnston | 2019-06-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| | * | | | | Newsfile | Erik Johnston | 2019-06-10 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Fix bug sending federation transactions with lots of EDUs | Erik Johnston | 2019-06-10 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we try and send a transaction with lots of EDUs and we run out of space, we call get_new_device_msgs_for_remote with a limit of 0, which then failed. | ||||
| * | | | | | 1.0.0rc2 v1.0.0rc2 | Erik Johnston | 2019-06-10 | 5 | -4/+12 |
| | | | | | | |||||
| * | | | | | Merge pull request #5417 from matrix-org/rav/shared_ssl_context | Erik Johnston | 2019-06-10 | 10 | -182/+455 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Share an SSL context object between SSL connections | ||||
| | * | | | | fix ci on py2, again | Richard van der Hoff | 2019-06-10 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | rename gutwrenched attr | Richard van der Hoff | 2019-06-10 | 1 | -5/+9 |
| | | | | | | |||||
| | * | | | | fix CI on python 2.7 | Richard van der Hoff | 2019-06-10 | 1 | -6/+4 |
| | | | | | | |||||
| | * | | | | fix build fails | Richard van der Hoff | 2019-06-10 | 2 | -1/+4 |
| | | | | | | |||||
| | * | | | | Tests for SSL certs for federation connections | Richard van der Hoff | 2019-06-10 | 6 | -106/+343 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add some tests for bad certificates for federation and .well-known connections | ||||
| | * | | | | Fix federation connections to literal IP addresses | Richard van der Hoff | 2019-06-10 | 2 | -6/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turns out we need a shiny version of service_identity to enforce this correctly. | ||||
| | * | | | | clean up impl, and import idna directly | Richard van der Hoff | 2019-06-10 | 2 | -15/+12 |
| | | | | | | |||||
| | * | | | | Share an SSL context object between SSL connections | Richard van der Hoff | 2019-06-09 | 1 | -60/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | This involves changing how the info callbacks work. | ||||
| * | | | | | Merge branch 'erikj/fix_null_valid_until_ms' of ↵ | Erik Johnston | 2019-06-10 | 3 | -1/+58 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into release-v1.0.0 | ||||
| | * | | | | | Newsfile | Erik Johnston | 2019-06-10 | 1 | -0/+1 |
| | | | | | | |