Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix noop checks when updating device keys | Erik Johnston | 2018-11-08 | 1 | -0/+5 |
| | | | | | | | | | | Clients often reupload their device keys (for some reason) so its important for the server to check for no-ops before sending out device list update notifications. The check is broken in python 3 due to the fact comparing bytes and unicode always fails, and that we write bytes to the DB but get unicode when we read. | ||||
* | Fix URL preview bugs (type error when loading cache from db, content-type ↵ | Amber Brown | 2018-11-08 | 2 | -10/+20 |
| | | | | including quotes) (#4157) | ||||
* | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 4 | -3/+21 |
| | | | | 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 | 2 | -10/+33 |
| | | | fixes #4056 | ||||
* | Tests for user consent resource (#4140) | Amber Brown | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | Add helpers for getting prev and auth events (#4139) | Erik Johnston | 2018-11-06 | 8 | -44/+60 |
| | | | | | | | * Add helpers for getting prev and auth events This is in preparation for allowing the event format to change between room versions. | ||||
* | Set the encoding to UTF8 in the default logconfig (#4138) | Amber Brown | 2018-11-03 | 1 | -0/+1 |
| | |||||
* | Merge pull request #4137 from matrix-org/erikj/clean_up_events | Erik Johnston | 2018-11-02 | 3 | -7/+4 |
|\ | | | | | Clean up event accesses and tests | ||||
| * | Clean up event accesses and tests | Erik Johnston | 2018-11-02 | 3 | -7/+4 |
| | | | | | | | | | | This is in preparation to refactor FrozenEvent to support different event formats for different room versions | ||||
* | | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 2 | -4/+24 |
| | | |||||
* | | Merge pull request #4132 from matrix-org/rav/fix_device_list_locking | Richard van der Hoff | 2018-11-02 | 3 | -11/+128 |
|\ \ | | | | | | | Fix locked upsert on device_lists_remote_cache | ||||
| * | | Add unique indexes to a couple of tables | Richard van der Hoff | 2018-11-02 | 3 | -6/+88 |
| | | | | | | | | | | | | | | | The indexes on device_lists_remote_extremeties can be unique, and they therefore should, to ensure that the db remains consistent. | ||||
| * | | Remove redundant database locks for device list updates | Richard van der Hoff | 2018-11-02 | 1 | -5/+40 |
| | | | | | | | | | | | | We can rely on the application-level per-user linearizer. | ||||
* | | | Merge pull request #4133 from matrix-org/travis/fix-terms-auth | Richard van der Hoff | 2018-11-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix logic error that prevented guests from seeing the privacy policy | ||||
| * | | | Fix logic error that prevented guests from seeing the privacy policy | Travis Ralston | 2018-11-01 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_none | Erik Johnston | 2018-11-02 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | Fix None exception in state res v2 | ||||
| * | | Fix None exception in state res v2 | Erik Johnston | 2018-11-02 | 1 | -0/+4 |
| |/ | |||||
* | | Merge pull request #4004 from matrix-org/travis/login-terms | Travis Ralston | 2018-11-01 | 5 | -17/+135 |
|\ \ | |/ |/| | Add m.login.terms to the registration flow | ||||
| * | Include a version query string arg for the consent route | Travis Ralston | 2018-10-31 | 2 | -3/+8 |
| | | |||||
| * | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 45 | -879/+1761 |
| |\ | |||||
| * \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 46 | -503/+1136 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-18 | 21 | -106/+472 |
| |\ \ \ | |||||
| * | | | | pep8 | Travis Ralston | 2018-10-15 | 3 | -14/+3 |
| | | | | | |||||
| * | | | | 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 | 10 | -3/+1047 |
| |\ \ \ \ | |||||
| * | | | | | Update login terms structure for the proposed language support | Travis Ralston | 2018-10-12 | 1 | -4/+7 |
| | | | | | | |||||
| * | | | | | Rely on the lack of ?u to represent public access | Travis Ralston | 2018-10-12 | 2 | -10/+6 |
| | | | | | | | | | | | | | | | | | | also general cleanup | ||||
| * | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-12 | 18 | -125/+224 |
| |\ \ \ \ \ | |||||
| * | | | | | | Use a flag rather than a new route for the public policy | Travis Ralston | 2018-10-03 | 3 | -17/+25 |
| | | | | | | | | | | | | | | | | | | | | | This also means that the template now has optional parameters, which will need to be documented somehow. | ||||
| * | | | | | | Auto-consent to the privacy policy if the user registered with terms | Travis Ralston | 2018-10-03 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | Make the terms flow requried | Travis Ralston | 2018-10-03 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Flesh out the fallback auth for terms | Travis Ralston | 2018-10-03 | 1 | -7/+67 |
| | | | | | | | |||||
| * | | | | | | 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 | 4 | -0/+40 |
| | | | | | | | | | | | | | | | | | | | | | As per https://github.com/vector-im/riot-web/issues/7168#issuecomment-419996117 | ||||
* | | | | | | | Merge pull request #4128 from matrix-org/erikj/state_res_v2_version | Erik Johnston | 2018-11-01 | 2 | -2/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add STATE_V2_TEST room version | ||||
| * | | | | | | | Add STATE_V2_TEST room version | Erik Johnston | 2018-11-01 | 2 | -2/+7 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-11-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | version | Amber Brown | 2018-11-01 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | version bump | Amber Brown | 2018-10-31 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -2/+6 |
| | | | | | | | |||||
| * | | | | | | version bump | Amber Brown | 2018-10-29 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | 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. | ||||
* | | | | | | | | Remove fetching keys via the deprecated v1 kex method (#4120) | Amber Brown | 2018-10-31 | 2 | -106/+12 |
| | | | | | | | | |||||
* | | | | | | | | Remove deprecated v1 key exchange endpoint (#4119) | Amber Brown | 2018-10-31 | 4 | -113/+1 |
| | | | | | | | | |||||
* | | | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -2/+6 |
| | | | | | | | | |||||
* | | | | | | | | Remove the unused /pull federation API (#4118) | Amber Brown | 2018-10-31 | 2 | -14/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #4006 from matrix-org/erikj/purge_state_groups | Erik Johnston | 2018-10-30 | 4 | -48/+137 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Delete unreferenced state groups during purge | ||||
| * | | | | | | | | Move _find_unreferenced_groups | Erik Johnston | 2018-10-29 | 2 | -81/+83 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix set operations thinko | Erik Johnston | 2018-10-29 | 1 | -3/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Don't make temporary list | Erik Johnston | 2018-10-29 | 1 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Make SQL a bit cleaner | Erik Johnston | 2018-10-29 | 1 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-26 | 59 | -948/+2189 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | erikj/purge_state_groups | ||||
| * | | | | | | | | pep8 | Erik Johnston | 2018-10-19 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-19 | 49 | -250/+1763 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/purge_state_groups | ||||
| * | | | | | | | | | Batch process handling state groups | Erik Johnston | 2018-10-19 | 2 | -101/+92 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix up comments | Erik Johnston | 2018-10-12 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add state_group index to event_to_state_groups | Erik Johnston | 2018-10-04 | 3 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to efficiently check for unreferenced state groups during purge. | ||||
| * | | | | | | | | | Delete unreferened state groups during purge | Erik Johnston | 2018-10-04 | 2 | -6/+77 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Write some tests for the email pusher (#4095) | Amber Brown | 2018-10-30 | 3 | -6/+14 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Deduplicate device updates sent over replication | Erik Johnston | 2018-10-29 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently send several kHz of device list updates over replication occisonally, which often causes the replications streams to lag and then get dropped. A lot of those updates will actually be duplicates, since we don't send e.g. device_ids across replication, so let's deduplicate it when we pull them out of the database. | ||||
* | | | | | | | | | | Don't truncate command name in metrics | Erik Johnston | 2018-10-29 | 1 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Delete the disused & unspecced identicon functionality (#4106) | Amber Brown | 2018-10-29 | 4 | -74/+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 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4099 from matrix-org/rav/upgrade_odd_pls | Richard van der Hoff | 2018-10-29 | 1 | -44/+81 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Better handling of odd PLs during room upgrades | ||||
| * | | | | | | | | | | 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. | ||||
* | | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgrades | Richard van der Hoff | 2018-10-29 | 7 | -38/+323 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Room version upgrade support | ||||
| * | | | | | | | | | optimise state copying | Richard van der Hoff | 2018-10-26 | 1 | -7/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Address review comments | Richard van der Hoff | 2018-10-26 | 2 | -12/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -4/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Basic initial support for room upgrades | Richard van der Hoff | 2018-10-25 | 5 | -0/+208 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | | | | | Make the replication logger quieter (#4108) | Amber Brown | 2018-10-29 | 1 | -1/+1 |
| |_|_|/ / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Port register_new_matrix_user to Python 3 and add tests (#4085) | Amber Brown | 2018-10-26 | 2 | -0/+215 |
|/ / / / / / / / | |||||
* | | | | | | | | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 9 | -420/+603 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #4051 from matrix-org/erikj/alias_disallow_list | Erik Johnston | 2018-10-25 | 5 | -15/+140 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add config option to control alias creation | ||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-25 | 46 | -443/+1124 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/alias_disallow_list | ||||
| * | | | | | | | | | Use allow/deny | Erik Johnston | 2018-10-25 | 1 | -6/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Use match rather than search | Erik Johnston | 2018-10-24 | 1 | -2/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Anchor returned regex to start and end of string | Erik Johnston | 2018-10-19 | 1 | -2/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add config option to control alias creation | Erik Johnston | 2018-10-19 | 5 | -15/+135 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_init | Neil Johnson | 2018-10-25 | 4 | -31/+84 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | fix race condiftion in calling initialise_reserved_users | ||||
| * | | | | | | | | | add new line | Neil Johnson | 2018-10-25 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | improve comments | Neil Johnson | 2018-10-25 | 1 | -6/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fix style inconsistencies | Neil Johnson | 2018-10-24 | 2 | -15/+47 |
| | | | | | | | | | | |||||
| * | | | | | | | | | commit transaction before closing | Neil Johnson | 2018-10-24 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init | Neil Johnson | 2018-10-24 | 31 | -368/+994 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | remove white space | Neil Johnson | 2018-10-23 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 3 | -25/+45 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-10-25 | 83 | -676/+2779 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | matthew/autocreate_autojoin | ||||
| * | | | | | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | Richard van der Hoff | 2018-10-24 | 12 | -67/+665 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rav/fix_event_filter_validation | ||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #4082 from matrix-org/rav/fix_pep8 | Richard van der Hoff | 2018-10-24 | 6 | -6/+6 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix a number of flake8 errors | ||||
| | | * | | | | | | | | | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 6 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broadly three things here: * disable W504 which seems a bit whacko * remove a bunch of `as e` expressions from exception handlers that don't use them * use `r""` for strings which include backslashes Also, we don't use pep8 any more, so we can get rid of the duplicate config there. | ||||
| | * | | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 6 | -61/+659 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | Add v2 state resolution algorithm | ||||
| | | * | | | | | | | | | Comment | Erik Johnston | 2018-10-24 | 1 | -2/+5 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 4 | -11/+11 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Update event_auth table for rejected events | Erik Johnston | 2018-10-16 | 1 | -15/+21 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fix up use of resolve_events_with_factory | Erik Johnston | 2018-10-16 | 1 | -13/+10 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | User event.sender rather than alias event.user_id | Erik Johnston | 2018-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Add v2 state res algorithm. | Erik Johnston | 2018-10-16 | 3 | -24/+616 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We hook this up to the vdh test room version. | ||||
| * | | | | | | | | | | | Allow backslashes in event field filters | Richard van der Hoff | 2018-10-24 | 1 | -1/+4 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783 which meant that single backslashes were not allowed in event field filters. The intention here is to allow single-backslashes, but disallow double-backslashes. | ||||
| * | | | | | | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 7 | -141/+141 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the way logcontexts and threads work in the pushers | ||||
| | * | | | | | | | | | | Fix start_pushers vs _start_pushers confusion | Richard van der Hoff | 2018-10-24 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | sanity-check the is_processing flag | Richard van der Hoff | 2018-10-24 | 2 | -8/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and rename it, for even more sanity | ||||
| | * | | | | | | | | | | Run PusherPool.start as a background process | Richard van der Hoff | 2018-10-22 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't do anything with the result, so this is needed to give this code a logcontext. | ||||
| | * | | | | | | | | | | Make on_started synchronous too | Richard van der Hoff | 2018-10-22 | 3 | -11/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings it into line with on_new_notifications and on_new_receipts. It requires a little bit of hoop-jumping in EmailPusher to load the throttle params before the first loop. | ||||
| | * | | | | | | | | | | Remove redundant run_as_background_process() from pusherpool | Richard van der Hoff | 2018-10-22 | 7 | -50/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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. | ||||
| | * | | | | | | | | | | Give pushers their own background logcontext | Richard van der Hoff | 2018-10-22 | 2 | -58/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each pusher has its own loop which runs for as long as it has work to do. This should run in its own background thread with its own logcontext, as other similar loops elsewhere in the system do - which means that CPU usage is consistently attributed to that loop, rather than to whatever request happened to start the loop. | ||||
| | * | | | | | | | | | | move get_all_pushers call down | Richard van der Hoff | 2018-10-22 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplifies the interface to _start_pushers | ||||
| | * | | | | | | | | | | Factor PusherPool._start_pusher out of _start_pushers | Richard van der Hoff | 2018-10-22 | 1 | -18/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and use it from start_pusher_by_id. This mostly simplifies start_pusher_by_id. | ||||
| | * | | | | | | | | | | Rename _refresh_pusher | Richard van der Hoff | 2018-10-22 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is public (or at least, called from outside the class), so ought to have a better name. | ||||
| * | | | | | | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 3 | -64/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | Clean up room alias creation | ||||
| | * | | | | | | | | | | Clean up room alias creation | Erik Johnston | 2018-10-19 | 3 | -64/+55 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requests | Travis Ralston | 2018-10-23 | 2 | -8/+22 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 49 | -314/+590 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | 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 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix exception documentation in matrixfederationclient.py | Travis Ralston | 2018-09-26 | 1 | -6/+6 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 | 5 | -80/+96 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #4076 from matrix-org/rav/fix_init_logcontexts | Richard van der Hoff | 2018-10-22 | 1 | -8/+22 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Run MAU queries as background processes | ||||
| | * | | | | | | | | | | Run MAU queries as background processes | Richard van der Hoff | 2018-10-20 | 1 | -8/+22 |
| | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3820 | ||||
| * | | | | | | | | | | Merge pull request #4073 from matrix-org/rav/require_psutil | Richard van der Hoff | 2018-10-22 | 2 | -10/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Make psutil an explicit dependency | ||||
| | * | | | | | | | | | | Make psutil an explicit dependency | Richard van der Hoff | 2018-10-19 | 2 | -10/+5 |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of #4027, we require psutil to be installed, so it should be in our dependency list. We can also remove some of the conditional import code introduced by #992. Fixes #4062. | ||||
| * / / / / / / / / / | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase ↵ | Amber Brown | 2018-10-20 | 9 | -71/+70 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on py3) (#4068) | ||||
| * | | | | | | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065 | Richard van der Hoff | 2018-10-19 | 2 | -28/+20 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | Calculate absolute path for email templates | ||||
| | * | | | | | | | | Calculate absolute path for email templates | Richard van der Hoff | 2018-10-19 | 2 | -28/+20 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix manhole on py3 (pt 2) (#4067) | Amber Brown | 2018-10-19 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Make the metrics less racy (#4061) | Amber Brown | 2018-10-19 | 2 | -16/+21 |
| | | | | | | | | | | |||||
| * | | | | | | | | | make a bytestring | Amber Brown | 2018-10-19 | 1 | -2/+2 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-10-18 | 11 | -5/+369 |
| |\| | | | | | | | |||||
| | * | | | | | | | 0.33.7 v0.33.7 | Richard van der Hoff | 2018-10-18 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | v0.33.7rc2 | Richard van der Hoff | 2018-10-17 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-17 | 4 | -35/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | | | | | Put the warning blob at the top of the file | Richard van der Hoff | 2018-10-17 | 1 | -6/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | Ship the email templates as package_data | Richard van der Hoff | 2018-10-17 | 10 | -4/+365 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the example email templates into the synapse package so that they can be used as package data, which should mean that all of the packaging mechanisms (pip, docker, debian, arch, etc) should now come with the example templates. In order to grandfather in people who relied on the templates being in the old place, check for that situation and fall back to using the defaults if the templates directory does not exist. | ||||
| | * | | | | | | | version bump | Amber Brown | 2018-10-15 | 1 | -1/+1 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Fix bug where we raised StopIteration in a generator | Erik Johnston | 2018-10-17 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This made python 3.7 unhappy | ||||
| * | | | | | | | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Thanks @Half-Shot !!! | ||||
| * | | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 4 | -35/+25 |
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | | Various cleanups in the federation client code (#4031) | Richard van der Hoff | 2018-10-16 | 3 | -61/+63 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improve logging: log things in the right order, include destination and txids in all log lines, don't log successful responses twice - Fix the docstring on TransportLayerClient.send_transaction - Don't use treq.request, which is overcomplicated for our purposes: just use a twisted.web.client.Agent. - simplify the logic for setting up the bodyProducer - fix bytes/str confusions | ||||
| * | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 8 | -0/+1044 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | E2E backups | ||||
| | * | | | | | missed one | David Baker | 2018-10-12 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Linting soothes the savage PEP8 monster | David Baker | 2018-10-12 | 1 | -4/+9 |
| | | | | | | | |||||
| | * | | | | | Misc PR feedback bits | David Baker | 2018-10-12 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Don't mangle exceptions | David Baker | 2018-10-12 | 1 | -4/+2 |
| | | | | | | | |||||
| | * | | | | | Split /room_keys/version into 2 servlets | David Baker | 2018-10-12 | 1 | -9/+21 |
| | | | | | | | |||||
| | * | | | | | PR feedback pt. 1 | David Baker | 2018-10-12 | 3 | -29/+22 |
| | | | | | | | |||||
| | * | | | | | Fix mergefail | David Baker | 2018-10-09 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | isort | David Baker | 2018-10-09 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 115 | -1523/+2315 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | 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 |
| | | | | | | | | |||||
| | * | | | | | | Don't reuse backup versions | David Baker | 2018-10-05 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't actually delete the keys, just mark the versions as deleted in the db rather than actually deleting them, then we won't reuse versions. Fixes https://github.com/vector-im/riot-web/issues/7448 | ||||
| | * | | | | | | WIP e2e key backups | David Baker | 2018-09-13 | 2 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continues from uhoreg's branch This just fixed the errcode on /room_keys/version if no backup and updates the schema delta to be on the latest so it gets run | ||||
| | * | | | | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 4 | -4/+10 |
| | | | | | | | | |||||
| | * | | | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 116 | -1483/+3715 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | allow session_data to be any JSON instead of just a string | Hubert Chathi | 2018-08-21 | 1 | -2/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | allow auth_data to be any JSON instead of a string | Hubert Chathi | 2018-08-21 | 1 | -2/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | use parse_string | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | 404 nicely if you try to interact with a missing current version | Matthew Hodgson | 2018-08-12 | 1 | -16/+35 |
| | | | | | | | | | |||||
| | * | | | | | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | flake8 | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 3 | -8/+36 |
| | | | | | | | | | |||||
| | * | | | | | | | fix idiocies and so make tests pass | Matthew Hodgson | 2018-08-12 | 2 | -3/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | don't needlessly return user_id | Matthew Hodgson | 2018-08-12 | 1 | -1/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | improve docstring | Matthew Hodgson | 2018-08-12 | 1 | -1/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | 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 | 2 | -4/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | fix typos | Matthew Hodgson | 2018-08-12 | 2 | -2/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 2 | -9/+113 |
| | | | | | | | | | |||||
| | * | | | | | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 1 | -20/+31 |
| | | | | | | | | | |||||
| | * | | | | | | | more docstring for the e2e_room_keys rest | Matthew Hodgson | 2018-08-12 | 2 | -2/+51 |
| | | | | | | | | | |||||
| | * | | | | | | | add storage docstring; remove unused set_e2e_room_keys | Matthew Hodgson | 2018-08-12 | 1 | -36/+83 |
| | | | | | | | | | |||||
| | * | | | | | | | 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 | 2 | -16/+16 |
| | | | | | | | | | |||||
| | * | | | | | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 5 | -79/+99 |
| | | | | | | | | | |||||
| | * | | | | | | | make /room_keys/version work | Matthew Hodgson | 2018-08-12 | 4 | -15/+38 |
| | | | | | | | | | |||||
| | * | | | | | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 5 | -6/+171 |
| | | | | | | | | | |||||
| | * | | | | | | | document the API | Matthew Hodgson | 2018-08-12 | 1 | -0/+133 |
| | | | | | | | | | |||||
| | * | | | | | | | make it work and fix pep8 | Matthew Hodgson | 2018-08-12 | 7 | -82/+134 |
| | | | | | | | | | |||||
| | * | | | | | | | interim WIP checkin; doesn't build yet | Matthew Hodgson | 2018-08-12 | 3 | -19/+84 |
| | | | | | | | | | |||||
| | * | | | | | | | total WIP skeleton for /room_keys API | Matthew Hodgson | 2018-08-12 | 4 | -0/+289 |
| | | | | | | | | | |||||
| * | | | | | | | | synapse/app: frontend_proxy.py: actually make workers work on py3 | Ivan Shapovalov | 2018-10-14 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | synapse/visibility.py: fix SyntaxError on py3.7 | Ivan Shapovalov | 2018-10-14 | 1 | -1/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Make workers work on Py3 (#4027) | Amber Brown | 2018-10-13 | 11 | -61/+62 |
| | | | | | | | | |||||
| * | | | | | | | Comments on get_all_new_events_stream | Richard van der Hoff | 2018-10-12 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | just some docstrings to clarify the behaviour here | ||||
| * | | | | | | | 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 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #4008 from matrix-org/erikj/log_looping_exceptions | Erik Johnston | 2018-10-09 | 2 | -13/+35 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | Log looping call exceptions | ||||
| | * | | | | | | Remove unnecessary extra function call layer | Erik Johnston | 2018-10-08 | 2 | -31/+16 |
| | | | | | | | | |||||
| | * | | | | | | Use errback pattern and catch async failures | Erik Johnston | 2018-10-08 | 2 | -15/+35 |
| | | | | | | | | |||||
| | * | | | | | | Log looping call exceptions | Erik Johnston | 2018-10-05 | 1 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a looping call function errors, then it kills the loop entirely. Currently it throws away the exception logs, so we should make it actually log them. Fixes #3929 | ||||
| * | | | | | | | Optimisation for filter_events_for_server | Richard van der Hoff | 2018-10-08 | 1 | -7/+6 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're better off hashing just the event_id than the whole ((type, state_key), event_id) tuple - so use a dict instead of a set. Also, iteritems > items. | ||||
* | | | | | | | isort | Neil Johnson | 2018-10-24 | 1 | -2/+1 |
| | | | | | | | |||||
* | | | | | | | 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 | 2 | -6/+6 |
| | | | | | | | |||||
* | | | | | | | clean up config error logic and imports | Neil Johnson | 2018-10-17 | 2 | -19/+20 |
| | | | | | | | |||||
* | | | | | | | 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 | 2 | -4/+18 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 17 | -130/+240 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliers | Richard van der Hoff | 2018-10-04 | 1 | -33/+69 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | Fix bug in forward_extremity update logic | ||||
| | * | | | | | actually exclude outliers | Richard van der Hoff | 2018-10-03 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | remove debugging | Richard van der Hoff | 2018-10-02 | 1 | -10/+0 |
| | | | | | | | |||||
| | * | | | | | Fix bug in forward_extremity update logic | Richard van der Hoff | 2018-10-02 | 1 | -33/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An event does not stop being a forward_extremity just because an outlier or rejected event refers to it. | ||||
| * | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-10-04 | 2 | -2/+5 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | full version | Amber Brown | 2018-10-04 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Pin to prometheus_client<0.4 to avoid renaming all of our metrics | Richard van der Hoff | 2018-10-03 | 1 | -1/+4 |
| | | | | | | | |||||
| | * | | | | | version | Amber Brown | 2018-10-03 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion | Erik Johnston | 2018-10-03 | 1 | -5/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix handling of rejected threepid invites | ||||
| | * | | | | | Sanitise error messages when user doesn't have permission to invite | Erik Johnston | 2018-10-03 | 1 | -5/+2 |
| | | | | | | | |||||
| | * | | | | | Fix handling of rejected threepid invites | Erik Johnston | 2018-10-03 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #3996 from matrix-org/erikj/fix_bg_iteration | Erik Johnston | 2018-10-03 | 1 | -2/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix exception in background metrics collection | ||||
| | * | | | | | Fix exception in background metrics collection | Erik Johnston | 2018-10-03 | 1 | -2/+6 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | We attempted to iterate through a list on a separate thread without doing the necessary copying. | ||||
| * / / / / | Fix exception handling in fetching remote profiles | Erik Johnston | 2018-10-03 | 1 | -6/+2 |
| |/ / / / | |||||
| * | | | | Fix bug when invalidating destination retry timings | Erik Johnston | 2018-10-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-02 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Fix error handling for missing auth_event | ||||
| | * \ \ \ | Merge branch 'develop' into rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-01 | 30 | -142/+299 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix error handling for missing auth_event | Richard van der Hoff | 2018-09-26 | 1 | -2/+2 |
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we were authorizing an event, if there was no `m.room.create` in its auth_events, we would raise a SynapseError with a cryptic message, which then meant that we would bail out of processing any incoming events, rather than storing a rejection for the faulty event and moving on. We should treat the absent event the same as any other auth failure, by raising an AuthError, so that the event is marked as rejected. | ||||
| * | | | | | Disable frozen dicts by default (#3987) | Amber Brown | 2018-10-02 | 1 | -3/+10 |
| | | | | | | |||||
| * | | | | | Fix error when logging incomplete requests | Erik Johnston | 2018-10-02 | 1 | -6/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a connection is lost before a request is read from Request, Twisted sets `method` (and `uri`) attributes to dummy values. These dummy values have incorrect types (i.e. they're not bytes), and so things like `__repr__` would raise an exception. To fix this we had a helper method to return the method with a consistent type. | ||||
| * | | | | | 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 | 20 | -36/+60 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | 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. | ||||
| * | | | | | | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cache | Erik Johnston | 2018-10-01 | 2 | -3/+44 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add a five minute cache to get_destination_retry_timings |