summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4420 from matrix-org/jaywink/openid-listenerErik Johnston2019-02-119-46/+252
|\ | | | | New listener resource for the federation API "openid/userinfo" endpoint
| * Fix flake8 issuesJason Robinson2019-01-233-4/+13
| | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * Fix openid tests after rebaseJason Robinson2019-01-231-2/+2
| | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * Fix sorting of imports in tests. Remove an unnecessary mockJason Robinson2019-01-231-2/+2
| | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * Collapse changelog to one lineJason Robinson2019-01-231-13/+1
| | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * Remove openid resource from default configJason Robinson2019-01-231-4/+13
| | | | | | | | | | | | Instead document it commented out. Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * Document `servlet_groups` parametersJason Robinson2019-01-231-0/+23
| | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * Add changelog for openid resource additionJason Robinson2019-01-231-0/+13
| | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * Split federation OpenID userinfo endpoint out of the federation resourceJason Robinson2019-01-234-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 SynapseHomeServerJason Robinson2019-01-231-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 Robinson2019-01-231-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 FederationReaderServerJason Robinson2019-01-231-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 Robinson2019-01-231-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 dependenciesJason Robinson2019-01-232-1/+2
| | | | | | | | | | | | Allows running parameterized tests. BSD license. Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * Fix a test docstring in frontend proxy testsJason Robinson2019-01-231-1/+1
| | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org>
* | Allow "unavailable" presence status for /sync (#4592)Valentin Anger2019-02-083-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 Hoff2019-02-082-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 Brown2019-02-0814-158/+83
| |
* | Merge branch 'master' into developRichard van der Hoff2019-02-070-0/+0
|\ \
| * | cleanupsRichard van der Hoff2019-02-071-4/+2
| | |
| * | Merge branch 'master' into erikj/msc1711_faqRichard van der Hoff2019-02-073-12/+17
| |\ \
| * | | NewsfileErik Johnston2019-02-071-0/+1
| | | |
| * | | Update MSC1711 FAQ to be explicit about well-knownErik Johnston2019-02-071-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 Johnston2019-02-072-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 developRichard van der Hoff2019-02-073-12/+17
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/release-v0.99.0'Richard van der Hoff2019-02-072-11/+16
| |\ \ \
| | * | | Update ACME docs to include port instructions (#4578) github/release-v0.99.0 release-v0.99.0Andrew Morgan2019-02-072-11/+16
| | | | |
| * | | | clarify option 1Richard van der Hoff2019-02-071-1/+1
| | |/ / | |/| |
* | | | Merge branch 'master' into developRichard van der Hoff2019-02-062-0/+3
|\| | |
| * | | Fix docker upload job to push -py2 images (#4576)Richard van der Hoff2019-02-062-0/+3
| | | |
* | | | Merge branch 'master' into developRichard van der Hoff2019-02-052-37/+19
|\| | |
| * | | faq cleanupsRichard van der Hoff2019-02-052-37/+19
| |/ /
* | | Merge branch 'master' into developRichard van der Hoff2019-02-0518-579/+1051
|\| |
| * | v0.99.0 v0.99.0Richard van der Hoff2019-02-0510-63/+23
| | |
| * | Add notes on SRV and .well-known (#4573)Richard van der Hoff2019-02-051-41/+117
| | |
| * | fix some thinkos in UPGRADE.rstRichard van der Hoff2019-02-051-6/+7
| | |
| * | Merge pull request #4570 from matrix-org/anoa/self_signed_upgradeAndrew Morgan2019-02-054-120/+151
| |\ \ | | | | | | | | Add ACME docs and link to it from README and INSTALL
| | * | Add TL;DR and final step details to ACMEAndrew Morgan2019-02-051-4/+20
| | | |
| | * | Merge branch 'anoa/self_signed_upgrade' of github.com:matrix-org/synapse ↵Andrew Morgan2019-02-051-1/+1
| | |\ \ | | | | | | | | | | | | | | | into anoa/self_signed_upgrade
| | | * | Update docs/ACME.mdRichard van der Hoff2019-02-051-2/+2
| | | | | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com>
| | * | | Update ACMEAndrew Morgan2019-02-051-14/+17
| | | | |
| | * | | Update INSTALLAndrew Morgan2019-02-051-4/+4
| | | | |
| | * | | Update READMEAndrew Morgan2019-02-051-8/+1
| | |/ /
| | * | Actually add ACME docsAndrew Morgan2019-02-051-0/+107
| | | |
| | * | Move ACME docs from INSTALL.md to ACME.mdAndrew Morgan2019-02-051-78/+1
| | | |
| | * | Re-add link to ACME docs from READMEAndrew Morgan2019-02-051-0/+6
| | | |
| | * | Merge branch 'release-v0.99.0' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-02-0514-421/+621
| | |\ \ | | | | | | | | | | | | | | | anoa/self_signed_upgrade
| | * | | Convert ACME docs to mdAndrew Morgan2019-02-053-100/+2
| | | | |
| | * | | Add link to ACME docs from READMEAndrew Morgan2019-02-051-0/+6
| | | | |
| | * | | Move ACME docs to docs/ACME.rst and link from UPGRADE.Andrew Morgan2019-02-053-98/+102
| | | | |
| | * | | Don't imply self-signed certs are requiredAndrew Morgan2019-02-051-16/+17
| | | | |
| * | | | Neilj/1711faq (#4572)Neil Johnson2019-02-053-0/+263
| | |/ / | |/| | | | | | | | | | | | | | MSC1711 certificates FAQ
| * | | Move things from README.rst to UPDATE.md (#4569)Richard van der Hoff2019-02-052-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 Hoff2019-02-056-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 Hoff2019-02-052-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 Hoff2019-02-052-1/+2
| | | | | | | | | | | | Fixes #4559
| * | | switch docker image to py3 by default (#4558)Richard van der Hoff2019-02-052-4/+5
| | | | | | | | | | | | | | | | Switch the matrixdotorg/synapse:latest Docker image to use python 3
| * | | fix typo in config comments (#4557)Richard van der Hoff2019-02-052-2/+3
| |/ /
| * | Merge pull request #4547 from matrix-org/anoa/acme_docsAndrew Morgan2019-02-012-83/+86
| |\ \ | | | | | | | | Add docs for ACME setup
| | * | Fix nginx capatilizationAndrew Morgan2019-02-011-2/+2
| | | |
| | * | Address commentsAndrew Morgan2019-02-011-17/+13
| | | |
| | * | Update README.rstRichard van der Hoff2019-02-011-1/+1
| | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com>
| | * | Update README.rstRichard van der Hoff2019-02-011-1/+1
| | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com>
| | * | Actually need to enable itAndrew Morgan2019-02-011-0/+8
| | | |
| | * | Merge branch 'release-v0.99.0' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-02-015-4/+12
| | |\ \ | | |/ / | |/| | | | | | anoa/acme_docs
| * | | 0.99.0rc4 v0.99.0rc4Richard van der Hoff2019-02-015-4/+12
| | | |
| | * | Address changesAndrew Morgan2019-02-011-22/+13
| | | |
| | * | Remove error and add link to foks fed tester projectAndrew Morgan2019-02-011-2/+3
| | | |
| | * | Clean up portions of docs that talk about reversing fed portAndrew Morgan2019-02-011-97/+24
| | | |
| | * | Add changelogAndrew Morgan2019-02-011-0/+1
| | | |
| | * | Add docs for ACME setupAndrew Morgan2019-02-011-0/+79
| |/ /
* | | Filter user directory state query to a subset of state events (#4462)Andrew Morgan2019-02-052-4/+13
| | | | | | | | | | | | | | | | | | * Filter user directory state query to a subset of state events * Add changelog
* | | Merge pull request #4546 from ↵Richard van der Hoff2019-02-012-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 logsRichard van der Hoff2019-02-012-2/+16
| | | | | | | | | | | | | | | | Fixes #4003
* | | | Merge remote-tracking branch 'origin/release-v0.99.0' into developRichard van der Hoff2019-02-013-31/+78
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #4544 from matrix-org/rav/skip_invalid_well_knownRichard van der Hoff2019-02-013-30/+77
| |\ \ \ | | | | | | | | | | Treat an invalid .well-known the same as an absent one
| | * | | Treat an invalid .well-known the same as an absent oneRichard van der Hoff2019-02-013-30/+77
| | | | | | | | | | | | | | | | | | | | ... basically, carry on and fall back to SRV etc.
| * | | | Fix b'ab' noise in logsRichard van der Hoff2019-02-011-1/+1
| |/ / /
* | | | Merge branch 'release-v0.99.0' into developRichard van der Hoff2019-02-014-52/+86
|\| | |
| * | | Merge pull request #4542 from matrix-org/rav/cache_for_bad_well_knownRichard van der Hoff2019-02-012-17/+59
| |\ \ \ | | | | | | | | | | Caching for invalid .well-knowns
| | * | | changelogRichard van der Hoff2019-02-011-0/+1
| | | | |
| | * | | Cache failures to parse .well-knownRichard van der Hoff2019-02-011-13/+43
| | | | | | | | | | | | | | | | | | | | Also add a Measure block around the .well-known fetch
| | * | | better logging for federation connectionsRichard van der Hoff2019-01-311-5/+16
| | | | |
| * | | | Merge pull request #4539 from matrix-org/rav/update_wellknown_routingRichard van der Hoff2019-02-013-35/+27
| |\| | | | | |/ / | |/| | Update federation routing logic to check .well-known before SRV
| | * | Update federation routing logic to check .well-known before SRVRichard van der Hoff2019-01-313-35/+27
| |/ /
* | | Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatableAndrew Morgan2019-01-313-11/+38
|\ \ \ | | | | | | | | Copy over non-federatable trait on room upgrade
| * | | Raise an exception instead of returning NoneAndrew Morgan2019-01-311-2/+9
| | | |
| * | | New function for getting room's create eventAndrew Morgan2019-01-312-18/+21
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-01-3190-84/+151
| |\ \ \ | | | | | | | | | | | | | | | anoa/room_upgrade_federatable
| * | | | lintAndrew Morgan2019-01-311-2/+4
| | | | |
| * | | | Add changelogAndrew Morgan2019-01-301-0/+1
| | | | |
| * | | | Copy over non-federatable trait on room upgradeAndrew Morgan2019-01-301-0/+14
| | | | |
* | | | | Merge branch 'release-v0.99.0' into developRichard van der Hoff2019-01-316-13/+103
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | v0.99.0rc3 v0.99.0rc3Richard van der Hoff2019-01-315-4/+22
| | | |
| * | | Add some debug for membership syncing issues (#4538)Richard van der Hoff2019-01-312-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 Hoff2019-01-312-5/+33
| | | |
| * | | update debian installation instructions (#4526)Richard van der Hoff2019-01-312-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | * update debian installation instructions * docs PR is docs
| * | | cleanups for contrib/prometheus/READMERichard van der Hoff2019-01-301-0/+7
| | | |
* | | | Reject large transactions on federation (#4513)Andrew Morgan2019-01-312-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reject large transactions on federation * Add changelog * lint * Simplify large transaction handling
* | | | Merge remote-tracking branch 'origin/release-v0.99.0' into developRichard van der Hoff2019-01-3086-84/+117
|\| | |
| * | | v0.99.0rc2 v0.99.0rc2Richard van der Hoff2019-01-304-3/+18
| | | |
| * | | Merge remote-tracking branch 'origin/develop' into release-v0.99.0Richard van der Hoff2019-01-302-1/+14
| |\ \ \
| * | | | ACME Upgrade Docs (#4528)Amber Brown2019-01-302-0/+33
| | | | |
| * | | | Update constants.pyNeil Johnson2019-01-301-1/+1
| | | | | | | | | | | | | | | remove trailing ,
| * | | | 0.99.0rc1 v0.99.0rc1Richard van der Hoff2019-01-3083-82/+67
| | |/ / | |/| |
* | | | by default include m.room.encryption on invites (#3902)Matthew Hodgson2019-01-303-0/+4
| |/ / |/| | | | | | | | | | | | | | | | | | | | * by default include m.room.encryption on invites * fix constant * changelog
* | | Merge pull request #4527 from ↵Erik Johnston2019-01-302-1/+14
|\ \ \ | |/ / |/| | | | | | | | matrix-org/erikj/fix_sending_remote_invite_rejections Fix remote invite rejections not coming down sync
| * | NewsfileErik Johnston2019-01-301-0/+1
| | |
| * | Fix remote invite rejections not comming down syncErik Johnston2019-01-301-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_capabilitiesErik Johnston2019-01-305-0/+153
|\ \ | | | | | | Server capabilities support
| * \ Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ↵Neil Johnson2019-01-30123-669/+2451
| |\ \ | | | | | | | | | | | | neilj/room_capabilities
| | * \ Merge branch 'develop' into neilj/room_capabilitiesNeil Johnson2019-01-30123-669/+2451
| | |\ \
| * | | | isortNeil Johnson2019-01-301-2/+1
| |/ / /
| * | | define room dispositions for use in exposing room capabilitiesNeil Johnson2019-01-301-0/+5
| | | |
| * | | formatting and use constants where availableNeil Johnson2019-01-301-19/+17
| | | |
| * | | Populate default room version from ConstantsNeil Johnson2019-01-301-1/+2
| | | |
| * | | reflect that rooms v3 is a stable room versionNeil Johnson2019-01-302-0/+2
| | | |
| * | | rework format of change password capabilityNeil Johnson2019-01-292-3/+5
| | | |
| * | | update to reflect broadening scopeNeil Johnson2019-01-291-1/+1
| | | |
| * | | support change_password in capabilities end-pointNeil Johnson2019-01-292-2/+35
| | | |
| * | | isortNeil Johnson2019-01-291-1/+2
| | | |
| * | | enforce auth for capabilities endpointNeil Johnson2019-01-292-14/+36
| | | |
| * | | register capabilities servletNeil Johnson2019-01-291-0/+2
| | | |
| * | | backout v3Neil Johnson2019-01-252-2/+0
| | | |
| * | | Support room version capabilities in CS API (MSC1804)Neil Johnson2019-01-252-0/+88
| | | |
| * | | towncrierNeil Johnson2019-01-251-0/+1
| | | |
| * | | track unstable room v3Neil Johnson2019-01-251-0/+2
| | | |
* | | | Fix replication for room v3 (#4523)Erik Johnston2019-01-302-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 Hoff2019-01-305-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_tlsErik Johnston2019-01-302-1/+4
|\ \ \ \ | | | | | | | | | | Fix bug where synapse fails to start if no_tls set
| * | | | Raise ConfigError insteadErik Johnston2019-01-301-1/+3
| | | | |
| * | | | NewsfileErik Johnston2019-01-301-0/+1
| | | | |
| * | | | _listener_http should return a listErik Johnston2019-01-301-1/+1
|/ / / /
* | | | Merge pull request #4521 from matrix-org/rav/fed_routing/cleanupsRichard van der Hoff2019-01-302-9/+12
|\ \ \ \ | | | | | | | | | | Tiny .well-known fixes
| * | | | newsfileRichard van der Hoff2019-01-301-0/+1
| | | | |
| * | | | fix exception textRichard van der Hoff2019-01-301-1/+1
| | | | |
| * | | | Also jitter the invalid cache periodRichard van der Hoff2019-01-301-9/+11
| | | | |
* | | | | Follow redirects on .well-known (#4520)Richard van der Hoff2019-01-303-2/+102
| | | | |
* | | | | SIGHUP for TLS cert reloading (#4495)Amber Brown2019-01-305-20/+81
|/ / / /
* | | | Add a caching layer to .well-known responses (#4516)Richard van der Hoff2019-01-306-10/+493
| | | |
* | | | Fix flake8 (#4519)Amber Brown2019-01-3012-102/+94
| |/ / |/| |
* | | Merge pull request #4486 from xperimental/workaround-4216Richard van der Hoff2019-01-302-1/+5
|\ \ \ | | | | | | | | Implement workaround for login error.
| * | | Implement workaround for login error.Robert Jacob2019-01-302-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Robert Jacob <xperimental@solidproject.de>
* | | | Merge pull request #4515 from matrix-org/erikj/room_version_v3Erik Johnston2019-01-295-4/+14
|\ \ \ \ | | | | | | | | | | Enable support for room version 3
| * | | | No vdh tests!Erik Johnston2019-01-291-2/+1
| | | | |
| * | | | NewsfileErik Johnston2019-01-291-0/+1
| | | | |
| * | | | Enable room version v3Erik Johnston2019-01-294-4/+14
|/ / / /
* | | | Merge pull request #4499 from matrix-org/erikj/redactions_eiahErik Johnston2019-01-298-16/+77
|\ \ \ \ | | | | | | | | | | Implement rechecking of redactions for room versions v3
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-299-46/+77
| |\ \ \ \ | |/ / / / |/| | | | | | | | | erikj/redactions_eiah
* | | | | Merge pull request #4514 from matrix-org/erikj/remove_event_idErik Johnston2019-01-299-47/+83
|\ \ \ \ \ | | | | | | | | | | | | Remove usages of event ID's domain
| * | | | | Update commentErik Johnston2019-01-291-3/+3
| | | | | |
| * | | | | check event format version not room versionErik Johnston2019-01-291-2/+2
| | | | | |
| * | | | | NewsfileErik Johnston2019-01-291-0/+1
| | | | | |
| * | | | | Don't assert an event must have an event IDErik Johnston2019-01-291-2/+3
| | | | | |
| * | | | | Only check event ID domain for signatures for V1 eventsErik Johnston2019-01-293-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 eventsErik Johnston2019-01-291-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 oursErik Johnston2019-01-292-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 roomErik Johnston2019-01-291-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 V2Erik Johnston2019-01-291-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | Since newer versions of events don't have the same format for event ID.
| | * | | | Fixup commentErik Johnston2019-01-291-2/+2
| | | | | |
| | * | | | kill vdh test some moreErik Johnston2019-01-291-2/+1
| | | | | |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-2954-288/+1051
| | |\ \ \ \ | |_|/ / / / |/| | | | | | | | | | | erikj/redactions_eiah
* | | | | | Merge pull request #4483 from matrix-org/erikj/event_v2Erik Johnston2019-01-295-19/+109
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implement event format V2
| * | | | | | NewsfileErik Johnston2019-01-291-0/+1
| | | | | | |
| * | | | | | Implement event format v2Erik Johnston2019-01-294-19/+108
| | | | | | |
* | | | | | | Merge pull request #4512 from matrix-org/anoa/consent_dirAndrew Morgan2019-01-293-11/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Check consent dir path on startup
| * | | | | | Add changelogAndrew Morgan2019-01-291-0/+1
| | | | | | |
| * | | | | | Check consent dir path on startupAndrew Morgan2019-01-292-11/+14
| | | | | | |
* | | | | | | Relax requirement for a content-type on .well-known (#4511)Richard van der Hoff2019-01-293-21/+14
| | | | | | |
* | | | | | | Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurlTravis Ralston2019-01-292-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Don't recommend :8448 to people on public_baseurl
| * | | | | | Create 4498.miscTravis Ralston2019-01-281-0/+1
| | | | | | |
| * | | | | | Don't recommend :8448 to people on public_baseurlTravis Ralston2019-01-281-1/+1
| | | | | | |
* | | | | | | Do not generate self-signed TLS certificates by default. (#4509)Amber Brown2019-01-294-45/+94
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-2910-164/+288
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor event building into EventBuilder
| * | | | | | Correctly set context.app_serviceErik Johnston2019-01-291-0/+2
| | | | | | |
| * | | | | | Don't set event_id twiceErik Johnston2019-01-291-2/+0
| | | | | | |
| * | | | | | Remove dead functionErik Johnston2019-01-291-11/+0
| | | | | | |
| * | | | | | Fix test to use valid event formatErik Johnston2019-01-291-1/+1
| | | | | | |
| * | | | | | Replace usage of builder.user_id with builder.senderErik Johnston2019-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `.user_id` is proxed to `.sender` in FrozenEvent, so this has no functional change
| * | | | | | NewsfileErik Johnston2019-01-291-0/+1
| | | | | | |
| * | | | | | Refactor event building into EventBuilderErik Johnston2019-01-295-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 dictsErik Johnston2019-01-292-40/+32
| | | | | | |
* | | | | | | Implement MSC1708 (.well-known lookups for server routing) (#4489)Richard van der Hoff2019-01-2923-21/+470
| | | | | | |
* | | | | | | Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signatureErik Johnston2019-01-293-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixup calls to `comput_event_signature`
| * | | | | | | NewsfileErik Johnston2019-01-291-0/+1
| | | | | | | |
| * | | | | | | Fixup calls to `comput_event_signature`Erik Johnston2019-01-292-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 Hoff2019-01-294-30/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I got fed up with always adding '@unittest.DEBUG' every time I needed to debug a test.
| | | | * | | | Update synapse/storage/events_worker.pyErik Johnston2019-01-291-1/+1
| | | | | | | |
| | | | * | | | Check redaction state when event is pulled out of the databaseErik Johnston2019-01-291-0/+13
| | | | | | | |
| | | | * | | | Fix typoErik Johnston2019-01-291-1/+1
| | | | | | | |
| | | | * | | | Remove unused argErik Johnston2019-01-291-2/+1
| | | | | | | |
| | | | * | | | Drop vdh supportErik Johnston2019-01-294-6/+2
| | | | | | | |
| | | | * | | | Add docstringErik Johnston2019-01-291-0/+12
| | | | | | | |
| | | | * | | | Update synapse/storage/events_worker.pyRichard van der Hoff2019-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re>
| | | | * | | | Finish comment...Erik Johnston2019-01-291-1/+1
| | | | | | | |
| | | | * | | | NewsfileErik Johnston2019-01-291-0/+1
| | | | | | | |
| | | | * | | | Implement rechecking of redactionsErik Johnston2019-01-295-10/+53
| | | | | | | |
| | | | * | | | Add RoomVersions.V3 constant, without enabling itErik Johnston2019-01-291-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_fallbackErik Johnston2019-01-293-14/+90
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Implement fallback for V2 invite API
| * | | | | | NewsfileErik Johnston2019-01-281-0/+1
| | | | | | |
| * | | | | | Implement fallback for V2 invite APIErik Johnston2019-01-282-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 Brown2019-01-292-5/+6
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validatorErik Johnston2019-01-294-26/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | Split up event validation between event and builder
| * | | | | | Remove duplicate checksErik Johnston2019-01-291-14/+0
| | | | | | |
| * | | | | | Fix up error messagesErik Johnston2019-01-291-2/+2
| | | | | | |
| * | | | | | Fold validate into validate_newErik Johnston2019-01-291-16/+11
| | | | | | |
| * | | | | | NewsfileErik Johnston2019-01-281-0/+1
| | | | | | |
| * | | | | | Split up event validation between event and builderErik Johnston2019-01-283-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 workerErik Johnston2019-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was introduced in PR #4470, commit 678a92cb56d547dcadffa723e29b4855a27d0901
* | | | | | | Fix typo in upserts code (#4505)Amber Brown2019-01-292-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix obvious problem :| * changelog
* | | | | | | Merge pull request #4493 from matrix-org/erikj/refactor_event_signingErik Johnston2019-01-293-42/+105
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor event signing to work on dicts
| * | | | | | | NewsfileErik Johnston2019-01-281-0/+1
| | | | | | | |
| * | | | | | | Refactor event signing to work on dictsErik Johnston2019-01-282-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 Hoff2019-01-293-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_versionErik Johnston2019-01-2811-28/+71
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Pass through room version to event auth
| * | | | | | Correctly use default room version if none is setErik Johnston2019-01-281-2/+2
| | | | | | |
| * | | | | | NewsfileErik Johnston2019-01-251-0/+1
| | | | | | |
| * | | | | | Pass through room version to event authErik Johnston2019-01-2510-27/+69
| | |_|/ / / | |/| | | |
* | | | | | Fix worker TLS (#4492)Amber Brown2019-01-288-48/+49
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * load cert * changelog * fix
* | | | | Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-288-18/+30
| | | | |
* | | | | Merge pull request #4412 from matrix-org/anoa/dm_room_upgradeAndrew Morgan2019-01-285-18/+83
|\ \ \ \ \ | |_|/ / / |/| | | | Migrate direct message and tag state on room upgrade
| * | | | Change return syntax in doc stringAndrew Morgan2019-01-281-1/+1
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-01-2832-123/+556
| |\ \ \ \ | |/ / / / |/| | | | | | | | | anoa/dm_room_upgrade
* | | | | Remove --process-dependency-links from UPGRADE.rst (#4485)Aaron Raimist2019-01-282-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/refactorRichard van der Hoff2019-01-283-35/+120
|\ \ \ \ \ | | | | | | | | | | | | Refactoring in MatrixFederationAgent
| * | | | | docstrings for _RoutingResultRichard van der Hoff2019-01-281-0/+36
| | | | | |
| * | | | | changelogRichard van der Hoff2019-01-281-0/+1
| | | | | |
| * | | | | Handle IP literals explicitlyRichard van der Hoff2019-01-282-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | We don't want to be doing .well-known lookups on these guys.
| * | | | | MatrixFederationAgent: factor out routing logicRichard van der Hoff2019-01-281-18/+62
|/ / / / / | | | | | | | | | | | | | | | This is going to get too big and unmanageable.
* | / / / Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487)Richard van der Hoff2019-01-283-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_versionErik Johnston2019-01-2517-86/+220
|\ \ \ \ | | | | | | | | | | Require event format version to parse or create events
| * | | | NewsfileErik Johnston2019-01-251-0/+1
| | | | |
| * | | | Replace missed usages of FrozenEventErik Johnston2019-01-253-10/+14
| | | | |
| * | | | Fix testsErik Johnston2019-01-255-4/+14
| | | | |
| * | | | Require event format version to parse or create eventsErik Johnston2019-01-258-72/+191
| | | | |
* | | | | Merge pull request #4471 from matrix-org/erikj/sqlite_native_upsertErik Johnston2019-01-253-4/+9
|\ \ \ \ \ | | | | | | | | | | | | Disable native upsert on sqlite
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-2513-7/+120
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | erikj/sqlite_native_upsert
* | | | | | Fix quoting for allowed_local_3pids example config (#4476)Richard van der Hoff2019-01-252-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Hoff2019-01-255-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Morgan2019-01-252-2/+2
| | | | | |
| * | | | | NewsfileErik Johnston2019-01-252-1/+2
| | | | | |
| * | | | | Disable native upserts for sqlite, as they don't workErik Johnston2019-01-251-3/+7
| |/ / / /
| | * | | Reuse predecessor methodAndrew Morgan2019-01-281-12/+8
| | | | |
| | * | | FixesAndrew Morgan2019-01-251-39/+39
| | | | |
| | * | | Clean up direct_rooms accessAndrew Morgan2019-01-251-3/+3
| | | | |
| | * | | Use python magicAndrew Morgan2019-01-251-2/+1
| | | | |
| | * | | Destructure account data tuple before useAndrew Morgan2019-01-251-3/+3
| | | | |
| | * | | Remove unnecessary null checkAndrew Morgan2019-01-251-7/+6
| | | | |
| | * | | Move room_tag declaration to be closer to its useAndrew Morgan2019-01-251-4/+5
| | | | |
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-01-2575-1069/+1683
| | |\ \ \ | |_|/ / / |/| | | | | | | | | anoa/dm_room_upgrade
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-30 09:45:30 +0000