summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fixAndrew Morgan2019-01-242-2/+13
|\ | | | | Add a 60s timeout to filtered room directory queries
| * Change default timeout value from 0 to NoneAndrew Morgan2019-01-241-1/+1
| |
| * Use self.clock instead of datetimeAndrew Morgan2019-01-241-4/+3
| |
| * isortAndrew Morgan2019-01-241-1/+1
| |
| * Add changelogAndrew Morgan2019-01-241-0/+1
| |
| * lintAndrew Morgan2019-01-241-1/+2
| |
| * Time out filtered room dir queries after 60sAndrew Morgan2019-01-241-2/+12
| |
* | Merge pull request #4464 from matrix-org/rav/fix_srv_lookupRichard van der Hoff2019-01-243-12/+89
|\ \ | | | | | | MatrixFederationAgent: Look up the right SRV record
| * | Look up the right SRV recordRichard van der Hoff2019-01-243-4/+12
| | |
| * | lots more tests for MatrixFederationAgentRichard van der Hoff2019-01-241-10/+79
| | |
* | | Generate the debian config during build (#4444)Richard van der Hoff2019-01-244-617/+33
| | | | | | | | | | | | | | | | | | Rather than hardcoding a config which we always forget to update, generate it from the default config.
* | | Fix UnboundLocalError in post_urlencoded_get_json (#4460)Richard van der Hoff2019-01-242-2/+4
|/ / | | | | This could cause exceptions if the id server returned 4xx responses.
* | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_checkNeil Johnson2019-01-245-9/+16
|\ \ | | | | | | Neilj/fix threepid auth check
| * | move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-223-7/+6
| | |
| * | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-225-8/+16
| | |
* | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_docNeil Johnson2019-01-242-1/+6
|\ \ \ | | | | | | | | Clarify docs for public_baseurl
| * | | ChangelogDavid Baker2019-01-241-0/+1
| | | |
| * | | Clarify docs for public_baseurlDavid Baker2019-01-241-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 Brown2019-01-242-5/+29
|/ /
* | Use native UPSERTs where possible (#4306)Amber Brown2019-01-2414-43/+238
| |
* | Don't send IP addresses as SNI (#4452)Richard van der Hoff2019-01-243-6/+73
| | | | | | | | | | | | 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_backportAndrew Morgan2019-01-232-0/+7
|\ \ | | | | | | Add metric for user dir current event stream position
| * | Add changelogAndrew Morgan2019-01-231-0/+1
| | |
| * | Add metric for user dir current event stream positionAndrew Morgan2019-01-231-0/+6
| | |
* | | Merge pull request #4428 from matrix-org/rav/matrix_federation_agentRichard van der Hoff2019-01-239-258/+555
|\ \ \ | |/ / |/| | Move SRV magic into an Agent-like thing
| * | fix python2 test failureRichard van der Hoff2019-01-231-1/+1
| | |
| * | Add a test for MatrixFederationAgentRichard van der Hoff2019-01-222-1/+195
| | |
| * | put resolve_service in an objectRichard van der Hoff2019-01-223-83/+104
| | | | | | | | | | | | this makes it easier to stub things out for tests.
| * | Require that service_name be a byte stringRichard van der Hoff2019-01-222-8/+8
| | | | | | | | | | | | it is only ever a bytes now, so let's enforce that.
| * | changelogRichard van der Hoff2019-01-221-0/+1
| | |
| * | Kill off matrix_federation_endpointRichard van der Hoff2019-01-222-145/+0
| | | | | | | | | | | | this thing is now redundant.
| * | Make MatrixFederationClient use MatrixFederationAgentRichard van der Hoff2019-01-222-27/+106
| | | | | | | | | | | | ... instead of the matrix_federation_endpoint
| * | MatrixFederationAgentRichard van der Hoff2019-01-222-0/+147
| | | | | | | | | | | | | | | Pull the magic that is currently in matrix_federation_endpoint and friends into an agent-like thing
* | | debian package: symlink to python-3.X (#4433)Richard van der Hoff2019-01-233-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the debian package, make the virtualenv symlink python to /usr/bin/python3.X rather than /usr/bin/python3. Also make sure we depend on the right python3.x package. This might help a bit with subtle failures when people install a package from the wrong distro (https://github.com/matrix-org/synapse/issues/4431).
* | | Fixup removal of duplicate `user_ips` rows (#4432)Erik Johnston2019-01-232-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | * Remove unnecessary ORDER BY clause * Add logging * Newsfile
* | | Support ACME for certificate provisioning (#4384)Amber Brown2019-01-238-36/+298
| | |
* | | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedupErik Johnston2019-01-222-26/+36
|\ \ \ | |_|/ |/| | Fix bug when removing duplicate rows from user_ips
| * | Refactor to rewrite the SQL insteadErik Johnston2019-01-221-13/+16
| | |
| * | Don't shadow paramsErik Johnston2019-01-221-4/+3
| | |
| * | NewsfileErik Johnston2019-01-221-0/+1
| | |
| * | Fix bug when removing duplicate rows from user_ipsErik Johnston2019-01-221-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | This was caused by accidentally overwritting a `last_seen` variable in a for loop, causing the wrong value to be written to the progress table. The result of which was that we didn't scan sections of the table when searching for duplicates, and so some duplicates did not get deleted.
* | | Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registrationNeil Johnson2019-01-223-11/+15
|\ \ \ | |_|/ |/| | Config option to disable requesting MSISDN on registration
| * | fix line lengthNeil Johnson2019-01-211-1/+3
| | |
| * | Config option to disable requesting MSISDN on registrationNeil Johnson2019-01-213-11/+13
| | |
* | | Make key fetches use regular federation client (#4426)Richard van der Hoff2019-01-223-172/+8
| | | | | | | | | | | | | | | All this magic is redundant.
* | | Refactor and bugfix for resove_service (#4427)Richard van der Hoff2019-01-226-86/+250
| | |
* | | Require ECDH key exchange & remove dh_params (#4429)Amber Brown2019-01-228-57/+6
| |/ |/| | | * remove dh_params and set better cipher string
* | Merge pull request #4402 from matrix-org/erikj/fed_v2_invite_serverErik Johnston2019-01-214-6/+42
|\ \ | |/ |/| Implement server side of MSC1794 - Federation v2 Invite API
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-01-2124-118/+261
| |\ | |/ |/| | | erikj/fed_v2_invite_server
* | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apisErik Johnston2019-01-214-68/+74
|\ \ | | | | | | Add groundwork for new versions of federation APIs
* | | Migrate encryption state on room upgrade (#4411)Andrew Morgan2019-01-213-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Migrate encryption state on room upgrade Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> * Add changelog file
* | | Fix race when persisting create event (#4404)Erik Johnston2019-01-182-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix race when persisting create event When persisting a chunk of DAG it is sometimes requried to do a state resolution, which requires knowledge of the room version. If this happens while we're persisting the create event then we need to use that event rather than attempting to look it up in the database.
* | | Tweak code coverage settings (#4400)Erik Johnston2019-01-183-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Tweak code coverage settings * Fix manifest * Newsfile * Fix commit status?
* | | Remove redundant WrappedConnection (#4409)Richard van der Hoff2019-01-184-93/+67
| | | | | | | | | | | | | | | | | | | | | | | | * Remove redundant WrappedConnection The matrix federation client uses an HTTP connection pool, which times out its idle HTTP connections, so there is no need for any of this business.
* | | Fix incorrect logcontexts after a Deferred was cancelled (#4407)Richard van der Hoff2019-01-174-3/+117
| | |
* | | sign_request -> build_auth_headers (#4408)Richard van der Hoff2019-01-173-15/+18
| | | | | | | | | | | | | | | Just got very confused about the fact that the headers are only an output, not an input.
* | | Changing macaroon_secret_key no longer logs you out (#4387)Richard van der Hoff2019-01-162-3/+1
| | |
* | | don't store more remote device lists if they have more than 1K devices (#4397)Richard van der Hoff2019-01-162-0/+20
| | |
* | | Merge pull request #4399 from andrewshadura/update-python-depsErik Johnston2019-01-162-2/+3
|\ \ \ | | | | | | | | Update Dependencies
| * | | Add a changelog entryAndrej Shadura2019-01-161-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
| * | | Depend on pymacaroons >= 0.13.0 instead on pymacaroons-pynaclAndrej Shadura2019-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 0.13.0, pymacaroons works correctly with pynacl, so there isn’t any more reason to depend on an outdated pynacl fork. Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
| * | | Use msgpack instead of msgpack-pythonAndrej Shadura2019-01-161-1/+1
|/ / / | | | | | | | | | | | | | | | The package msgpack-python has been deprecated. Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
* | | Merge pull request #4392 from matrix-org/neilj/fix_user_type_typoErik Johnston2019-01-152-1/+2
|\ \ \ | | | | | | | | ALL_USER_TYPES should be a tuple
| * | | ALL_USER_TYPES should be a tupleNeil Johnson2019-01-152-1/+2
|/ / /
| | * NewsfileErik Johnston2019-01-161-0/+1
| | |
| | * Add /v2/invite federation APIErik Johnston2019-01-153-6/+41
| |/
| * NewsfileErik Johnston2019-01-151-0/+1
| |
| * Add groundwork for new versions of federation APIsErik Johnston2019-01-153-68/+73
|/
* Merge branch 'release-v0.34.1.1' into developRichard van der Hoff2019-01-124-49/+163
|\
| * moar plusses!Richard van der Hoff2019-01-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turns out that 0.34.1.1+1 comes before 0.34.1.1+bionic (etc). The version may only contain "~ 0-9 A-Z a-z + - ." (sorting in that order). Option 1: replace "+" with something that sorts after +. Options are "-" (but dpkg-source complains about that) or "." (but that would mean we couldn't distinguish packaging-only changes from real changes). Option 2: stick with + and just find something that sorts after 'xenial'. The only options there are "-", "." (same problems as before), "z", and "+". Hence, ++1. Sorry.
| * Rewrite build_debian_packages github/release-v0.34.1.1 release-v0.34.1.1Richard van der Hoff2019-01-122-46/+154
| | | | | | | | Rewrite this in python so that it can be run in parallel.
| * s/Breaks/Conflicts/ in debian/controlRichard van der Hoff2019-01-112-3/+9
| | | | | | | | Otherwise people can't upgrade from matrix-synapse without removing it first
* | Silence travis-ci build warnings by removing non-functional python3.6 (#4377)Richard van der Hoff2019-01-122-0/+8
| | | | | | | | | | | | * Remove non-functional python3.6 in travis env * changelog
* | Remove duplicates in the user_ips table and add an index (#4370)Amber Brown2019-01-124-4/+164
| |
* | Merge remote-tracking branch 'origin/master' into developAmber Brown2019-01-116-195/+51
|\ \
| * | Merge Synapse v0.34.1.1Amber Brown2019-01-116-195/+51
| |\|
| | * changelog, for debianAmber Brown2019-01-111-0/+6
| | |
| | * changelog v0.34.1.1Amber Brown2019-01-112-1/+14
| | |
| | * versionAmber Brown2019-01-111-1/+1
| | |
| | * Merge pull request #4374 from matrix-org/rav/macaroon_key_fix_0.34.1Amber Brown2019-01-114-194/+31
| |/| | | | | | | Fix spontaneous logout
| | * changelogRichard van der Hoff2019-01-102-1/+1
| | |
| | * Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-104-194/+31
| |/| | | | | | | | | | Fixes #4371
| | * Revert "Fix macaroon_secret_key fallback logic"Richard van der Hoff2019-01-101-3/+3
| | | | | | | | | | | | | | | | | | This is already fixed in 0.34.1, by 59f93bb This reverts commit efc522c55e996e420271de2d9094835dda52ade4.
| | * changelogRichard van der Hoff2019-01-101-0/+1
| | |
| | * Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-103-197/+33
| | |\
| | | * Fix macaroon_secret_key fallback logicRichard van der Hoff2019-01-101-3/+3
| | | |
| | | * Skip macaroon check for access tokens in the dbRichard van der Hoff2019-01-102-186/+28
| | | |
| | | * Fix fallback to signing key for macaroon-secret-keyRichard van der Hoff2019-01-101-2/+2
| | | |
* | | | Merge pull request #4342 from aaronraimist/new-virtualenvRichard van der Hoff2019-01-102-3/+3
|\ \ \ \ | | | | | | | | | | Update README to use new virtualenv (#4328)
| * | | | README.rst: fix hash_password pathRichard van der Hoff2019-01-021-2/+1
| | | | |
| * | | | Add changelogAaron Raimist2019-01-011-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | | Update README to use new virtualenv (#4328)Aaron Raimist2019-01-011-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | | Merge branch 'master' into developRichard van der Hoff2019-01-091-3/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | fix docker build to install optional deps github/release-v0.34.1 release-v0.34.1Richard van der Hoff2019-01-091-3/+1
| | | | |
* | | | | Merge branch 'master' into developRichard van der Hoff2019-01-092-1/+8
|\| | | |
| * | | | debian: Remove Breaks: matrix-synapse-ldap3 v0.34.1+1Richard van der Hoff2019-01-092-1/+8
| | | | |
* | | | | Merge branch 'master' into developRichard van der Hoff2019-01-0945-46/+73
|\| | | |
| * | | | 0.34.1 v0.34.1Richard van der Hoff2019-01-095-5/+13
| | | | |
| * | | | Merge branch 'develop' into release-v0.34.1Erik Johnston2019-01-094-6/+13
| |\ \ \ \
| * | | | | clean up changelog v0.34.1rc1Richard van der Hoff2019-01-081-3/+2
| | | | | |
| * | | | | 0.34.1rc1Richard van der Hoff2019-01-081-1/+1
| | | | | |
| * | | | | changelogRichard van der Hoff2019-01-0841-41/+61
| | | | | |
* | | | | | Merge pull request #4368 from matrix-org/erikj/better_errorsErik Johnston2019-01-092-68/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixup docstrings for matrixfederationclient
| * | | | | | NewsfileErik Johnston2019-01-091-0/+1
| | | | | | |
| * | | | | | Fixup docstrings for matrixfederationclientErik Johnston2019-01-091-68/+73
| | | | | | |
* | | | | | | Fix adding new rows instead of updating them if one of the key values is a ↵Amber Brown2019-01-093-1/+81
| |_|/ / / / |/| | | | | | | | | | | | | | | | | NULL in upserts. (#4369)
* | | | | | Merge pull request #4362 from matrix-org/erikj/better_errorsErik Johnston2019-01-092-5/+6
|\| | | | | | | | | | | | | | | | | Use RequestSendFailed when fail to parse content type headers
| * | | | | NewsfileErik Johnston2019-01-081-0/+1
| | | | | |
| * | | | | Use RequestSendFailed when fail to parse content type headersErik Johnston2019-01-081-5/+5
| | | | | |
* | | | | | Merge pull request #4361 from matrix-org/erikj/better_errorsErik Johnston2019-01-082-1/+7
|\| | | | | | |/ / / / |/| | | | Don't log stack traces for HTTP error responses
| * | | | NewsfileErik Johnston2019-01-081-0/+1
| | | | |
| * | | | Don't log stack traces for HTTP error responsesErik Johnston2019-01-081-1/+6
|/ / / /
* | | | Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-086-44/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Correctly retry and back off if we get a HTTPerror response * Refactor request sending to have better excpetions MatrixFederationHttpClient blindly reraised exceptions to the caller without differentiating "expected" failures (e.g. connection timeouts etc) versus more severe problems (e.g. programming errors). This commit adds a RequestSendFailed exception that is raised when "expected" failures happen, allowing the TransactionQueue to log them as warnings while allowing us to log other exceptions as actual exceptions.
* | | | Fix synapse.config.__main__ on python 3 (#4356)Amber Brown2019-01-082-1/+2
| | | |
* | | | Fix command hint to generate a config file (#4353)Jason Robinson2019-01-073-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix command hint to generate a config file When trying to start Synapse without a config file, it will complain and give a hint towards what command to run. This hinted command is missing the "report_stats" parameter, which is required with either yes or no value. Add this to the command. Not an ideal situation but makes the given command work without the user getting another error, even though it might be unclear what "report_stats" represents. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* | | | Add GET account data routes (#4303)Travis Ralston2019-01-072-1/+34
| | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/issues/1339
* | | | Check jinja version for consent resource (#4327)Richard van der Hoff2019-01-074-28/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Raise a ConfigError if an invalid resource is specified * Require Jinja 2.9 for the consent resource * changelog
* | | | fix the check for whether `is_url` to match all the other ones in codebase ↵Michael Telatynski2019-01-062-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | (#3405) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* | | | Update debian Conflicts specifications (#4349)Richard van der Hoff2019-01-043-2/+14
| | | | | | | | | | | | ... to allow installation alongside our matrix-synapse transitional package.
* | | | fix NPE in /messages by checking if all events were filtered out (#4330)Matthew Hodgson2019-01-022-10/+12
| | | |
* | | | Update README to not lie about required restart (#4343)Aaron Raimist2019-01-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update README to not lie about required restart Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | Merge pull request #4344 from matrix-org/neilj/fix_synchrotron_fix_4312Neil Johnson2019-01-022-25/+26
|\ \ \ \ | | | | | | | | | | Ensure synchrotrons can access is_support_user in the storage layer
| * | | | Ensure synchrotrons can access is_support_user in the storage layerNeil Johnson2019-01-022-25/+26
|/ / / /
* | | | Update docker-compose.yml (#4282)jribal2019-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Hi, the original docker-compose file did not work by default. You get federation port working but no client port. My proposal is to let federation port work as it is by default (8448) and let traefik handle client http/https traffic.
* | | | Update PR template to use absolute links (#4341)Aaron Raimist2019-01-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update PR template to use absolute links Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | Avoid packaging _trial_temp directory (#4326)Richard van der Hoff2019-01-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Make sure we don't put the _trial_temp directory in the package target directory. Fixes https://github.com/matrix-org/synapse/issues/4322
* | | | Install the optional dependencies into the debian package (#4325)Richard van der Hoff2019-01-025-20/+37
|/ / / | | | | | | | | | | | | | | | | | | | | | since #4298, the optional dependencies are no longer installed with a simple `pip install .`, which meant that they were not being included in the debian package. The easy fix to that is dh_virtualenv --extras, but that needs dh_virtualenv 1.1...
* | | Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-297-590/+45
| | |
* | | Remove mention of lt-cred-mech in the sample coturn config. (#4333)Krithin Sitaram2018-12-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove mention of lt-cred-mech in the sample coturn config. See https://github.com/coturn/coturn/pull/262 for more context. Also clean up some minor formatting issues while I'm here. * Add changelog. Signed-off-by: Krithin Sitaram <krithin@gmail.com>
* | | Log roomid along with Unknown room (#4297)Will Hunt2018-12-242-1/+2
| | |
* | | Merge pull request #4307 from matrix-org/erikj/v2_roomsRichard van der Hoff2018-12-243-1/+6
|\ \ \ | | | | | | | | Add v2 room version
| * | | NewsfileErik Johnston2018-12-181-0/+1
| | | |
| * | | Add v2 room versionErik Johnston2018-12-182-1/+5
| | | |
* | | | Return well_known in /login response (#4319)Richard van der Hoff2018-12-243-7/+15
| | | | | | | | | | | | | | | | ... as per MSC1730.
* | | | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5Richard van der Hoff2018-12-232-1/+24
|\ \ \ \ | | | | | | | | | | Fix test_metrics.py compatibility prometheus_client 0.5
| * | | | Fix test_metrics.py compatibility prometheus_client 0.5Maarten de Vries2018-12-212-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prometheus_client 0.5 has a named-tuple Sample type with more member than the old plain tuple had. This commit makes sure the unit test detects this and changes the way it reads the sample. Signed-off-by: Maarten de Vries <maarten@de-vri.es>
* | | | | Merge pull request #4316 from matrix-org/rav/fix_docker_uploadRichard van der Hoff2018-12-212-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix circleci config for synapse:latest docker upload
| * | | | | Fix circleci config for synapse:latest docker uploadRichard van der Hoff2018-12-212-2/+3
| |/ / / / | | | | | | | | | | | | | | | Give the image the right tag, so that we can push it.
* | | | | Add a script to generate a clean config file (#4315)Richard van der Hoff2018-12-2211-46/+157
| | | | |
* | | | | Fix indentation in default config (#4313)Richard van der Hoff2018-12-222-35/+36
| | | | | | | | | | | | | | | These settings are not supposed to be under 'listeners'.
* | | | | Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-228-272/+590
| | | | |
* | | | | Make the dependencies more like a standard Python project and hook up the ↵Amber Brown2018-12-227-158/+111
|/ / / / | | | | | | | | | | | | optional dependencies to setuptools (#4298)
* | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-2/+7
|\ \ \ \
| * | | | Mention updating extensions github/release-v0.34.0 release-v0.34.0Richard van der Hoff2018-12-201-2/+7
| | | | |
* | | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-3/+4
|\| | | |
| * | | | clarify that installing -py3 removes the old pkgRichard van der Hoff2018-12-201-3/+4
| | | | |
* | | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-1/+8
|\| | | |
| * | | | buster is a thingRichard van der Hoff2018-12-201-1/+8
| | |/ / | |/| |
* | | | Merge branch 'master' into developRichard van der Hoff2018-12-2042-29/+2514
|\| | |
| * | | Clarify that py2 packages will continue to exist v0.34.0Richard van der Hoff2018-12-201-0/+4
| | | |
| * | | document supported python 3 versionsRichard van der Hoff2018-12-202-5/+9
| | | |
| * | | more changelog fixRichard van der Hoff2018-12-201-1/+1
| | | |
| * | | minor changelog tweaksRichard van der Hoff2018-12-201-4/+4
| | | |
| * | | fix UPGRADE formattingRichard van der Hoff2018-12-201-6/+6
| | | |
| * | | Prepare 0.34 releaseRichard van der Hoff2018-12-207-24/+18
| | | |
| * | | Update log config for debian packagesRichard van der Hoff2018-12-201-0/+1
| | | | | | | | | | | | | | | | Better follow our own release notes.
| * | | Debian packaging via dh_virtualenvRichard van der Hoff2018-12-2041-2/+2481
| |\ \ \
| | * | | Debian packaging via dh_virtualenv (#4285)Richard van der Hoff2018-12-2036-509/+310
| | | | |
| | * | | import from package-debian-synapseAmber Brown2018-12-2038-0/+2678
| | | | |
| * | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-202-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 'sandbox' to the CSP for media repo * Changelog
| * | | | Improved welcome page (#4294)Nad Chishtie2018-12-142-25/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar.
| * | | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-142-1/+2
| |/ / /
* | | | Merge pull request #4309 from KB1RD/KB1RD-fixesRichard van der Hoff2018-12-192-3/+8
|\ \ \ \ | | | | | | | | | | Fix the variable names used for account_data
| * | | | Create 4309.bugfixNathan Pennie2018-12-191-0/+1
| | | | |
| * | | | Fixed line lengthNathan Pennie2018-12-191-1/+5
| | | | |
| * | | | Fix the variable names used for account_dataNathan Pennie2018-12-191-3/+3
|/ / / /
* | | | ensure can report mau stats when hs.config.mau_stats_only is set (#4305)Neil Johnson2018-12-182-1/+2
| | | | | | | | | | | | * ensure can report mau stats when hs.config.mau_stats_only is set
* | | | create support user (#4141)Neil Johnson2018-12-1420-47/+371
| | | | | | | | | | | | | | | | | | | | | | | | Allow for the creation of a support user. A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits.
* | | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-142-1/+2
| | | |
* | | | Improved welcome page (#4294)Nad Chishtie2018-12-142-25/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar.
* | | | Merge pull request #4274 from matrix-org/michaelkaye/update_kernel_dco_linkRichard van der Hoff2018-12-112-1/+2
|\ \ \ \ | | | | | | | | | | Update link to kernel.org DCO usage
| * | | | Update CONTRIBUTING.rstMichael Kaye2018-12-111-1/+1
| | | | | | | | | | | | | | | Reduce size of hyperlink
| * | | | changelogMichael Kaye2018-12-071-0/+1
| | | | |
| * | | | Update link to kernel.org DCO usageMichael Kaye2018-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | https://www.kernel.org/doc/Documentation/SubmittingPatches returns a simple page indicating that it's moved to: "process/submitting-patches.rst". I believe the new link contains the same information as what was previously linked to.
* | | | | Merge branch 'release-v0.34.0' into developRichard van der Hoff2018-12-1143-98/+146
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 0.34.0rc2 v0.34.0rc2Richard van der Hoff2018-12-115-4/+17
| | | | |
| * | | | remove changelog filesRichard van der Hoff2018-12-1134-36/+0
| | | | |
| * | | | Merge pull request #4290 from matrix-org/rav/remove_webclientRichard van der Hoff2018-12-116-58/+44
| |\ \ \ \ | | | | | | | | | | | | Stop installing Matrix Console by default
| | * | | | Stop installing Matrix Console by defaultRichard van der Hoff2018-12-116-58/+44
| | | | | | | | | | | | | | | | | | | | | | | | This is based on the work done by @krombel in #2601.
| * | | | | Merge pull request #4289 from matrix-org/rav/welcome_pageRichard van der Hoff2018-12-113-0/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | Add a welcome page to the static resources
| | * \ \ \ \ Merge branch 'rav/disable_pager_in_ci' into rav/welcome_pageRichard van der Hoff2018-12-112-2/+3
| | |\ \ \ \ \
| | * | | | | | Add a welcome page to the static resourcesRichard van der Hoff2018-12-113-0/+30
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is largely a precursor for the removal of the bundled webclient. The idea is to present a page at / which reassures people that something is working, and to give them some links for next steps. The welcome page lives at `/_matrix/static/`, so is enabled alongside the other `static` resources (which, in practice, means the client API is enabled). We'll redirect to it from `/` if we have nothing better to display there. It would be nice to have a way to disable it (in the same way that you might disable the nginx welcome page), but I can't really think of a good way to do that without a load of ickiness. It's based on the work done by @krombel for #2601.
| * | | | | | Merge pull request #4291 from matrix-org/rav/disable_pager_in_ciRichard van der Hoff2018-12-112-2/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | Disable pager for ci script
| | * | | | | Disable pager for ci scriptRichard van der Hoff2018-12-112-2/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | ... otherwise it hangs
| * | | | | fix upgrade.rst link again v0.34.0rc1Richard van der Hoff2018-12-041-1/+1
| | | | | |
| * | | | | Fix link to upgrade notesRichard van der Hoff2018-12-041-1/+1
| | | | | |
| * | | | | fix typo in changelogRichard van der Hoff2018-12-041-1/+1
| | | | | |
| * | | | | Prepare 0.34.0rc1Richard van der Hoff2018-12-042-2/+56
| |/ / / /
* | | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-112-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 'sandbox' to the CSP for media repo * Changelog
* | | | | Merge pull request #4279 from matrix-org/hs/fix-config-corsWill Hunt2018-12-102-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Make /config more CORS-y
| * | | | | Move imports to one lineWill Hunt2018-12-101-4/+1
| | | | | |
| * | | | | Use `send_cors`Will Hunt2018-12-101-4/+1
| | | | | |
| * | | | | changelog & isortWill Hunt2018-12-092-1/+6
| | | | | |
| * | | | | Make /config more CORS-yWill Hunt2018-12-091-1/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #4283 from matrix-org/erikj/isort_dfErik Johnston2018-12-102-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | Make isort tox check print diff when it fails
| * | | | NewsfileErik Johnston2018-12-101-0/+1
| | | | |
| * | | | Make isort tox check print diff when it failsErik Johnston2018-12-101-2/+2
|/ / / /
* | | | Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-076-15/+39
| | | | | | | | | | | | | | | | | | | | When we register a new user from SAML2 data, initialise their displayname correctly.
* | | | Update the example systemd config to use a virtualenv (#4273)Richard van der Hoff2018-12-073-22/+32
| | | | | | | | | | | | | | | | | | | | If you're installing as a system package, the system package should have set up the systemd config, so it's more useful to give an example of running in a virtualenv here.
* | | | Implement SAML2 authentication (#4267)Richard van der Hoff2018-12-079-2/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements both a SAML2 metadata endpoint (at `/_matrix/saml2/metadata.xml`), and a SAML2 response receiver (at `/_matrix/saml2/authn_response`). If the SAML2 response matches what's been configured, we complete the SSO login flow by redirecting to the client url (aka `RelayState` in SAML2 jargon) with a login token. What we don't yet have is anything to build a SAML2 request and redirect the user to the identity provider. That is left as an exercise for the reader.
* | | | Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-075-32/+184
| | | | | | | | | | | | | | | | This is mostly factoring out the post-CAS-login code to somewhere we can reuse it for other SSO flows, but it also fixes the userid mapping while we're at it.
* | | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-067-169/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rip out half-implemented m.login.saml2 support This was implemented in an odd way that left most of the work to the client, in a way that I really didn't understand. It's going to be a pain to maintain, so let's start by ripping it out. * drop undocumented dependency on dateutil It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat.
* | | | drop undocumented dependency on dateutil (#4266)Richard van der Hoff2018-12-062-7/+7
| | | | | | | | | | | | | | | | It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat.
* | | | Implement .well-known handling (#4262)Richard van der Hoff2018-12-055-0/+140
|/ / / | | | | | | | | | Sometimes it's useful for synapse to generate its own .well-known file.
* | | Merge pull request #4260 from matrix-org/rav/python3Richard van der Hoff2018-12-043-53/+82
|\ \ \ | | | | | | | | Notes on upgrading to python3, and README updates.
| * | | Notes on upgrading to python3, and README updates.Richard van der Hoff2018-12-043-53/+82
| | | |
* | | | Merge pull request #4261 from matrix-org/rav/docker/remove_log_fileRichard van der Hoff2018-12-042-3/+2
|\ \ \ \ | | | | | | | | | | Remove obsolete settings from docker homeserver.yaml
| * | | | Remove obsolete settings from docker homeserver.yamlRichard van der Hoff2018-12-042-3/+2
| |/ / / | | | | | | | | | | | | These aren't used, because we have a `log_config` setting.
* | | | Merge pull request #4005 from matrix-org/michaelkaye/move_to_docker_labelRichard van der Hoff2018-12-041-8/+4
|\ \ \ \ | |/ / / |/| | | Use labels to tag builds with their SHA1 version.
| * | | Use labels to tag builds with their SHA1 version.Michael Kaye2018-10-041-8/+4
| | | | | | | | | | | | | | | | | | | | The additional sha1 tagged builds in docker hub are messy, so instead tag the build with the SHA1 version.
* | | | Add an option to enable recording IPs for appservice users (#3831)Travis Ralston2018-12-043-9/+26
| | | |
* | | | Fix non-ASCII pushrules (#4248)Amber Brown2018-12-042-12/+24
| | | |
* | | | Merge pull request #4210 from axelsimon/patch-1Richard van der Hoff2018-12-041-2/+2
|\ \ \ \ | | | | | | | | | | Replace mentions of Vector with Riot
| * | | | Replace mentions of Vector with Riotaxel simon2018-11-201-2/+2
| | |/ / | |/| | | | | | | | | | https://github.com/vector-im/vector-web/issues/1977 --> https://github.com/vector-im/riot-web/issues/1977 And mention of Vector as a client replaced with Riot.
* | | | Add an option to disable search for homeservers which may not be interested ↵Travis Ralston2018-12-044-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | in it (#4230) This is useful for homeservers not intended for users, such as bot-only homeservers or ones that only process IoT data.
* | | | Add note to UPGRADE.rst about removing riot.im from list of trusted identity ↵Aaron Raimist2018-12-042-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | servers (#4224) * Add note to UPGRADE.rst about removing riot.im from list of trusted identity servers Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | add more detail to logging regarding "More than one row matched" error (#4234)Ben Parsons2018-12-042-6/+7
| | | |
* | | | Fix UnicodeDecodeError when postgres is not configured in english (#4253)Richard van der Hoff2018-12-043-8/+47
| | | | | | | | | | | | | | | | This is a bit of a half-assed effort at fixing https://github.com/matrix-org/synapse/issues/4252. Fundamentally the right answer is to drop support for Python 2.
* | | | Merge pull request #4244 from aaronraimist/drop-sent-txtRichard van der Hoff2018-12-047-74/+4
|\ \ \ \ | | | | | | | | | | Drop sent_transactions
| * | | | Add changelogAaron Raimist2018-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | | Drop sent_transactionsAaron Raimist2018-12-016-74/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | | Patch defer.inlineCallbacks to check logcontexts in tests (#4205)Richard van der Hoff2018-12-044-3/+99
| | | | |
* | | | | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3Richard van der Hoff2018-12-042-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix removing pushers on python 3
| * | | | | changelogAmber Brown2018-12-031-0/+1
| | | | | |
| * | | | | fix type errorAmber Brown2018-12-031-1/+1
| | | | | |
* | | | | | Merge pull request #4257 from aaronraimist/add-editorconfigRichard van der Hoff2018-12-043-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add a basic .editorconfig
| * | | | | | Add a basic .editorconfigAaron Raimist2018-12-033-0/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* / / / / / Run the AS senders as background processes (#4189)Richard van der Hoff2018-12-042-12/+26
|/ / / / / | | | | | | | | | | | | | | | This should fix some "Starting db connection from sentinel context" warnings, and will mean we get metrics for these processes.
* / / / / Workaround for non-ascii event ids (#4241)Richard van der Hoff2018-12-032-1/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | It turns out that we accept events with non-ascii IDs, which would later cause an explosion during state res. Fixes #4226
* | | | Neilj/fix autojoin (#4223)Neil Johnson2018-11-285-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | * Fix auto join failures for servers that require user consent * Fix auto join failures for servers that require user consent
* | | | Report combined coverage to codecov (#4225)Amber Brown2018-11-283-17/+23
| | | |
* | | | Neilj/fix mau initial reserved users (#4211)Neil Johnson2018-11-282-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix transaction wrapping bug that caused get_user_id_by_threepid_txn to fail * towncrier * white space
* | | | Support m.login.sso (#4220)Richard van der Hoff2018-11-275-52/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clean up the CSS for the fallback login form I was finding this hard to work with, so simplify a bunch of things. Each flow is now a form inside a div of class login_flow. The login_flow class now has a fixed width, as that looks much better than each flow having a differnt width. * Support m.login.sso MSC1721 renames m.login.cas to m.login.sso. This implements the change (retaining support for m.login.cas for older clients). * changelog
* | | | Check logcontexts before and after each test (#4190)Richard van der Hoff2018-11-273-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add better diagnostics to flakey keyring test * fix interpolation fail * Check logcontexts before and after each test * update changelog * update changelog
* | | | Fix more logcontext leaks in tests (#4209)Richard van der Hoff2018-11-272-1/+3
| | | |
* | | | Do a GC after each test to fix logcontext leaks (#4227)Richard van der Hoff2018-11-273-3/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Some words about garbage collections and logcontexts * Do a GC after each test to fix logcontext leaks This feels like an awful hack, but... * changelog
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-18 11:01:47 +0000