Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4647 from matrix-org/erikj/add_room_publishing_rules | Erik Johnston | 2019-02-15 | 3 | -31/+193 |
|\ | | | | | Add configurable room list publishing rules | ||||
| * | Move defaults up into code | Erik Johnston | 2019-02-15 | 1 | -22/+44 |
| | | |||||
| * | Hoist up checks to reduce overall work | Erik Johnston | 2019-02-15 | 1 | -17/+15 |
| | | |||||
| * | Fixup comments | Erik Johnston | 2019-02-15 | 1 | -8/+27 |
| | | |||||
| * | Clarify comments | Erik Johnston | 2019-02-14 | 1 | -3/+3 |
| | | |||||
| * | Clarify and fix behaviour when there are multiple aliases | Erik Johnston | 2019-02-14 | 1 | -6/+18 |
| | | |||||
| * | Only fetch aliases when publishing rooms | Erik Johnston | 2019-02-14 | 1 | -15/+15 |
| | | |||||
| * | Fixup comments | Erik Johnston | 2019-02-14 | 1 | -8/+15 |
| | | |||||
| * | Add configurable room list publishing rules | Erik Johnston | 2019-02-14 | 3 | -22/+126 |
| | | | | | | | | | | This allows specifying who and what is allowed to be published onto the public room list | ||||
* | | Merge branch 'master' into develop | Richard van der Hoff | 2019-02-14 | 3 | -7/+16 |
|\ \ | |||||
| * | | 0.99.1.1 v0.99.1.1 | Richard van der Hoff | 2019-02-14 | 1 | -1/+1 |
| | | | |||||
| * | | Fix errors in acme provisioning (#4648) | Richard van der Hoff | 2019-02-14 | 2 | -6/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Better logging for errors on startup * Fix "TypeError: '>' not supported" when starting without an existing certificate * Fix a bug where an existing certificate would be reprovisoned every day | ||||
* | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-02-14 | 1 | -2/+2 |
|\| | | |/ |/| | |||||
| * | 0.99.1 v0.99.1 | Richard van der Hoff | 2019-02-14 | 1 | -2/+2 |
| | | |||||
| * | 0.99.1rc2 v0.99.1rc2 | Richard van der Hoff | 2019-02-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4450 from 14mRh4X0r/fix-dependency-message | Richard van der Hoff | 2019-02-13 | 1 | -2/+5 |
|\ \ | | | | | | | Fix error message for optional dependencies | ||||
| * | | Fix error message for optional dependencies | Willem Mulder | 2019-01-23 | 1 | -2/+5 |
| | | | | | | | | | | | | Signed-off-by: Willem Mulder <willemmaster@hotmail.com> | ||||
* | | | Merge remote-tracking branch 'origin/release-v0.99.1' into develop | Richard van der Hoff | 2019-02-13 | 3 | -22/+34 |
|\ \ \ | | |/ | |/| | |||||
| * | | Update synapse/app/_base.py | Erik Johnston | 2019-02-13 | 1 | -1/+1 |
| | | | | | | | | | Co-Authored-By: richvdh <1389908+richvdh@users.noreply.github.com> | ||||
| * | | Use `listen_tcp` for the replication listener | Richard van der Hoff | 2019-02-13 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | Fixes the "can't listen on 0.0.0.0" error. Also makes it more consistent with what we do elsewhere. | ||||
| * | | Improve logging around listening services | Richard van der Hoff | 2019-02-13 | 2 | -11/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I wanted to bring listen_tcp into line with listen_ssl in terms of returning a list of ports, and wanted to check that was a safe thing to do - hence the logging in `refresh_certificate`. Also, pull the 'Synapse now listening' message up to homeserver.py, because it was being duplicated everywhere else. | ||||
| * | | Special-case the default bind_addresses for metrics listener | Richard van der Hoff | 2019-02-13 | 2 | -4/+7 |
| | | | | | | | | | | | | | | | turns out it doesn't really support ipv6, so let's hack around that by only listening on ipv4 by default. | ||||
* | | | Run `black` on user directory code (#4635) | Amber Brown | 2019-02-13 | 2 | -131/+116 |
|/ / | |||||
* | | Update changelog and version | Erik Johnston | 2019-02-12 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4608 from matrix-org/anoa/acls_room_upgrade | Erik Johnston | 2019-02-12 | 1 | -0/+1 |
|\ \ | | | | | | | Transfer Server ACLs on room upgrade | ||||
| * | | Transfer Server ACLs on room upgrade | Andrew Morgan | 2019-02-11 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #4627 from matrix-org/erikj/user_ips_analyze | Erik Johnston | 2019-02-12 | 2 | -3/+31 |
|\ \ \ | | | | | | | | | Analyze user_ips before running deduplication | ||||
| * | | | Fix pep8 | Erik Johnston | 2019-02-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Analyze user_ips before running deduplication | Erik Johnston | 2019-02-12 | 2 | -3/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the table locks taken out by the naive upsert, the table statistics may be out of date. During deduplication it is important that the correct index is used as otherwise a full table scan may be incorrectly used, which can end up thrashing the database badly. | ||||
* | | | | Merge pull request #4626 from matrix-org/erikj/fixup_user_ips_dedupe | Erik Johnston | 2019-02-12 | 1 | -3/+60 |
|\ \ \ \ | | | | | | | | | | | Reduce user_ips bloat during dedupe background update | ||||
| * | | | | Reduce user_ips bloat during dedupe background update | Erik Johnston | 2019-02-12 | 1 | -3/+60 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The background update to remove duplicate rows naively deleted and reinserted the duplicates. For large tables with a large number of duplicates this causes a lot of bloat (with postgres), as the inserted rows are appended to the table, since deleted rows will not be overwritten until a VACUUM has happened. This should hopefully also help ensure that the query in the last batch uses the correct index, as inserting a large number of new rows without analyzing will upset the query planner. | ||||
* | | | | Merge pull request #4625 from matrix-org/rav/fix_generate_config_warnings | Erik Johnston | 2019-02-12 | 1 | -7/+2 |
|\ \ \ \ | | | | | | | | | | | fix self-signed cert notice from generate-config | ||||
| * | | | | fix self-signed cert notice from generate-config | Richard van der Hoff | 2019-02-12 | 1 | -7/+2 |
| |/ / / | | | | | | | | | | | | | fixes #4620 | ||||
* | | | | Disable TLS by default (#4614) | Richard van der Hoff | 2019-02-12 | 2 | -27/+27 |
| | | | | |||||
* | | | | Fix error when loading cert if tls is disabled (#4618) | Richard van der Hoff | 2019-02-12 | 2 | -17/+45 |
|/ / / | | | | | | | | | | | | | | | | If TLS is disabled, it should not be an error if no cert is given. Fixes #4554. | ||||
* | | | fix tests | Richard van der Hoff | 2019-02-11 | 1 | -1/+1 |
| | | | |||||
* | | | Infer no_tls from presence of TLS listeners | Richard van der Hoff | 2019-02-11 | 5 | -18/+24 |
| | | | | | | | | | | | | | | | Rather than have to specify `no_tls` explicitly, infer whether we need to load the TLS keys etc from whether we have any TLS-enabled listeners. | ||||
* | | | Merge branch 'rav/no_create_server_contexts_if_no_tls' into rav/tls_cert/work | Richard van der Hoff | 2019-02-11 | 2 | -3/+6 |
|\ \ \ | |||||
| * | | | Don't create server contexts when TLS is disabled | Richard van der Hoff | 2019-02-11 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | | we aren't going to use them anyway. | ||||
* | | | | Merge branch 'rav/tls_config_logging_fixes' into rav/tls_cert/work | Richard van der Hoff | 2019-02-11 | 2 | -22/+38 |
|\| | | | |||||
| * | | | Logging improvements around TLS certs | Richard van der Hoff | 2019-02-11 | 2 | -22/+38 |
| | | | | | | | | | | | | | | | | | | | | Log which file we're reading keys and certs from, and refactor the code a bit in preparation for other work | ||||
* | | | | Fail cleanly if listener config lacks a 'port' | Richard van der Hoff | 2019-02-11 | 1 | -0/+5 |
|/ / / | | | | | | | | | | ... otherwise we would fail with a mysterious KeyError or something later. | ||||
* | | | Move ClientTLSOptionsFactory init out of refresh_certificates (#4611) | Richard van der Hoff | 2019-02-11 | 3 | -6/+7 |
| | | | | | | | | | | | | | | | 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 | 3 | -5/+124 |
|\ \ \ | | | | | | | | | add updating of backup versions | ||||
| * | | | make sure version is in body and wrap in linearizer queue | Hubert Chathi | 2019-02-08 | 2 | -12/+28 |
| | | | | | | | | | | | | | | | | also add tests | ||||
| * | | | re-try to make isort happy | Hubert Chathi | 2019-02-06 | 1 | -1/+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 | 1 | -48/+81 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | ACME Reprovisioning (#4522) | Amber Brown | 2019-02-11 | 4 | -25/+88 |
| | | | |||||
* | | | Be tolerant of blank TLS fingerprints config (#4589) | Amber Brown | 2019-02-11 | 1 | -1/+5 |
| | | | |||||
* | | | Merge pull request #4420 from matrix-org/jaywink/openid-listener | Erik Johnston | 2019-02-11 | 5 | -45/+130 |
|\ \ \ | | | | | | | | | New listener resource for the federation API "openid/userinfo" endpoint | ||||
| * | | | Fix flake8 issues | Jason Robinson | 2019-01-23 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | 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> | ||||
| * | | | 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> | ||||
| * | | | 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> | ||||
| * | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Allows running parameterized tests. BSD license. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | | | Allow "unavailable" presence status for /sync (#4592) | Valentin Anger | 2019-02-08 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 1 | -6/+21 |
| | | | | | | | | | | | | | | | | | | | | 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 | 13 | -158/+82 |
| | | | | |||||
* | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-02-05 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | v0.99.0 v0.99.0 | Richard van der Hoff | 2019-02-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix default ACME config for py2 (#4564) | Richard van der Hoff | 2019-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Fixes #4559 | ||||
| * | | | | fix typo in config comments (#4557) | Richard van der Hoff | 2019-02-05 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | 0.99.0rc4 v0.99.0rc4 | Richard van der Hoff | 2019-02-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Filter user directory state query to a subset of state events (#4462) | Andrew Morgan | 2019-02-05 | 1 | -4/+12 |
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | * 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 | 1 | -2/+15 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | Fixes #4003 | ||||
* | | | | | Merge remote-tracking branch 'origin/release-v0.99.0' into develop | Richard van der Hoff | 2019-02-01 | 1 | -20/+7 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #4544 from matrix-org/rav/skip_invalid_well_known | Richard van der Hoff | 2019-02-01 | 1 | -19/+6 |
| |\ \ \ \ | | | | | | | | | | | | | 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 | 1 | -19/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | ... 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 | 1 | -22/+63 |
|\| | | | | |||||
| * | | | | 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 |
| | | | | | |||||
| * | | | | Update federation routing logic to check .well-known before SRV | Richard van der Hoff | 2019-01-31 | 1 | -5/+5 |
| |/ / / | |||||
* | | | | Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatable | Andrew Morgan | 2019-01-31 | 2 | -11/+37 |
|\ \ \ \ | | | | | | | | | | | 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 | 5 | -3/+34 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | anoa/room_upgrade_federatable | ||||
| * | | | | | lint | Andrew Morgan | 2019-01-31 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | 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 | 3 | -8/+44 |
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | v0.99.0rc3 v0.99.0rc3 | Richard van der Hoff | 2019-01-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add some debug for membership syncing issues (#4538) | Richard van der Hoff | 2019-01-31 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | 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 | 1 | -5/+32 |
| | | | | | |||||
* | | | | | Reject large transactions on federation (#4513) | Andrew Morgan | 2019-01-31 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 2 | -2/+2 |
|\| | | | | |||||
| * | | | | v0.99.0rc2 v0.99.0rc2 | Richard van der Hoff | 2019-01-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/develop' into release-v0.99.0 | Richard van der Hoff | 2019-01-30 | 1 | -1/+13 |
| |\ \ \ \ | |||||
| * | | | | | 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 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | by default include m.room.encryption on invites (#3902) | Matthew Hodgson | 2019-01-30 | 2 | -0/+3 |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * by default include m.room.encryption on invites * fix constant * changelog | ||||
* | | | | 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 | 3 | -0/+74 |
|\ \ \ | | | | | | | | | Server capabilities support | ||||
| * \ \ | Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2019-01-30 | 53 | -542/+1641 |
| |\ \ \ | | | | | | | | | | | | | | | | neilj/room_capabilities | ||||
| | * \ \ | Merge branch 'develop' into neilj/room_capabilities | Neil Johnson | 2019-01-30 | 53 | -542/+1641 |
| | |\ \ \ | |||||
| * | | | | | 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 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | support change_password in capabilities end-point | Neil Johnson | 2019-01-29 | 1 | -2/+12 |
| | | | | | |||||
| * | | | | enforce auth for capabilities endpoint | Neil Johnson | 2019-01-29 | 1 | -10/+17 |
| | | | | | |||||
| * | | | | 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 | 1 | -0/+49 |
| | | | | | |||||
| * | | | | track unstable room v3 | Neil Johnson | 2019-01-25 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Fix replication for room v3 (#4523) | Erik Johnston | 2019-01-30 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 4 | -60/+114 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | | | Raise ConfigError instead | Erik Johnston | 2019-01-30 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | _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 | 1 | -9/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Tiny .well-known fixes | ||||
| * | | | | | 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 | 1 | -2/+4 |
| | | | | | | |||||
* | | | | | | SIGHUP for TLS cert reloading (#4495) | Amber Brown | 2019-01-30 | 3 | -20/+79 |
|/ / / / / | |||||
* | | | | | Add a caching layer to .well-known responses (#4516) | Richard van der Hoff | 2019-01-30 | 2 | -2/+249 |
| | | | | | |||||
* | | | | | Fix flake8 (#4519) | Amber Brown | 2019-01-30 | 7 | -92/+92 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #4486 from xperimental/workaround-4216 | Richard van der Hoff | 2019-01-30 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Implement workaround for login error. | ||||
| * | | | | Implement workaround for login error. | Robert Jacob | 2019-01-30 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robert Jacob <xperimental@solidproject.de> | ||||
* | | | | | No vdh tests! | Erik Johnston | 2019-01-29 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Enable room version v3 | Erik Johnston | 2019-01-29 | 4 | -4/+14 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-29 | 8 | -46/+76 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | erikj/redactions_eiah | ||||
| * \ \ \ \ | Merge pull request #4514 from matrix-org/erikj/remove_event_id | Erik Johnston | 2019-01-29 | 8 | -47/+82 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | 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 |
| | | | | | | | |||||
| | * | | | | | 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 | 17 | -208/+503 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/redactions_eiah | ||||
| * | | | | | | Merge pull request #4483 from matrix-org/erikj/event_v2 | Erik Johnston | 2019-01-29 | 4 | -19/+108 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Implement event format V2 | ||||
| | * | | | | | | 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 | 2 | -11/+14 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Check consent dir path on startup | ||||
| | * | | | | | | 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 | 1 | -20/+13 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurl | Travis Ralston | 2019-01-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Don't recommend :8448 to people on public_baseurl | ||||
| | * | | | | | | 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 | 1 | -43/+18 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #4481 from matrix-org/erikj/event_builder | Erik Johnston | 2019-01-29 | 7 | -133/+260 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | |||||
| | * | | | | | | 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 | ||||
| | * | | | | | | 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 | 1 | -10/+6 |
| | | | | | | | | |||||
| * | | | | | | | Implement MSC1708 (.well-known lookups for server routing) (#4489) | Richard van der Hoff | 2019-01-29 | 1 | -4/+110 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signature | Erik Johnston | 2019-01-29 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixup calls to `comput_event_signature` | ||||
| | * | | | | | | | 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 | ||||
* | | | | | | | | | 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 |
| | | | | | | | | | |||||
* | | | | | | | | | 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 | 2 | -14/+89 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Implement fallback for V2 invite API | ||||
| * | | | | | | | 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 | 1 | -5/+5 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validator | Erik Johnston | 2019-01-29 | 3 | -26/+45 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | |||||
| * | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix obvious problem :| * changelog | ||||
* | | | | | | | | Merge pull request #4493 from matrix-org/erikj/refactor_event_signing | Erik Johnston | 2019-01-29 | 2 | -42/+104 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Refactor event signing to work on dicts | ||||
| * | | | | | | | | 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. | ||||
* | | | | | | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_version | Erik Johnston | 2019-01-28 | 8 | -25/+56 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Pass through room version to event auth | ||||
| * | | | | | | | Correctly use default room version if none is set | Erik Johnston | 2019-01-28 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 8 | -24/+55 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Fix worker TLS (#4492) | Amber Brown | 2019-01-28 | 7 | -48/+48 |
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * load cert * changelog * fix | ||||
* | | | | | | Fix UPSERTs on SQLite 3.24+ (#4477) | Amber Brown | 2019-01-28 | 3 | -12/+20 |
| | | | | | | |||||
* | | | | | | 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 | 15 | -107/+342 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | anoa/dm_room_upgrade | ||||
| * | | | | | docstrings for _RoutingResult | Richard van der Hoff | 2019-01-28 | 1 | -0/+36 |
| | | | | | | |||||
| * | | | | | Handle IP literals explicitly | Richard van der Hoff | 2019-01-28 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -11/+12 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -82/+205 |
| |\ \ \ \ | | | | | | | | | | | | | Require event format version to parse or create events | ||||
| | * | | | | Replace missed usages of FrozenEvent | Erik Johnston | 2019-01-25 | 3 | -10/+14 |
| | | | | | | |||||
| | * | | | | Require event format version to parse or create events | Erik Johnston | 2019-01-25 | 8 | -72/+191 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-25 | 7 | -6/+99 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | erikj/sqlite_native_upsert | ||||
| | * | | | | | Fix quoting for allowed_local_3pids example config (#4476) | Richard van der Hoff | 2019-01-25 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you use double-quotes here, you have to escape your backslashes. It's much easier with single-quotes. (Note that the existing double-backslashes are already interpreted by python's """ parsing.) | ||||
| | * | | | | | Fix Host header sent by MatrixFederationAgent (#4468) | Richard van der Hoff | 2019-01-25 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the Host header logic down here so that (a) it is used if we reuse the agent elsewhere, and (b) we can mess about with it with .well-known. | ||||
| | * | | | | | Don't require sqlite3 when using postgres (#4466) | Andrew Morgan | 2019-01-25 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Disable native upserts for sqlite, as they don't work | Erik Johnston | 2019-01-25 | 1 | -3/+7 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Reuse predecessor method | Andrew Morgan | 2019-01-28 | 1 | -12/+8 |
| | | | | | | |||||
* | | | | | | Fixes | Andrew Morgan | 2019-01-25 | 1 | -39/+39 |
| | | | | | | |||||
* | | | | | | Clean up direct_rooms access | Andrew Morgan | 2019-01-25 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Use python magic | Andrew Morgan | 2019-01-25 | 1 | -2/+1 |
| | | | | | | |||||
* | | | | | | Destructure account data tuple before use | Andrew Morgan | 2019-01-25 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Remove unnecessary null check | Andrew Morgan | 2019-01-25 | 1 | -7/+6 |
| | | | | | | |||||
* | | | | | | Move room_tag declaration to be closer to its use | Andrew Morgan | 2019-01-25 | 1 | -4/+5 |
| | | | | | | |||||
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-01-25 | 38 | -409/+1140 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | anoa/dm_room_upgrade | ||||
| * | | | | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_rooms | Andrew Morgan | 2019-01-25 | 3 | -0/+85 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Ability to search entire room history after upgrading room | ||||
| | * | | | | Merge branch 'anoa/full_search_upgraded_rooms' of ↵ | Andrew Morgan | 2019-01-24 | 3 | -3/+3 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into anoa/full_search_upgraded_rooms | ||||
| | | * | | | | Apply suggestions from code review | Richard van der Hoff | 2019-01-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com> | ||||
| | | * | | | | Update synapse/api/filtering.py | Richard van der Hoff | 2019-01-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com> | ||||
| | * | | | | | Remove redundant create event None check | Andrew Morgan | 2019-01-24 | 1 | -3/+0 |
| | |/ / / / | |||||
| | * | | | | Do not return in a deferred function | Andrew Morgan | 2019-01-22 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Ensure new filter is actually created | Andrew Morgan | 2019-01-22 | 2 | -2/+1 |
| | | | | | | |||||
| | * | | | | Fix a bug with single-room search searching all rooms | Andrew Morgan | 2019-01-22 | 3 | -35/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create a new method for getting predecessor rooms * Remove formatting change | ||||
| | * | | | | Search for messages across predecessor rooms | Andrew Morgan | 2019-01-18 | 3 | -0/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> | ||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813 | Erik Johnston | 2019-01-25 | 30 | -364/+920 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions | Erik Johnston | 2019-01-24 | 4 | -13/+66 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add room_version param to get_pdu | ||||
| | | * | | | | | Review comments | Erik Johnston | 2019-01-24 | 2 | -1/+7 |
| | | | | | | | | |||||
| | | * | | | | | Add room_version param to get_pdu | Erik Johnston | 2019-01-23 | 4 | -13/+60 |
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | When we add new event format we'll need to know the event format or room version when parsing events. | ||||
| | * | | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invites | Erik Johnston | 2019-01-24 | 4 | -39/+34 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Store rejected remote invite events as outliers | ||||
| | | * | | | | | Update make_membership_event docs | Erik Johnston | 2019-01-24 | 1 | -2/+5 |
| | | | | | | | | |||||
| | | * | | | | | Remove unecessary setting of outlier bit | Erik Johnston | 2019-01-24 | 1 | -2/+0 |
| | | | | | | | | |||||
| | | * | | | | | Use term 'out of band membership' instead | Erik Johnston | 2019-01-24 | 3 | -9/+10 |
| | | | | | | | | |||||
| | | * | | | | | Clarify the invite flows | Erik Johnston | 2019-01-23 | 3 | -7/+24 |
| | | | | | | | | |||||
| | | * | | | | | Remove unnecessary '_sign_event' | Erik Johnston | 2019-01-23 | 2 | -15/+8 |
| | | | | | | | | |||||
| | | * | | | | | Store rejected remote invite events as outliers | Erik Johnston | 2019-01-23 | 3 | -38/+21 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently they're stored as non-outliers even though the server isn't in the room, which can be problematic in places where the code assumes it has the state for all non outlier events. In particular, there is an edge case where persisting the leave event triggers a state resolution, which requires looking up the room version from state. Since the server doesn't have the state, this causes an exception to be thrown. | ||||
| | * | | | | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2 | Erik Johnston | 2019-01-24 | 5 | -4/+48 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | Add support for persisting event format versions | ||||
| | * | | | | | Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fix | Andrew Morgan | 2019-01-24 | 1 | -2/+12 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add a 60s timeout to filtered room directory queries | ||||
| | | * | | | | | Change default timeout value from 0 to None | Andrew Morgan | 2019-01-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Use self.clock instead of datetime | Andrew Morgan | 2019-01-24 | 1 | -4/+3 |
| | | | | | | | | |||||
| | | * | | | | | isort | Andrew Morgan | 2019-01-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | lint | Andrew Morgan | 2019-01-24 | 1 | -1/+2 |
| | | | | | | | | |||||
| | | * | | | | | Time out filtered room dir queries after 60s | Andrew Morgan | 2019-01-24 | 1 | -2/+12 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #4464 from matrix-org/rav/fix_srv_lookup | Richard van der Hoff | 2019-01-24 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | MatrixFederationAgent: Look up the right SRV record | ||||
| | | * | | | | | | Look up the right SRV record | Richard van der Hoff | 2019-01-24 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460) | Richard van der Hoff | 2019-01-24 | 1 | -2/+3 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | This could cause exceptions if the id server returned 4xx responses. | ||||
| | * | | | | | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check | Neil Johnson | 2019-01-24 | 3 | -8/+12 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Neilj/fix threepid auth check | ||||
| | | * | | | | | | move guard out of is_threepid_reserved and into register.py | Neil Johnson | 2019-01-22 | 2 | -6/+5 |
| | | | | | | | | | |||||
| | | * | | | | | | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 3 | -7/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_doc | Neil Johnson | 2019-01-24 | 1 | -1/+5 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Clarify docs for public_baseurl | ||||
| | | * | | | | | | | Clarify docs for public_baseurl | David Baker | 2019-01-24 | 1 | -1/+5 |
| | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is leading to problems with people upgrading to clients that support MSC1730 because people have this misconfigured, so try to make the docs completely unambiguous. | ||||
| | * / | | | | | | Fix UPSERT check (#4459) | Amber Brown | 2019-01-24 | 1 | -5/+28 |
| | |/ / / / / / | |||||
| | * | | | | | | Use native UPSERTs where possible (#4306) | Amber Brown | 2019-01-24 | 7 | -30/+212 |
| | | | | | | | | |||||
| | * | | | | | | Don't send IP addresses as SNI (#4452) | Richard van der Hoff | 2019-01-24 | 1 | -3/+12 |
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is that we have cut-and-pasted an impl from Twisted, and then failed to maintain it. It was fixed in Twisted in https://github.com/twisted/twisted/pull/1047/files; let's do the same here. | ||||
| | * | | | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backport | Andrew Morgan | 2019-01-23 | 1 | -0/+6 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add metric for user dir current event stream position | ||||
| | | * | | | | | Add metric for user dir current event stream position | Andrew Morgan | 2019-01-23 | 1 | -0/+6 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #4428 from matrix-org/rav/matrix_federation_agent | Richard van der Hoff | 2019-01-23 | 4 | -232/+240 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | Move SRV magic into an Agent-like thing | ||||
| | | * | | | | | put resolve_service in an object | Richard van der Hoff | 2019-01-22 | 2 | -63/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes it easier to stub things out for tests. | ||||
| | | * | | | | | Require that service_name be a byte string | Richard van der Hoff | 2019-01-22 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is only ever a bytes now, so let's enforce that. |