Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 1.6.0rc2 v1.6.0rc2 | Richard van der Hoff | 2019-11-25 | 1 | -1/+1 |
| | |||||
* | Fix exceptions from background database update for event labels. (#6407) | Richard van der Hoff | 2019-11-25 | 1 | -18/+25 |
| | | | | | | Add some exception handling here so that events whose json cannot be parsed are ignored rather than getting us stuck in a loop. Fixes #6404. | ||||
* | 1.6.0rc1 v1.6.0rc1 | Andrew Morgan | 2019-11-20 | 1 | -1/+1 |
| | |||||
* | Move admin endpoints into separate files (#6308) | Manuel Stahl | 2019-11-20 | 4 | -555/+621 |
| | |||||
* | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanups | Brendan Abolivier | 2019-11-20 | 2 | -70/+125 |
|\ | | | | | Only do `rc_login` ratelimiting on succesful login. | ||||
| * | Lint | Brendan Abolivier | 2019-11-20 | 1 | -1/+3 |
| | | |||||
| * | Apply suggestions from code review | Erik Johnston | 2019-11-18 | 2 | -3/+3 |
| | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> | ||||
| * | Add failed auth ratelimiting to UIA | Erik Johnston | 2019-11-06 | 1 | -1/+32 |
| | | |||||
| * | Only do `rc_login` ratelimiting on succesful login. | Erik Johnston | 2019-11-06 | 2 | -72/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | We were doing this in a number of places which meant that some login code paths incremented the counter multiple times. It was also applying ratelimiting to UIA endpoints, which was probably not intentional. In particular, some custom auth modules were calling `check_user_exists`, which incremented the counters, meaning that people would fail to login sometimes. | ||||
* | | Replace UPDATE with UPSERT on device_max_stream_id table (#6363) | Andrew Morgan | 2019-11-15 | 1 | -2/+15 |
| | | |||||
* | | Fix guest -> real account upgrade with account validity enabled (#6359) | Andrew Morgan | 2019-11-14 | 1 | -6/+3 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-11-14 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | anoa/homeserver_copy * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5 | ||||
| * \ | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 | Brendan Abolivier | 2019-11-14 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Set room version default to 5 | ||||
| | * | | Set room version default to 5 | Neil Johnson | 2019-10-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | A couple more instances | Andrew Morgan | 2019-11-12 | 2 | -2/+2 |
| | | | | |||||
* | | | | Replace instance variations of homeserver with correct case/spacing | Andrew Morgan | 2019-11-12 | 18 | -31/+31 |
|/ / / | |||||
* | | | Merge pull request #6340 from matrix-org/babolivier/pagination_query | Brendan Abolivier | 2019-11-08 | 1 | -8/+32 |
|\ \ \ | | | | | | | | | Fix the SQL SELECT query in _paginate_room_events_txn | ||||
| * | | | Incorporate review | Brendan Abolivier | 2019-11-08 | 1 | -12/+12 |
| | | | | |||||
| * | | | Lint | Brendan Abolivier | 2019-11-07 | 1 | -2/+2 |
| | | | | |||||
| * | | | Only join on event_labels if we're filtering on labels | Brendan Abolivier | 2019-11-07 | 1 | -9/+24 |
| | | | | |||||
| * | | | Handle lack of filter | Brendan Abolivier | 2019-11-07 | 1 | -5/+3 |
| | | | | |||||
| * | | | Fix the SQL SELECT query in _paginate_room_events_txn | Brendan Abolivier | 2019-11-07 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | Doing a SELECT DISTINCT when paginating is quite expensive, because it requires the engine to do sorting on the entire events table. However, we only need to run it if we're filtering on 2+ labels, so this PR is changing the request so that DISTINCT is only used then. | ||||
* | | | | Merge pull request #6295 from matrix-org/erikj/split_purge_history | Erik Johnston | 2019-11-08 | 5 | -174/+323 |
|\ \ \ \ | | | | | | | | | | | Split purge API into events vs state and add PurgeEventsStorage | ||||
| * | | | | Move type annotation into docstring | Erik Johnston | 2019-11-08 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Fix deleting state groups during room purge. | Erik Johnston | 2019-11-06 | 1 | -13/+14 |
| | | | | | | | | | | | | | | | | | | | | And fix the tests to actually test that things got deleted. | ||||
| * | | | | Use correct type annotation | Erik Johnston | 2019-11-06 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-11-05 | 3 | -83/+94 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | erikj/split_purge_history | ||||
| * | | | | | Change to not require a state_groups.room_id index. | Erik Johnston | 2019-11-04 | 4 | -53/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does mean that we won't clean up orphaned state groups (i.e. state groups that were persisted but the associated event wasn't). | ||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-11-04 | 64 | -336/+1288 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | erikj/split_purge_history | ||||
| * | | | | | | Fix up comment | Erik Johnston | 2019-11-01 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Update log line to lie a little less | Erik Johnston | 2019-10-31 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add state_groups.room_id index | Erik Johnston | 2019-10-31 | 2 | -0/+24 |
| | | | | | | | |||||
| * | | | | | | Docstrings | Erik Johnston | 2019-10-31 | 1 | -3/+11 |
| | | | | | | | |||||
| * | | | | | | Fix purge room API | Erik Johnston | 2019-10-31 | 1 | -5/+8 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-31 | 79 | -218/+562 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_purge_history | ||||
| * | | | | | | | Split purge API into events vs state | Erik Johnston | 2019-10-30 | 5 | -177/+300 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_update | Brendan Abolivier | 2019-11-07 | 2 | -0/+80 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | MSC2326: Add background update to take previous events into account | ||||
| * | | | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.py | Brendan Abolivier | 2019-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | | | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.py | Brendan Abolivier | 2019-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | | | | | | | | Copy results | Brendan Abolivier | 2019-11-07 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Revert "Back to using cursor_to_dict" | Brendan Abolivier | 2019-11-07 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1186612d6cd728e6b7ed7806579db3cea7410b54. | ||||
| * | | | | | | | | Back to using cursor_to_dict | Brendan Abolivier | 2019-11-07 | 1 | -9/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Initialise value before looping | Brendan Abolivier | 2019-11-07 | 1 | -4/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Incorporate review | Brendan Abolivier | 2019-11-07 | 1 | -14/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix field name | Brendan Abolivier | 2019-11-06 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Update insert | Brendan Abolivier | 2019-11-06 | 1 | -1/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' into babolivier/msc2326_bg_update | Brendan Abolivier | 2019-11-04 | 6 | -92/+189 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| * | | | | | | | | Print out the actual number of affected rows | Brendan Abolivier | 2019-11-04 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Correctly order results | Brendan Abolivier | 2019-11-04 | 1 | -5/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | TODO | Brendan Abolivier | 2019-11-04 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix exit condition | Brendan Abolivier | 2019-11-04 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Lint | Brendan Abolivier | 2019-11-04 | 1 | -6/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Don't try to process events we already have a label for | Brendan Abolivier | 2019-11-04 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Use a sensible default value for labels | Brendan Abolivier | 2019-11-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Use the right format for rows | Brendan Abolivier | 2019-11-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | MSC2326: Add background update to take previous events into account | Brendan Abolivier | 2019-11-04 | 2 | -0/+72 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groups | Andrew Morgan | 2019-11-07 | 3 | -1/+29 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-11-04 | 3 | -83/+94 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | anoa/room_upgrade_groups | ||||
| * | | | | | | | | | Re-add docstring, with caveats detailed | Andrew Morgan | 2019-11-04 | 3 | -3/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Transfer upgraded rooms on groups | Andrew Morgan | 2019-11-04 | 2 | -0/+24 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Fix LruCache callback deduplication (#6213) | V02460 | 2019-11-07 | 1 | -11/+37 |
| | | | | | | | | | |||||
* | | | | | | | | | Make numeric user_id checker start at @0, and don't ratelimit on checking ↵ | Andrew Morgan | 2019-11-06 | 3 | -21/+39 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6338) | ||||
| * | | | | | | | | | raise exception after multiple failures | Andrew Morgan | 2019-11-06 | 1 | -3/+10 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Address review comments | Andrew Morgan | 2019-11-06 | 2 | -13/+13 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Don't forget to ratelimit calls outside of RegistrationHandler | Andrew Morgan | 2019-11-06 | 2 | -2/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Numeric ID checker now checks @0, don't ratelimit on checking | Andrew Morgan | 2019-11-06 | 2 | -20/+29 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-11-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | 1.5.1 v1.5.1 | Richard van der Hoff | 2019-11-06 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ↵ | Richard van der Hoff | 2019-11-06 | 4 | -92/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6320) Fixes a bug where rejected events were persisted with the wrong state group. Also fixes an occasional internal-server-error when receiving events over federation which are rejected and (possibly because they are backwards-extremities) have no prev_group. Fixes #6289. | ||||
* | | | | | | | | | Add some checks that we aren't using state from rejected events (#6330) | Richard van der Hoff | 2019-11-05 | 2 | -6/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Raise an exception if accessing state for rejected events Add some sanity checks on accessing state_group etc for rejected events. * Skip calculating push actions for rejected events It didn't actually cause any bugs, because rejected events get filtered out at various later points, but there's not point in trying to calculate the push actions for a rejected event. | ||||
* | | | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_stats | Erik Johnston | 2019-11-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix phone home stats | ||||
| * | | | | | | | | | Fix phone home stats | Erik Johnston | 2019-11-05 | 1 | -2/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2 | Richard van der Hoff | 2019-11-05 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Fix exception when OpenGraph tag values are ints | ||||
| * | | | | | | | | Fix exception when OpenGraph tag values are ints | Richard van der Hoff | 2019-11-05 | 1 | -1/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'develop' into rav/url_preview_limit_title | Richard van der Hoff | 2019-11-05 | 143 | -1693/+3109 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| * | / / / / / | Improve documentation for EventContext fields (#6319) | Richard van der Hoff | 2019-11-05 | 2 | -26/+68 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Remove the psutil dependency (#6318) | Amber Brown | 2019-11-05 | 3 | -83/+94 |
| |/ / / / / | | | | | | | | | | | | | * remove psutil and replace with resource | ||||
| * / / / / | document the REPLICATE command a bit better (#6305) | Richard van der Hoff | 2019-11-04 | 3 | -9/+95 |
| |/ / / / | | | | | | | | | | | | | | | | since I found myself wonder how it works | ||||
| * | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326 | Brendan Abolivier | 2019-11-01 | 6 | -4/+98 |
| |\ \ \ \ | | | | | | | | | | | | | Implement MSC2326 (label based filtering) | ||||
| | * | | | | Incorporate review | Brendan Abolivier | 2019-11-01 | 4 | -3/+9 |
| | | | | | | |||||
| | * | | | | Update synapse/storage/data_stores/main/schema/delta/56/event_labels.sql | Brendan Abolivier | 2019-11-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| | * | | | | Add more data to the event_labels table and fix the indexes | Brendan Abolivier | 2019-11-01 | 3 | -5/+21 |
| | | | | | | |||||
| | * | | | | Add unstable feature flag | Brendan Abolivier | 2019-11-01 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | Lint | Brendan Abolivier | 2019-11-01 | 2 | -1/+2 |
| | | | | | | |||||
| | * | | | | Incorporate review | Brendan Abolivier | 2019-11-01 | 3 | -5/+18 |
| | | | | | | |||||
| | * | | | | Lint | Brendan Abolivier | 2019-10-30 | 1 | -7/+1 |
| | | | | | | |||||
| | * | | | | Add more integration testing | Brendan Abolivier | 2019-10-30 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add unit tests | Brendan Abolivier | 2019-10-30 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add index on label | Brendan Abolivier | 2019-10-30 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Implement filtering | Brendan Abolivier | 2019-10-30 | 2 | -2/+20 |
| | | | | | | |||||
| | * | | | | Store labels for new events | Brendan Abolivier | 2019-10-30 | 2 | -1/+22 |
| | | | | | | |||||
| | * | | | | Add database table for keeping track of labels on events | Brendan Abolivier | 2019-10-29 | 1 | -0/+20 |
| | | | | | | |||||
| * | | | | | Factor out an _AsyncEventContextImpl (#6298) | Richard van der Hoff | 2019-11-01 | 2 | -84/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intention here is to make it clearer which fields we can expect to be populated when: notably, that the _event_type etc aren't used for the synchronous impl of EventContext. | ||||
| * | | | | | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schema | Hubert Chathi | 2019-11-01 | 1 | -0/+42 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | fix hidden field in devices table for older sqlite | ||||
| | * | | | | | fix hidden field in devices table for older sqlite | Hubert Chathi | 2019-10-31 | 1 | -0/+42 |
| | | | | | | | |||||
| * | | | | | | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 10 | -6/+429 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198. | ||||
| * | | | | | | Remove last usages of deprecated logging.warn method (#6314) | Andrew Morgan | 2019-11-01 | 2 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Depublish a room from the public rooms list when it is upgraded (#6232) | Andrew Morgan | 2019-11-01 | 4 | -30/+91 |
| | | | | | | | |||||
| * | | | | | | Update synapse/storage/data_stores/main/devices.py | Hubert Chathi | 2019-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | | | | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-31 | 108 | -380/+803 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify | Hubert Chathi | 2019-10-31 | 5 | -3/+58 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | make notification of signatures work with workers | ||||
| | | * \ \ \ \ | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify | Hubert Chathi | 2019-10-31 | 103 | -376/+742 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | clean up code a bit | Hubert Chathi | 2019-10-31 | 1 | -5/+9 |
| | | | | | | | | | |||||
| | | * | | | | | | make user signatures a separate stream | Hubert Chathi | 2019-10-30 | 5 | -14/+50 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify | Hubert Chathi | 2019-10-30 | 43 | -1142/+1234 |
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | |||||
| | | * | | | | | | make notification of signatures work with workers | Hubert Chathi | 2019-10-24 | 3 | -2/+17 |
| | | | | | | | | | |||||
| | * | | | | | | | rstrip slashes from url on appservice (#6306) | Will Hunt | 2019-10-31 | 1 | -1/+3 |
| | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | Update black to 19.10b0 (#6304) | Amber Brown | 2019-11-01 | 37 | -158/+179 |
| | | |_|_|/ / | | |/| | | | | | | | | | | | * update version of black and also fix the mypy config being overridden | ||||
| | * | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storage | Erik Johnston | 2019-10-31 | 19 | -66/+338 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add StateGroupStorage interface | ||||
| | | * | | | | | Apply suggestions from code review | Erik Johnston | 2019-10-31 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix docstring Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| | | * | | | | | Port to use state storage | Erik Johnston | 2019-10-30 | 16 | -65/+102 |
| | | | | | | | | |||||
| | | * | | | | | Add StateGroupStorage interface | Erik Johnston | 2019-10-30 | 3 | -1/+235 |
| | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Expose some homeserver functionality to spam checkers (#6259) | Travis Ralston | 2019-10-31 | 2 | -1/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Offer the homeserver instance to the spam checker * Newsfile * Linting * Expose a Spam Checker API instead of passing the homeserver object * Alter changelog * s/hs/api | ||||
| | * | | | | | Fix /purge_room API. | Erik Johnston | 2019-10-31 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fails trying to clean the `topic` table which was recently removed. | ||||
| | * | | | | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 62 | -145/+159 |
| | | | | | | | | | | | | | | | | | | | | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated. | ||||
| | * | | | | | fix delete_existing for _persist_events (#6300) | Richard van der Hoff | 2019-10-30 | 2 | -5/+2 |
| | |/ / / / | | | | | | | | | | | | | this is part of _retry_on_integrity_error, so should only be on _persist_events_and_state_updates | ||||
| * | | | | | rename get_devices_by_remote to get_device_updates_by_remote | Hubert Chathi | 2019-10-30 | 2 | -6/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-30 | 42 | -1075/+1167 |
| |\| | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-30 | 45 | -542/+555 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | erikj/split_out_persistence_store | ||||
| | | * \ \ \ | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptor | Erik Johnston | 2019-10-30 | 1 | -4/+5 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Make ObservableDeferred.observe() always return deferred. | ||||
| | | | * | | | | Clarify docstring | Erik Johnston | 2019-10-30 | 1 | -0/+4 |
| | | | | | | | | |||||
| | | | * | | | | Make ObservableDeferred.observe() always return deferred. | Erik Johnston | 2019-10-30 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to use in an async/await world. Also fixes a bug where cache descriptors would occaisonally return a raw value rather than a deferred. | ||||
| | | * | | | | | Fix log line that was printing undefined value (#6278) | Andrew Morgan | 2019-10-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Fix small typo in comment (#6269) | Andrew Morgan | 2019-10-30 | 1 | -1/+1 |
| | | |/ / / / | |||||
| | | * | | | | Fix typo in domain name in account_threepid_delegates config option (#6273) | Andrew Morgan | 2019-10-30 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Handle FileNotFound error in checking git repository version (#6284) | Andrew Morgan | 2019-10-30 | 1 | -4/+6 |
| | | | | | | | |||||
| | | * | | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_await | Erik Johnston | 2019-10-30 | 6 | -53/+32 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Port receipt and read markers to async/wait | ||||
| | | | * \ \ \ | Merge branch 'erikj/federation_server_async_await' of ↵ | Erik Johnston | 2019-10-29 | 1 | -1/+1 |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/receipts_async_await | ||||
| | | | * | | | | | Port receipt and read markers to async/wait | Erik Johnston | 2019-10-29 | 6 | -53/+32 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge pull request #6274 from matrix-org/erikj/replication_async | Erik Johnston | 2019-10-30 | 6 | -44/+26 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Port replication http server endpoints to async/await | ||||
| | | | * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-29 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | | | | | | | | | | | | | erikj/replication_async | ||||
| | | | * | | | | | | Port replication http server endpoints to async/await | Erik Johnston | 2019-10-29 | 6 | -44/+26 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge pull request #6275 from matrix-org/erikj/port_rest_events | Erik Johnston | 2019-10-30 | 1 | -94/+72 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Port room rest handlers to async/await | ||||
| | | | * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-29 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | erikj/port_rest_events | ||||
| | | | * | | | | | | | Port room rest handlers to async/await | Erik Johnston | 2019-10-29 | 1 | -94/+72 |
| | | | | |/ / / / / | | | | |/| | | | | | |||||
| | | * | | | | | | | Don't return coroutines | Erik Johnston | 2019-10-29 | 1 | -6/+6 |
| | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-29 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| / / / | | | | |_|/ / / | | | |/| | | | | erikj/federation_server_async_await | ||||
| | | | * | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-10-29 | 1 | -1/+1 |
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | * | | | | | Make concurrently_execute work with async/await | Erik Johnston | 2019-10-29 | 1 | -4/+3 |
| | | | | | | | | |||||
| | | * | | | | | Port federation_server to async/await | Erik Johnston | 2019-10-29 | 1 | -118/+87 |
| | | |/ / / / | |||||
| | | * | | | | Merge pull request #6263 from matrix-org/erikj/caches_return_deferreds | Erik Johnston | 2019-10-29 | 3 | -7/+6 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Quick fix to ensure cache descriptors always return deferreds | ||||
| | | | * | | | | Update docstring | Erik Johnston | 2019-10-29 | 1 | -3/+2 |
| | | | | | | | | |||||
| | | | * | | | | Quick fix to ensure cache descriptors always return deferreds | Erik Johnston | 2019-10-28 | 3 | -4/+4 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-29 | 1 | -4/+8 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Add CI for synapse_port_db (#6140) | Brendan Abolivier | 2019-10-28 | 1 | -3/+6 |
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds: * a test sqlite database * a configuration file for the sqlite database * a configuration file for a postgresql database (using the credentials in `.buildkite/docker-compose.pyXX.pgXX.yaml`) as well as a new script named `.buildkite/scripts/test_synapse_port_db.sh` that: 1. installs Synapse 2. updates the test sqlite database to the latest schema and runs background updates on it 3. creates an empty postgresql database 4. run the `synapse_port_db` script to migrate the test sqlite database to the empty postgresql database (with coverage) Step `2` is done via a new script located at `scripts-dev/update_database`. The test sqlite database is extracted from a SyTest run, so that it can be considered as an actual homeserver's database with actual data in it. | ||||
| | | * | | | | | Merge tag 'v1.5.0rc2' into develop | Richard van der Hoff | 2019-10-28 | 4 | -8/+28 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.5.0rc2 (2019-10-28) ============================= Bugfixes -------- - Update list of boolean columns in `synapse_port_db`. ([\#6247](https://github.com/matrix-org/synapse/issues/6247)) - Fix /keys/query API on workers. ([\#6256](https://github.com/matrix-org/synapse/issues/6256)) - Improve signature checking on some federation APIs. ([\#6262](https://github.com/matrix-org/synapse/issues/6262)) Internal Changes ---------------- - Move schema delta files to the correct data store. ([\#6248](https://github.com/matrix-org/synapse/issues/6248)) - Small performance improvement by removing repeated config lookups in room stats calculation. ([\#6255](https://github.com/matrix-org/synapse/issues/6255)) | ||||
| | | * | | | | | | Convert EventContext to attrs (#6218) | Richard van der Hoff | 2019-10-28 | 2 | -62/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make EventContext use an attr | ||||
| | | * | | | | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keys | Hubert Chathi | 2019-10-25 | 2 | -0/+33 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | delete keys when deleting backup versions | ||||
| | | | * | | | | | | delete keys when deleting backups | Hubert Chathi | 2019-10-24 | 2 | -0/+33 |
| | | | | |_|_|/ / | | | | |/| | | | | |||||
| | | * | | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-25 | 1 | -1/+3 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-25 | 1 | -67/+67 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_logging | Erik Johnston | 2019-10-25 | 6 | -17/+24 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Reduce debug logging overhead | ||||
| | | | * | | | | | | | | Address codestyle concerns | Michael Kaye | 2019-10-24 | 3 | -5/+10 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Delay printf until logging is required. | Michael Kaye | 2019-10-24 | 2 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using % will cause the string to be generated even if debugging is off. | ||||
| | | | * | | | | | | | | use %r to __repr__ objects | Michael Kaye | 2019-10-24 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids calculating __repr__ unless we are going to log. | ||||
| | | | * | | | | | | | | Don't encode object as UTF-8 string if not needed. | Michael Kaye | 2019-10-24 | 1 | -2/+4 |
| | | | | |_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe that string formatting ~10-15 sized events will take a proportion of CPU time. | ||||
| | | * / | | | | | | | Make user/room stats log line less verbose. | Michael Kaye | 2019-10-24 | 1 | -1/+1 |
| | | |/ / / / / / / | |||||
| | * | | | | | | | | Review comments | Erik Johnston | 2019-10-30 | 4 | -13/+28 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Use new EventPersistenceStore | Erik Johnston | 2019-10-23 | 3 | -3/+12 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add DataStores and Storage classes. | Erik Johnston | 2019-10-23 | 3 | -4/+34 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Move persist_events out from main data store. | Erik Johnston | 2019-10-23 | 2 | -634/+711 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for splitting out of state_groups_state from the main store into it own one, as persisting events depends on calculating state. | ||||
| * | | | | | | | | | black | Hubert Chathi | 2019-10-30 | 1 | -1/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | apply changes as a result of PR review | Hubert Chathi | 2019-10-30 | 2 | -55/+46 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-24 | 277 | -4434/+4751 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | don't error if federation query doesn't have cross-signing keys | Hubert Chathi | 2019-10-24 | 1 | -7/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with ↵ | Hubert Chathi | 2019-10-23 | 1 | -67/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workers | ||||
| * | | | | | | | | | black | Hubert Chathi | 2019-10-22 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | vendor-prefix the EDU name until MSC1756 is merged into the spec | Hubert Chathi | 2019-10-22 | 2 | -2/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | update to work with newer code, and fix formatting | Hubert Chathi | 2019-10-22 | 3 | -6/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | add missing param | Hubert Chathi | 2019-10-22 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | make black happy | Hubert Chathi | 2019-10-22 | 2 | -27/+39 |
| | | | | | | | | | | |||||
| * | | | | | | | | | don't crash if the user doesn't have cross-signing keys | Hubert Chathi | 2019-10-22 | 1 | -14/+25 |
| | | | | | | | | | | |||||
| * | | | | | | | | | implement federation parts of cross-signing | Hubert Chathi | 2019-10-22 | 4 | -10/+179 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Apply suggestions from code review | Richard van der Hoff | 2019-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
* | | | | | | | | | | Strip overlong OpenGraph data from url preview | Richard van der Hoff | 2019-11-05 | 1 | -1/+19 |
| |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ... to stop people causing DoSes with malicious web pages | ||||
* | | | | | | | | | 1.5.0 v1.5.0 github/release-v1.5.0 release-v1.5.0 | Richard van der Hoff | 2019-10-29 | 1 | -1/+1 |
| |_|_|_|_|_|/ / |/| | | | | | | | |||||
* | | | | | | | | Make room directory search case insensitive | Erik Johnston | 2019-10-29 | 1 | -4/+8 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | 1.5.0rc2 v1.5.0rc2 | Richard van der Hoff | 2019-10-28 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Improve signature checking on some federation APIs (#6262) | Richard van der Hoff | 2019-10-28 | 3 | -7/+27 |
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Make sure that we check that events sent over /send_join, /send_leave, and /invite, are correctly signed and come from the expected servers. | ||||
* | | | | | | Merge pull request #6255 from matrix-org/erikj/stats_config | Erik Johnston | 2019-10-25 | 1 | -1/+3 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Remove repeated calls to config.stats_enabled. | ||||
| * | | | | | Remove repeated calls to config.stats_enabled. | Erik Johnston | 2019-10-25 | 1 | -1/+3 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | Turns out that fetching variables from the config object is expensive, so doing it once at startup avoids unnecessary work. | ||||
* / | | | | Fix /keys/query API on workers. | Erik Johnston | 2019-10-25 | 1 | -67/+67 |
|/ / / / | | | | | | | | | | | | | | | | | The necessary getters were added only to the master store and not the worker stores. | ||||
* | | | | Move schema delta files to the correct data store. | Erik Johnston | 2019-10-24 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | They were put in the global schema delta directory due to a bad merge. | ||||
* | | | | 1.5.0rc1 | Andrew Morgan | 2019-10-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Option to suppress resource exceeded alerting (#6173) | Neil Johnson | 2019-10-24 | 4 | -43/+96 |
| | | | | | | | | | | | | | | | | The expected use case is to suppress MAU limiting on small instances | ||||
* | | | | Cleanup extra quotes from IDEs (#6236) | Andrew Morgan | 2019-10-23 | 1 | -2/+1 |
| |/ / |/| | | |||||
* | | | Add config linting script that checks for bool casing (#6203) | Andrew Morgan | 2019-10-23 | 9 | -15/+22 |
| | | | | | | | | | | | | | | | Add a linting script that enforces all boolean values in the default config be lowercase. This has annoyed me for a while so I decided to fix it. | ||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-22 | 3 | -13/+479 |
|\| | | | | | | | | | | | erikj/refactor_stores | ||||
| * | | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 | Hubert Chathi | 2019-10-22 | 3 | -13/+479 |
| |\ \ | | |/ | |/| | Cross-signing [3/4] -- uploading signatures edition | ||||
| | * | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-10-18 | 152 | -2508/+5409 |
| | |\ | |||||
| | * | | fix doc strings | Hubert Chathi | 2019-10-18 | 1 | -9/+13 |
| | | | | |||||
| | * | | make isort happy | Hubert Chathi | 2019-09-24 | 1 | -1/+0 |
| | | | | |||||
| | * | | add some comments | Hubert Chathi | 2019-09-24 | 1 | -2/+10 |
| | | | | |||||
| | * | | drop some logger lines to debug | Hubert Chathi | 2019-09-24 | 1 | -3/+3 |
| | | | | |||||
| | * | | make changes based on PR feedback | Hubert Chathi | 2019-09-24 | 2 | -118/+165 |
| | | | | |||||
| | * | | add function docs | Hubert Chathi | 2019-09-07 | 1 | -2/+24 |
| | | | | |||||
| | * | | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 36 | -510/+1219 |
| | |\ \ | |||||
| | * | | | run black | Hubert Chathi | 2019-09-06 | 1 | -24/+10 |
| | | | | | |||||
| | * | | | split out signature processing into separate functions | Hubert Chathi | 2019-09-06 | 1 | -195/+204 |
| | | | | | |||||
| | * | | | avoid modifying input parameter | Hubert Chathi | 2019-09-05 | 1 | -7/+7 |
| | | | | | |||||
| | * | | | update with newer coding style | Hubert Chathi | 2019-09-04 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | make black happy | Hubert Chathi | 2019-09-04 | 3 | -93/+79 |
| | | | | | |||||
| | * | | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 3 | -84/+152 |
| | | | | | |||||
| | * | | | implement device signature uploading/fetching | Hubert Chathi | 2019-09-04 | 3 | -0/+338 |
| | | | | | |||||
* | | | | | Clean up prepare_database.py a bit and add comments | Erik Johnston | 2019-10-22 | 1 | -7/+30 |
| | | | | | |||||
* | | | | | Delete background_update table creation in main data_store | Erik Johnston | 2019-10-22 | 1 | -21/+0 |
| | | | | | |||||
* | | | | | Move README into synapse/storage/__init__.py | Erik Johnston | 2019-10-22 | 2 | -13/+12 |
| | | | | | |||||
* | | | | | Add a basic README to synapse.storage | Erik Johnston | 2019-10-22 | 1 | -0/+13 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-22 | 19 | -198/+631 |
|\| | | | | | | | | | | | | | | | | | | | erikj/refactor_stores | ||||
| * | | | | Remove Auth.check method (#6217) | Richard van der Hoff | 2019-10-18 | 2 | -21/+5 |
| | |_|/ | |/| | | | | | | This method was somewhat redundant, and confusing. | ||||
| * | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into develop | Hubert Chathi | 2019-10-18 | 12 | -21/+623 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 149 | -2344/+5400 |
| | |\ \ \ | |||||
| | * | | | | use the right function for when we're already in runInteraction | Hubert Chathi | 2019-10-18 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-09-07 | 36 | -510/+1219 |
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | |||||
| | * | | | add user signature stream change cache to slaved device store | Hubert Chathi | 2019-09-04 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 96 | -1261/+1463 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 98 | -1378/+3636 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-08-28 | 85 | -1304/+3405 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Cross-signing [1/4] -- hidden devices (#5759) | Hubert Chathi | 2019-08-12 | 3 | -10/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * allow devices to be marked as "hidden" This is a prerequisite for cross-signing, as it allows us to create other things that live within the device namespace, so they can be used for signatures. | ||||
| | * | | | | | | black | Hubert Chathi | 2019-08-28 | 1 | -3/+1 |
| | | | | | | | | |||||
| | * | | | | | | use stream ID generator instead of timestamp | Hubert Chathi | 2019-08-28 | 4 | -23/+23 |
| | | | | | | | | |||||
| | * | | | | | | make isort happy | Hubert Chathi | 2019-08-21 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | apply PR review suggestions | Hubert Chathi | 2019-08-21 | 4 | -53/+46 |
| | | | | | | | | |||||
| | * | | | | | | make changes from PR review | Hubert Chathi | 2019-08-01 | 4 | -49/+75 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-08-01 | 187 | -1954/+2779 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | don't need to return the hidden column any more | Hubert Chathi | 2019-08-01 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | really fix queries to work with Postgres | Hubert Chathi | 2019-07-31 | 1 | -19/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (by going back to not using SQL directly) | ||||
| | | * | | | | | | PostgreSQL, Y U no like? | Hubert Chathi | 2019-07-31 | 1 | -3/+4 |
| | | | | | | | | | |||||
| | | * | | | | | | remove extra SQL query param | Hubert Chathi | 2019-07-31 | 1 | -1/+0 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge branch 'develop' into cross-signing_hidden | Hubert Chathi | 2019-07-30 | 187 | -1934/+2767 |
| | | |\ \ \ \ \ \ | |||||
| | * | | | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-07-30 | 3 | -21/+17 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | apply changes from PR review | Hubert Chathi | 2019-07-30 | 3 | -20/+17 |
| | | | | | | | | | | |||||
| | * | | | | | | | | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 10 | -12/+558 |
| | |/ / / / / / / | |||||
| | * | | | | | | | allow devices to be marked as "hidden" | Hubert Chathi | 2019-07-24 | 2 | -16/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a prerequisite for cross-signing, as it allows us to create other things that live within the device namespace, so they can be used for signatures. | ||||
| * | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 9 | -122/+125 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix logging config for the docker image (#6197) | Richard van der Hoff | 2019-10-18 | 1 | -3/+2 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that loggers that are instantiated before the config is loaded get turned off. Also bring the logging config that is generated by --generate-config into line. Fixes #6194. | ||||
| * | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 29 | -187/+354 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rip out some unreachable code | Richard van der Hoff | 2019-10-17 | 4 | -153/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only possible rejection reason is AUTH_ERROR, so all of this is unreachable. | ||||
* | | | | | | | | | | Fix schema management to work with multiple data stores. | Erik Johnston | 2019-10-21 | 1 | -41/+108 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Move storage classes into a main "data store". | Erik Johnston | 2019-10-21 | 261 | -4324/+4500 |
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for having multiple data stores that offer different functionality, e.g. splitting out state or event storage. | ||||
* | | | | | | | | | Merge branch 'master' into develop | Brendan Abolivier | 2019-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 1.4.1 | Brendan Abolivier | 2019-10-18 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #6196 from matrix-org/erikj/await | Erik Johnston | 2019-10-18 | 6 | -114/+113 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Move rest/admin to use async/await. | ||||
| * | | | | | | | | | | Port synapse/rest/client/_base.py to async/await | Erik Johnston | 2019-10-11 | 1 | -9/+5 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add maybe_awaitable and fix __init__ bugs | Erik Johnston | 2019-10-11 | 2 | -2/+34 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Port synaps/rest/client/users.py to async/await | Erik Johnston | 2019-10-11 | 1 | -11/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Port synaps/rest/client/server_notice_servlet.py to async/await | Erik Johnston | 2019-10-11 | 1 | -6/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Port synaps/rest/client/media.py to async/await | Erik Johnston | 2019-10-11 | 1 | -16/+11 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Port rest/admin/__init__.py to async/await | Erik Johnston | 2019-10-11 | 1 | -72/+55 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212) | Erik Johnston | 2019-10-18 | 1 | -4/+9 |
| |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix presence timeouts when synchrotron restarts. Handling timeouts would fail if there was an external process that had timed out, e.g. a synchrotron restarting. This was due to a couple of variable name typoes. Fixes #3715. |