| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 1 | -2/+21 |
| | | | | | | | * Fix auto join failures for servers that require user consent * Fix auto join failures for servers that require user consent | ||||
| * | Remove duplicate slashes in generated consent URLs | Travis Ralston | 2018-11-15 | 1 | -1/+1 |
| | | |||||
| * | Remove hack to support rejoining rooms | Erik Johnston | 2018-11-09 | 1 | -74/+42 |
| | | |||||
| * | Simplify to always drop events if server isn't in the room | Erik Johnston | 2018-11-09 | 1 | -14/+9 |
| | | |||||
| * | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 1 | -1/+1 |
| | | | | | So people can still collect consent the old way if they want to. | ||||
| * | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 1 | -7/+15 |
| | | | | fixes #4056 | ||||
| * | Add helpers for getting prev and auth events (#4139) | Erik Johnston | 2018-11-06 | 1 | -24/+24 |
| | | | | | | | | * Add helpers for getting prev and auth events This is in preparation for allowing the event format to change between room versions. | ||||
| * | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 1 | -4/+10 |
| | | |||||
| * | Include a version query string arg for the consent route | Travis Ralston | 2018-10-31 | 1 | -1/+4 |
| | | |||||
| * | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 8 | -133/+515 |
| |\ | |||||
| | * | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades | Richard van der Hoff | 2018-10-31 | 2 | -14/+140 |
| | |\ | | | | | | | Attempt to move room aliases on room upgrades | ||||
| | | * | Avoid else clause on exception for clarity | Richard van der Hoff | 2018-10-31 | 1 | -2/+1 |
| | | | | |||||
| | | * | Attempt to move room aliases on room upgrades | Richard van der Hoff | 2018-10-31 | 2 | -14/+141 |
| | | | | |||||
| | * | | Log some bits about event creation (#4121) | Richard van der Hoff | 2018-10-31 | 2 | -0/+7 |
| | | | | | | | | | | | | | I found these helpful in debugging my room upgrade tests. | ||||
| | * | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -2/+6 |
| | | | | |||||
| | * | | Delete the disused & unspecced identicon functionality (#4106) | Amber Brown | 2018-10-29 | 1 | -3/+0 |
| | |/ | |||||
| | * | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatar | Richard van der Hoff | 2018-10-29 | 1 | -1/+2 |
| | |\ | | | | | | | Remember to copy the avatar on room upgrades | ||||
| | | * | Remember to copy the avatar on room upgrades | Richard van der Hoff | 2018-10-26 | 1 | -1/+2 |
| | | | | |||||
| | * | | Better handling of odd PLs during room upgrades | Richard van der Hoff | 2018-10-27 | 1 | -44/+81 |
| | |/ | | | | | | | | | | | | | Fixes handling of rooms where we have permission to send the tombstone, but not other state. We need to (a) fail more gracefully when we can't send the PLs in the old room, and (b) not set the PLs in the new room until we are done with the other stuff. | ||||
| | * | optimise state copying | Richard van der Hoff | 2018-10-26 | 1 | -7/+5 |
| | | | |||||
| | * | Address review comments | Richard van der Hoff | 2018-10-26 | 1 | -7/+9 |
| | | | | | | | | | Improve comments, get old room state from the context we already have | ||||
| | * | restrict PLs in old room | Richard van der Hoff | 2018-10-25 | 1 | -1/+43 |
| | | | |||||
| | * | copy state | Richard van der Hoff | 2018-10-25 | 1 | -11/+26 |
| | | | |||||
| | * | preserve PLs | Richard van der Hoff | 2018-10-25 | 1 | -1/+7 |
| | | | |||||
| | * | preserve room visibility | Richard van der Hoff | 2018-10-25 | 1 | -3/+5 |
| | | | |||||
| | * | Basic initial support for room upgrades | Richard van der Hoff | 2018-10-25 | 1 | -0/+121 |
| | | | | | | | | | | | Currently just creates a new, empty, room, and sends a tombstone in the old room. | ||||
| | * | Allow power_level_content_override=None for _send_events_for_new_room | Richard van der Hoff | 2018-10-25 | 1 | -5/+6 |
| | | | |||||
| | * | Make room_member_handler a member of RoomCreationHandler | Richard van der Hoff | 2018-10-25 | 2 | -8/+7 |
| | | | | | | | | | ... to save passing it into `_send_events_for_new_room` | ||||
| | * | Factor _generate_room_id out of create_room | Richard van der Hoff | 2018-10-25 | 1 | -22/+23 |
| | | | | | | | | | we're going to need this for room upgrades. | ||||
| | * | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 5 | -86/+72 |
| | | | | | | | | | | | | | | | | | Currently when fetching state groups from the data store we make two hits two the database: once for members and once for non-members (unless request is filtered to one or the other). This adds needless load to the datbase, so this PR refactors the lookup to make only a single database hit. | ||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-25 | 8 | -43/+79 |
| | |\ | | | | | | | | | | erikj/alias_disallow_list | ||||
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-10-25 | 13 | -103/+440 |
| | | |\ | | | | | | | | | | | | | matthew/autocreate_autojoin | ||||
| | | * | | remove trailing whiter space | Neil Johnson | 2018-10-24 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | fix tuple | Richard van der Hoff | 2018-10-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | Co-Authored-By: neilisfragile <neil@matrix.org> | ||||
| | | * | | remove errant exception and style | Neil Johnson | 2018-10-23 | 1 | -5/+5 |
| | | | | | |||||
| | | * | | clean up config error logic and imports | Neil Johnson | 2018-10-17 | 1 | -14/+16 |
| | | | | | |||||
| | | * | | no need to join room if creator | Neil Johnson | 2018-10-13 | 1 | -1/+2 |
| | | | | | |||||
| | | * | | improve auto room join logic, comments and tests | Neil Johnson | 2018-10-12 | 1 | -3/+8 |
| | | | | | |||||
| | | * | | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 5 | -42/+74 |
| | | |\ \ | |||||
| | | * | | | move logic into register, fix room alias localpart bug, tests | Neil Johnson | 2018-10-04 | 1 | -27/+18 |
| | | | | | | |||||
| | | * | | | emit room aliases event | Matthew Hodgson | 2018-09-29 | 1 | -3/+8 |
| | | | | | | |||||
| | | * | | | fix thinkos | Matthew Hodgson | 2018-09-29 | 1 | -6/+6 |
| | | | | | | |||||
| | | * | | | fix UTs | Matthew Hodgson | 2018-09-28 | 1 | -4/+9 |
| | | | | | | |||||
| | | * | | | untested stab at autocreating autojoin rooms | Matthew Hodgson | 2018-09-28 | 1 | -0/+18 |
| | | | | | | |||||
| | * | | | | Add config option to control alias creation | Erik Johnston | 2018-10-19 | 1 | -0/+9 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 9 | -74/+100 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 1 | -15/+15 |
| | |\ \ \ \ | | | | | | | | | | | | | Add v2 state resolution algorithm | ||||
| | | * | | | | Comment | Erik Johnston | 2018-10-24 | 1 | -2/+5 |
| | | | | | | | |||||
| | | * | | | | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Fix up use of resolve_events_with_factory | Erik Johnston | 2018-10-16 | 1 | -13/+10 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 3 | -4/+4 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Clean up the way logcontexts and threads work in the pushers | ||||
| | | * | | | | | Remove redundant run_as_background_process() from pusherpool | Richard van der Hoff | 2018-10-22 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `on_new_notifications` and `on_new_receipts` in `HttpPusher` and `EmailPusher` now always return synchronously, so we can remove the `defer.gatherResults` on their results, and the `run_as_background_process` wrappers can be removed too because the PusherPool methods will now complete quickly enough. | ||||
| | * | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 2 | -32/+50 |
| | |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | Clean up room alias creation | ||||
| | | * | | | | | Clean up room alias creation | Erik Johnston | 2018-10-19 | 2 | -32/+50 |
| | | |/ / / / | |||||
| | * | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requests | Travis Ralston | 2018-10-23 | 1 | -2/+16 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Handle HttpResponseException more safely for federated groups | ||||
| | | * | | | | | Comments help | Travis Ralston | 2018-10-23 | 1 | -0/+5 |
| | | | | | | | | |||||
| | | * | | | | | isort | Travis Ralston | 2018-10-12 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | More sane handling of group errors and pep8 | Travis Ralston | 2018-10-12 | 1 | -4/+5 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'develop' into travis/fix-federated-group-requests | Travis Ralston | 2018-10-12 | 7 | -91/+181 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Remove debugging statement | Travis Ralston | 2018-09-26 | 1 | -1/+0 |
| | | | | | | | | | |||||
| | | * | | | | | | Handle HttpResponseException more safely for federated groups | Travis Ralston | 2018-09-26 | 1 | -2/+11 |
| | | | | | | | | | |||||
| | * | | | | | | | Give some more things logcontexts (#4077) | Richard van der Hoff | 2018-10-23 | 2 | -7/+11 |
| | | | | | | | | | |||||
| | * | | | | | | | Correctly account for cpu usage by background threads (#4074) | Richard van der Hoff | 2018-10-23 | 1 | -14/+4 |
| | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap calls to deferToThread() in a thing which uses a child logcontext to attribute CPU usage to the right request. While we're in the area, remove the logcontext_tracer stuff, which is never used, and afaik doesn't work. Fixes #4064 | ||||
| * | | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-18 | 2 | -9/+14 |
| |\| | | | | | | |||||
| | * | | | | | | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | Thanks @Half-Shot !!! | ||||
| | * | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 1 | -7/+5 |
| | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's quite important that get_missing_events returns the *latest* events in the room; however we were pulling event ids out of the database until we got *at least* 10, and then taking the *earliest* of the results. We also shouldn't really be relying on depth, and should be checking the room_id. | ||||
| * | | | | | | pep8 | Travis Ralston | 2018-10-15 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Ensure the terms params are actually provided | Travis Ralston | 2018-10-15 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Python is hard | Travis Ralston | 2018-10-15 | 1 | -5/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-15 | 1 | -0/+289 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 1 | -0/+289 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | E2E backups | ||||
| | | * | | | | Linting soothes the savage PEP8 monster | David Baker | 2018-10-12 | 1 | -4/+9 |
| | | | | | | | |||||
| | | * | | | | PR feedback pt. 1 | David Baker | 2018-10-12 | 1 | -20/+21 |
| | | | | | | | |||||
| | | * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 13 | -205/+498 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | | Apparently this blank line is Very Important | David Baker | 2018-10-09 | 1 | -0/+1 |
| | | | | | | | |||||
| | | * | | | | be python3 compatible | David Baker | 2018-10-09 | 1 | -2/+3 |
| | | | | | | | |||||
| | | * | | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 20 | -168/+546 |
| | | |\ \ \ \ | |||||
| | | * | | | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 1 | -7/+28 |
| | | | | | | | | |||||
| | | * | | | | | switch get_current_version_info back to being get_version_info | Matthew Hodgson | 2018-08-12 | 1 | -4/+7 |
| | | | | | | | | |||||
| | | * | | | | | fix flakes | Matthew Hodgson | 2018-08-12 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | fix typos | Matthew Hodgson | 2018-08-12 | 1 | -1/+2 |
| | | | | | | | | |||||
| | | * | | | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 1 | -8/+103 |
| | | | | | | | | |||||
| | | * | | | | | more docstring for the e2e_room_keys rest | Matthew Hodgson | 2018-08-12 | 1 | -2/+0 |
| | | | | | | | | |||||
| | | * | | | | | fix factoring out of _should_replace_room_key | Matthew Hodgson | 2018-08-12 | 1 | -3/+4 |
| | | | | | | | | |||||
| | | * | | | | | rename room_key_version table correctly, and fix opt args | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| | | | | | | | | |||||
| | | * | | | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 1 | -30/+58 |
| | | | | | | | | |||||
| | | * | | | | | make /room_keys/version work | Matthew Hodgson | 2018-08-12 | 1 | -7/+11 |
| | | | | | | | | |||||
| | | * | | | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 1 | -5/+42 |
| | | | | | | | | |||||
| | | * | | | | | make it work and fix pep8 | Matthew Hodgson | 2018-08-12 | 1 | -26/+43 |
| | | | | | | | | |||||
| | | * | | | | | interim WIP checkin; doesn't build yet | Matthew Hodgson | 2018-08-12 | 1 | -15/+31 |
| | | | | | | | | |||||
| | | * | | | | | total WIP skeleton for /room_keys API | Matthew Hodgson | 2018-08-12 | 1 | -0/+60 |
| | | | | | | | | |||||
| * | | | | | | | Update login terms structure for the proposed language support | Travis Ralston | 2018-10-12 | 1 | -4/+7 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-12 | 2 | -20/+37 |
| |\| | | | | | | |||||
| | * | | | | | | Add description to counter metric | Erik Johnston | 2018-10-10 | 1 | -1/+5 |
| | | | | | | | | |||||
| | * | | | | | | Track number of non-empty sync responses instead | Erik Johnston | 2018-10-10 | 1 | -9/+15 |
| | | | | | | | | |||||
| | * | | | | | | Append _total to metric and fix up spelling | Erik Johnston | 2018-10-10 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Add metric to count lazy member sync requests | Erik Johnston | 2018-10-09 | 1 | -6/+20 |
| | | | | | | | | |||||
| | * | | | | | | Remove unnecessary extra function call layer | Erik Johnston | 2018-10-08 | 1 | -15/+3 |
| | | | | | | | | |||||
| | * | | | | | | Use errback pattern and catch async failures | Erik Johnston | 2018-10-08 | 1 | -1/+6 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Use a flag rather than a new route for the public policy | Travis Ralston | 2018-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | This also means that the template now has optional parameters, which will need to be documented somehow. | ||||
| * | | | | | | Supply params for terms auth stage | Travis Ralston | 2018-10-03 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/1692 | ||||
| * | | | | | | Incorporate Dave's work for GDPR login flows | Travis Ralston | 2018-10-03 | 1 | -0/+4 |
| |/ / / / / | | | | | | | | | | | As per https://github.com/vector-im/riot-web/issues/7168#issuecomment-419996117 | ||||
| * | | | | | Fix exception handling in fetching remote profiles | Erik Johnston | 2018-10-03 | 1 | -6/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #3989 from matrix-org/rav/better_stacktraces | Richard van der Hoff | 2018-10-02 | 2 | -22/+23 |
| |\ \ \ \ \ | | | | | | | | | | | | | Avoid reraise, to improve stacktraces | ||||
| | * | | | | | Avoid reraise, to improve stacktraces | Richard van der Hoff | 2018-10-01 | 2 | -22/+23 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state | Erik Johnston | 2018-10-02 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix lazy loaded sync with rejected state events | ||||
| | * | | | | | Fix lazy loaded sync with rejected state events | Erik Johnston | 2018-10-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, we assume that the name and canonical alias events in the state have not been rejected. In practice this may not be the case (though we should probably think about fixing that) so lets ensure that we gracefully handle that case, rather than 404'ing the sync request like we do now. | ||||
| * | | | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 1 | -12/+46 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix exceptions when handling incoming transactions | ||||
| | * | | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 3 | -5/+21 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | | Include event when resolving state for missing prevs | Richard van der Hoff | 2018-09-27 | 1 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a forward extremity for a room as `E`, and you receive `A`, `B`, s.t. `A -> B -> E`, and `B` also points to an unknown event `X`, then we need to do state res between `X` and `E`. When that happens, we need to make sure we include `X` in the state that goes into the state res alg. Fixes #3934. | ||||
| | * | | | | | Include state from remote servers in pdu handling | Richard van der Hoff | 2018-09-27 | 1 | -4/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we've fetched state events from remote servers in order to resolve the state for a new event, we need to actually pass those events into resolve_events_with_factory (so that it can do the state res) and then persist the ones we need - otherwise other bits of the codebase get confused about why we have state groups pointing to non-existent events. | ||||
| | * | | | | | Fix "unhashable type: 'list'" exception in federation handling | Richard van der Hoff | 2018-09-27 | 1 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_state_groups returns a map from state_group_id to a list of FrozenEvents, so was very much the wrong thing to be putting as one of the entries in the list passed to resolve_events_with_factory (which expects maps from (event_type, state_key) to event id). We actually want get_state_groups_ids().values() rather than get_state_groups(). This fixes the main problem in #3923, but there are other problems with this bit of code which get discovered once you do so. | ||||
| * | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checks | Richard van der Hoff | 2018-09-28 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | remove spurious federation checks on localhost | ||||
| | * | | | | | Fix complete fail to do the right thing | Richard van der Hoff | 2018-09-28 | 1 | -0/+1 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typing | Richard van der Hoff | 2018-09-27 | 1 | -3/+19 |
| |\ \ \ \ \ | | | | | | | | | | | | | Improve performance of getting typing updates for replication | ||||
| | * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing | Erik Johnston | 2018-09-19 | 10 | -70/+198 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Improve performance of getting typing updates for replication | Erik Johnston | 2018-09-05 | 1 | -3/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetching the list of all new typing notifications involved iterating over all rooms and comparing their serial. Lets move to using a stream change cache, like we do for other streams. | ||||
| * | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups | Richard van der Hoff | 2018-09-27 | 1 | -2/+10 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Clarifications in FederationHandler | ||||
| | * | | | | | | more comments | Richard van der Hoff | 2018-09-27 | 1 | -4/+3 |
| | | | | | | | | |||||
| | * | | | | | | Clarifications in FederationHandler | Richard van der Hoff | 2018-09-27 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add some comments on things that look a bit bogus * rename this `state` variable to avoid confusion with the `state` used elsewhere in this function. (There was no actual conflict, but it was a confusing bit of spaghetti.) | ||||
| * | | | | | | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Replaced all occurences of e.message with str(e) | ||||
| | * | | | | | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 2 | -2/+2 |
| | | |_|/ / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Schnuffle <schnuffle@github.com> | ||||
| * | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2 | Richard van der Hoff | 2018-09-27 | 1 | -0/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Logging improvements | ||||
| | * | | | | | | Logging improvements | Richard van der Hoff | 2018-09-26 | 1 | -0/+4 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Some logging tweaks to help with debugging incoming federation transactions | ||||
| * / / / / / | Include eventid in log lines when processing incoming federation ↵ | Richard van der Hoff | 2018-09-27 | 1 | -26/+39 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions (#3959) when processing incoming transactions, it can be hard to see what's going on, because we process a bunch of stuff in parallel, and because we may end up recursively working our way through a chain of three or four events. This commit creates a way to use logcontexts to add the relevant event ids to the log lines. | ||||
| * | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu | Amber Brown | 2018-09-26 | 1 | -23/+46 |
| |\ \ \ \ \ | | | | | | | | | | | | | Comments and interface cleanup for on_receive_pdu | ||||
| | * | | | | | Comments and interface cleanup for on_receive_pdu | Richard van der Hoff | 2018-09-20 | 1 | -23/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some informative comments about what's going on here. Also, `sent_to_us_directly` and `get_missing` were doing the same thing (apart from in `_handle_queued_pdus`, which looks like a bug), so let's get rid of `get_missing` and use `sent_to_us_directly` consistently. | ||||
| * | | | | | | Only lazy load self-members on initial sync | Matthew Hodgson | 2018-09-25 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | Given we have disabled lazy loading for incr syncs in #3840, we can make self-LL more efficient by only doing it on initial sync. Also adds a bounds check for if/when we change our mind, so that we don't try to include LL members on sync responses with no timeline. | ||||
| * | | | | | | Always LL ourselves if we're in a room to simplify clients (#3916) | Matthew Hodgson | 2018-09-20 | 1 | -0/+4 |
| |/ / / / / | | | | | | | | | | | | | | | | Should fix https://github.com/vector-im/riot-web/issues/7209 | ||||
| * | / / / | Improve the logging when handling a federation transaction (#3904) | Richard van der Hoff | 2018-09-19 | 1 | -55/+109 |
| | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's try to rationalise the logging that happens when we are processing an incoming transaction, to make it easier to figure out what is going wrong when they take ages. In particular: - make everything start with a [room_id event_id] prefix - make sure we log a warning when catching exceptions rather than just turning them into other, more cryptic, exceptions. | ||||
| * | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout | Amber Brown | 2018-09-19 | 1 | -1/+30 |
| |\ \ \ \ | | | | | | | | | | | Bump timeout on get_missing_events request | ||||
| | * | | | | Bump timeout on get_missing_events request | Richard van der Hoff | 2018-09-18 | 1 | -1/+30 |
| | | | | | | |||||
| * | | | | | Use directory server for room joins (#3899) | Richard van der Hoff | 2018-09-18 | 1 | -0/+5 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | When we do a join, always try the server we used for the alias lookup first. Fixes #2418 | ||||
| * | | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoin | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | don't ratelimit autojoins | ||||
| | * | | | | don't ratelimit autojoins | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Reinstate missing null check | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Return a 404 when deleting unknown room alias | Richard van der Hoff | 2018-09-17 | 1 | -3/+16 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/issues/1675 Fixes https://github.com/matrix-org/synapse/issues/2782 | ||||
| * | | | | don't filter membership events based on history visibility (#3874) | Matthew Hodgson | 2018-09-14 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't filter membership events based on history visibility as we will already have filtered the messages in the timeline, and state events are always visible. and because @erikjohnston said so. | ||||
| * | | | | show heroes if a room has a 'deleted' name/canonical_alias (#3851) | Matthew Hodgson | 2018-09-12 | 1 | -2/+15 |
| | | | | | |||||
| * | | | | argh pep8 | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | correctly log gappy sync metrics | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix logline | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Speed up lazy loading (#3827) | Matthew Hodgson | 2018-09-12 | 1 | -30/+88 |
| | | | | | | | | | | | | | | | | | | | | | * speed up room summaries by pulling their data from room_memberships rather than room state * disable LL for incr syncs, and log incr sync stats (#3840) | ||||
| * | | | | Don't send empty tags list down sync | Erik Johnston | 2018-09-06 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Send existing room tags down sync on join | Erik Johnston | 2018-09-06 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user joined a room any existing tags were not sent down the sync stream. Ordinarily this isn't a problem because the user needs to be in the room to have set tags in it, however synapse will sometimes add tags for a user to a room, e.g. for server notices, which need to come down sync. | ||||
| * | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_state | Amber Brown | 2018-09-07 | 1 | -8/+8 |
| |\ \ \ \ | | | | | | | | | | | User iter* during sync state calculations | ||||
| | * | | | | User iter* during sync state calculations | Erik Johnston | 2018-09-05 | 1 | -8/+8 |
| | |/ / / | |||||
| * / / / | Port handlers/ to Python 3 (#3803) | Amber Brown | 2018-09-07 | 6 | -19/+22 |
| |/ / / | |||||
| * | | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func | Erik Johnston | 2018-09-03 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Remove unnecessary resolve_events_with_state_map | ||||
| | * | | | Remove unnecessary resolve_events_with_state_map | Erik Johnston | 2018-08-22 | 1 | -1/+1 |
| | | |/ | |/| | | | | | | | | | | We only ever used the synchronous resolve_events_with_state_map in one place, which is trivial to replace with the async version. | ||||
| * | | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 1 | -1/+2 |
| | | | | |||||
| * | | | don't return non-LL-member state in incremental sync state blocks (#3760) | Matthew Hodgson | 2018-08-28 | 1 | -1/+8 |
| |/ / | | | | | don't return non-LL-member state in incremental sync state blocks | ||||
| * | | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 2 | -9/+26 |
| |\ \ | | | | | | | Allow profile updates to happen on workers | ||||
| | * | | Rename WorkerProfileHandler to BaseProfileHandler | Erik Johnston | 2018-08-22 | 1 | -3/+10 |
| | | | | |||||
| | * | | Add assert to ensure handler is only run on master | Erik Johnston | 2018-08-22 | 1 | -0/+2 |
| | | | | |||||
| | * | | Remove redundant vars | Erik Johnston | 2018-08-22 | 1 | -3/+0 |
| | | | | |||||
| | * | | Add some fixmes | Erik Johnston | 2018-08-17 | 1 | -0/+4 |
| | | | | |||||
| | * | | Call UserDirectoryHandler methods directly | Erik Johnston | 2018-08-17 | 1 | -21/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that the user directory handling is fairly racey as a bunch of stuff assumes that the processing happens on master, which it doesn't when there is a synapse.app.user_dir worker. So lets just call the function directly until we actually get round to fixing it, since it doesn't make the situation any worse. | ||||
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-17 | 15 | -84/+409 |
| | |\ \ | | | | | | | | | | | | | erikj/split_profiles | ||||
| | * | | | Split ProfileHandler into master and worker | Erik Johnston | 2018-08-17 | 1 | -7/+14 |
| | | | | | |||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-09 | 6 | -55/+112 |
| | |\ \ \ | | | | | | | | | | | | | | | | erikj/split_profiles | ||||
| | * | | | | Allow profile changes to happen on workers | Erik Johnston | 2018-08-07 | 1 | -5/+21 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-20 | 16 | -109/+445 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | erikj/refactor_state_handler | ||||
| | * \ \ \ \ | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates | Richard van der Hoff | 2018-08-17 | 3 | -17/+11 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fix logcontexts for running pushers | ||||
| | | * | | | | | Fix logcontexts for running pushers | Richard van der Hoff | 2018-08-17 | 3 | -17/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, avoid resetting the logcontext before running the pushers, to fix the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning. Instead, give them their own "background process" logcontexts. | ||||
| | * | | | | | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 3 | -8/+25 |
| | | |_|_|/ / | |/| | | | | |||||
| | * | | | | | block event creation and room creation on hitting resource limits | Neil Johnson | 2018-08-16 | 2 | -1/+9 |
| | |/ / / / | |||||
| | * | | | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 1 | -1/+34 |
| | | | | | | |||||
| | * | | | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 1 | -10/+149 |
| | | | | | | |||||
| | * | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | Fix Mau off by one errors | ||||
| | | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 4 | -31/+108 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | | * | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| | | * | | | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | | * \ \ \ \ \ | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -13/+14 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | | * \ \ \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | * | | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 1 | -12/+76 |
| | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 1 | -17/+57 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Move more federation APIs to workers | ||||
| | | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-15 | 14 | -27/+78 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| | | * | | | | | | | | | Use federation handler function rather than duplicate | Erik Johnston | 2018-08-15 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves renaming _persist_events to be a public function. | ||||
| | | * | | | | | | | | | Move clean_room_for_join to master | Erik Johnston | 2018-08-09 | 1 | -2/+14 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-09 | 6 | -55/+112 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| | | * | | | | | | | | | Add EDU/query handling over replication | Erik Johnston | 2018-08-06 | 1 | -11/+13 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Add replication APIs for persisting federation events | Erik Johnston | 2018-08-06 | 1 | -9/+35 |
| | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 1 | -14/+4 |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | support admin_email config and pass through into blocking errors, | ||||
| | | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | remove blank line | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | | * | | | | | | | | Update register.py | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | remove comments | ||||
| | | * | | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 1 | -13/+14 |
| | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| | * | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 3 | -14/+51 |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | ||||
| | | * | | | | | | Log when we 3pid/unbind request fails | Erik Johnston | 2018-08-09 | 1 | -0/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 3 | -14/+49 |
| | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661 | ||||
| | * | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| | |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | | | Block ability to read via sync if mau limit exceeded | ||||
| | | * | | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 1 | -1/+6 |
| | | | | | | | |||||
| | | * | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 1 | -7/+5 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 5 | -34/+69 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | neilj/mau_sync_block | ||||
| | | * | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 1 | -5/+11 |
| | | | | | | | |||||
| | * | | | | | Revert "support admin_email config and pass through into blocking errors, ↵ | Neil Johnson | 2018-08-13 | 1 | -14/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6. | ||||
| | * | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 1 | -13/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| | * | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 1 | -0/+5 |
| | | | | | | | |||||
| | * | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 11 | -11/+11 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Remove redundant room_version checks | Erik Johnston | 2018-08-20 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Revert spurious change | Erik Johnston | 2018-08-20 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Choose state algorithm based on room version | Erik Johnston | 2018-08-09 | 2 | -4/+9 |
| |/ / / / | |||||
| * | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 2 | -31/+21 |
| |\ \ \ \ | | |_|/ | |/| | | Add helper base class for generating new replication endpoints | ||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-03 | 5 | -141/+210 |
| | |\ \ \ | | | | | | | | | | | | | | | | erikj/refactor_repl_servlet | ||||
| | * | | | | Use new helper base class for membership requests | Erik Johnston | 2018-07-31 | 1 | -24/+17 |
| | | | | | | |||||
| | * | | | | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 1 | -7/+4 |
| | | | | | | |||||
| * | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 1 | -0/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | more metrics for the federation and appservice senders | ||||
| | * | | | | | more metrics for the federation and appservice senders | Richard van der Hoff | 2018-08-07 | 1 | -0/+10 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 2 | -3/+38 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Support for room versioning | ||||
| | * | | | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 1 | -2/+11 |
| | | | | | | |||||
| | * | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 1 | -1/+26 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first tranche of support for room versioning. It includes: * setting the default room version in the config file * new room_version param on the createRoom API * storing the version of newly-created rooms in the m.room.create event * fishing the version of existing rooms out of the m.room.create event | ||||
| * | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 2 | -21/+6 |
| |\ \ \ \ | |_|/ / |/| | | | API for monthly_active_users table | ||||
| | * | | | py3 fix | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | bug fixes | Neil Johnson | 2018-08-03 | 2 | -17/+6 |
| | | | | | |||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 3 | -114/+140 |
| | |\| | | |||||
| | * | | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 2 | -12/+8 |
| | | | | | |||||
| * | | | | Return M_NOT_FOUND when a profile could not be found. (#3596) | Will Hunt | 2018-08-03 | 1 | -31/+58 |
| | |/ / |/| | | |||||
| * | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 1 | -17/+8 |
| |\ \ \ | | | | | | | | | Clean up handling of errors from outbound requests | ||||
| | * | | | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 1 | -17/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code brings the SimpleHttpClient into line with the MatrixFederationHttpClient by having it raise HttpResponseExceptions when a request fails (rather than trying to parse for matrix errors and maybe raising MatrixCodeMessageException). Then, whenever we were checking for MatrixCodeMessageException and turning them into SynapseErrors, we now need to check for HttpResponseExceptions and call to_synapse_error. | ||||
| * | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 2 | -10/+44 |
| |\ \ \ \ | |||||
| | * | | | | Check room visibility for /event/ requests | Richard van der Hoff | 2018-08-02 | 1 | -4/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the user has permission to view the requeseted event for /event/{eventId} and /room/{roomId}/event/{eventId} requests. Also check that the event is in the given room for /room/{roomId}/event/{eventId}, for sanity. | ||||
| | * | | | | Avoid extra db lookups | Richard van der Hoff | 2018-08-02 | 1 | -27/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're about to look up the events themselves anyway, we can skip the extra db queries here. | ||||
| | * | | | | Validation for events/rooms in fed requests | Richard van der Hoff | 2018-08-02 | 1 | -1/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we get a federation request which refers to an event id, make sure that said event is in the room the caller claims it is in. (patch supplied by @turt2live) | ||||
| * | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_store | Erik Johnston | 2018-08-02 | 1 | -87/+88 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Split out DB writes in federation handler | ||||
| | * | | | | update docs | Erik Johnston | 2018-08-01 | 1 | -3/+5 |
| | | | | | | |||||
| | * | | | | _persist_auth_tree no longer returns anything | Erik Johnston | 2018-08-01 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-30 | 6 | -30/+177 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | erikj/split_fed_store | ||||
| | * | | | | Split out DB writes in federation handler | Erik Johnston | 2018-07-25 | 1 | -83/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to easily add an internal replication API to proxy these reqeusts to master, so that we can move federation APIs to workers. | ||||
| * | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 2 | -3/+35 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Initial impl of capping MAU | ||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-01 | 1 | -14/+14 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | neilj/mau_sign_in_log_in_limits | ||||
| | * | | | | | count_monthly_users() async | Neil Johnson | 2018-08-01 | 1 | -4/+7 |
| | | | | | | | |||||
| | * | | | | | make count_monthly_users async synapse/handlers/auth.py | Neil Johnson | 2018-08-01 | 1 | -4/+5 |
| | | | | | | | |||||
| | * | | | | | coding style | Neil Johnson | 2018-07-31 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 2 | -2/+29 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 2 | -10/+21 |
| | |/ / / |/| | | | |||||
| * | | | | rename replication_layer to federation_client | Richard van der Hoff | 2018-07-31 | 1 | -14/+14 |
| |/ / / | | | | | | | | | | | | | I have HAD ENOUGH of trying to remember wtf a replication layer is in terms of classes. | ||||
| * | | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 2 | -4/+22 |
| | | | | | | | | | | make /context lazyload & filter aware. | ||||
| * | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid | Richard van der Hoff | 2018-07-27 | 1 | -0/+4 |
| |\ \ \ | | | | | | | | | if inviter_display_name == ""||None then default to inviter MXID | ||||
| | * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Michael Telatynski | 2018-07-24 | 31 | -1534/+3975 |
| | |\ \ \ | | | | | | | | | | | | | | | | t3chguy/default_inviter_display_name_3pid | ||||
| | * | | | | if inviter_display_name == ""||None then default to inviter MXID | Michael Telatynski | 2018-06-13 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | to prevent email invite from "None" | ||||
| * | | | | | Deduplicate redundant lazy-loaded members (#3331) | Matthew Hodgson | 2018-07-26 | 1 | -25/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * attempt at deduplicating lazy-loaded members as per the proposal; we can deduplicate redundant lazy-loaded members which are sent in the same sync sequence. we do this heuristically rather than requiring the client to somehow tell us which members it has chosen to cache, by instead caching the last N members sent to a client, and not sending them again. For now we hardcode N to 100. Each cache for a given (user,device) tuple is in turn cached for up to X minutes (to avoid the caches building up). For now we hardcode X to 30. * add include_redundant_members filter option & make it work * remove stale todo * add tests for _get_some_state_from_cache * incorporate review | ||||
| * | | | | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that looping_call does check the deferred returned by its callback, and (at least in the case of client_ips), we were relying on this, and I broke it in #3604. Update run_as_background_process to return the deferred, and make sure we return it to clock.looping_call. | ||||
| * | | | | | Merge pull request #2970 from matrix-org/matthew/filter_members | Matthew Hodgson | 2018-07-26 | 1 | -14/+102 |
| |\ \ \ \ \ | | | | | | | | | | | | | Implement the lazy_load_members room state filter parameter | ||||
| | * \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-25 | 3 | -13/+21 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |