Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 17 | -67/+303 |
| | |||||
* | Remove v1/register's broken shared secret functionality (#3703) | Amber Brown | 2018-08-18 | 2 | -54/+1 |
| | |||||
* | Merge pull request #3701 from matrix-org/rav/use_producer_for_responses | Richard van der Hoff | 2018-08-17 | 9 | -64/+63 |
|\ | | | | | Use a producer to stream back responses | ||||
| * | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 |
| | | |||||
| * | Fix the tests | Amber Brown | 2018-08-15 | 7 | -60/+49 |
| | | |||||
| * | Use a producer to stream back responses | Richard van der Hoff | 2018-08-15 | 1 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | The problem with dumping all of the json response into the Request object at once is that doing so starts the timeout for the next request to be received: so if it takes longer than 60s to stream back the response to the client, the client never gets it. The correct solution is to use a Producer; then the timeout is only started once all of the content is sent over the TCP connection. | ||||
* | | Merge pull request #3700 from matrix-org/rav/wait_for_producers | Richard van der Hoff | 2018-08-17 | 3 | -92/+180 |
|\ \ | | | | | | | Refactor request logging code | ||||
| * | | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 |
| | | | |||||
| * | | Refactor request logging code | Richard van der Hoff | 2018-08-15 | 2 | -92/+179 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves a bunch of the logic for deciding when to log the receipt and completion of HTTP requests into SynapseRequest, rather than in the request handling wrappers. Advantages of this are: * we get logs for *all* requests (including OPTIONS and HEADs), rather than just those that end up hitting handlers we've remembered to decorate correctly. * when a request handler wires up a Producer (as the media stuff does currently, and as other things will do soon), we log at the point that all of the traffic has been sent to the client. | ||||
* | | | Merge pull request #3707 from matrix-org/neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 9 | -24/+75 |
|\ \ \ | | | | | | | | | add new error type ResourceLimit | ||||
| * \ \ | Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse ↵ | Neil Johnson | 2018-08-17 | 12 | -4/+36 |
| |\ \ \ | | | | | | | | | | | | | | | | into neilj/limit_exceeded_error | ||||
| | * \ \ | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 11 | -4/+35 |
| | |\ \ \ | |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #3708 from ↵ | Neil Johnson | 2018-08-17 | 7 | -3/+29 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/neilj/resource_Limit_block_event_creation Neilj/resource limit block event creation | ||||
| * | | | | | remove errant yield | Neil Johnson | 2018-08-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | For resource limit blocked users, prevent writing into rooms | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 4 | -2/+19 |
| | | | | | | |||||
| * | | | | | block event creation and room creation on hitting resource limits | Neil Johnson | 2018-08-16 | 2 | -1/+9 |
| | | | | | | |||||
* | | | | | | Merge pull request #3712 from matrix-org/travis/register-admin-docs | Amber Brown | 2018-08-17 | 2 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Update the admin register documentation to return a real user ID | ||||
| * | | | | | Create 3712.misc | Travis Ralston | 2018-08-17 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Update the admin register documentation to return a real user ID | Travis Ralston | 2018-08-17 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | Presumably this is the intention anyways. I've also updated the domain part to be something more along the lines of what people might expect. | ||||
* | | | | | Merge pull request #3705 from matrix-org/erikj/fix_inbound_fed_worker | Erik Johnston | 2018-08-16 | 2 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix inbound federation on reader worker | ||||
| * | | | | | Newsfile | Erik Johnston | 2018-08-16 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fix inbound federation on reader worker | Erik Johnston | 2018-08-16 | 1 | -0/+2 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | Inbound federation requires calculating push, which in turn relies on having access to account data. | ||||
| | * | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | server limits config docs | Neil Johnson | 2018-08-17 | 1 | -0/+26 |
| |/ / / | |||||
| * / / | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 8 | -24/+47 |
|/ / / | |||||
* | | | Add GET media/v1/config (#3184) | Will Hunt | 2018-08-16 | 3 | -1/+51 |
| | | | |||||
* | | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 3 | -2/+47 |
| | | | |||||
* | | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 6 | -18/+159 |
| | | | |||||
* | | | Merge pull request #3686 from matrix-org/rav/changelog_links_to_prs | Richard van der Hoff | 2018-08-15 | 1 | -10/+10 |
|\ \ \ | | | | | | | | | Changelog should link to PRs | ||||
| * | | | Changelog should link to PRs | Richard van der Hoff | 2018-08-13 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | The changelog makes much more sense if it consistently links to PRs, rather than mostly PRs with the occasional issue #. | ||||
* | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 4 | -4/+59 |
|\ \ \ \ | | | | | | | | | | | Fix Mau off by one errors | ||||
| * | | | | Fix mau blocking calulation bug on login | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 31 | -186/+615 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 5 | -4/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| * | | | | | | fix off by 1 errors | Neil Johnson | 2018-08-14 | 2 | -3/+14 |
| | | | | | | | |||||
| * | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-14 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| * | | | | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 3 | -7/+50 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| * \ \ \ \ \ \ | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 8 | -22/+46 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| * \ \ \ \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 7 | -20/+111 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
* | | | | | | | | | Remove incorrectly re-added changelog files | Richard van der Hoff | 2018-08-15 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were removed for the 0.33.2 release, but were incorrectly re-added in | ||||
* | | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 8 | -19/+174 |
| |_|_|_|_|/ / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 16 | -138/+512 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Move more federation APIs to workers | ||||
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-15 | 217 | -2760/+2605 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| * | | | | | | | | Use federation handler function rather than duplicate | Erik Johnston | 2018-08-15 | 2 | -48/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves renaming _persist_events to be a public function. | ||||
| * | | | | | | | | Rename slave TransactionStore to SlaveTransactionStore | Erik Johnston | 2018-08-15 | 6 | -11/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Update docs/workers.rst | Erik Johnston | 2018-08-09 | 1 | -0/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Newsfile | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Move clean_room_for_join to master | Erik Johnston | 2018-08-09 | 2 | -2/+49 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixup doc comments | Erik Johnston | 2018-08-09 | 2 | -0/+28 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-09 | 67 | -408/+1156 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| * | | | | | | | | | Pull in necessary stores in federation_reader | Erik Johnston | 2018-08-06 | 2 | -1/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Move necessary storage functions to worker classes | Erik Johnston | 2018-08-06 | 3 | -98/+100 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Import all functions from TransactionStore | Erik Johnston | 2018-08-06 | 1 | -11/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add EDU/query handling over replication | Erik Johnston | 2018-08-06 | 4 | -13/+62 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add replication APIs for persisting federation events | Erik Johnston | 2018-08-06 | 4 | -10/+290 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 9 | -30/+38 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | support admin_email config and pass through into blocking errors, | ||||
| * | | | | | | | | | remove changelog referencing another PR | Neil Johnson | 2018-08-15 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | clean up AuthError | Neil Johnson | 2018-08-15 | 1 | -7/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'neilj/update_limits_error_codes' of ↵ | Neil Johnson | 2018-08-15 | 4 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into neilj/admin_email | ||||
| | * | | | | | | | | | update error codes | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | update resource limit error codes | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 2 | -4/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | update admin email to uri | Neil Johnson | 2018-08-15 | 2 | -2/+2 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 5 | -11/+11 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 18 | -76/+373 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| * | | | | | | | | | remove blank line | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Update register.py | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | remove comments | ||||
| * | | | | | | | set admin email via config | Neil Johnson | 2018-08-13 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 7 | -22/+45 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
* | | | | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name | Neil Johnson | 2018-08-15 | 2 | -3/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | combine mau metrics into one group | ||||
| * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 8 | -22/+115 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | neilj/change_prometheus_mau_metric_name | ||||
| * | | | | | | | Rename MAU prometheus metric | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | pep8 | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | combine mau metrics into one group | Neil Johnson | 2018-08-14 | 1 | -4/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 6 | -20/+79 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | ||||
| * | | | | | | Log when we 3pid/unbind request fails | Erik Johnston | 2018-08-09 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 6 | -20/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661 | ||||
* | | | | | | | Merge pull request #3692 from ↵ | Neil Johnson | 2018-08-14 | 4 | -3/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/neil/fix_postgres_test_initialise_reserved_users Neil/fix postgres test initialise reserved users | ||||
| * | | | | | | | fix setup_test_homeserver to be postgres compatible | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix missing yield in ↵ | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synapse.storage.monthly_active_users.initialise_reserved_users | ||||
| * | | | | | | | adding missing yield | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | in case max_mau is less than I think | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 7 | -20/+112 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Block ability to read via sync if mau limit exceeded | ||||
| * | | | | | | make comments clearer | Neil Johnson | 2018-08-14 | 1 | -1/+2 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 4 | -18/+19 |
| | | | | | | |||||
| * | | | | | fix errant parenthesis | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fix imports | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 3 | -12/+48 |
| | | | | | | |||||
| * | | | | | Where server is disabled, block ability for locked out users to read new ↵ | Neil Johnson | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | messages | ||||
| * | | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 2 | -13/+18 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 6 | -1/+22 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block | ||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 98 | -405/+819 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block | ||||
| * | | | | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 2 | -5/+53 |
| | | | | | | | | |||||
* | | | | | | | | Dockerised sytest (#3660) | Amber Brown | 2018-08-14 | 4 | -0/+53 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3681 from matrix-org/neilj/fix_reap_users_in_postgres | Amber Brown | 2018-08-14 | 2 | -16/+29 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Neilj/fix reap users in postgres | ||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into ↵ | Amber Brown | 2018-08-14 | 56 | -292/+404 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | neilj/fix_reap_users_in_postgres | ||||
* | | | | | | | | | Implement a new test baseclass to cut down on boilerplate (#3684) | Amber Brown | 2018-08-14 | 3 | -37/+174 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-base | Jan Christian Grünhage | 2018-08-14 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | update docker base-image to alpine 3.8 | ||||
| * | | | | | | | | update docker base-image to alpine 3.8 | Jan Christian Grünhage | 2018-08-09 | 2 | -1/+2 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Name changelog after PR, not bug | Richard van der Hoff | 2018-08-13 | 1 | -0/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3677 from andrewshadura/master | Richard van der Hoff | 2018-08-13 | 3 | -196/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use recaptcha_ajax.js directly from Google | ||||
| * | | | | | | | | Use recaptcha_ajax.js directly from Google | Andrej Shadura | 2018-08-10 | 3 | -196/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script recaptcha_ajax.js contains minified non-free code which we probably cannot redistribute. Since it talks to Google servers anyway, it is better to just download it from Google directly instead of shipping it. This fixes #1932. | ||||
* | | | | | | | | | Revert "support admin_email config and pass through into blocking errors, ↵ | Neil Johnson | 2018-08-13 | 7 | -45/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6. | ||||
* | | | | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 7 | -22/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
* | | | | | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 49 | -59/+227 |
| | | | | | | | | | |||||
| | | * | | | | | | Fixes test_reap_monthly_active_users so it passes under postgres | Neil Johnson | 2018-08-11 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | fix sqlite/postgres incompatibility in reap_monthly_active_users | Neil Johnson | 2018-08-11 | 1 | -16/+28 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3679 from matrix-org/hawkowl/blackify-tests | Amber Brown | 2018-08-11 | 76 | -2280/+1631 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Blackify the tests | ||||
| * | | | | | | | | fix up a forced long line | Amber Brown | 2018-08-11 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | changelog | Amber Brown | 2018-08-10 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Run black. | black | 2018-08-10 | 75 | -2280/+1629 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'rav/fix_linearizer_cancellation' into develop | Richard van der Hoff | 2018-08-10 | 2 | -43/+69 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-08-10 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix linearizer cancellation on twisted < 18.7 | Richard van der Hoff | 2018-08-10 | 1 | -43/+68 |
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that cancellation of inlineDeferreds didn't really work properly until Twisted 18.7. This commit refactors Linearizer.queue to avoid inlineCallbacks. | ||||
* | | | | | | | | | log *after* reloading log config | Richard van der Hoff | 2018-08-10 | 1 | -2/+1 |
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ... because logging *before* reloading means the log message gets lost in the old MemoryLogger | ||||
* | | | | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 33 | -34/+35 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 15 | -16/+113 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | send SNI for federation requests | ||||
| * | | | | | | | more generic conversion of str/bytes to unicode | Jeroen | 2018-08-09 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | include private functions from twisted | Jeroen | 2018-08-09 | 1 | -2/+35 |
| | | | | | | | | |||||
| * | | | | | | | updated docstring for ServerContextFactory | Jeroen | 2018-08-08 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | fix isort | Jeroen | 2018-07-29 | 1 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | fix accidental removal of hs | Jeroen | 2018-07-27 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 156 | -5187/+7015 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into ↵ | Jeroen | 2018-07-14 | 347 | -1985/+2111 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 88 | -205/+1673 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # synapse/http/endpoint.py | ||||
| * | | | | | | | | | | take idna implementation from twisted | Jeroen | 2018-06-26 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | towncrier changelog | Jeroen | 2018-06-26 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | allow self-signed certificates | Jeroen | 2018-06-26 | 3 | -35/+36 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | formatting changes for pep8 | Jeroen | 2018-06-25 | 4 | -5/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | send SNI for federation requests | Jeroen | 2018-06-24 | 15 | -13/+71 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 6 | -1/+22 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | Flag to disable HS without disabling federation | ||||
| * | | | | | | | | | | fix pep8 too many lines | Neil Johnson | 2018-08-08 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 14 | -22/+245 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 6 | -7/+115 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Ability to disable client/server Synapse via conf toggle | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hs | Neil Johnson | 2018-08-08 | 16 | -157/+226 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-06 | 1 | -4/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-06 | 2 | -8/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs | ||||
| * | | | | | | | | | | | | | | | disable HS from config | Neil Johnson | 2018-08-04 | 5 | -1/+21 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-08-09 | 61 | -56/+75 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | 0.33.2 changelog v0.33.2 github/release-v0.33.2 release-v0.33.2 | Amber Brown | 2018-08-09 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | 0.33.2 | Amber Brown | 2018-08-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | fix the changelog & template | Amber Brown | 2018-08-09 | 2 | -50/+50 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | fix changelog | Amber Brown | 2018-08-07 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | fix for rc1 v0.33.2rc1 | Amber Brown | 2018-08-07 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | changelog | Amber Brown | 2018-08-07 | 59 | -54/+64 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | version | Amber Brown | 2018-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 6 | -274/+396 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | ||||
| * | | | | | | | | | | | | | | | Fixup wording and remove dead code | Erik Johnston | 2018-08-09 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Rename POST param to METHOD | Erik Johnston | 2018-08-08 | 2 | -13/+22 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixup logging and docstrings | Erik Johnston | 2018-08-08 | 2 | -2/+40 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix isort | Erik Johnston | 2018-08-06 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-03 | 67 | -647/+1073 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_repl_servlet | ||||
| * | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-31 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Use new helper base class for membership requests | Erik Johnston | 2018-07-31 | 2 | -195/+108 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 2 | -86/+40 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | Erik Johnston | 2018-07-31 | 1 | -0/+208 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will hopefully reduce the boiler plate required to implement new internal HTTP requests. | ||||
* | | | | | | | | | | | | | | | | Test fixes for Python 3 (#3647) | Amber Brown | 2018-08-09 | 14 | -52/+71 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 4 | -1/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | more metrics for the federation and appservice senders | ||||
| * | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | fix metric name | Richard van der Hoff | 2018-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | more metrics for the federation and appservice senders | Richard van der Hoff | 2018-08-07 | 3 | -1/+32 |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 14 | -22/+244 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | Support for room versioning | ||||
| * | | | | | | | | | | | | | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 3 | -15/+5 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Check m.room.create for sane room_versions | Richard van der Hoff | 2018-08-06 | 2 | -4/+32 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 4 | -8/+25 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | sanity check response from make_join | Richard van der Hoff | 2018-08-03 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Enforce compatibility when processing make_join requests | Richard van der Hoff | 2018-08-03 | 3 | -4/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject make_join requests from servers which do not support the room version. Also include the room version in the response. | ||||
| * | | | | | | | | | | | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 7 | -5/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first tranche of support for room versioning. It includes: * setting the default room version in the config file * new room_version param on the createRoom API * storing the version of newly-created rooms in the m.room.create event * fishing the version of existing rooms out of the m.room.create event | ||||
| * | | | | | | | | | | | | | | Docstrings for BaseFederationServlet | Richard van der Hoff | 2018-08-03 | 1 | -0/+47 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to save me reverse-engineering this stuff again. | ||||
* | | | | | | | | | | | | | | Merge pull request #3662 from matrix-org/neilj/reserved_users | Neil Johnson | 2018-08-08 | 6 | -7/+115 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | Reserved users for MAU limits | ||||
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-08 | 16 | -156/+225 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/reserved_users | ||||
* | | | | | | | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 18 | -163/+414 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | API for monthly_active_users table | ||||
| * | | | | | | | | | | | | | typos | Neil Johnson | 2018-08-08 | 2 | -3/+3 |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #3658 from ↵ | Richard van der Hoff | 2018-08-07 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/fix_event_persisted_position_metrics Fix occasional glitches in the synapse_event_persisted_position metric | ||||
| * | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix occasional glitches in the synapse_event_persisted_position metric | Richard van der Hoff | 2018-08-07 | 1 | -3/+8 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every so often this metric glitched to a negative number. I'm assuming it was due to backfilled events. | ||||
* / | | | | | | | | | | | | fix event lag graph | Richard van der Hoff | 2018-08-07 | 1 | -8/+16 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Return M_NOT_FOUND when a profile could not be found. (#3596) | Will Hunt | 2018-08-03 | 2 | -31/+59 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3644 from ↵ | Michael Kaye | 2018-08-03 | 9 | -112/+139 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/michaelkaye/refactor_docker_locations_v2 Refactor Dockerfile location | ||||
| * | | | | | | | | | | | Update README.md | Michael Kaye | 2018-08-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to contrib/docker | ||||
| * | | | | | | | | | | | Update README.md | Michael Kaye | 2018-08-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to docker/README.md | ||||
| * | | | | | | | | | | | Update README.rst | Michael Kaye | 2018-08-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to contrib/docker | ||||
| * | | | | | | | | | | | Update README.rst | Michael Kaye | 2018-08-03 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrap at 80ish | ||||
| * | | | | | | | | | | | Add news entry | Michael Kaye | 2018-08-02 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Address SPAG issues | Michael Kaye | 2018-08-02 | 1 | -2/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Do not include docker files in python build | Michael Kaye | 2018-08-02 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Refactor docker locations and README. | Michael Kaye | 2018-08-02 | 7 | -110/+126 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses #3224 | ||||
| | | * | | | | | | | | | Ability to whitelist specific threepids against monthly active user limiting | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | mock config.max_mau_value | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | prevent total number of reserved users being too large | Neil Johnson | 2018-08-07 | 1 | -1/+3 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | implement reserved users for mau limits | Neil Johnson | 2018-08-07 | 4 | -13/+99 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | WIP building out mau reserved users | Neil Johnson | 2018-08-06 | 1 | -1/+15 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | add default mau_limits_reserved_threepids | Neil Johnson | 2018-08-06 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | load mau limit threepids | Neil Johnson | 2018-08-06 | 1 | -0/+3 |
| | |/ / / / / / / / / | |||||
| | * | | | / / / / / | Fix postgres compatibility bug | Neil Johnson | 2018-08-06 | 1 | -4/+15 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | update comments to reflect new sig | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | make use of _simple_select_one_onecol, improved comments | Neil Johnson | 2018-08-06 | 2 | -8/+15 |
| | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | py3 fix | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | remove unused import | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | bug fixes | Neil Johnson | 2018-08-03 | 5 | -27/+10 |
| | | | | | | | | |||||
| | * | | | | | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 5 | -53/+66 |
| | | | | | | | | |||||
| | * | | | | | | fix (lots of) py3 test failures | Neil Johnson | 2018-08-03 | 3 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | fix py3 test failure | Neil Johnson | 2018-08-03 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Add ability to limit number of monthly active users on the server | Neil Johnson | 2018-08-03 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | fix caching and tests | Neil Johnson | 2018-08-03 | 3 | -62/+80 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 25 | -379/+450 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment | Amber Brown | 2018-08-03 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Mention the word "newsfragment" in CONTRIBUTING.rst | ||||
| * | | | | | | | newsfragment | Michael Kaye | 2018-08-02 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Mention the word "newsfragment" in CONTRIBUTING.rst | Michael Kaye | 2018-08-02 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 9 | -142/+124 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Clean up handling of errors from outbound requests | ||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 5 | -78/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code brings the SimpleHttpClient into line with the MatrixFederationHttpClient by having it raise HttpResponseExceptions when a request fails (rather than trying to parse for matrix errors and maybe raising MatrixCodeMessageException). Then, whenever we were checking for MatrixCodeMessageException and turning them into SynapseErrors, we now need to check for HttpResponseExceptions and call to_synapse_error. | ||||
| * | | | | | | | Refactor code for turning HttpResponseException into SynapseError | Richard van der Hoff | 2018-08-01 | 3 | -34/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit replaces SynapseError.from_http_response_exception with HttpResponseException.to_synapse_error. The new method actually returns a ProxiedRequestError, which allows us to pass through additional metadata from the API call. | ||||
| * | | | | | | | Be more careful which errors we send back over the C-S API | Richard van der Hoff | 2018-08-01 | 3 | -32/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We really shouldn't be sending all CodeMessageExceptions back over the C-S API; it will include things like 401s which we shouldn't proxy. That means that we need to explicitly turn a few HttpResponseExceptions into SynapseErrors in the federation layer. The effect of the latter is that the matrix errcode will get passed through correctly to calling clients, which might help with some of the random M_UNKNOWN errors when trying to join rooms. | ||||
* | | | | | | | | Merge pull request #3638 from ↵ | Richard van der Hoff | 2018-08-02 | 2 | -129/+149 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/refactor_federation_client_exception_handling Factor out exception handling in federation_client | ||||
| * | | | | | | | | changelog | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Factor out exception handling in federation_client | Richard van der Hoff | 2018-08-01 | 1 | -129/+148 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out the error handling from make_membership_event, send_join, and send_leave, so that it can be shared. | ||||
* | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 11 | -21/+77 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge tag 'v0.33.1' | Richard van der Hoff | 2018-08-02 | 9 | -19/+73 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 0.33.1 (2018-08-02) =========================== SECURITY FIXES -------------- - Fix a potential issue where servers could request events for rooms they have not joined. (`#3641 <https://github.com/matrix-org/synapse/issues/3641>`_) - Fix a potential issue where users could see events in private rooms before they joined. (`#3642 <https://github.com/matrix-org/synapse/issues/3642>`_) | ||||
| | * | | | | | | | | changelog: this is a security release v0.33.1 github/release-v0.33.1 release-v0.33.1 | Richard van der Hoff | 2018-08-02 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix changelog typos | Richard van der Hoff | 2018-08-02 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Prepare 0.33.1 | Richard van der Hoff | 2018-08-02 | 4 | -3/+11 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #3642 from matrix-org/rav/another_room_id_check | Richard van der Hoff | 2018-08-02 | 5 | -7/+25 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Check room visibility for /event/ requests | ||||
| | | * | | | | | | | | changelogs | Richard van der Hoff | 2018-08-02 | 2 | -1/+2 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Check room visibility for /event/ requests | Richard van der Hoff | 2018-08-02 | 3 | -6/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the user has permission to view the requeseted event for /event/{eventId} and /room/{roomId}/event/{eventId} requests. Also check that the event is in the given room for /room/{roomId}/event/{eventId}, for sanity. | ||||
| | * | | | | | | | | | Merge pull request #3641 from matrix-org/rav/room_id_check | Richard van der Hoff | 2018-08-02 | 5 | -12/+40 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validation for events/rooms in fed requests | ||||
| | | * | | | | | | | | changelog | Richard van der Hoff | 2018-08-02 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Avoid extra db lookups | Richard van der Hoff | 2018-08-02 | 3 | -62/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're about to look up the events themselves anyway, we can skip the extra db queries here. | ||||
| | | * | | | | | | | | Validation for events/rooms in fed requests | Richard van der Hoff | 2018-08-02 | 3 | -1/+64 |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we get a federation request which refers to an event id, make sure that said event is in the room the caller claims it is in. (patch supplied by @turt2live) | ||||
| * | | | | | | | | | Merge pull request #3594 from matrix-org/richvdh-patch-1 | Richard van der Hoff | 2018-07-24 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Update ISSUE_TEMPLATE.md | ||||
| | * | | | | | | | | | Update ISSUE_TEMPLATE.md | Richard van der Hoff | 2018-07-24 | 1 | -2/+3 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | request backticks for logs | ||||
| * | | | | | | | | | Merge pull request #3377 from Valodim/note-affinity | Richard van der Hoff | 2018-07-19 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | document that the affinity package is required for the cpu_affinity setting | ||||
| | * | | | | | | | | add note that the affinity package is required for the cpu_affinity setting | Vincent Breitmoser | 2018-06-09 | 1 | -0/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_store | Erik Johnston | 2018-08-02 | 3 | -89/+101 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Split out DB writes in federation handler | ||||
| * | | | | | | | | | | update docs | Erik Johnston | 2018-08-01 | 2 | -4/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | _persist_auth_tree no longer returns anything | Erik Johnston | 2018-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-30 | 37 | -108/+787 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_fed_store | ||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-27 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Split out DB writes in federation handler | Erik Johnston | 2018-07-25 | 2 | -85/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to easily add an internal replication API to proxy these reqeusts to master, so that we can move federation APIs to workers. | ||||
| | | | | | * | | | | | | update generate_monthly_active_users, and reap_monthly_active_users | Neil Johnson | 2018-08-02 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | | | | * | | | | | | typo | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | | | * | | | | | | wip attempt at caching | Neil Johnson | 2018-08-02 | 1 | -9/+47 |
| | | | | | | | | | | | | |||||
| | | | | | * | | | | | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 7 | -61/+97 |
| | | | | | | | | | | | | |||||
| | | | | | * | | | | | | remove unused count_monthly_users | Neil Johnson | 2018-08-02 | 2 | -90/+0 |
| | | | | | | | | | | | | |||||
| | | | | | * | | | | | | fix test, update constructor call | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | |