summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-08241-1918/+2403
|\
| * Update ModuleApi to avoid register(generate_token=True) (#5640)Richard van der Hoff2019-07-082-8/+57
| | | | | | | | | | | | | | | | * Update ModuleApi to avoid register(generate_token=True) This is the only place this is still used, so I'm trying to kill it off. * changelog
| * Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-082-39/+11
| | | | | | | | | | | | | | | | * Factor out some redundant code in the login impl Also fixes a redundant access_token which was generated during jwt login. * changelog
| * Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-083-60/+60
| | | | | | This is only used in tests, so...
| * Add a few more common environment directory names to black exclusion (#5630)Andrew Morgan2019-07-082-0/+3
| | | | | | | | | | | | * Add a few more common environment directory names to black exclusion * Add changelog
| * Add default push rule to ignore reactions (#5623)J. Ryan Stinnett2019-07-052-0/+14
| | | | | | | | | | | | | | This adds a default push rule following the proposal in [MSC2153](https://github.com/matrix-org/matrix-doc/pull/2153). See also https://github.com/vector-im/riot-web/issues/10208 See also https://github.com/matrix-org/matrix-js-sdk/pull/976
| * Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-053-7/+24
| | | | | | | | | | Riot team would like some extra fields as part of m.replace, so here you go. Fixes: #5598
| * Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-057-196/+3
| | | | | | | | | | | | | | | | | | This has never been documented, and I'm not sure it's ever been used outside sytest. It's quite a lot of poorly-maintained code, so I'd like to get rid of it. For now I haven't removed the database table; I suggest we leave that for a future clearout.
| * remove dead transaction persist code (#5622)Richard van der Hoff2019-07-054-69/+1
| | | | | | | | this hasn't done anything for years
| * Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-056-16/+148
| | | | | | | | | | | | | | - Put the default window_size back to 1000ms (broken by #5181) - Make the `rc_federation` config actually do something - fix an off-by-one error in the 'concurrent' limit - Avoid creating an unused `_PerHostRatelimiter` object for every single incoming request
| * Make errors about email password resets much clearer (#5616)Andrew Morgan2019-07-052-11/+9
| | | | | | The runtime errors that dealt with local email password resets talked about config options that users may not even have in their config file yet (if upgrading). Instead, the cryptic errors are now replaced with hopefully much more helpful ones.
| * Improve the backwards compatibility re-exports of synapse.logging.context ↵Amber Brown2019-07-054-5/+62
| | | | | | | | | | | | | | | | (#5617) * Improve the backwards compatibility re-exports of synapse.logging.context. * reexport logformatter too
| * Add a sytest blacklist file (#5611)Andrew Morgan2019-07-055-148/+43
| | | | | | | | | | | | | | * Add a sytest blacklist file * Add changelog * Add blacklist to manifest
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-07-043-6/+26
| |\
| | * Update changelog v1.1.0 github/release-v1.1.0 release-v1.1.0Erik Johnston2019-07-041-0/+10
| | |
| | * 1.1.0Erik Johnston2019-07-044-4/+9
| | |
| | * Merge pull request #5615 from matrix-org/anoa/fix_changelog_email_resetsErik Johnston2019-07-042-1/+2
| | |\ | | | | | | | | Suggest people use a config file for Docker instead of env vars
| | | * Suggest people use a config file for Docker instead of env varsAndrew Morgan2019-07-042-1/+2
| | |/
| * | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0498-233/+249
| | |
| * | Fix 'utime went backwards' errors on daemonization. (#5609)Richard van der Hoff2019-07-033-31/+44
| |/ | | | | | | | | | | | | | | * Fix 'utime went backwards' errors on daemonization. Fixes #5608 * remove spurious debug
| * 1.1.0rc2 v1.1.0rc2Richard van der Hoff2019-07-036-5/+18
| |
| * Fix a number of "Starting txn from sentinel context" warnings (#5605)Richard van der Hoff2019-07-035-6/+35
| | | | | | | | Fixes #5602, #5603
| * Remove SMTP_* env var functionality from docker conf (#5596)Andrew Morgan2019-07-032-19/+1
| | | | | | | | | | Removes any `SMTP_*` docker container environment variables from having any effect on the default config. Fixes https://github.com/matrix-org/synapse/issues/5430
| * Fix media repo breaking (#5593)Amber Brown2019-07-026-24/+58
| |
| * tweak changelog v1.1.0rc1Richard van der Hoff2019-07-021-10/+13
| |
| * Merge remote-tracking branch 'origin/master' into release-v1.1.0Richard van der Hoff2019-07-023-5/+7
| |\
| | * Merge pull request #5552 from matrix-org/rav/github_templatesRichard van der Hoff2019-06-263-5/+7
| | |\ | | | | | | | | Update github templates
| | | * changelogRichard van der Hoff2019-06-251-0/+1
| | | |
| | | * Update github templatesRichard van der Hoff2019-06-251-2/+3
| | | |
| | | * Update SUPPORT.mdRichard van der Hoff2019-06-251-3/+3
| | | |
| * | | prepare v1.1.0rc1Richard van der Hoff2019-07-0291-94/+106
| | | |
| * | | Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-027-45/+231
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * SAML2 Improvements and redirect stuff Signed-off-by: Alexander Trost <galexrt@googlemail.com> * Code cleanups and simplifications. Also: share the saml client between redirect and response handlers. * changelog * Revert redundant changes to static js * Move all the saml stuff out to a centralised handler * Add support for tracking SAML2 sessions. This allows us to correctly handle `allow_unsolicited: False`. * update sample config * cleanups * update sample config * rename BaseSSORedirectServlet for consistency * Address review comments
| | * \ \ Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-0155-450/+832
| | |\ \ \
| | * | | | Address review commentsRichard van der Hoff2019-07-011-5/+7
| | | | | |
| | * | | | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| | | | | |
| | * | | | update sample configRichard van der Hoff2019-06-271-6/+13
| | | | | |
| | * | | | cleanupsRichard van der Hoff2019-06-273-11/+18
| | | | | |
| | * | | | update sample configRichard van der Hoff2019-06-261-0/+13
| | | | | |
| | * | | | Add support for tracking SAML2 sessions.Richard van der Hoff2019-06-262-3/+56
| | | | | | | | | | | | | | | | | | | | | | | | This allows us to correctly handle `allow_unsolicited: False`.
| | * | | | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-264-50/+96
| | | | | |
| | * | | | Revert redundant changes to static jsRichard van der Hoff2019-06-261-4/+2
| | | | | |
| | * | | | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-26478-11486/+18913
| | |\ \ \ \
| | * | | | | changelogRichard van der Hoff2019-06-111-0/+1
| | | | | | |
| | * | | | | Merge tag 'v1.0.0rc3' into rav/saml2_clientRichard van der Hoff2019-06-116-2/+14
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.0.0rc3 (2019-06-10) ============================= Security: Fix authentication bug introduced in 1.0.0rc1. Please upgrade to rc3 immediately
| | * | | | | | Code cleanups and simplifications.Richard van der Hoff2019-06-116-50/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: share the saml client between redirect and response handlers.
| | * | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-10157-1096/+5758
| | |\ \ \ \ \ \
| | * | | | | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-025-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Trost <galexrt@googlemail.com>
| * | | | | | | | Merge pull request #5587 from matrix-org/erikj/fix_synctlErik Johnston2019-07-022-6/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix --no-daemonize flag for synctl
| | * | | | | | | | NewsfileErik Johnston2019-07-021-0/+1
| | | | | | | | | |
| | * | | | | | | | Fix --no-daemonize flag for synctlErik Johnston2019-07-021-6/+6
| | | | | | | | | |
| * | | | | | | | | Add ability to set timezone for Docker container (#5383)Amir Zarrinkafsh2019-07-023-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Amir Zarrinkafsh <nightah@me.com>
| * | | | | | | | | Fix JWT login with new users (#5586)PauRE2019-07-022-6/+4
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
| * | | | | | | | fix async/await consentresource (#5585)Amber Brown2019-07-012-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5582
| * | | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopErik Johnston2019-07-012-2/+20
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | Fix sync tightloop bug.
| | * | | | | | | Fixup commentErik Johnston2019-07-011-6/+13
| | | | | | | | |
| | * | | | | | | NewsfileErik Johnston2019-06-211-0/+1
| | | | | | | | |
| | * | | | | | | Fix sync tightloop bug.Erik Johnston2019-06-211-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If, for some reason, presence updates take a while to persist then it can trigger clients to tightloop calling `/sync` due to the presence handler returning updates but not advancing the stream token. Fixes #5503.
| * | | | | | | | Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-2912-174/+162
| | | | | | | | |
| * | | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimitBrendan Abolivier2019-06-282-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't update the ratelimiter before sending a 3PID invite
| | * | | | | | | | Only ratelimit when sending the emailBrendan Abolivier2019-06-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we do the opposite, an event can arrive after or while sending the email and the 3PID invite event will get ratelimited.
| | * | | | | | | | ChangelogBrendan Abolivier2019-06-281-0/+1
| | | | | | | | | |
| | * | | | | | | | Don't update the ratelimiter before sending a 3PID inviteBrendan Abolivier2019-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would cause emails being sent, but Synapse responding with a 429 when creating the event. The client would then retry, and with bad timing the same scenario would happen again. Some testing I did ended up sending me 10 emails for one single invite because of this.
| * | | | | | | | | Don't log GC 0s at INFO (#5557)Amber Brown2019-06-282-1/+5
| | | | | | | | | |
| * | | | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ↵Amber Brown2019-06-287-9/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation (#5550)
| * | | | | | | | | Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-275-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Hoffend <dh@dotlan.net>
| * | | | | | | | | Include systemd-python in Debian package to allow logging to journal (#5261)Silke Hofstra2019-06-272-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Silke Hofstra <silke@slxh.eu>
| * | | | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2019-06-273-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helps address #5444
| * | | | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesErik Johnston2019-06-274-37/+98
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | Refactor devices changed query to pull less from DB
| | * | | | | | | | Review commentsErik Johnston2019-06-272-7/+5
| | | | | | | | | |
| | * | | | | | | | Move changelogErik Johnston2019-06-261-0/+0
| | | | | | | | | |
| | * | | | | | | | Refactor and comment sync device list codeErik Johnston2019-06-261-17/+53
| | | | | | | | | |
| | * | | | | | | | Use batch_iter and correct docstringErik Johnston2019-06-261-15/+12
| | | | | | | | | |
| | * | | | | | | | Rename get_users_whose_devices_changedErik Johnston2019-06-263-5/+5
| | | | | | | | | |
| | * | | | | | | | NewsfileErik Johnston2019-06-261-0/+1
| | | | | | | | | |
| | * | | | | | | | Refactor get_user_ids_changed to pull less from DBErik Johnston2019-06-263-28/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a client asks for users whose devices have changed since a token we used to pull *all* users from the database since the token, which could easily be thousands of rows for old tokens. This PR changes this to only check for changes for users the client is actually interested in. Fixes #5553
* | | | | | | | | | ChangelogBrendan Abolivier2019-07-081-0/+1
| | | | | | | | | |
* | | | | | | | | | LintBrendan Abolivier2019-07-081-1/+2
| | | | | | | | | |
* | | | | | | | | | Use application/json when querying the IS's /store-invite endpointBrendan Abolivier2019-07-081-4/+17
|/ / / / / / / / /
* | | | | | | | | Docker image: Add a migrate_config mode (#5567)Richard van der Hoff2019-06-274-17/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... to help people escape env var hell
* | | | | | | | | Docker image: open the non-TLS port by default. (#5568)Richard van der Hoff2019-06-272-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | There's not much point in binding to localhost when it's in a docker container.
* | | | | | | | | Deprecate the env var way of running the docker image (#5566)Richard van der Hoff2019-06-274-154/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly a documentation change, but also adds a default value for SYNAPSE_CONFIG_PATH, so that running from the generated config is the default, and will Just Work provided your config is in the right place.
* | | | | | | | | Fix JWT login (#5555)PauRE2019-06-273-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix JWT login with register Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Add pyjwt conditional dependency Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Added changelog file Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Improved changelog description Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
* | | | | | | | | Merge pull request #5565 from matrix-org/rav/docker/fix_log_configRichard van der Hoff2019-06-273-1/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Docker: generate our own log config
| * | | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| | | | | | | | | |
| * | | | | | | | | Docker: generate our own log configRichard van der Hoff2019-06-261-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running under docker, we want to use docker's own logging stuff rather than losing the logs somewhere on the container's filesystem, so let's use log configs that spit logs out to stdout instead.
| * | | | | | | | | Add support for SYNAPSE_CONFIG_DIRRichard van der Hoff2019-06-262-0/+5
| | | | | | | | | |
* | | | | | | | | | Reduce the amount of stuff we send in the docker context (#5564)Richard van der Hoff2019-06-272-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes docker builds a bit faster.
* | | | | | | | | | Merge pull request #5563 from matrix-org/rav/docker/data_dirRichard van der Hoff2019-06-273-4/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker image: add support for SYNAPSE_DATA_DIR parameter
| * | | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| | | | | | | | | |
| * | | | | | | | | Docker image: add support for SYNAPSE_DATA_DIR parameterRichard van der Hoff2019-06-262-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4830.
| * | | | | | | | | document supported env vars for docker 'generate' optionRichard van der Hoff2019-06-261-0/+7
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5562 from matrix-org/rav/docker/no-generate-keysRichard van der Hoff2019-06-272-8/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Docker: only run --generate-keys when generating config on-the-fly.
| * | | | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Docker: only run --generate-keys when generating config on-the-fly.Richard van der Hoff2019-06-261-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to generate any missing configs when running from a precanned config. (There's a strong argument that we don't want to do this at all, since generating a new signing key on each invocation sounds disasterous, but I don't fancy unpicking that for now.)
| * | | | | | | | | | improve logging for generate_config_from_templateRichard van der Hoff2019-06-261-1/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #5561 from matrix-org/rav/docker/refactorRichard van der Hoff2019-06-272-62/+118
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the docker/start.py script
| * | | | | | | | | changelogRichard van der Hoff2019-06-261-0/+1
| | | | | | | | | |
| * | | | | | | | | isortRichard van der Hoff2019-06-251-4/+5
| | | | | | | | | |
| * | | | | | | | | Add a main() functionRichard van der Hoff2019-06-251-8/+11
| | | | | | | | | |
| * | | | | | | | | Factor out a run_generate_config functionRichard van der Hoff2019-06-251-17/+28
| | | | | | | | | |
| * | | | | | | | | Factor out "generate_config_from_template"Richard van der Hoff2019-06-251-41/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and inline generate_secrets
* | | | | | | | | | Merge pull request #5570 from almereyda/patch-2Richard van der Hoff2019-06-272-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Update purge_api README
| * | | | | | | | | | fix changelogRichard van der Hoff2019-06-271-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Create 5570.miscjon r2019-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jon Richter <jon@allmende.io>
| * | | | | | | | | | Update purge_api READMEjon r2019-06-271-2/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | This points the reverse links at the intended location.
* | | | | | | | | | Merge pull request #5313 from twrist/patch-1Richard van der Hoff2019-06-272-2/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Update HAProxy example rules
| * | | | | | | | | Create 5313.miscIke Johnson2019-06-021-0/+1
| | | | | | | | | |
| * | | | | | | | | Update HAProxy example rulesIke Johnson2019-06-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These new rules allow a user to instead route only matrix traffic, allowing them to run matrix on the domain without affecting their existing websites
* | | | | | | | | | Improve docs on choosing server_name (#5558)Richard van der Hoff2019-06-262-13/+19
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | Fixes #4901
* | | | | | | | | Remove & changelog (#5548)Amber Brown2019-06-262-54/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'master' into developAndrew Morgan2019-06-253-2/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | * master: Fix broken link in MSC1711 FAQ Update changelog to better expain password reset change (#5545)
| * | | | | | | Merge branch 'release-v1.0.0'Andrew Morgan2019-06-252-1/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * release-v1.0.0: Update changelog to better expain password reset change (#5545)
| | * | | | | | | Update changelog to better expain password reset change (#5545) github/release-v1.0.0 release-v1.0.0Andrew Morgan2019-06-242-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the v1.0.0 changelog to provide more information to those upgrading to v1.0 on why they may receive errors or find their password reset abilities have now been disabled. Helps address #5444
| * | | | | | | | Fix broken link in MSC1711 FAQRichard van der Hoff2019-06-251-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2019-06-253-52/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #4583 Does slightly less than #5045, which prevented a room from being upgraded multiple times, one after another. This PR still allows that, but just prevents two from happening at the same time. Mostly just to mitigate the fact that servers are slow and it can take a moment for the room upgrade to actually complete. We don't want people sending another request to upgrade the room when really they just thought the first didn't go through.
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into developRichard van der Hoff2019-06-255-8/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Increase default log level for docker image to INFO. (#5547)Richard van der Hoff2019-06-252-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3370.
| * | | | | | | | Update docker image to use Python 3.7. (#5546)Richard van der Hoff2019-06-253-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Python 3.7 is apparently faster than 3.6, and should be mature enough.
* | | | | | | | | Grafana dashboard updatesRichard van der Hoff2019-06-251-1/+6814
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add extremities graphs to grafana dashboardRichard van der Hoff2019-06-251-23/+832
| | | | | | | | |
| * | | | | | | | format json for grafana dashboardRichard van der Hoff2019-06-251-1/+6005
|/ / / / / / / /
* | | | | | | | Add info about black to code_style.rst (#5537)Andrew Morgan2019-06-242-45/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5533 Adds information about how to install and run black on the codebase.
* | | | | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-244-6/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add --data-dir and --open-private-ports options.
| * | | | | | | | changelogRichard van der Hoff2019-06-241-0/+1
| | | | | | | | |
| * | | | | | | | Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-243-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is helpful when generating a config file for running synapse under docker.
| * | | | | | | | Add --data-directory commandline argumentRichard van der Hoff2019-06-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't necessarily want to put the data in the cwd.
* | | | | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsRichard van der Hoff2019-06-2430-107/+88
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Stop conflating generated config and default config
| * | | | | | | | changelogRichard van der Hoff2019-06-241-0/+1
| | | | | | | | |
| * | | | | | | | Don't load the generated config as the default.Richard van der Hoff2019-06-2429-94/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's too confusing.
| * | | | | | | | Ensure that all config options have sensible defaultsRichard van der Hoff2019-06-244-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable us to skip the unintuitive behaviour where the generated config and default config are the same thing.
* | | | | | | | | Merge pull request #5499 from matrix-org/rav/cleanup_metricsRichard van der Hoff2019-06-243-29/+53
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Cleanups and sanity-checking in cpu and db metrics
| * | | | | | | | | blackRichard van der Hoff2019-06-241-6/+2
| | | | | | | | | |
| * | | | | | | | | Avoid raising exceptions in metricsRichard van der Hoff2019-06-241-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sentry will catch the errors if they happen, so that should be good enough, and woun't make things explode if we hit the error condition.
| * | | | | | | | | Merge branch 'develop' into rav/cleanup_metricsRichard van der Hoff2019-06-24397-10437/+9513
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | changelogRichard van der Hoff2019-06-191-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Sanity-checking for metrics updatesRichard van der Hoff2019-06-191-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that our clocks go forward.
| * | | | | | | | | | Simplify PerformanceCounters.update interfaceRichard van der Hoff2019-06-191-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we already have the duration for the update, so may as well use it rather than passing extra params around and recalculating it.
| * | | | | | | | | | Remove unused _get_event_countersRichard van der Hoff2019-06-191-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been redundant since cdb3757942fefdcdc3d33b9c6d7c9e44decefd6f.
* | | | | | | | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-246-20/+49
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Split public rooms directory auth config in two
| * | | | | | | | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-246-20/+49
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenErik Johnston2019-06-243-17/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | Fix /messages on workers when no from param specified.
| * | | | | | | | | | | NewsfileErik Johnston2019-06-241-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix /messages on workers when no from param specified.Erik Johnston2019-06-242-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no `from` param is specified we calculate and use the "current token" that inlcuded typing, presence, etc. These are unused during pagination and are not available on workers, so we simply don't calculate them.
* | | | | | | | | | | | Merge pull request #5516 from matrix-org/rav/acme_key_pathRichard van der Hoff2019-06-2410-12/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Allow configuration of the path used for ACME account keys.
| * | | | | | | | | | | changelogRichard van der Hoff2019-06-245-2/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Remove unused Config.config_dir_path attributeRichard van der Hoff2019-06-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is no longer used and only serves to confuse.
| * | | | | | | | | | | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-244-7/+59
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because sticking it in the same place as the config isn't necessarily the right thing to do.
* | | | | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-2435-67/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config
* | | | | | | | | | | Factor acme bits out to a separate file (#5521)Richard van der Hoff2019-06-243-53/+94
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | This makes some of the conditional-import hoop-jumping easier.
* | | | | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalRichard van der Hoff2019-06-242-6/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use monotonic clock where possible for metrics
| * | | | | | | | | | Use monotonic clock where possible for metricsRichard van der Hoff2019-06-192-6/+15
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes intermittent errors observed on Apple hardware which were caused by time.clock() appearing to go backwards when called from different threads. Also fixes a bug where database activity times were logged as 1/1000 of their correct ratio due to confusion between milliseconds and seconds.
* | | | | | | | | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-226-74/+2
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | This has no useful purpose on python3, and is generally a source of confusion.
* | | | | | | | | Improve help and cmdline option names for --generate-config options (#5512)Richard van der Hoff2019-06-212-22/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * group the arguments together into a group * add new names "--generate-missing-config" and "--config-directory" for existing cmdline options "--generate-keys" and "--keys-dir", which better reflect their purposes.
* | | | | | | | | Refactor Config parser and add some comments. (#5511)Richard van der Hoff2019-06-212-14/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some comments, and simplify `read_config_files`.
* | | | | | | | | Improve logging when generating config files (#5510)Richard van der Hoff2019-06-214-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make it a bit clearer what's going on.
* | | | | | | | | Only import jinja2 when needed (#5514)Andrew Morgan2019-06-212-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/5431 `jinja2` was being imported even when it wasn't strictly necessary. This made it required to run Synapse, even if the functionality that required it wasn't enabled. This was causing new Synapse installations to crash on startup. Email modules are now required.
* | | | | | | | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509)Richard van der Hoff2019-06-212-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a README.txt which always sets off this warning, which is a bit alarming when you first start synapse. I don't think we need to warn about this.
* | | | | | | | | Fix logging error when a tampered event is detected. (#5500)Richard van der Hoff2019-06-212-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5513 from matrix-org/erikj/fix_messages_tokenErik Johnston2019-06-212-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix /messages on worker when no token supplied
| * | | | | | | | | NewsfileErik Johnston2019-06-211-0/+1
| | | | | | | | | |
| * | | | | | | | | Fix /messages on worker when no token suppliedErik Johnston2019-06-211-0/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5505 from matrix-org/erikj/messages_workerErik Johnston2019-06-213-0/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Support pagination API in client_reader worker
| * | | | | | | | Update docs/workers.rst Erik Johnston2019-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E_TOO_MANY_NEGATIVES Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | | | | | | | NewsfileErik Johnston2019-06-211-0/+1
| | | | | | | | |
| * | | | | | | | Support pagination API in client_reader workerErik Johnston2019-06-212-0/+9
|/ / / / / / / /
* | | | | | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremitiesErik Johnston2019-06-213-1/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add metrics for length of new extremities persisted.
| * | | | | | | | BlackErik Johnston2019-06-201-2/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-06-20400-10564/+9688
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/histogram_extremities
| * | | | | | | | | Add descriptions and remove redundant set(..)Erik Johnston2019-06-192-4/+7
| | | | | | | | | |
| * | | | | | | | | Only count non-cache state resolutionErik Johnston2019-06-181-3/+3
| | | | | | | | | |
| * | | | | | | | | Use consistent bucketsErik Johnston2019-06-181-1/+1
| | | | | | | | | |
| * | | | | | | | | NewsfileErik Johnston2019-06-171-0/+1
| | | | | | | | | |
| * | | | | | | | | Add metric fo number of state groups in resolutionErik Johnston2019-06-171-0/+10
| | | | | | | | | |
| * | | | | | | | | Add metrics for len of new extremities persisted.Erik Johnston2019-06-171-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Of new events being persisted add metrics for total size of forward extremities and number of unchanged, "stale" extremities.
* | | | | | | | | | Improve email notification logging (#5502)Neil Johnson2019-06-202-1/+2
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Run Black. (#5482)Amber Brown2019-06-20376-10399/+9153
| | | | | | | | |
* | | | | | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorErik Johnston2019-06-192-9/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Handle the case of `get_missing_events` failing
| * | | | | | | | | Fix loglineErik Johnston2019-06-181-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-06-18387-9715/+17324
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | erikj/fix_get_missing_events_error
| * | | | | | | | | NewsfileErik Johnston2019-04-101-0/+1
| | | | | | | | | |
| * | | | | | | | | Handle the case of `get_missing_events` failingErik Johnston2019-04-101-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a call to `/get_missing_events` fails we log an exception and stop processing the top level event we received over federation. Instead let's try and handle it sensibly given it is a somewhat expected failure mode.
* | | | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsErik Johnston2019-06-197-1/+166
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add experimental option to reduce extremities.
| * | | | | | | | | | Run as background process and fix commentsErik Johnston2019-06-193-4/+7
| | | | | | | | | | |
| * | | | | | | | | | NewsfileErik Johnston2019-06-181-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Add experimental option to reduce extremities.Erik Johnston2019-06-186-1/+162
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL.
* | | | | | | | | | Merge pull request #5490 from matrix-org/rav/xmlsec_in_dockerRichard van der Hoff2019-06-192-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Include xmlsec in the docker image
| * | | | | | | | | | changelogRichard van der Hoff2019-06-181-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Include xmlsec in the docker imageRichard van der Hoff2019-06-181-1/+3
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5467.
* | | | | | | | | | Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typoBrendan Abolivier2019-06-192-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix typo in deactivation background job
| * | | | | | | | | | Fix typo in deactivation background jobBrendan Abolivier2019-06-192-1/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #4276 from Ralith/performance-adviceRichard van der Hoff2019-06-183-7/+29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Improve advice regarding poor performance
| * | | | | | | | | | README.rst: fix header levelRichard van der Hoff2019-06-181-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Improve advice regarding poor performanceBenjamin Saunders2019-06-093-7/+29
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
* | | | | | | | | | Add some logging to 3pid invite sig verification (#5015)David Baker2019-06-182-8/+39
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had to add quite a lot of logging to diagnose a problem with 3pid invites - we only logged the one failure which isn't all that informative. NB. I'm not convinced the logic of this loop is right: I think it should just accept a single valid signature from a trusted source rather than fail if *any* signature is invalid. Also it should probably not skip the rest of middle loop if a check fails? However, I'm deliberately not changing the logic here.
* | | | | | | | | Fix seven contrib files with Python syntax errors (#5446)cclauss2019-06-187-119/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix seven contrib files with Python syntax errors Signed-off-by: cclauss <cclauss@me.com>
* | | | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pidBrendan Abolivier2019-06-173-1/+43
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add third party rules hook for 3PID invites
| * | | | | | | | | Make check_threepid_can_be_invited asyncBrendan Abolivier2019-06-171-0/+1
| | | | | | | | | |
| * | | | | | | | | ChangelogBrendan Abolivier2019-06-171-0/+1
| | | | | | | | | |
| * | | | | | | | | Add third party rules hook for 3PID invitesBrendan Abolivier2019-06-172-1/+41
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_developErik Johnston2019-06-173-4/+49
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add third party rules hook into create room
| * | | | | | | | | | NewsfileErik Johnston2019-06-171-0/+1
| |/ / / / / / / / /
| * | / / / / / / / Add third party rules hook into create roomErik Johnston2019-06-172-4/+48
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5478 from matrix-org/joriks/demo_python3Jorik Schellekens2019-06-173-4/+71
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Joriks/demo python3
| * | | | | | | | | ChangelogJorik Schellekens2019-06-171-0/+1
| | | | | | | | | |
| * | | | | | | | | One shot demo server startupJorik Schellekens2019-06-172-4/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure the demo servers to use untrusted tls certs so that they communicate with each other. This configuration makes them very unsafe so I've added warnings about it in the readme.
* | | | | | | | | | Remove Postgres 9.4 support (#5448)Amber Brown2019-06-1810-79/+50
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsErik Johnston2019-06-175-19/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Handle HttpResponseException when using federation client.
| * | | | | | | | | Handle failing to talk to master over replicationErik Johnston2019-06-071-1/+9
| | | | | | | | | |
| * | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| | | | | | | | | |
| * | | | | | | | | Handle HttpResponseException when using federation client.Erik Johnston2019-06-073-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we just log exceptions everywhere.
* | | | | | | | | | Merge pull request #5388 from matrix-org/erikj/fix_email_pushErik Johnston2019-06-175-30/+124
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix email notifications for unnamed rooms with multiple people
| * | | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Add testErik Johnston2019-06-073-8/+70
| | | | | | | | | | |
| * | | | | | | | | | Refactor email testsErik Johnston2019-06-071-22/+42
| | | | | | | | | | |
| * | | | | | | | | | Fix email notifications for large unnamed rooms.Erik Johnston2019-06-071-0/+11
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we try and calculate a description for a room for with no name but multiple other users we threw an exception (due to trying to subscript result of `dict.values()`).
* | | | | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_masterErik Johnston2019-06-172-3/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Only start background group attestation renewals on master
| * | | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Only start background group attestation renewals on masterErik Johnston2019-06-071-3/+4
| | | | | | | | | | |
* | | | | | | | | | | Move SyTest to Buildkite (#5459)Amber Brown2019-06-176-76/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including workers!
* | | | | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateErik Johnston2019-06-173-7/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix 3PID invite room state over federation.
| * | | | | | | | | | | NewsfileErik Johnston2019-06-141-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix 3PID invite room state over federation.Erik Johnston2019-06-141-6/+0
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes that when a user exchanges a 3PID invite for a proper invite over federation it does not include the `invite_room_state` key. This was due to synapse incorrectly sending out two invite requests.
| * | | | | | | | | | Change to absolute path for contrib/dockerNeil Johnson2019-06-131-1/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | because this file is reproduced on dockerhub and relative paths don't work
* | | | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-149-4/+284
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Allow server admins to define implementations of extra rules for allowing or denying incoming events
| * | | | | | | | | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-149-4/+284
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveErik Johnston2019-06-144-12/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Prometheus histograms are cumalative
| * | | | | | | | | | NewsfileErik Johnston2019-06-141-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Prometheus histograms are cumalativeErik Johnston2019-06-143-12/+12
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_jobBrendan Abolivier2019-06-142-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | Fix background job for deactivated flag
| * | | | | | | | | | Fix changelogBrendan Abolivier2019-06-142-1/+2
| | | | | | | | | | |
| * | | | | | | | | | ChangelogBrendan Abolivier2019-06-141-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix background job for deactivated flagBrendan Abolivier2019-06-141-2/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5462 from ↵Brendan Abolivier2019-06-146-27/+68
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_deactivated_accounts_2 Don't send renewal emails to deactivated users (second attempt)
| * | | | | | | | | | Don't send renewal emails to deactivated usersBrendan Abolivier2019-06-146-27/+68
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #5460 from matrix-org/joriks/demo_python3Jorik Schellekens2019-06-142-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use python3 in the demo
| * | | | | | | | | | ChangelogJorik Schellekens2019-06-141-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Use python3 in the demoJorik Schellekens2019-06-141-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileErik Johnston2019-06-143-6/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Don't log exception when failing to fetch remote content.
| * | | | | | | | | | NewsfileErik Johnston2019-06-071-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Don't log exception when failing to fetch remote content.Erik Johnston2019-06-072-6/+13
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, let's not log stack traces when we stop processing becuase the response body was too large.
* | | | | | | | | | Track deactivated accounts in the database (#5378)Brendan Abolivier2019-06-145-0/+183
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5458 from matrix-org/hawkowl/fix-prometheusErik Johnston2019-06-143-39/+25
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Fix Prometheus erroring after the extremities monitoring
| * | | | | | | | | changelogAmber H. Brown2019-06-141-0/+1
| | | | | | | | | |
| * | | | | | | | | fix prometheus rendering errorAmber H. Brown2019-06-142-39/+24
|/ / / / / / / / /
* | | | | | | | | Updates to the federation_client script (#5447)Richard van der Hoff2019-06-132-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * py3 fixes for federation_client * .well-known support for federation_client
* | | | | | | | | Clean up code for sending federation EDUs. (#5381)Richard van der Hoff2019-06-132-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code confused the hell out of me today. Split _get_new_device_messages into its two (unrelated) parts.
* | | | | | | | | Expose statistics on extrems to prometheus (#5384)Amber Brown2019-06-137-114/+331
| | | | | | | | |
* | | | | | | | | Remove Python 2.7 support. (#5425)Amber Brown2019-06-129-170/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove 2.7 from CI and publishing * fill out classifiers and also make it not be installed on 3.5 * some minor bumps so that the old deps work on python 3.5
* | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-1118-50/+394
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | 1.0.0 v1.0.0Erik Johnston2019-06-116-4/+28
| | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-22 06:22:53 +0000