Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove unnecessary variable declaration | Andrew Morgan | 2019-09-03 | 1 | -1/+0 |
| | |||||
* | fix typo | Matthew Hodgson | 2019-09-03 | 1 | -1/+1 |
| | |||||
* | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 5 | -7/+0 |
| | | | | | | | | | | Remove all the "double return" statements which were a result of us removing all the instances of ``` defer.returnValue(...) return ``` statements when we switched to python3 fully. | ||||
* | Opentrace device lists (#5853) | Jorik Schellekens | 2019-09-03 | 2 | -3/+68 |
| | | | Trace device list changes. | ||||
* | 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 | 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. | ||||
* | 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 | 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) | Amber Brown | 2019-08-28 | 1 | -2/+3 |
| | | |||||
* | | 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 | 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 | 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) | reivilibre | 2019-08-27 | 1 | -0/+10 |
|/ / | | | | | Admin API: Set adminship of a user | ||||
* | | 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) | Jorik Schellekens | 2019-08-22 | 2 | -3/+77 |
| | | | | | | Add opentracing tags and logs for e2e keys | ||||
* | | 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 | 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 ↵ | Michael Telatynski | 2019-08-15 | 1 | -1/+13 |
|/ | | | | contain creator_id. (#5633) | ||||
* | 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 | 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 | 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 |
| | | | |||||
* | | | Remove duplicate return statement | Andrew Morgan | 2019-07-31 | 1 | -1/+0 |
| |/ |/| | |||||
* | | 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) | 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) | Amber Brown | 2019-07-30 | 2 | -4/+105 |
|/ | |||||
* | 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) | 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 | ||||
| * | Log when we receive a /make_* request from a different origin | Richard van der Hoff | 2019-07-26 | 1 | -2/+35 |
| | | |||||
* | | 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) | 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) | Amber Brown | 2019-07-23 | 32 | -364/+330 |
|/ | |||||
* | 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 | 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 | 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) | 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) | 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 | 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) | 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 | 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) | 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 | 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) | 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) | 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) | 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. | ||||
* | | | 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) | Richard van der Hoff | 2019-07-03 | 1 | -1/+9 |
| | | | | | | | | | | | | Fixes #5602, #5603 | ||||
* | | | 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 | 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) | Daniel Hoffend | 2019-06-27 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Hoffend <dh@dotlan.net> | ||||
* | | | 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 | 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 | 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. | ||||
* | | 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) | Richard van der Hoff | 2019-06-24 | 2 | -53/+93 |
|/ | | | This makes some of the conditional-import hoop-jumping easier. | ||||
* | 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 | ||||
| * | Fix logline | Erik Johnston | 2019-06-18 | 1 | -1/+1 |
| | | |||||
| * | 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. | ||||
* | | | 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 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. | ||||
* | | | | 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. | ||||
* | | | 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 | 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. | ||||
| * | | | 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 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 | ||||
| * | | | | 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 |
|/ / / | |||||
* / / | 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 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 | ||||
* | | | Add option to disable per-room profiles | Brendan Abolivier | 2019-05-16 | 1 | -0/+9 |
| | | | |||||
* | | | Make /sync attempt to return device updates for both joined and invited ↵ | Matthew Hodgson | 2019-05-16 | 1 | -19/+25 |
| | | | | | | | | | | | | users (#3484) | ||||
* | | | Make all the rate limiting options more consistent (#5181) | Amber Brown | 2019-05-15 | 1 | -2/+2 |
| | | | |||||
* | | | Allow client event serialization to be async | Erik Johnston | 2019-05-14 | 5 | -52/+71 |
| | | | |||||
* | | | add options to require an access_token to GET /profile and /publicRooms on ↵ | Matthew Hodgson | 2019-05-08 | 1 | -0/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CS API (#5083) This commit adds two config options: * `restrict_public_rooms_to_local_users` Requires auth to fetch the public rooms directory through the CS API and disables fetching it through the federation API. * `require_auth_for_profile_requests` When set to `true`, requires that requests to `/profile` over the CS API are authenticated, and only returns the user's profile if the requester shares a room with the profile's owner, as per MSC1301. MSC1301 also specifies a behaviour for federation (only returning the profile if the server asking for it shares a room with the profile's owner), but that's currently really non-trivial to do in a not too expensive way. Next step is writing down a MSC that allows a HS to specify which user sent the profile query. In this implementation, Synapse won't send a profile query over federation if it doesn't believe it already shares a room with the profile's owner, though. Groups have been intentionally omitted from this commit. | ||||
* | | | Do checks on aliases for incoming m.room.aliases events (#5128) | Brendan Abolivier | 2019-05-08 | 2 | -4/+33 |
| | | | | | | | | | | | | | | | Follow-up to #5124 Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended. | ||||
* | | | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_invite | Erik Johnston | 2019-05-07 | 1 | -0/+11 |
|\ \ \ | | | | | | | | | Ratelimit 3pid invites | ||||
| * | | | Rate limit early | Erik Johnston | 2019-05-02 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-04-26 | 3 | -0/+263 |
| |\ \ \ | | | | | | | | | | | | | | | | erikj/ratelimit_3pid_invite | ||||
| * | | | | Ratelimit 3pid invites | Erik Johnston | 2019-04-26 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We do ratelimit sending the 3PID invite events, but that happens after spamming the identity server. | ||||
* | | | | | Add some limitations to alias creation | Brendan Abolivier | 2019-05-02 | 2 | -2/+23 |
| |/ / / |/| | | | |||||
* | | | | Fix infinite loop in presence handler | Richard van der Hoff | 2019-04-26 | 1 | -0/+5 |
| |/ / |/| | | | | | | | | Fixes #5102 | ||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-04-17 | 15 | -237/+275 |
|\ \ \ | | | | | | | | | | | | | babolivier/account_expiration | ||||
| * \ \ | Merge pull request #5047 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 1 | -0/+228 |
| |\ \ \ | | |_|/ | |/| | | Send out emails with links to extend an account's validity period | ||||
| * | | | Add config option to block users from looking up 3PIDs (#5010) | Brendan Abolivier | 2019-04-04 | 1 | -0/+5 |
| | |/ | |/| | |||||
| * | | Prevent kicking users who aren't in the room (#4999) | Andrew Morgan | 2019-04-04 | 1 | -0/+9 |
| | | | | | | | | | Prevent kick events from succeeding if the user is not currently in the room. | ||||
| * | | Fix grammar and document get_current_users_in_room (#4998) | Andrew Morgan | 2019-04-03 | 8 | -14/+14 |
| | | | |||||
| * | | Remove presence lists (#4989) | Neil Johnson | 2019-04-03 | 1 | -165/+2 |
| | | | | | | | | | Remove presence list support as per MSC 1819 | ||||
| * | | Merge pull request #4982 from matrix-org/erikj/msc1915 | Erik Johnston | 2019-04-03 | 3 | -15/+71 |
| |\ \ | | | | | | | | | Implement MSC1915 - 3PID unbind APIs | ||||
| | * | | Correctly handle id_server param | Erik Johnston | 2019-04-02 | 1 | -0/+1 |
| | | | | |||||
| | * | | Remove threepid binding if id server returns 400/404/501 | Erik Johnston | 2019-04-02 | 1 | -9/+10 |
| | | | | |||||
| | * | | Fixup docstrings | Erik Johnston | 2019-04-02 | 1 | -2/+4 |
| | | | | |||||
| | * | | Allowing specifying IS to use in unbind API. | Erik Johnston | 2019-04-01 | 3 | -7/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the homeserver will use the identity server used during the binding of the 3PID to unbind the 3PID. However, we need to allow clients to explicitly ask the homeserver to unbind via a particular identity server, for the case where the 3PID was bound out of band from the homeserver. Implements MSC915. | ||||
| | * | | For unbind poke IS used during binding of 3PID | Erik Johnston | 2019-04-01 | 1 | -9/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the behaviour from using the server specified trusted identity server to using the IS that used during the binding of the 3PID, if known. This is the behaviour specified by MSC1915. | ||||
| | * | | Track IS used to bind 3PIDs | Erik Johnston | 2019-04-01 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | This will then be used to know which IS to default to when unbinding the threepid. | ||||
| * | | | Transfer related groups on room upgrade (#4990) | Andrew Morgan | 2019-04-02 | 1 | -0/+1 |
| | | | | | | | | | | | | Transfers the m.room.related_groups state event on room upgrade. | ||||
| * | | | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 3 | -18/+13 |
| |/ / | | | | | | | | | | Collect all the things that make room-versions different to one another into one place, so that it's easier to define new room versions. | ||||
| * | | Allow password providers to bind emails (#4947) | Andrew Morgan | 2019-03-28 | 1 | -0/+17 |
| | | | | | | | | | This PR allows password provider modules to bind email addresses when a user is registering and is motivated by matrix-org/matrix-synapse-ldap3#58 | ||||
| * | | Use an assert | Erik Johnston | 2019-03-28 | 1 | -2/+1 |
| | | | |||||
| * | | Review comments | Erik Johnston | 2019-03-28 | 1 | -44/+62 |
| | | | |||||
| * | | Use event streams to calculate presence | Erik Johnston | 2019-03-27 | 1 | -29/+130 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Primarily this fixes a bug in the handling of remote users joining a room where the server sent out the presence for all local users in the room to all servers in the room. We also change to using the state delta stream, rather than the distributor, as it will make it easier to split processing out of the master process (as well as being more flexible). Finally, when sending presence states to newly joined servers we filter out old presence states to reduce the number sent. Initially we filter out states that are offline and have a last active more than a week ago, though this can be changed down the line. Fixes #3962 | ||||
* | | | Add management endpoints for account validity | Brendan Abolivier | 2019-04-17 | 1 | -4/+29 |
| |/ |/| | |||||
* | | Send out emails with links to extend an account's validity period | Brendan Abolivier | 2019-04-17 | 1 | -0/+228 |
|/ | |||||
* | Support 3PID login in password providers (#4931) | Andrew Morgan | 2019-03-26 | 3 | -8/+51 |
| | | | | | Adds a new method, check_3pid_auth, which gives password providers the chance to allow authentication with third-party identifiers such as email or msisdn. | ||||
* | Refactor out state delta handling into its own class (#4917) | Amber Brown | 2019-03-25 | 2 | -46/+75 |
| | |||||
* | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms | Erik Johnston | 2019-03-21 | 2 | -2/+11 |
|\ | | | | | Deny peeking into rooms that have been blocked | ||||
| * | Deny peeking into rooms that have been blocked | Erik Johnston | 2019-03-21 | 2 | -2/+11 |
| | | |||||
* | | Merge pull request #4904 from matrix-org/erikj/fix_shutdown | Erik Johnston | 2019-03-21 | 4 | -2/+13 |
|\| | | | | | Fixup shutdown room API | ||||
| * | Revert spurious delete | Erik Johnston | 2019-03-20 | 1 | -0/+4 |
| | | |||||
| * | Use flags | Erik Johnston | 2019-03-20 | 4 | -13/+13 |
| | | |||||
| * | Move requester check into assert_accepted_privacy_policy | Erik Johnston | 2019-03-20 | 1 | -5/+8 |
| | | |||||
| * | Only require consent for events with an associated request | Erik Johnston | 2019-03-20 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | There are a number of instances where a server or admin may puppet a user to join/leave rooms, which we don't want to fail if the user has not consented to the privacy policy. We fix this by adding a check to test if the requester has an associated access_token, which is used as a proxy to answer the question of whether the action is being done on behalf of a real request from the user. | ||||
* | | Merge pull request #4896 from matrix-org/erikj/disable_room_directory | Erik Johnston | 2019-03-21 | 2 | -0/+22 |
|\ \ | |/ |/| | Add option to disable search room lists | ||||
| * | Disable publishing to room list when its disabled | Erik Johnston | 2019-03-20 | 1 | -0/+8 |
| | | |||||
| * | Pull out config option | Erik Johnston | 2019-03-20 | 1 | -3/+3 |
| | | |||||
| * | Return before we log | Erik Johnston | 2019-03-20 | 1 | -4/+5 |
| | | |||||
| * | Add option to disable search room lists | Erik Johnston | 2019-03-19 | 1 | -0/+13 |
| | | | | | | | | This disables both local and remote room list searching. | ||||
* | | Batch up outgoing read-receipts to reduce federation traffic. (#4890) | Richard van der Hoff | 2019-03-20 | 1 | -1/+1 |
|/ | | | | Rate-limit outgoing read-receipts as per #4730. | ||||
* | fix test_auto_create_auto_join_where_no_consent (#4886) | Neil Johnson | 2019-03-19 | 2 | -3/+15 |
| | |||||
* | Migrate the user directory initial population to a background task (#4864) | Amber Brown | 2019-03-19 | 1 | -160/+13 |
| | |||||
* | Add ratelimiting on failed login attempts (#4865) | Brendan Abolivier | 2019-03-18 | 1 | -5/+23 |
| | |||||
* | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 2 | -2/+38 |
| | | | Add two ratelimiters on login (per-IP address and per-userID). | ||||
* | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_worker | Richard van der Hoff | 2019-03-15 | 1 | -55/+24 |
|\ | | | | | Move client receipt processing to federation sender worker. | ||||
| * | Move client receipt processing to federation sender worker. | Richard van der Hoff | 2019-03-13 | 1 | -33/+4 |
| | | | | | | | | | | This is mostly a prerequisite for #4730, but also fits with the general theme of "move everything off the master that we possibly can". | ||||
| * | declare a ReadReceipt class | Richard van der Hoff | 2019-03-13 | 1 | -24/+22 |
| | | | | | | | | | | I'm going to use this in queues and things, so it'll be useful to give it more of a structure. | ||||
* | | Merge pull request #4846 from matrix-org/hawkowl/userdir-search | Erik Johnston | 2019-03-14 | 1 | -48/+77 |
|\ \ | |/ |/| | Improve searching in the userdir | ||||
| * | fixup | Amber Brown | 2019-03-13 | 1 | -1/+1 |
| | | |||||
| * | fixup | Amber Brown | 2019-03-12 | 1 | -47/+70 |
| | | |||||
| * | fixes | Amber Brown | 2019-03-12 | 1 | -39/+6 |
| | | |||||
| * | initial | Amber Brown | 2019-03-11 | 1 | -1/+40 |
| | | |||||
* | | Transfer local user's push rules on room upgrade (#4838) | Andrew Morgan | 2019-03-12 | 1 | -0/+4 |
|/ | | | Transfer push rules (notifications) on room upgrade | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-03-08 | 4 | -205/+155 |
|\ | | | | | | | erikj/soft_fail_impl | ||||
| * | Merge pull request #4829 from matrix-org/erikj/device_list_seen_updates | Erik Johnston | 2019-03-08 | 1 | -3/+7 |
| |\ | | | | | | | When re-syncing device lists reset the state | ||||
| | * | When re-syncing device lists reset the state | Erik Johnston | 2019-03-07 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | We keep track of what stream IDs we've seen so that we know what updates we've handled or missed. If we re-sync we don't know if the updates we've seen are included in the re-sync (there may be a race), so we should reset the seen updates. | ||||
| * | | Add some debug logging for device list handling | Erik Johnston | 2019-03-07 | 1 | -2/+38 |
| |/ | |||||
| * | Rewrite userdir to be faster (#4537) | Amber Brown | 2019-03-07 | 1 | -185/+37 |
| | | |||||
| * | Merge pull request #4815 from matrix-org/erikj/docstrings | Erik Johnston | 2019-03-06 | 1 | -7/+26 |
| |\ | | | | | | | Add docstrings from matrix-org-hotfixes | ||||
| | * | Add docstrings from matrix-org-hotfixes | Erik Johnston | 2019-03-06 | 1 | -7/+26 |
| | | | |||||
| * | | Port #4422 debug logging from hotfixes | Erik Johnston | 2019-03-06 | 1 | -7/+46 |
| |/ | |||||
| * | Make registration ratelimiter separate from the main events one | Brendan Abolivier | 2019-03-06 | 1 | -1/+1 |
| | | |||||
| * | Revert "Split ratelimiters in two (one for events, one for registration)" | Brendan Abolivier | 2019-03-06 | 3 | -3/+3 |
| | | | | | | | | This reverts commit d7dbad3526136cfc9fdbd568635be5016fb637db. | ||||
| * | Split ratelimiters in two (one for events, one for registration) | Brendan Abolivier | 2019-03-05 | 3 | -3/+3 |
| | | |||||
* | | Factor out soft fail checks | Erik Johnston | 2019-03-08 | 1 | -5/+22 |
| | | |||||
* | | Implement soft fail | Erik Johnston | 2019-03-06 | 1 | -1/+76 |
|/ | |||||
* | Add rate-limiting on registration (#4735) | Brendan Abolivier | 2019-03-05 | 2 | -10/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rate-limiting for registration * Add unit test for registration rate limiting * Add config parameters for rate limiting on auth endpoints * Doc * Fix doc of rate limiting function Co-Authored-By: babolivier <contact@brendanabolivier.com> * Incorporate review * Fix config parsing * Fix linting errors * Set default config for auth rate limiting * Fix tests * Add changelog * Advance reactor instead of mocked clock * Move parameters to registration specific config and give them more sensible default values * Remove unused config options * Don't mock the rate limiter un MAU tests * Rename _register_with_store into register_with_store * Make CI happy * Remove unused import * Update sample config * Fix ratelimiting test for py2 * Add non-guest test | ||||
* | Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_room | Erik Johnston | 2019-03-05 | 1 | -0/+46 |
|\ | | | | | Stop backpaginating when events not visible | ||||
| * | clarify comments | Erik Johnston | 2019-03-05 | 1 | -8/+11 |
| | | |||||
| * | Only check history visibility when filtering | Erik Johnston | 2019-03-04 | 1 | -1/+3 |
| | | | | | | | | | | | | When filtering events to send to server we check more than just history visibility. However when deciding whether to backfill or not we only care about the history visibility. | ||||
| * | s/get_forward_events/get_successor_events/ | Erik Johnston | 2019-03-04 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-03-04 | 6 | -52/+137 |
| |\ | | | | | | | | | | erikj/stop_fed_not_in_room | ||||
| * | | Update comments | Erik Johnston | 2019-02-27 | 1 | -3/+13 |
| | | | |||||
| * | | Stop backpaginating when events not visible | Erik Johnston | 2019-02-20 | 1 | -0/+31 |
| | | | |||||
* | | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keys | Erik Johnston | 2019-03-05 | 1 | -168/+174 |
|\ \ \ | | | | | | | | | Allow /keys/{changes,query} API to run on worker | ||||
| * | | | Allow /keys/{changes,query} API to run on worker | Erik Johnston | 2019-03-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Split DeviceHandler into master and worker | Erik Johnston | 2019-03-04 | 1 | -168/+174 |
| | | | | |||||
* | | | | Clean up read-receipt handling. | Richard van der Hoff | 2019-03-04 | 1 | -59/+44 |
|/ / / | | | | | | | | | | | | | | | | | | | Remove a call to run_as_background_process: there is no need to run this as a background process, because build_and_send_edu does not block. We may as well inline the whole of _push_remotes. | ||||
* | / | Avoid rebuilding Edu objects in worker mode (#4770) | Richard van der Hoff | 2019-03-04 | 3 | -5/+5 |
| |/ |/| | | | | | | | In worker mode, on the federation sender, when we receive an edu for sending over the replication socket, it is parsed into an Edu object. There is no point extracting the contents of it so that we can then immediately build another Edu. | ||||
* | | Fix incorrect log about not persisting duplicate state event. (#4776) | Richard van der Hoff | 2019-03-01 | 1 | -3/+4 |
| | | | | | | We were logging this when it was not true. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-02-26 | 21 | -482/+1672 |
|\ \ | | | | | | | | | | anoa/public_rooms_federate_develop | ||||
| * | | Revert "Prevent showing non-fed rooms in fed /publicRooms" | Andrew Morgan | 2019-02-26 | 1 | -65/+11 |
| | | | |||||
| * | | Merge pull request #4736 from matrix-org/anoa/public_rooms_federate | Andrew Morgan | 2019-02-26 | 1 | -11/+65 |
| |\ \ | | | | | | | | | Config option to prevent showing non-fed rooms in fed /publicRooms | ||||
| | * | | Cleaner chunk logic | Andrew Morgan | 2019-02-26 | 1 | -5/+4 |
| | | | | |||||
| | * | | Correct indent | Andrew Morgan | 2019-02-26 | 1 | -3/+3 |
| | | | | |||||
| | * | | Correct docstring types and chunk logic | Andrew Morgan | 2019-02-26 | 1 | -10/+11 |
| | | | | |||||
| | * | | Clean up room chunk logic | Andrew Morgan | 2019-02-26 | 1 | -6/+8 |
| | | | | |||||
| | * | | Make not showing non-federated rooms the default | Andrew Morgan | 2019-02-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Result may be None | Andrew Morgan | 2019-02-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Address rich comments | Andrew Morgan | 2019-02-26 | 1 | -6/+30 |
| | | | | |||||
| | * | | elif not else if | Andrew Morgan | 2019-02-25 | 1 | -1/+1 |
| | | | | |||||
| | * | | syntax derp | Andrew Morgan | 2019-02-25 | 1 | -1/+1 |
| | | | |