Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Remove unused methods from c/s api v1 in register.py (#5963) | Andrew Morgan | 2019-09-02 | 1 | -104/+0 | |
| | | | | | | | | | | | | | | | | | | These methods were part of the v1 C/S API. Remove them as they are no longer used by any code paths. | |||||
* | | | | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2020-02-24 | 10 | -19/+21 | |
|\| | | | | | ||||||
| * | | | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 10 | -19/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :) | |||||
| * | | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937) | Andrew Morgan | 2019-08-30 | 2 | -132/+9 | |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | This reverts commit 71fc04069a5770a204c3514e0237d7374df257a8. This broke 3PID invites as #5892 was required for it to work correctly. | |||||
* | | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" | Andrew Morgan | 2020-02-24 | 2 | -256/+176 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 978f263e7c5d1eb440efaf07abc5009408ade25d, reversing changes made to 4f6ee99818d9c338944a10585d0aea4c7349d456. | |||||
* | | | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Andrew Morgan | 2020-02-24 | 1 | -1/+4 | |
|\| | | | | ||||||
| * | | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Will Hunt | 2019-08-28 | 1 | -1/+4 | |
| |\ \ \ \ | | | | | | | | | | | | | Exempt support users from consent | |||||
| | * | | | | Apply suggestions from code review | Will Hunt | 2019-08-23 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org> | |||||
| | * | | | | Exempt bot users | Half-Shot | 2019-08-23 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Return user_type in get_user_by_id | Half-Shot | 2019-08-23 | 1 | -1/+4 | |
| | | | | | | ||||||
* | | | | | | Use the v2 lookup API for 3PID invites (#5897) | Andrew Morgan | 2020-02-24 | 2 | -176/+256 | |
|\| | | | | | ||||||
| * | | | | | Use the v2 lookup API for 3PID invites (#5897) | Andrew Morgan | 2019-08-28 | 2 | -9/+132 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/5861 Adds support for the v2 lookup API as defined in [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134). Currently this is only used for 3PID invites. Sytest PR: https://github.com/matrix-org/sytest/pull/679 | |||||
* | | | | | | Implement a structured logging output system. (#5680) | Andrew Morgan | 2020-02-21 | 1 | -2/+3 | |
|\| | | | | | ||||||
| * | | | | | Implement a structured logging output system. (#5680) | Amber Brown | 2019-08-28 | 1 | -2/+3 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | Andrew Morgan | 2020-02-21 | 1 | -0/+9 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | reivilibre | 2019-08-28 | 1 | -0/+9 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add GET method to admin API /users/@user:dom/admin | |||||
| | * | | | | | Add GET method to admin API /users/@user:dom/admin | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | |||||
* | | | | | | | Merge pull request #5859 from matrix-org/rei/msc2197 | Andrew Morgan | 2020-02-21 | 1 | -1/+28 | |
|\| | | | | | | ||||||
| * | | | | | | Merge pull request #5859 from matrix-org/rei/msc2197 | reivilibre | 2019-08-28 | 1 | -1/+28 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | MSC2197 Search Filters over Federation | |||||
| | * | | | | | | Support MSC2197 outbound with unstable prefix | Olivier Wilkinson (reivilibre) | 2019-08-15 | 1 | -1/+28 | |
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | |||||
* | | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limit | Andrew Morgan | 2020-02-21 | 1 | -1/+1 | |
|\| | | | | | | ||||||
| * | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limit | Richard van der Hoff | 2019-08-27 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Increase profile display name limit | |||||
| | * | | | | | Increase max display name limit | Neil Johnson | 2019-08-24 | 1 | -1/+1 | |
| | | |/ / / | | |/| | | | ||||||
* | | | | | | Add Admin API capability to set adminship of a user (#5878) | Andrew Morgan | 2020-02-21 | 1 | -0/+10 | |
|\| | | | | | ||||||
| * | | | | | Add Admin API capability to set adminship of a user (#5878) | reivilibre | 2019-08-27 | 1 | -0/+10 | |
| |/ / / / | | | | | | | | | | | Admin API: Set adminship of a user | |||||
* | | | | | Propagate opentracing contexts through EDUs (#5852) | Andrew Morgan | 2020-02-21 | 1 | -6/+21 | |
|\| | | | | ||||||
| * | | | | Propagate opentracing contexts through EDUs (#5852) | Jorik Schellekens | 2019-08-22 | 1 | -6/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Propagate opentracing contexts through EDUs Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | |||||
| * | | | | Revert "Add "require_consent" parameter for registration" | Brendan Abolivier | 2019-08-22 | 1 | -12/+2 | |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 3320aaab3a9bba3f5872371aba7053b41af9d0a0. | |||||
| * | | | | Add "require_consent" parameter for registration | Half-Shot | 2019-08-22 | 1 | -2/+12 | |
| | | | | | ||||||
* | | | | | Opentrace e2e keys (#5855) | Andrew Morgan | 2020-02-21 | 2 | -3/+77 | |
|\| | | | | ||||||
| * | | | | Opentrace e2e keys (#5855) | Jorik Schellekens | 2019-08-22 | 2 | -3/+77 | |
| | | | | | | | | | | | | | | | Add opentracing tags and logs for e2e keys | |||||
* | | | | | Servlet to purge old rooms (#5845) | Andrew Morgan | 2020-02-21 | 1 | -0/+17 | |
|\| | | | | ||||||
| * | | | | Servlet to purge old rooms (#5845) | Richard van der Hoff | 2019-08-22 | 1 | -0/+17 | |
| | | | | | ||||||
* | | | | | Merge pull request #5860 from matrix-org/erikj/update_5704_comments | Andrew Morgan | 2020-02-21 | 1 | -17/+5 | |
|\| | | | | ||||||
| * | | | | Merge pull request #5860 from matrix-org/erikj/update_5704_comments | Erik Johnston | 2019-08-19 | 1 | -17/+5 | |
| |\ \ \ \ | | | | | | | | | | | | | Remove logging for #5407 and update comments | |||||
| | * | | | | Remove logging for #5407 and update comments | Erik Johnston | 2019-08-15 | 1 | -17/+5 | |
| | |/ / / | ||||||
* | | | | | Don't create broken room when power_level_content_override.users does not ↵ | Andrew Morgan | 2020-02-20 | 1 | -1/+13 | |
|\| | | | | | | | | | | | | | | | | | | | contain creator_id. (#5633) | |||||
| * | | | | Don't create broken room when power_level_content_override.users does not ↵ | Michael Telatynski | 2019-08-15 | 1 | -1/+13 | |
| |/ / / | | | | | | | | | | | | | contain creator_id. (#5633) | |||||
* | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_sync | Andrew Morgan | 2020-02-20 | 1 | -6/+37 | |
|\| | | | ||||||
| * | | | Handle TimelineBatch being limited and empty. | Erik Johnston | 2019-08-06 | 1 | -6/+37 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This hopefully addresses #5407 by gracefully handling an empty but limited TimelineBatch. We also add some logging to figure out how this is happening. | |||||
| * | | | Account validity: allow defining HTML templates to serve the us… (#5807) | Brendan Abolivier | 2019-08-01 | 1 | -1/+9 | |
| |\ \ \ | | | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt | |||||
| | * | | | Allow defining HTML templates to serve the user on account renewal | Brendan Abolivier | 2019-08-01 | 1 | -1/+9 | |
| | | |/ | | |/| | ||||||
* | | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_room | Andrew Morgan | 2020-02-20 | 1 | -1/+3 | |
|\| | | | ||||||
| * | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_room | Erik Johnston | 2019-08-01 | 1 | -1/+3 | |
| |\ \ \ | | | | | | | | | | | Deny redaction of events in a different room. | |||||
| | * | | | Deny redaction of events in a different room. | Erik Johnston | 2019-07-31 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | We already correctly filter out such redactions, but we should also deny them over the CS API. | |||||
* | | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errors | Andrew Morgan | 2020-02-20 | 2 | -32/+60 | |
|\| | | | | ||||||
| * | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errors | Erik Johnston | 2019-08-01 | 2 | -32/+60 | |
| |\ \ \ \ | | |/ / / | |/| | | | Handle RequestSendFailed exception correctly in more places. | |||||
| | * | | | Don't log as exception when failing durig backfill | Erik Johnston | 2019-07-30 | 1 | -0/+3 | |
| | | | | | ||||||
| | * | | | Correctly handle errors doing requests to group servers | Erik Johnston | 2019-07-29 | 1 | -32/+57 | |
| | | | | | ||||||
* | | | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686) | Andrew Morgan | 2020-02-20 | 1 | -1/+0 | |
|\| | | | | ||||||
| * | | | | Remove duplicate return statement | Andrew Morgan | 2019-07-31 | 1 | -1/+0 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keys | Andrew Morgan | 2020-02-20 | 1 | -4/+3 | |
|\| | | | ||||||
| * | | | Unwrap error | Erik Johnston | 2019-07-30 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Fix error handling when fetching remote device keys | Erik Johnston | 2019-07-30 | 1 | -3/+1 | |
| | | | | ||||||
* | | | | Remove non-functional 'expire_access_token' setting (#5782) | Andrew Morgan | 2020-02-20 | 1 | -1/+1 | |
|\| | | | ||||||
| * | | | Remove non-functional 'expire_access_token' setting (#5782) | Richard van der Hoff | 2019-07-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `expire_access_token` didn't do what it sounded like it should do. What it actually did was make Synapse enforce the 'time' caveat on macaroons used as access tokens, but since our access token macaroons never contained such a caveat, it was always a no-op. (The code to add 'time' caveats was removed back in v0.18.5, in #1656) | |||||
* | | | | Room Complexity Client Implementation (#5783) | Andrew Morgan | 2020-02-20 | 2 | -4/+105 | |
|\| | | | ||||||
| * | | | Room Complexity Client Implementation (#5783) | Amber Brown | 2019-07-30 | 2 | -4/+105 | |
| |/ / | ||||||
* | | | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqlite | Andrew Morgan | 2020-02-20 | 2 | -2/+2 | |
|\| | | ||||||
| * | | Move some timeout checking logs to DEBUG #5785 | Amber Brown | 2019-07-30 | 2 | -2/+2 | |
| | | | ||||||
* | | | Update the device list cache when keys/query is called (#5693) | Andrew Morgan | 2020-02-20 | 2 | -82/+136 | |
|\| | | ||||||
| * | | Update the device list cache when keys/query is called (#5693) | Jorik Schellekens | 2019-07-29 | 2 | -74/+136 | |
| | | | ||||||
| * | | Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatch | Richard van der Hoff | 2019-07-26 | 1 | -2/+35 | |
| |\ \ | | | | | | | | | Log when we receive a /make_* request from a different origin | |||||
* | \ \ | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1 | Andrew Morgan | 2020-02-19 | 1 | -2/+35 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1 | Richard van der Hoff | 2019-07-26 | 1 | -2/+35 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | Log when we receive a /make_* request from a different origin | Richard van der Hoff | 2019-07-26 | 1 | -2/+35 | |
| | | |/ | | |/| | ||||||
| * / | | Log when we receive receipt from a different origin | Erik Johnston | 2019-07-26 | 1 | -13/+22 | |
| |/ / | ||||||
* | | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch | Andrew Morgan | 2020-02-19 | 1 | -13/+22 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch | Erik Johnston | 2019-07-24 | 1 | -13/+22 | |
| |\ \ | | | | | | | | | Log when we receive receipt from a different origin | |||||
| | * | | Log when we receive receipt from a different origin | Erik Johnston | 2019-07-23 | 1 | -13/+22 | |
| | |/ | ||||||
* | | | Stop trying to fetch events with event_id=None. (#5753) | Andrew Morgan | 2020-02-19 | 1 | -1/+7 | |
|\| | | ||||||
| * | | Stop trying to fetch events with event_id=None. (#5753) | Richard van der Hoff | 2019-07-24 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | `None` is not a valid event id, so queuing up a database fetch for it seems like a silly thing to do. I considered making `get_event` return `None` if `event_id is None`, but then its interaction with `allow_none` seemed uninituitive, and strong typing ftw. | |||||
* | | | Replace returnValue with return (#5736) | Andrew Morgan | 2020-02-19 | 32 | -364/+330 | |
|\| | | ||||||
| * | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 32 | -364/+330 | |
| |/ | ||||||
* | | Ignore redactions of m.room.create events (#5701) | Andrew Morgan | 2020-02-19 | 1 | -9/+24 | |
|\| | ||||||
| * | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 1 | -9/+24 | |
| | | ||||||
* | | Return a different error from Invalid Password when a user is deactivated ↵ | Andrew Morgan | 2020-02-17 | 1 | -0/+9 | |
|\| | | | | | | | (#5674) | |||||
| * | Return a different error from Invalid Password when a user is deactivated ↵ | Andrew Morgan | 2019-07-15 | 1 | -0/+9 | |
| | | | | | | | | | | (#5674) Return `This account has been deactivated` instead of `Invalid password` when a user is deactivated. | |||||
* | | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data | Andrew Morgan | 2020-02-17 | 1 | -0/+183 | |
|\| | ||||||
| * | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data | Erik Johnston | 2019-07-15 | 1 | -0/+183 | |
| |\ | | | | | | | Add basic function to get all data for a user out of synapse | |||||
| | * | pep8 | Erik Johnston | 2019-07-05 | 1 | -4/+0 | |
| | | | ||||||
| | * | Remove FileExfiltrationWriter | Erik Johnston | 2019-07-05 | 1 | -63/+0 | |
| | | | ||||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-07-05 | 13 | -36/+168 | |
| | |\ | | | | | | | | | | | | | erikj/admin_exfiltrate_data | |||||
| | * | | Assume key existence. Update docstrings | Erik Johnston | 2019-07-05 | 1 | -3/+1 | |
| | | | | ||||||
| | * | | Fixup from review comments. | Erik Johnston | 2019-07-04 | 1 | -17/+22 | |
| | | | | ||||||
| | * | | Apply comment fixups from code review | Erik Johnston | 2019-07-03 | 1 | -6/+6 | |
| | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | |||||
| | * | | Add basic function to get all data for a user out of synapse | Erik Johnston | 2019-07-02 | 1 | -0/+247 | |
| | | | | ||||||
* | | | | Implement access token expiry (#5660) | Andrew Morgan | 2020-02-17 | 2 | -14/+38 | |
|\| | | | ||||||
| * | | | Implement access token expiry (#5660) | Richard van der Hoff | 2019-07-12 | 2 | -14/+38 | |
| | | | | | | | | | | | | | | | | Record how long an access token is valid for, and raise a soft-logout once it expires. | |||||
* | | | | Inline issue_access_token (#5659) | Andrew Morgan | 2020-02-17 | 1 | -7/+3 | |
|\| | | | ||||||
| * | | | Inline issue_access_token (#5659) | Richard van der Hoff | 2019-07-11 | 1 | -7/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is only used in one place, so it's clearer if we inline it and reduce the API surface. Also, fixes a buglet where we would create an access token even if we were about to block the user (we would never return the AT, so the user could never use it, but it was still created and added to the db.) | |||||
* | | | | Merge pull request #5658 from matrix-org/babolivier/is-json | Andrew Morgan | 2020-02-17 | 1 | -1/+1 | |
|\| | | | ||||||
| * | | | Merge pull request #5658 from matrix-org/babolivier/is-json | Brendan Abolivier | 2019-07-10 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Send 3PID bind requests as JSON data | |||||
| | * | | | Typo | Brendan Abolivier | 2019-07-10 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Send 3PID bind requests as JSON data | Brendan Abolivier | 2019-07-10 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Remove access-token support from RegistrationStore.register (#5642) | Andrew Morgan | 2020-02-17 | 1 | -1/+1 | |
|\| | | | | ||||||
| * | | | | Remove access-token support from RegistrationStore.register (#5642) | Richard van der Hoff | 2019-07-10 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | | | | | | | | The 'token' param is no longer used anywhere except the tests, so let's kill that off too. | |||||
* | | | | Merge pull request #5638 from matrix-org/babolivier/invite-json | Andrew Morgan | 2020-02-17 | 1 | -4/+24 | |
|\| | | | ||||||
| * | | | Merge pull request #5638 from matrix-org/babolivier/invite-json | Brendan Abolivier | 2019-07-09 | 1 | -4/+18 | |
| |\ \ \ | | | | | | | | | | | Use JSON when querying the IS's /store-invite endpoint | |||||
| | * \ \ | Merge branch 'develop' into babolivier/invite-json | Brendan Abolivier | 2019-07-08 | 18 | -196/+251 | |
| | |\ \ \ | ||||||
| | * | | | | Lint | Brendan Abolivier | 2019-07-08 | 1 | -1/+2 | |
| | | | | | | ||||||
| | * | | | | Use application/json when querying the IS's /store-invite endpoint | Brendan Abolivier | 2019-07-08 | 1 | -4/+17 | |
| | | | | | | ||||||
* | | | | | | remove unused and unnecessary check for FederationDeniedError (#5645) | Andrew Morgan | 2020-02-17 | 1 | -4/+1 | |
|\| | | | | | ||||||
| * | | | | | remove unused and unnecessary check for FederationDeniedError (#5645) | Hubert Chathi | 2019-07-09 | 1 | -4/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FederationDeniedError is a subclass of SynapseError, which is a subclass of CodeMessageException, so if e is a FederationDeniedError, then this check for FederationDeniedError will never be reached since it will be caught by the check for CodeMessageException above. The check for CodeMessageException does almost the same thing as this check (since FederationDeniedError initialises with code=403 and msg="Federation denied with %s."), so may as well just keep allowing it to handle this case. | |||||
* | | | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-self | Andrew Morgan | 2020-02-17 | 1 | -0/+4 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-self | Brendan Abolivier | 2019-07-09 | 1 | -0/+4 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Allow newly-registered users to lookup their own profiles | |||||
| | * | | | | | Allow newly-registered users to lookup their own profiles | Brendan Abolivier | 2019-07-08 | 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. | |||||
* | | | | | | Remove access-token support from RegistrationHandler.register (#5641) | Andrew Morgan | 2020-02-17 | 1 | -24/+3 | |
|\| | | | | | ||||||
| * | | | | | Remove access-token support from RegistrationHandler.register (#5641) | Richard van der Hoff | 2019-07-08 | 1 | -24/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing uses this now, so we can remove the dead code, and clean up the API. Since we're changing the shape of the return value anyway, we take the opportunity to give the method a better name. | |||||
* | | | | | | Better logging for auto-join. (#5643) | Andrew Morgan | 2020-02-17 | 1 | -0/+7 | |
|\| | | | | | ||||||
| * | | | | | Better logging for auto-join. (#5643) | Richard van der Hoff | 2019-07-08 | 1 | -0/+7 | |
| |/ / / / | | | | | | | | | | | It was pretty unclear what was going on, so I've added a couple of log lines. | |||||
| * | | | | Move get_or_create_user to test code (#5628) | Richard van der Hoff | 2019-07-08 | 1 | -51/+0 | |
| | | | | | | | | | | | | | | | This is only used in tests, so... | |||||
* | | | | | Remove support for invite_3pid_guest. (#5625) | Andrew Morgan | 2020-02-17 | 3 | -81/+0 | |
|\| | | | | ||||||
| * | | | | Remove support for invite_3pid_guest. (#5625) | Richard van der Hoff | 2019-07-05 | 3 | -81/+0 | |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has never been documented, and I'm not sure it's ever been used outside sytest. It's quite a lot of poorly-maintained code, so I'd like to get rid of it. For now I haven't removed the database table; I suggest we leave that for a future clearout. | |||||
* | | | | Fix with isort==4.3.21 and black==19.3b0 | Andrew Morgan | 2020-02-14 | 3 | -6/+5 | |
| | | | | ||||||
* | | | | Delete duplicate user deactivation | Andrew Morgan | 2020-02-14 | 1 | -7/+0 | |
| | | | | ||||||
* | | | | Fix incorrect run_in_background import statement | Andrew Morgan | 2020-02-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Andrew Morgan | 2020-02-14 | 12 | -35/+36 | |
|\| | | | ||||||
| * | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 12 | -35/+36 | |
| | | | | ||||||
* | | | | Fix a number of "Starting txn from sentinel context" warnings (#5605) | Andrew Morgan | 2020-02-14 | 1 | -1/+9 | |
|\| | | | ||||||
| * | | | Fix a number of "Starting txn from sentinel context" warnings (#5605) | Richard van der Hoff | 2019-07-03 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | Fixes #5602, #5603 | |||||
* | | | | Complete the SAML2 implementation (#5422) | Andrew Morgan | 2020-02-14 | 1 | -0/+123 | |
|\| | | | ||||||
| * | | | Complete the SAML2 implementation (#5422) | Richard van der Hoff | 2019-07-02 | 1 | -0/+123 | |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * SAML2 Improvements and redirect stuff Signed-off-by: Alexander Trost <galexrt@googlemail.com> * Code cleanups and simplifications. Also: share the saml client between redirect and response handlers. * changelog * Revert redundant changes to static js * Move all the saml stuff out to a centralised handler * Add support for tracking SAML2 sessions. This allows us to correctly handle `allow_unsolicited: False`. * update sample config * cleanups * update sample config * rename BaseSSORedirectServlet for consistency * Address review comments | |||||
| | * | | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-07-01 | 5 | -26/+64 | |
| | |\ \ | ||||||
| | * | | | Address review comments | Richard van der Hoff | 2019-07-01 | 1 | -5/+7 | |
| | | | | | ||||||
| | * | | | cleanups | Richard van der Hoff | 2019-06-27 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Add support for tracking SAML2 sessions. | Richard van der Hoff | 2019-06-26 | 1 | -2/+37 | |
| | | | | | | | | | | | | | | | | | | | | This allows us to correctly handle `allow_unsolicited: False`. | |||||
| | * | | | Move all the saml stuff out to a centralised handler | Richard van der Hoff | 2019-06-26 | 1 | -0/+86 | |
| | | |/ | | |/| | ||||||
* | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop | Andrew Morgan | 2020-02-14 | 1 | -2/+19 | |
|\| | | | ||||||
| * | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop | Erik Johnston | 2019-07-01 | 1 | -2/+19 | |
| |\ \ \ | | |_|/ | |/| | | Fix sync tightloop bug. | |||||
| | * | | Fixup comment | Erik Johnston | 2019-07-01 | 1 | -6/+13 | |
| | | | | ||||||
| | * | | Fix sync tightloop bug. | Erik Johnston | 2019-06-21 | 1 | -2/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If, for some reason, presence updates take a while to persist then it can trigger clients to tightloop calling `/sync` due to the presence handler returning updates but not advancing the stream token. Fixes #5503. | |||||
| * | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit | Brendan Abolivier | 2019-06-28 | 1 | -0/+1 | |
| |\ \ \ | | | | | | | | | | | Don't update the ratelimiter before sending a 3PID invite | |||||
| | * | | | 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. | |||||
| | * | | | 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. | |||||
* | | | | Added possibilty to disable local password authentication (#5092) | Andrew Morgan | 2020-02-14 | 2 | -1/+4 | |
|\| | | | ||||||
| * | | | Added possibilty to disable local password authentication (#5092) | Daniel Hoffend | 2019-06-27 | 2 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Hoffend <dh@dotlan.net> | |||||
* | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devices | Andrew Morgan | 2020-02-14 | 2 | -25/+59 | |
|\| | | | ||||||
| * | | | Review comments | Erik Johnston | 2019-06-27 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | Refactor and comment sync device list code | Erik Johnston | 2019-06-26 | 1 | -17/+53 | |
| | | | | ||||||
| * | | | Rename get_users_whose_devices_changed | Erik Johnston | 2019-06-26 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | Refactor get_user_ids_changed to pull less from DB | Erik Johnston | 2019-06-26 | 2 | -18/+16 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a client asks for users whose devices have changed since a token we used to pull *all* users from the database since the token, which could easily be thousands of rows for old tokens. This PR changes this to only check for changes for users the client is actually interested in. Fixes #5553 | |||||
* | | | Prevent multiple upgrades on the same room at once (#5051) | Andrew Morgan | 2020-02-14 | 1 | -51/+89 | |
|\| | | ||||||
| * | | Prevent multiple upgrades on the same room at once (#5051) | Andrew Morgan | 2019-06-25 | 1 | -51/+89 | |
| | | | | | | | | | | | | | | | | | | | | | Closes #4583 Does slightly less than #5045, which prevented a room from being upgraded multiple times, one after another. This PR still allows that, but just prevents two from happening at the same time. Mostly just to mitigate the fact that servers are slow and it can take a moment for the room upgrade to actually complete. We don't want people sending another request to upgrade the room when really they just thought the first didn't go through. | |||||
* | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_token | Andrew Morgan | 2020-02-13 | 1 | -3/+1 | |
|\| | | ||||||
| * | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_token | Erik Johnston | 2019-06-24 | 1 | -3/+1 | |
| |\ \ | | | | | | | | | Fix /messages on workers when no from param specified. | |||||
| | * | | Fix /messages on workers when no from param specified. | Erik Johnston | 2019-06-24 | 1 | -3/+1 | |
| | |/ | | | | | | | | | | | | | | | | | | | If no `from` param is specified we calculate and use the "current token" that inlcuded typing, presence, etc. These are unused during pagination and are not available on workers, so we simply don't calculate them. | |||||
* | | | Merge pull request #5516 from matrix-org/rav/acme_key_path | Andrew Morgan | 2020-02-13 | 2 | -5/+38 | |
|\| | | ||||||
| * | | Allow configuration of the path used for ACME account keys. | Richard van der Hoff | 2019-06-24 | 2 | -5/+38 | |
| | | | | | | | | | | | | | | | Because sticking it in the same place as the config isn't necessarily the right thing to do. | |||||
* | | | Factor acme bits out to a separate file (#5521) | Andrew Morgan | 2020-02-13 | 2 | -53/+93 | |
|\| | | ||||||
| * | | Factor acme bits out to a separate file (#5521) | Richard van der Hoff | 2019-06-24 | 2 | -53/+93 | |
| |/ | | | | | This makes some of the conditional-import hoop-jumping easier. | |||||
* | | Run Black. (#5482) | Andrew Morgan | 2020-02-13 | 3 | -7/+3 | |
|\| | ||||||
| * | Run Black. (#5482) | Amber Brown | 2019-06-20 | 35 | -2765/+2187 | |
| | | ||||||
| * | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error | Erik Johnston | 2019-06-19 | 1 | -9/+19 | |
| |\ | | | | | | | Handle the case of `get_missing_events` failing | |||||
* | | | Dinsic Blacking with black==18.6b2 | Andrew Morgan | 2020-02-11 | 36 | -2867/+2296 | |
| | | | ||||||
* | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events | Andrew Morgan | 2020-02-10 | 1 | -2/+5 | |
|\| | | ||||||
| * | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events | Erik Johnston | 2019-06-19 | 1 | -1/+74 | |
| |\ \ | | | | | | | | | Add experimental option to reduce extremities. | |||||
| | * | | Run as background process and fix comments | Erik Johnston | 2019-06-19 | 1 | -2/+5 | |
| | | | | ||||||
* | | | | Add some logging to 3pid invite sig verification (#5015) | Andrew Morgan | 2020-02-10 | 1 | -8/+38 | |
|\| | | | ||||||
| * | | | Add some logging to 3pid invite sig verification (#5015) | David Baker | 2019-06-18 | 1 | -8/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had to add quite a lot of logging to diagnose a problem with 3pid invites - we only logged the one failure which isn't all that informative. NB. I'm not convinced the logic of this loop is right: I think it should just accept a single valid signature from a trusted source rather than fail if *any* signature is invalid. Also it should probably not skip the rest of middle loop if a check fails? However, I'm deliberately not changing the logic here. | |||||
* | | | | Fix logline | Andrew Morgan | 2020-02-10 | 1 | -1/+1 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Fix logline | Erik Johnston | 2019-06-18 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2020-02-10 | 1 | -9/+19 | |
|\| | | | | | | | | | | | | | | | erikj/fix_get_missing_events_error | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-06-18 | 20 | -323/+1372 | |
| |\| | | | | | | | | | | | | | | erikj/fix_get_missing_events_error | |||||
| * | | | Handle the case of `get_missing_events` failing | Erik Johnston | 2019-04-10 | 1 | -9/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a call to `/get_missing_events` fails we log an exception and stop processing the top level event we received over federation. Instead let's try and handle it sensibly given it is a somewhat expected failure mode. | |||||
* | | | | Add experimental option to reduce extremities. | Andrew Morgan | 2020-02-10 | 1 | -1/+71 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Add experimental option to reduce extremities. | Erik Johnston | 2019-06-18 | 1 | -1/+71 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL. | |||||
* | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pid | Andrew Morgan | 2020-02-10 | 1 | -0/+9 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Add third party rules hook for 3PID invites | Brendan Abolivier | 2019-06-17 | 1 | -0/+10 | |
| | | | | ||||||
| * | | | Add third party rules hook into create room | Erik Johnston | 2019-06-17 | 1 | -1/+24 | |
| |/ / | ||||||
* | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions | Andrew Morgan | 2020-02-10 | 2 | -16/+17 | |
|\| | | ||||||
| * | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions | Erik Johnston | 2019-06-17 | 2 | -16/+17 | |
| |\ \ | | | | | | | | | Handle HttpResponseException when using federation client. | |||||
| | * | | Handle HttpResponseException when using federation client. | Erik Johnston | 2019-06-07 | 2 | -16/+17 | |
| | | | | | | | | | | | | | | | | Otherwise we just log exceptions everywhere. | |||||
| * | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state | Erik Johnston | 2019-06-17 | 1 | -6/+0 | |
| |\ \ \ | | | | | | | | | | | Fix 3PID invite room state over federation. | |||||
| * \ \ \ | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules | Brendan Abolivier | 2019-06-14 | 2 | -4/+78 | |
| |\ \ \ \ | | | | | | | | | | | | | Allow server admins to define implementations of extra rules for allowing or denying incoming events | |||||
* | \ \ \ \ | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0 | Andrew Morgan | 2020-02-10 | 7 | -14/+134 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add the ability to restrict max avatar filesize and content-type (#19) | Andrew Morgan | 2019-12-12 | 1 | -0/+46 | |
| | | | | | | | ||||||
| * | | | | | | Add limit_profile_requests_to_known_users option (#18) | Andrew Morgan | 2019-12-05 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Discard retention policies when retrieving state | Brendan Abolivier | 2019-11-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+32 | |
| | | | | | | | ||||||
| * | | | | | | Create configurable ratelimiter for 3pid invites (#11) | Andrew Morgan | 2019-11-12 | 1 | -8/+8 | |
| | | | | | | | ||||||
| * | | | | | | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | | | | 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 | |
| | | | | | | | ||||||
| * | | | | | | Add test case | Brendan Abolivier | 2019-10-04 | 1 | -1/+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. | |||||
| * | | | | | | 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> | |||||
| * | | | | | | Lint | Brendan Abolivier | 2019-09-27 | 1 | -1/+34 | |
| | | | | | | | ||||||
* | | | | | | | Don't send renewal emails to deactivated users | Andrew Morgan | 2020-02-10 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Don't send renewal emails to deactivated users | Brendan Abolivier | 2019-06-14 | 2 | -0/+9 | |
| | | | | | | | ||||||
* | | | | | | | Track deactivated accounts in the database (#5378) | Andrew Morgan | 2020-02-10 | 1 | -0/+3 | |
|\| | | | | | | |/ / / / / |/| | | | | | ||||||
| * | | | | | Track deactivated accounts in the database (#5378) | Brendan Abolivier | 2019-06-14 | 1 | -0/+4 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'dinsic' into babolivier/dinsic-message-retention | Brendan Abolivier | 2019-08-28 | 1 | -1/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Allow defining HTML templates to serve the user on account renewal | Brendan Abolivier | 2019-08-01 | 1 | -1/+9 | |
| | | | | | | | ||||||
* | | | | | | | Implement per-room message retention policies | Brendan Abolivier | 2019-08-28 | 3 | -4/+115 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5646 from matrix-org/babolivier/profile-allow-self dinsic_2019-07-09 | Brendan Abolivier | 2019-07-09 | 1 | -0/+4 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Port #5644 to dinsic | |||||
| * | | | | | | 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. | |||||
* | | | | | | | 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. | |||||
* | | | | | | | 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. | |||||
* | | | | | | 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. | |||||
* | | | | | | | Add third party rules hook for 3PID invites | Brendan Abolivier | 2019-06-17 | 1 | -0/+10 | |
| | | | | | | | ||||||
* | | | | | | | Add third party rules hook into create room | Erik Johnston | 2019-06-17 | 1 | -3/+13 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #5471 from matrix-org/erikj/3pid_remote_invite_state | Brendan Abolivier | 2019-06-17 | 1 | -6/+0 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Port "Fix 3PID invite room state over federation" to dinsic | |||||
| * | | | | | | 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. | |||||
* | | | | | | Merge branch 'babolivier/third_party_event_rules' into dinsic | Brendan Abolivier | 2019-06-14 | 2 | -4/+78 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Add plugin APIs for implementations of custom event rules. | Brendan Abolivier | 2019-06-14 | 2 | -4/+78 | |
| |/ / / / | ||||||
* | | | | | Don't send renewal emails to deactivated users | Brendan Abolivier | 2019-06-14 | 2 | -0/+9 | |
| | | | | | ||||||
* | | | | | Track deactivated accounts in the database (#5378) | Brendan Abolivier | 2019-06-14 | 1 | -0/+4 | |
| | | | | | ||||||
* | | | | | Merge branch 'dinsic' into babolivier/userdir_hide_users | Brendan Abolivier | 2019-06-12 | 12 | -220/+761 | |
|\ \ \ \ \ | ||||||
| * | | | | | Merge branch 'master' into dinsic | Brendan Abolivier | 2019-06-12 | 11 | -216/+729 | |
| |\| | | | | ||||||
| | * | | | | Fix defaults on checking threepids | Erik Johnston | 2019-06-10 | 1 | -0/+1 | |
| | | |/ / | | |/| | | ||||||
| | * | | | Add ability to perform password reset via email without trusting the ↵ | Andrew Morgan | 2019-06-06 | 2 | -14/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identity server (#5377) Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368 | |||||
| | * | | | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369) | Richard van der Hoff | 2019-06-06 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | Fixes some warnings, and a scary-looking stacktrace when sytest kills the process. | |||||
| | * | | | Merge pull request #5089 from dnaf/m-heroes-empty-room-name | Brendan Abolivier | 2019-06-06 | 1 | -5/+4 | |
| | |\ \ \ | | | | | | | | | | | | | Make /sync return heroes if room name or canonical alias are empty | |||||
| | | * | | | Simplify condition | Brendan Abolivier | 2019-06-06 | 1 | -2/+2 | |
| | | | | | | ||||||
| | | * | | | Simplify condition | Brendan Abolivier | 2019-06-05 | 1 | -3/+2 | |
| | | | | | | ||||||
| | | * | | | Merge branch 'develop' into m-heroes-empty-room-name | Brendan Abolivier | 2019-06-05 | 15 | -254/+832 | |
| | | |\ \ \ | ||||||
| | | * | | | | Lint | Katie Wolfe | 2019-04-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I probably should've just run autopep8 in the first place... Signed-off-by: Katie Wolfe <katie@dnaf.moe> | |||||
| | | * | | | | Clean up code | Katie Wolfe | 2019-04-24 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Katie Wolfe <katie@dnaf.moe> | |||||
| | | * | | | | Show heroes if room name or canonical alias are empty | Katie Wolfe | 2019-04-24 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4194 Signed-off-by: Katie Wolfe <katie@dnaf.moe> | |||||
| | | * | | | | Show heroes if room name or canonical alias are empty | Katie Wolfe | 2019-04-24 | 1 | -5/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4194 Signed-off-by: Katie Wolfe <katie@dnaf.moe> | |||||
| | * | | | | | Merge pull request #5355 from matrix-org/babolivier/heroes_left_members | Brendan Abolivier | 2019-06-06 | 1 | -15/+19 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Include left members in room summaries' heroes | |||||
| | | * | | | | | Do user_id != me checks before deciding whether we should pick heroes from ↵ | Brendan Abolivier | 2019-06-05 | 1 | -15/+19 | |
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | the joined members or the parted ones | |||||
| | * | | | | | Fix background updates to handle redactions/rejections (#5352) | Erik Johnston | 2019-06-06 | 2 | -9/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix background updates to handle redactions/rejections In background updates based on current state delta stream we need to handle that we may not have all the events (or at least that `get_events` may raise an exception). | |||||
| | * | | | | | Add logging when request fails and clarify we ignore errors. | Erik Johnston | 2019-06-05 | 1 | -4/+12 | |
| | | | | | | | ||||||
| | * | | | | | Fix handling of failures when calling /event_auth. | Erik Johnston | 2019-06-03 | 1 | -12/+38 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When processing an incoming event over federation, we may try and resolve any unexpected differences in auth events. This is a non-essential process and so should not stop the processing of the event if it fails (e.g. due to the remote disappearing or not implementing the necessary endpoints). Fixes #3330 | |||||
| | * | | | | Merge pull request #5309 from matrix-org/rav/limit_displayname_length | Richard van der Hoff | 2019-06-01 | 2 | -0/+15 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | Limit displaynames and avatar URLs | |||||
| | | * | | | | Limit displaynames and avatar URLs | Richard van der Hoff | 2019-06-01 | 2 | -0/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These end up in join events everywhere, so let's limit them. Fixes #5079 | |||||
| | * | | | | | Fix "db txn 'update_presence' from sentinel context" log messages (#5275) | Richard van der Hoff | 2019-05-28 | 1 | -52/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4414. | |||||
| | * | | | | | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_events | Erik Johnston | 2019-05-24 | 2 | -0/+6 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Don't bundle aggregations with events in /sync or /events or state queries | |||||
| | | * | | | | | Don't bundle aggs for /state and /members etc APIs | Erik Johnston | 2019-05-24 | 1 | -0/+3 | |
| | | | | | | | | ||||||
| | | * | | | | | Don't bundle events in /sync or /events | Erik Johnston | 2019-05-21 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we'll send down the annotations too anyway, so this just ends up confusing clients. | |||||
| | * | | | | | | Add config option for setting homeserver's default room version (#5223) | Andrew Morgan | 2019-05-23 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present. That hardcoded value is now located in the server.py config file. | |||||
| | * | | | | | | Simplifications and comments in do_auth (#5227) | Richard van der Hoff | 2019-05-23 | 1 | -120/+181 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was staring at this function trying to figure out wtf it was actually doing. This is (hopefully) a non-functional refactor which makes it a bit clearer. | |||||
| | * | | | | | | Room Statistics (#4338) | Amber Brown | 2019-05-21 | 1 | -0/+325 | |
| | | |/ / / / | | |/| | | | | ||||||
| * | | | | | | Merge branch 'master' into dinsic | Brendan Abolivier | 2019-06-11 | 4 | -4/+32 | |
| |\| | | | | | | |_|_|/ / | |/| | | | | ||||||
| | * | | | | Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactions | Erik Johnston | 2019-05-21 | 1 | -1/+15 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | Block attempts to annotate the same event twice | |||||
| | | * | | | | Fix words | Erik Johnston | 2019-05-21 | 1 | -3/+3 | |
| | | | | | | | ||||||
| | | * | | | | Block attempts to annotate the same event twice | Erik Johnston | 2019-05-20 | 1 | -1/+15 | |
| | | |/ / / | ||||||
| | * / / / | Exclude soft-failed events from fwd-extremity candidates. (#5146) | Richard van der Hoff | 2019-05-21 | 1 | -1/+6 | |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When considering the candidates to be forward-extremities, we must exclude soft failures. Hopefully fixes #5090. | |||||
| | * | | | Limit UserIds to a length that fits in a state key (#5198) | ReidAnderson | 2019-05-20 | 1 | -1/+10 | |
| | | | | | ||||||
| | * | | | fix mapping of return values for get_or_register_3pid_guest (#5177) | bytepoets-blo | 2019-05-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | * fix mapping of return values for get_or_register_3pid_guest | |||||
* | | | | | Fix variable definition | Brendan Abolivier | 2019-06-10 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fix condition | Brendan Abolivier | 2019-06-10 | 1 | -1/+1 | |
| | | | | |