Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Logging improvements around TLS certs | Richard van der Hoff | 2019-02-11 | 3 | -22/+39 |
| | | | | | Log which file we're reading keys and certs from, and refactor the code a bit in preparation for other work | ||||
* | Move ClientTLSOptionsFactory init out of refresh_certificates (#4611) | Richard van der Hoff | 2019-02-11 | 5 | -9/+9 |
| | | | | | It's nothing to do with refreshing the certificates. No idea why it was here. | ||||
* | Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updating | Erik Johnston | 2019-02-11 | 5 | -5/+197 |
|\ | | | | | add updating of backup versions | ||||
| * | make sure version is in body and wrap in linearizer queue | Hubert Chathi | 2019-02-08 | 3 | -12/+100 |
| | | | | | | | | also add tests | ||||
| * | re-try to make isort happy | Hubert Chathi | 2019-02-06 | 1 | -1/+1 |
| | | |||||
| * | add changelog entry | Hubert Chathi | 2019-02-06 | 1 | -0/+1 |
| | | |||||
| * | fix import to make isort happy | Hubert Chathi | 2019-02-06 | 1 | -2/+7 |
| | | |||||
| * | add new endpoint to update backup versions | Hubert Chathi | 2019-02-06 | 3 | -1/+87 |
| | | |||||
| * | return proper error codes for some 404s | Hubert Chathi | 2019-02-06 | 1 | -4/+16 |
| | | |||||
* | | Clean up default listener configuration (#4586) | Richard van der Hoff | 2019-02-11 | 2 | -48/+82 |
| | | | | | | | | | | | | | | | | | | | | Rearrange the comments to try to clarify them, and expand on what some of it means. Use a sensible default 'bind_addresses' setting. For the insecure port, only bind to localhost, and enable x_forwarded, since apparently it's for use behind a load-balancer. | ||||
* | | Clarifications for reverse proxy docs (#4607) | Richard van der Hoff | 2019-02-11 | 6 | -62/+117 |
| | | | | | | | | | | | | | | Factor out the reverse proxy info to a separate file, add some more info on reverse-proxying the federation port. | ||||
* | | ACME Reprovisioning (#4522) | Amber Brown | 2019-02-11 | 5 | -25/+89 |
| | | |||||
* | | Be tolerant of blank TLS fingerprints config (#4589) | Amber Brown | 2019-02-11 | 2 | -1/+6 |
| | | |||||
* | | Merge pull request #4420 from matrix-org/jaywink/openid-listener | Erik Johnston | 2019-02-11 | 9 | -46/+252 |
|\ \ | | | | | | | New listener resource for the federation API "openid/userinfo" endpoint | ||||
| * | | Fix flake8 issues | Jason Robinson | 2019-01-23 | 3 | -4/+13 |
| | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Fix openid tests after rebase | Jason Robinson | 2019-01-23 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Fix sorting of imports in tests. Remove an unnecessary mock | Jason Robinson | 2019-01-23 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Collapse changelog to one line | Jason Robinson | 2019-01-23 | 1 | -13/+1 |
| | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Remove openid resource from default config | Jason Robinson | 2019-01-23 | 1 | -4/+13 |
| | | | | | | | | | | | | | | | | | | Instead document it commented out. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Document `servlet_groups` parameters | Jason Robinson | 2019-01-23 | 1 | -0/+23 |
| | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Add changelog for openid resource addition | Jason Robinson | 2019-01-23 | 1 | -0/+13 |
| | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Split federation OpenID userinfo endpoint out of the federation resource | Jason Robinson | 2019-01-23 | 4 | -46/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the OpenID userinfo endpoint to be active even if the federation resource is not active. The OpenID userinfo endpoint is called by integration managers to verify user actions using the client API OpenID access token. Without this verification, the integration manager cannot know that the access token is valid. The OpenID userinfo endpoint will be loaded in the case that either "federation" or "openid" resource is defined. The new "openid" resource is defaulted to active in default configuration. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Add tests for the openid lister for SynapseHomeServer | Jason Robinson | 2019-01-23 | 1 | -1/+48 |
| | | | | | | | | | | | | | | | | | | | | | Check all possible variants of openid and federation listener on/off possibilities. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Make SynapseHomeServer _http_listener use self.get_reactor() | Jason Robinson | 2019-01-23 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For all the homeserver classes, only the FrontendProxyServer passes its reactor when doing the http listen. Looking at previous PR's looks like this was introduced to make it possible to write a test, otherwise when you try to run a test with the test homeserver it tries to do a real bind to a port. Passing the reactor that the homeserver is instantiated with should probably be the right thing to do anyway? Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Add tests for the openid lister for FederationReaderServer | Jason Robinson | 2019-01-23 | 1 | -0/+66 |
| | | | | | | | | | | | | | | | | | | | | | Check all possible variants of openid and federation listener on/off possibilities. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Make FederationReaderServer _http_listen use self.get_reactor() | Jason Robinson | 2019-01-23 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For all the homeserver classes, only the FrontendProxyServer passes its reactor when doing the http listen. Looking at previous PR's looks like this was introduced to make it possible to write a test, otherwise when you try to run a test with the test homeserver it tries to do a real bind to a port. Passing the reactor that the homeserver is instantiated with should probably be the right thing to do anyway? Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Add parameterized Python module to test dependencies | Jason Robinson | 2019-01-23 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | Allows running parameterized tests. BSD license. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Fix a test docstring in frontend proxy tests | Jason Robinson | 2019-01-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | | Allow "unavailable" presence status for /sync (#4592) | Valentin Anger | 2019-02-08 | 3 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow "unavailable" presence status for /sync Closes #3772, closes #3779 Signed-off-by: Valentin Anger <valentin.an.1999@gmail.com> * Add changelog for PR 4592 | ||||
* | | | Fix 'no unique or exclusion constraint' error (#4591) | Richard van der Hoff | 2019-02-08 | 2 | -6/+22 |
| | | | | | | | | | | | | | | | Add more tables to the list of tables which need a background update to complete before we can upsert into them, which fixes a race against the background updates. | ||||
* | | | Deduplicate some code in synapse.app (#4567) | Amber Brown | 2019-02-08 | 14 | -158/+83 |
| | | | |||||
* | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-02-07 | 0 | -0/+0 |
|\ \ \ | |||||
| * | | | cleanups | Richard van der Hoff | 2019-02-07 | 1 | -4/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into erikj/msc1711_faq | Richard van der Hoff | 2019-02-07 | 3 | -12/+17 |
| |\ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2019-02-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Update MSC1711 FAQ to be explicit about well-known | Erik Johnston | 2019-02-07 | 1 | -11/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A surprising number of people are using the well-known method, and are simply copying the example configuration. This is problematic as the example includes an explicit port, which causes inbound federation requests to have the HTTP Host header include the port, upsetting some reverse proxies. Given that, we update the well-known example to be more explicit about the various ways you can set it up, and the consequence of using an explict port. | ||||
* | | | | | Update MSC1711 FAQ to be explicit about well-known (#4584) | Erik Johnston | 2019-02-07 | 2 | -13/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A surprising number of people are using the well-known method, and are simply copying the example configuration. This is problematic as the example includes an explicit port, which causes inbound federation requests to have the HTTP Host header include the port, upsetting some reverse proxies. Given that, we update the well-known example to be more explicit about the various ways you can set it up, and the consequence of using an explict port. | ||||
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-02-07 | 3 | -12/+17 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge remote-tracking branch 'origin/release-v0.99.0' | Richard van der Hoff | 2019-02-07 | 2 | -11/+16 |
| |\ \ \ \ | |||||
| | * | | | | Update ACME docs to include port instructions (#4578) github/release-v0.99.0 release-v0.99.0 | Andrew Morgan | 2019-02-07 | 2 | -11/+16 |
| | | | | | | |||||
| * | | | | | clarify option 1 | Richard van der Hoff | 2019-02-07 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-02-06 | 2 | -0/+3 |
|\| | | | | |||||
| * | | | | Fix docker upload job to push -py2 images (#4576) | Richard van der Hoff | 2019-02-06 | 2 | -0/+3 |
| | | | | | |||||
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-02-05 | 2 | -37/+19 |
|\| | | | | |||||
| * | | | | faq cleanups | Richard van der Hoff | 2019-02-05 | 2 | -37/+19 |
| |/ / / | |||||
* | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-02-05 | 18 | -579/+1051 |
|\| | | | |||||
| * | | | v0.99.0 v0.99.0 | Richard van der Hoff | 2019-02-05 | 10 | -63/+23 |
| | | | | |||||
| * | | | Add notes on SRV and .well-known (#4573) | Richard van der Hoff | 2019-02-05 | 1 | -41/+117 |
| | | | | |||||
| * | | | fix some thinkos in UPGRADE.rst | Richard van der Hoff | 2019-02-05 | 1 | -6/+7 |
| | | | | |||||
| * | | | Merge pull request #4570 from matrix-org/anoa/self_signed_upgrade | Andrew Morgan | 2019-02-05 | 4 | -120/+151 |
| |\ \ \ | | | | | | | | | | | Add ACME docs and link to it from README and INSTALL | ||||
| | * | | | Add TL;DR and final step details to ACME | Andrew Morgan | 2019-02-05 | 1 | -4/+20 |
| | | | | | |||||
| | * | | | Merge branch 'anoa/self_signed_upgrade' of github.com:matrix-org/synapse ↵ | Andrew Morgan | 2019-02-05 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into anoa/self_signed_upgrade | ||||
| | | * | | | Update docs/ACME.md | Richard van der Hoff | 2019-02-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com> | ||||
| | * | | | | Update ACME | Andrew Morgan | 2019-02-05 | 1 | -14/+17 |
| | | | | | | |||||
| | * | | | | Update INSTALL | Andrew Morgan | 2019-02-05 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | Update README | Andrew Morgan | 2019-02-05 | 1 | -8/+1 |
| | |/ / / | |||||
| | * | | | Actually add ACME docs | Andrew Morgan | 2019-02-05 | 1 | -0/+107 |
| | | | | | |||||
| | * | | | Move ACME docs from INSTALL.md to ACME.md | Andrew Morgan | 2019-02-05 | 1 | -78/+1 |
| | | | | | |||||
| | * | | | Re-add link to ACME docs from README | Andrew Morgan | 2019-02-05 | 1 | -0/+6 |
| | | | | | |||||
| | * | | | Merge branch 'release-v0.99.0' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-02-05 | 14 | -421/+621 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | anoa/self_signed_upgrade | ||||
| | * | | | | Convert ACME docs to md | Andrew Morgan | 2019-02-05 | 3 | -100/+2 |
| | | | | | | |||||
| | * | | | | Add link to ACME docs from README | Andrew Morgan | 2019-02-05 | 1 | -0/+6 |
| | | | | | | |||||
| | * | | | | Move ACME docs to docs/ACME.rst and link from UPGRADE. | Andrew Morgan | 2019-02-05 | 3 | -98/+102 |
| | | | | | | |||||
| | * | | | | Don't imply self-signed certs are required | Andrew Morgan | 2019-02-05 | 1 | -16/+17 |
| | | | | | | |||||
| * | | | | | Neilj/1711faq (#4572) | Neil Johnson | 2019-02-05 | 3 | -0/+263 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | MSC1711 certificates FAQ | ||||
| * | | | | Move things from README.rst to UPDATE.md (#4569) | Richard van der Hoff | 2019-02-05 | 2 | -442/+490 |
| | | | | | | | | | | | | | | | The readme was getting pretty unmanageable and hard to grok. This is an attempt to simplify things by moving installation instructions from the README to a separate file. I've tried to resist the temptation to fix too much stuff while I'm here - it mostly just copies-and-pastes from one doc to the other, and changes from rst to md syntax. | ||||
| * | | | | Enable ACME support in the docker image (#4566) | Richard van der Hoff | 2019-02-05 | 6 | -41/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: * Fix wrapping in docker readme * Clean up some docs on the docker image * a workaround for #4554 | ||||
| * | | | | Docker: only copy what we need to the build image (#4562) | Richard van der Hoff | 2019-02-05 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two reasons this is a good thing: * first, it means that you don't end up with stuff kicking around your working copy ending up in the build image by mistake (which can upset the pip install process) * second: it means that the docker image cache is more effective, and we can reuse docker images when iterating on the docker stuff. | ||||
| * | | | | Fix default ACME config for py2 (#4564) | Richard van der Hoff | 2019-02-05 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | Fixes #4559 | ||||
| * | | | | switch docker image to py3 by default (#4558) | Richard van der Hoff | 2019-02-05 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | Switch the matrixdotorg/synapse:latest Docker image to use python 3 | ||||
| * | | | | fix typo in config comments (#4557) | Richard van der Hoff | 2019-02-05 | 2 | -2/+3 |
| |/ / / | |||||
| * | | | Merge pull request #4547 from matrix-org/anoa/acme_docs | Andrew Morgan | 2019-02-01 | 2 | -83/+86 |
| |\ \ \ | | | | | | | | | | | Add docs for ACME setup | ||||
| | * | | | Fix nginx capatilization | Andrew Morgan | 2019-02-01 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Address comments | Andrew Morgan | 2019-02-01 | 1 | -17/+13 |
| | | | | | |||||
| | * | | | Update README.rst | Richard van der Hoff | 2019-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com> | ||||
| | * | | | Update README.rst | Richard van der Hoff | 2019-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com> | ||||
| | * | | | Actually need to enable it | Andrew Morgan | 2019-02-01 | 1 | -0/+8 |
| | | | | | |||||
| | * | | | Merge branch 'release-v0.99.0' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-02-01 | 5 | -4/+12 |
| | |\ \ \ | | |/ / / | |/| | | | | | | | | anoa/acme_docs | ||||
| * | | | | 0.99.0rc4 v0.99.0rc4 | Richard van der Hoff | 2019-02-01 | 5 | -4/+12 |
| | | | | | |||||
| | * | | | Address changes | Andrew Morgan | 2019-02-01 | 1 | -22/+13 |
| | | | | | |||||
| | * | | | Remove error and add link to foks fed tester project | Andrew Morgan | 2019-02-01 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | Clean up portions of docs that talk about reversing fed port | Andrew Morgan | 2019-02-01 | 1 | -97/+24 |
| | | | | | |||||
| | * | | | Add changelog | Andrew Morgan | 2019-02-01 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Add docs for ACME setup | Andrew Morgan | 2019-02-01 | 1 | -0/+79 |
| |/ / / | |||||
* | | / | Filter user directory state query to a subset of state events (#4462) | Andrew Morgan | 2019-02-05 | 2 | -4/+13 |
| |_|/ |/| | | | | | | | | | | | | | | * Filter user directory state query to a subset of state events * Add changelog | ||||
* | | | Merge pull request #4546 from ↵ | Richard van der Hoff | 2019-02-01 | 2 | -2/+16 |
|\ \ \ | | | | | | | | | | | | | | | | | matrix-org/rav/silence_critical_error_from_federation Fix noisy "twisted.internet.task.TaskStopped" errors in logs | ||||
| * | | | Fix noisy "twisted.internet.task.TaskStopped" errors in logs | Richard van der Hoff | 2019-02-01 | 2 | -2/+16 |
| | | | | | | | | | | | | | | | | Fixes #4003 | ||||
* | | | | Merge remote-tracking branch 'origin/release-v0.99.0' into develop | Richard van der Hoff | 2019-02-01 | 3 | -31/+78 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #4544 from matrix-org/rav/skip_invalid_well_known | Richard van der Hoff | 2019-02-01 | 3 | -30/+77 |
| |\ \ \ | | | | | | | | | | | Treat an invalid .well-known the same as an absent one | ||||
| | * | | | Treat an invalid .well-known the same as an absent one | Richard van der Hoff | 2019-02-01 | 3 | -30/+77 |
| | | | | | | | | | | | | | | | | | | | | ... basically, carry on and fall back to SRV etc. | ||||
| * | | | | Fix b'ab' noise in logs | Richard van der Hoff | 2019-02-01 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'release-v0.99.0' into develop | Richard van der Hoff | 2019-02-01 | 4 | -52/+86 |
|\| | | | |||||
| * | | | Merge pull request #4542 from matrix-org/rav/cache_for_bad_well_known | Richard van der Hoff | 2019-02-01 | 2 | -17/+59 |
| |\ \ \ | | | | | | | | | | | Caching for invalid .well-knowns | ||||
| | * | | | changelog | Richard van der Hoff | 2019-02-01 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Cache failures to parse .well-known | Richard van der Hoff | 2019-02-01 | 1 | -13/+43 |
| | | | | | | | | | | | | | | | | | | | | Also add a Measure block around the .well-known fetch | ||||
| | * | | | better logging for federation connections | Richard van der Hoff | 2019-01-31 | 1 | -5/+16 |
| | | | | | |||||
| * | | | | Merge pull request #4539 from matrix-org/rav/update_wellknown_routing | Richard van der Hoff | 2019-02-01 | 3 | -35/+27 |
| |\| | | | | |/ / | |/| | | Update federation routing logic to check .well-known before SRV | ||||
| | * | | Update federation routing logic to check .well-known before SRV | Richard van der Hoff | 2019-01-31 | 3 | -35/+27 |
| |/ / | |||||
* | | | Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatable | Andrew Morgan | 2019-01-31 | 3 | -11/+38 |
|\ \ \ | | | | | | | | | Copy over non-federatable trait on room upgrade | ||||
| * | | | Raise an exception instead of returning None | Andrew Morgan | 2019-01-31 | 1 | -2/+9 |
| | | | | |||||
| * | | | New function for getting room's create event | Andrew Morgan | 2019-01-31 | 2 | -18/+21 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-01-31 | 90 | -84/+151 |
| |\ \ \ | | | | | | | | | | | | | | | | anoa/room_upgrade_federatable | ||||
| * | | | | lint | Andrew Morgan | 2019-01-31 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | Add changelog | Andrew Morgan | 2019-01-30 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Copy over non-federatable trait on room upgrade | Andrew Morgan | 2019-01-30 | 1 | -0/+14 |
| | | | | | |||||
* | | | | | Merge branch 'release-v0.99.0' into develop | Richard van der Hoff | 2019-01-31 | 6 | -13/+103 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | v0.99.0rc3 v0.99.0rc3 | Richard van der Hoff | 2019-01-31 | 5 | -4/+22 |
| | | | | |||||
| * | | | Add some debug for membership syncing issues (#4538) | Richard van der Hoff | 2019-01-31 | 2 | -2/+12 |
| | | | | | | | | | | | | I can't figure out what's going on with #4422 and #4436; perhaps this will help. | ||||
| * | | | Fix infinite loop when an event is redacted in a v3 room (#4535) | Richard van der Hoff | 2019-01-31 | 2 | -5/+33 |
| | | | | |||||
| * | | | update debian installation instructions (#4526) | Richard van der Hoff | 2019-01-31 | 2 | -5/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | * update debian installation instructions * docs PR is docs | ||||
| * | | | cleanups for contrib/prometheus/README | Richard van der Hoff | 2019-01-30 | 1 | -0/+7 |
| | | | | |||||
* | | | | Reject large transactions on federation (#4513) | Andrew Morgan | 2019-01-31 | 2 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reject large transactions on federation * Add changelog * lint * Simplify large transaction handling | ||||
* | | | | Merge remote-tracking branch 'origin/release-v0.99.0' into develop | Richard van der Hoff | 2019-01-30 | 86 | -84/+117 |
|\| | | | |||||
| * | | | v0.99.0rc2 v0.99.0rc2 | Richard van der Hoff | 2019-01-30 | 4 | -3/+18 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/develop' into release-v0.99.0 | Richard van der Hoff | 2019-01-30 | 2 | -1/+14 |
| |\ \ \ | |||||
| * | | | | ACME Upgrade Docs (#4528) | Amber Brown | 2019-01-30 | 2 | -0/+33 |
| | | | | | |||||
| * | | | | Update constants.py | Neil Johnson | 2019-01-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | remove trailing , | ||||
| * | | | | 0.99.0rc1 v0.99.0rc1 | Richard van der Hoff | 2019-01-30 | 83 | -82/+67 |
| | |/ / | |/| | | |||||
* | | | | by default include m.room.encryption on invites (#3902) | Matthew Hodgson | 2019-01-30 | 3 | -0/+4 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | * by default include m.room.encryption on invites * fix constant * changelog | ||||
* | | | Merge pull request #4527 from ↵ | Erik Johnston | 2019-01-30 | 2 | -1/+14 |
|\ \ \ | |/ / |/| | | | | | | | | matrix-org/erikj/fix_sending_remote_invite_rejections Fix remote invite rejections not coming down sync | ||||
| * | | Newsfile | Erik Johnston | 2019-01-30 | 1 | -0/+1 |
| | | | |||||
| * | | Fix remote invite rejections not comming down sync | Erik Johnston | 2019-01-30 | 1 | -1/+13 |
|/ / | | | | | | | | | | | | | | | | | | | This was broken in PR #4405, commit 886e5ac, where we changed remote rejections to be outliers. The fix is to explicitly add the leave event in when we know its an out of band invite. We can't always add the event as if the server is/was in the room there might be more events to send down the sync than just the leave. | ||||
* | | Merge pull request #4472 from matrix-org/neilj/room_capabilities | Erik Johnston | 2019-01-30 | 5 | -0/+153 |
|\ \ | | | | | | | Server capabilities support | ||||
| * \ | Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2019-01-30 | 123 | -669/+2451 |
| |\ \ | | | | | | | | | | | | | neilj/room_capabilities | ||||
| | * \ | Merge branch 'develop' into neilj/room_capabilities | Neil Johnson | 2019-01-30 | 123 | -669/+2451 |
| | |\ \ | |||||
| * | | | | isort | Neil Johnson | 2019-01-30 | 1 | -2/+1 |
| |/ / / | |||||
| * | | | define room dispositions for use in exposing room capabilities | Neil Johnson | 2019-01-30 | 1 | -0/+5 |
| | | | | |||||
| * | | | formatting and use constants where available | Neil Johnson | 2019-01-30 | 1 | -19/+17 |
| | | | | |||||
| * | | | Populate default room version from Constants | Neil Johnson | 2019-01-30 | 1 | -1/+2 |
| | | | | |||||
| * | | | reflect that rooms v3 is a stable room version | Neil Johnson | 2019-01-30 | 2 | -0/+2 |
| | | | | |||||
| * | | | rework format of change password capability | Neil Johnson | 2019-01-29 | 2 | -3/+5 |
| | | | | |||||
| * | | | update to reflect broadening scope | Neil Johnson | 2019-01-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | support change_password in capabilities end-point | Neil Johnson | 2019-01-29 | 2 | -2/+35 |
| | | | | |||||
| * | | | isort | Neil Johnson | 2019-01-29 | 1 | -1/+2 |
| | | | | |||||
| * | | | enforce auth for capabilities endpoint | Neil Johnson | 2019-01-29 | 2 | -14/+36 |
| | | | | |||||
| * | | | register capabilities servlet | Neil Johnson | 2019-01-29 | 1 | -0/+2 |
| | | | | |||||
| * | | | backout v3 | Neil Johnson | 2019-01-25 | 2 | -2/+0 |
| | | | | |||||
| * | | | Support room version capabilities in CS API (MSC1804) | Neil Johnson | 2019-01-25 | 2 | -0/+88 |
| | | | | |||||
| * | | | towncrier | Neil Johnson | 2019-01-25 | 1 | -0/+1 |
| | | | | |||||
| * | | | track unstable room v3 | Neil Johnson | 2019-01-25 | 1 | -0/+2 |
| | | | | |||||
* | | | | Fix replication for room v3 (#4523) | Erik Johnston | 2019-01-30 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix replication for room v3 We were not correctly quoting the path fragments over http replication, which meant that it exploded when the event IDs had a slash in them * Newsfile | ||||
* | | | | ACME config cleanups (#4525) | Richard van der Hoff | 2019-01-30 | 5 | -60/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Handle listening for ACME requests on IPv6 addresses the weird url-but-not-actually-a-url-string doesn't handle IPv6 addresses without extra quoting. Building a string which you are about to parse again seems like a weird choice. Let's just use listenTCP, which is consistent with what we do elsewhere. * Clean up the default ACME config make it look a bit more consistent with everything else, and tweak the defaults to listen on port 80. * newsfile | ||||
* | | | | Merge pull request #4524 from matrix-org/erikj/fix_no_tls | Erik Johnston | 2019-01-30 | 2 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Fix bug where synapse fails to start if no_tls set | ||||
| * | | | | Raise ConfigError instead | Erik Johnston | 2019-01-30 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Newsfile | Erik Johnston | 2019-01-30 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | _listener_http should return a list | Erik Johnston | 2019-01-30 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #4521 from matrix-org/rav/fed_routing/cleanups | Richard van der Hoff | 2019-01-30 | 2 | -9/+12 |
|\ \ \ \ | | | | | | | | | | | Tiny .well-known fixes | ||||
| * | | | | newsfile | Richard van der Hoff | 2019-01-30 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | fix exception text | Richard van der Hoff | 2019-01-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Also jitter the invalid cache period | Richard van der Hoff | 2019-01-30 | 1 | -9/+11 |
| | | | | | |||||
* | | | | | Follow redirects on .well-known (#4520) | Richard van der Hoff | 2019-01-30 | 3 | -2/+102 |
| | | | | | |||||
* | | | | | SIGHUP for TLS cert reloading (#4495) | Amber Brown | 2019-01-30 | 5 | -20/+81 |
|/ / / / | |||||
* | | | | Add a caching layer to .well-known responses (#4516) | Richard van der Hoff | 2019-01-30 | 6 | -10/+493 |
| | | | | |||||
* | | | | Fix flake8 (#4519) | Amber Brown | 2019-01-30 | 12 | -102/+94 |
| |/ / |/| | | |||||
* | | | Merge pull request #4486 from xperimental/workaround-4216 | Richard van der Hoff | 2019-01-30 | 2 | -1/+5 |
|\ \ \ | | | | | | | | | Implement workaround for login error. | ||||
| * | | | Implement workaround for login error. | Robert Jacob | 2019-01-30 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: Robert Jacob <xperimental@solidproject.de> | ||||
* | | | | Merge pull request #4515 from matrix-org/erikj/room_version_v3 | Erik Johnston | 2019-01-29 | 5 | -4/+14 |
|\ \ \ \ | | | | | | | | | | | Enable support for room version 3 | ||||
| * | | | | No vdh tests! | Erik Johnston | 2019-01-29 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Enable room version v3 | Erik Johnston | 2019-01-29 | 4 | -4/+14 |
|/ / / / | |||||
* | | | | Merge pull request #4499 from matrix-org/erikj/redactions_eiah | Erik Johnston | 2019-01-29 | 8 | -16/+77 |
|\ \ \ \ | | | | | | | | | | | Implement rechecking of redactions for room versions v3 | ||||
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-29 | 9 | -46/+77 |
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | erikj/redactions_eiah | ||||
* | | | | | Merge pull request #4514 from matrix-org/erikj/remove_event_id | Erik Johnston | 2019-01-29 | 9 | -47/+83 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove usages of event ID's domain | ||||
| * | | | | | Update comment | Erik Johnston | 2019-01-29 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | check event format version not room version | Erik Johnston | 2019-01-29 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Don't assert an event must have an event ID | Erik Johnston | 2019-01-29 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Only check event ID domain for signatures for V1 events | Erik Johnston | 2019-01-29 | 3 | -31/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In future version events won't have an event ID, so we won't be able to do this check. | ||||
| * | | | | | Use event origin for filtering incoming events | Erik Johnston | 2019-01-29 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only process events sent to us from a server if the event ID matches the server, to help guard against federation storms. We replace this with a check against the event origin. | ||||
| * | | | | | Use snder and not event ID domain to check if ours | Erik Johnston | 2019-01-29 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The transaction queue only sends out events that we generate. This was done by checking domain of event ID, but that can no longer be used. Instead, we may as well use the sender field. | ||||
| * | | | | | Remove event ID usage when checking if new room | Erik Johnston | 2019-01-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event ID is changing, so we can no longer get the domain from it. On the other hand, the check is unnecessary. | ||||
| * | | | | | Only check event IDs domain signed event for V1 and V2 | Erik Johnston | 2019-01-29 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | Since newer versions of events don't have the same format for event ID. | ||||
| | * | | | | Fixup comment | Erik Johnston | 2019-01-29 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | kill vdh test some more | Erik Johnston | 2019-01-29 | 1 | -2/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-29 | 54 | -288/+1051 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | erikj/redactions_eiah | ||||
* | | | | | | Merge pull request #4483 from matrix-org/erikj/event_v2 | Erik Johnston | 2019-01-29 | 5 | -19/+109 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Implement event format V2 | ||||
| * | | | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Implement event format v2 | Erik Johnston | 2019-01-29 | 4 | -19/+108 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4512 from matrix-org/anoa/consent_dir | Andrew Morgan | 2019-01-29 | 3 | -11/+15 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Check consent dir path on startup | ||||
| * | | | | | | Add changelog | Andrew Morgan | 2019-01-29 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Check consent dir path on startup | Andrew Morgan | 2019-01-29 | 2 | -11/+14 |
| | | | | | | | |||||
* | | | | | | | Relax requirement for a content-type on .well-known (#4511) | Richard van der Hoff | 2019-01-29 | 3 | -21/+14 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurl | Travis Ralston | 2019-01-29 | 2 | -1/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Don't recommend :8448 to people on public_baseurl | ||||
| * | | | | | | Create 4498.misc | Travis Ralston | 2019-01-28 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Don't recommend :8448 to people on public_baseurl | Travis Ralston | 2019-01-28 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Do not generate self-signed TLS certificates by default. (#4509) | Amber Brown | 2019-01-29 | 4 | -45/+94 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #4481 from matrix-org/erikj/event_builder | Erik Johnston | 2019-01-29 | 10 | -164/+288 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Refactor event building into EventBuilder | ||||
| * | | | | | | Correctly set context.app_service | Erik Johnston | 2019-01-29 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Don't set event_id twice | Erik Johnston | 2019-01-29 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | Remove dead function | Erik Johnston | 2019-01-29 | 1 | -11/+0 |
| | | | | | | | |||||
| * | | | | | | Fix test to use valid event format | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Replace usage of builder.user_id with builder.sender | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `.user_id` is proxed to `.sender` in FrozenEvent, so this has no functional change | ||||
| * | | | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Refactor event building into EventBuilder | Erik Johnston | 2019-01-29 | 5 | -112/+254 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is so that everything is done in one place, making it easier to change the event format based on room version | ||||
| * | | | | | | Make add_hashes_and_signatures operate on dicts | Erik Johnston | 2019-01-29 | 2 | -40/+32 |
| | | | | | | | |||||
* | | | | | | | Implement MSC1708 (.well-known lookups for server routing) (#4489) | Richard van der Hoff | 2019-01-29 | 23 | -21/+470 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signature | Erik Johnston | 2019-01-29 | 3 | -2/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixup calls to `comput_event_signature` | ||||
| * | | | | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fixup calls to `comput_event_signature` | Erik Johnston | 2019-01-29 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently pass FrozenEvent instead of `dict` to `compute_event_signature`, which works by accident due to `dict(event)` producing the correct result. This fixes PR #4493 commit 855a151 | ||||
* | | | | | | | | Enable configuring test log level via env var (#4506) | Richard van der Hoff | 2019-01-29 | 4 | -30/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I got fed up with always adding '@unittest.DEBUG' every time I needed to debug a test. | ||||
| | | | * | | | | Update synapse/storage/events_worker.py | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | | * | | | | Check redaction state when event is pulled out of the database | Erik Johnston | 2019-01-29 | 1 | -0/+13 |
| | | | | | | | | |||||
| | | | * | | | | Fix typo | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | | * | | | | Remove unused arg | Erik Johnston | 2019-01-29 | 1 | -2/+1 |
| | | | | | | | | |||||
| | | | * | | | | Drop vdh support | Erik Johnston | 2019-01-29 | 4 | -6/+2 |
| | | | | | | | | |||||
| | | | * | | | | Add docstring | Erik Johnston | 2019-01-29 | 1 | -0/+12 |
| | | | | | | | | |||||
| | | | * | | | | Update synapse/storage/events_worker.py | Richard van der Hoff | 2019-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re> | ||||
| | | | * | | | | Finish comment... | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | | * | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| | | | | | | | | |||||
| | | | * | | | | Implement rechecking of redactions | Erik Johnston | 2019-01-29 | 5 | -10/+53 |
| | | | | | | | | |||||
| | | | * | | | | Add RoomVersions.V3 constant, without enabling it | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We add the constant, but don't add it to the known room versions. This lets us start adding V3 logic, but the servers will never join or create V3 rooms | ||||
* | | | | | | | Merge pull request #4496 from matrix-org/erikj/invite_fallback | Erik Johnston | 2019-01-29 | 3 | -14/+90 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Implement fallback for V2 invite API | ||||
| * | | | | | | Newsfile | Erik Johnston | 2019-01-28 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Implement fallback for V2 invite API | Erik Johnston | 2019-01-28 | 2 | -14/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the room version is either 1 or 2 then a server should retry failed `/v2/invite` requests with the v1 API | ||||
* | | | | | | | Make linearizer more quiet (#4507) | Amber Brown | 2019-01-29 | 2 | -5/+6 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validator | Erik Johnston | 2019-01-29 | 4 | -26/+46 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Split up event validation between event and builder | ||||
| * | | | | | | Remove duplicate checks | Erik Johnston | 2019-01-29 | 1 | -14/+0 |
| | | | | | | | |||||
| * | | | | | | Fix up error messages | Erik Johnston | 2019-01-29 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Fold validate into validate_new | Erik Johnston | 2019-01-29 | 1 | -16/+11 |
| | | | | | | | |||||
| * | | | | | | Newsfile | Erik Johnston | 2019-01-28 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Split up event validation between event and builder | Erik Johnston | 2019-01-28 | 3 | -23/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The validator was being run on the EventBuilder objects, and so the validator only checked a subset of fields. With the upcoming EventBuilder refactor even fewer fields will be there to validate. To get around this we split the validation into those that can be run against an EventBuilder and those run against a fully fledged event. | ||||
* | | | | | | | Fix receiving events from federation via a worker | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was introduced in PR #4470, commit 678a92cb56d547dcadffa723e29b4855a27d0901 | ||||
* | | | | | | | Fix typo in upserts code (#4505) | Amber Brown | 2019-01-29 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix obvious problem :| * changelog | ||||
* | | | | | | | Merge pull request #4493 from matrix-org/erikj/refactor_event_signing | Erik Johnston | 2019-01-29 | 3 | -42/+105 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refactor event signing to work on dicts | ||||
| * | | | | | | | Newsfile | Erik Johnston | 2019-01-28 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Refactor event signing to work on dicts | Erik Johnston | 2019-01-28 | 2 | -42/+104 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for making EventBuilder format agnostic, which means event signing should be done against the event dict rather than the EventBuilder object. | ||||
* | | | | | | | Use SimpleResolverComplexifier in tests (#4497) | Richard van der Hoff | 2019-01-29 | 3 | -32/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | two reasons for this. One, it saves a bunch of boilerplate. Two, it squashes unicode to IDNA-in-a-`str` (even on python 3) in a way that it turns out we rely on to give consistent behaviour between python 2 and 3. | ||||
* | | | | | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_version | Erik Johnston | 2019-01-28 | 11 | -28/+71 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Pass through room version to event auth | ||||
| * | | | | | | Correctly use default room version if none is set | Erik Johnston | 2019-01-28 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Newsfile | Erik Johnston | 2019-01-25 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 10 | -27/+69 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Fix worker TLS (#4492) | Amber Brown | 2019-01-28 | 8 | -48/+49 |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * load cert * changelog * fix | ||||
* | | | | | Fix UPSERTs on SQLite 3.24+ (#4477) | Amber Brown | 2019-01-28 | 8 | -18/+30 |
| | | | | | |||||
* | | | | | Merge pull request #4412 from matrix-org/anoa/dm_room_upgrade | Andrew Morgan | 2019-01-28 | 5 | -18/+83 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Migrate direct message and tag state on room upgrade | ||||
| * | | | | Change return syntax in doc string | Andrew Morgan | 2019-01-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-01-28 | 32 | -123/+556 |
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | anoa/dm_room_upgrade | ||||
* | | | | | Remove --process-dependency-links from UPGRADE.rst (#4485) | Aaron Raimist | 2019-01-28 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove --process-dependency-links from UPGRADE.rst Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
* | | | | | Merge pull request #4488 from matrix-org/rav/fed_routing/refactor | Richard van der Hoff | 2019-01-28 | 3 | -35/+120 |
|\ \ \ \ \ | | | | | | | | | | | | | Refactoring in MatrixFederationAgent | ||||
| * | | | | | docstrings for _RoutingResult | Richard van der Hoff | 2019-01-28 | 1 | -0/+36 |
| | | | | | | |||||
| * | | | | | changelog | Richard van der Hoff | 2019-01-28 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Handle IP literals explicitly | Richard van der Hoff | 2019-01-28 | 2 | -17/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | We don't want to be doing .well-known lookups on these guys. | ||||
| * | | | | | MatrixFederationAgent: factor out routing logic | Richard van der Hoff | 2019-01-28 | 1 | -18/+62 |
|/ / / / / | | | | | | | | | | | | | | | | This is going to get too big and unmanageable. | ||||
* | / / / | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487) | Richard van der Hoff | 2019-01-28 | 3 | -12/+193 |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that the library does a better job of parsing URIs than our reinvented wheel. Who knew. There are two things going on here. The first is that, unlike parse_server_name, URI.fromBytes will strip off square brackets from IPv6 literals, which means that it is valid input to ClientTLSOptionsFactory and HostnameEndpoint. The second is that we stay in `bytes` throughout (except for the argument to ClientTLSOptionsFactory), which avoids the weirdness of (sometimes) ending up with idna-encoded values being held in `unicode` variables. TBH it probably would have been ok but it made the tests fragile. | ||||
* | | | | Merge pull request #4470 from matrix-org/erikj/require_format_version | Erik Johnston | 2019-01-25 | 17 | -86/+220 |
|\ \ \ \ | | | | | | | | | | | Require event format version to parse or create events | ||||
| * | | | | Newsfile | Erik Johnston | 2019-01-25 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Replace missed usages of FrozenEvent | Erik Johnston | 2019-01-25 | 3 | -10/+14 |
| | | | | | |||||
| * | | | | Fix tests | Erik Johnston | 2019-01-25 | 5 | -4/+14 |
| | | | | | |||||
| * | | | | Require event format version to parse or create events | Erik Johnston | 2019-01-25 | 8 | -72/+191 |
| | | | | | |||||
* | | | | | Merge pull request #4471 from matrix-org/erikj/sqlite_native_upsert | Erik Johnston | 2019-01-25 | 3 | -4/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Disable native upsert on sqlite | ||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-25 | 13 | -7/+120 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | erikj/sqlite_native_upsert |