14627 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	04196a4dae	Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop ... Fix sync tightloop bug.	2019-07-01 11:43:10 +01:00
Erik Johnston	915280f1ed	Fixup comment	2019-07-01 10:22:42 +01:00
Amber Brown	f40a7dc41f	Make the http server handle coroutine-making REST servlets (#5475)	2019-06-29 17:06:55 +10:00
Brendan Abolivier	c7ff297dde	Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit ... Don't update the ratelimiter before sending a 3PID invite	2019-06-28 17:43:48 +01:00
Brendan Abolivier	15d9fc31bd	Only ratelimit when sending the email ... If we do the opposite, an event can arrive after or while sending the email and the 3PID invite event will get ratelimited.	2019-06-28 16:04:05 +01:00
Brendan Abolivier	b339f6489f	Changelog	2019-06-28 15:24:59 +01:00
Brendan Abolivier	01d0f8e701	Don't update the ratelimiter before sending a 3PID invite ... 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.	2019-06-28 15:22:16 +01:00
Amber Brown	071150ce19	Don't log GC 0s at INFO (#5557)	2019-06-28 21:45:33 +10:00
Amber Brown	be3b901ccd	Update the TLS cipher string and provide configurability for TLS on outgoing federation (#5550)	2019-06-28 18:19:09 +10:00
Daniel Hoffend	9646a593ac	Added possibilty to disable local password authentication (#5092) ... Signed-off-by: Daniel Hoffend <dh@dotlan.net>	2019-06-27 18:37:29 +01:00
Silke Hofstra	457b8e4c4d	Include systemd-python in Debian package to allow logging to journal (#5261) ... Signed-off-by: Silke Hofstra <silke@slxh.eu>	2019-06-27 18:26:41 +01:00
Andrew Morgan	c548dbc4b1	Make it clearer that the template dir is relative to synapse's root dir (#5543) ... Helps address #5444	2019-06-27 18:20:17 +01:00
Erik Johnston	e79ec03165	Merge pull request #5559 from matrix-org/erikj/refactor_changed_devices ... Refactor devices changed query to pull less from DB	2019-06-27 16:53:15 +01:00
Erik Johnston	729f5a4fb6	Review comments	2019-06-27 16:06:23 +01:00
Richard van der Hoff	555b6fa0d5	Docker image: Add a migrate_config mode (#5567) ... ... to help people escape env var hell	2019-06-27 13:52:40 +01:00
Richard van der Hoff	1ddc7b39c9	Docker image: open the non-TLS port by default. (#5568) ... There's not much point in binding to localhost when it's in a docker container.	2019-06-27 13:50:10 +01:00
Richard van der Hoff	2f7ebc2a55	Deprecate the env var way of running the docker image (#5566) ... 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.	2019-06-27 13:49:48 +01:00
PauRE	856ea04eb3	Fix JWT login (#5555) ... * 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>	2019-06-27 12:02:41 +01:00
Richard van der Hoff	b4db70e167	Merge pull request #5565 from matrix-org/rav/docker/fix_log_config ... Docker: generate our own log config	2019-06-27 11:19:37 +01:00
Richard van der Hoff	b2d2617c0d	Reduce the amount of stuff we send in the docker context (#5564) ... this makes docker builds a bit faster.	2019-06-27 11:18:51 +01:00
Richard van der Hoff	b1b8a24b63	Merge pull request #5563 from matrix-org/rav/docker/data_dir ... Docker image: add support for SYNAPSE_DATA_DIR parameter	2019-06-27 11:17:44 +01:00
Richard van der Hoff	53faa6a429	Merge pull request #5562 from matrix-org/rav/docker/no-generate-keys ... Docker: only run --generate-keys when generating config on-the-fly.	2019-06-27 11:17:21 +01:00
Richard van der Hoff	02aeb5a98a	Merge pull request #5561 from matrix-org/rav/docker/refactor ... Refactor the docker/start.py script	2019-06-27 11:16:37 +01:00
Richard van der Hoff	42a3619ef4	Merge pull request #5570 from almereyda/patch-2 ... Update purge_api README	2019-06-27 00:58:17 +01:00
Richard van der Hoff	a11475f396	fix changelog	2019-06-27 00:57:59 +01:00
Richard van der Hoff	47fa836abb	Merge pull request #5313 from twrist/patch-1 ... Update HAProxy example rules	2019-06-27 00:53:48 +01:00
Richard van der Hoff	79b9d9076d	rename BaseSSORedirectServlet for consistency	2019-06-27 00:46:57 +01:00
Richard van der Hoff	dde4118341	update sample config	2019-06-27 00:41:04 +01:00
Richard van der Hoff	28db0ae537	cleanups	2019-06-27 00:37:41 +01:00
Richard van der Hoff	a0acfcc73e	update sample config	2019-06-26 23:56:28 +01:00
Richard van der Hoff	36f4953dec	Add support for tracking SAML2 sessions. ... This allows us to correctly handle `allow_unsolicited: False`.	2019-06-26 23:50:55 +01:00
jon r	536820e572	Create 5570.misc ... Signed-off-by: Jon Richter <jon@allmende.io>	2019-06-27 00:13:34 +02:00
jon r	db56383b24	Update purge_api README ... This points the reverse links at the intended location.	2019-06-27 00:08:18 +02:00
Richard van der Hoff	3705322103	Move all the saml stuff out to a centralised handler	2019-06-26 22:52:02 +01:00
Richard van der Hoff	0ade403f55	Revert redundant changes to static js	2019-06-26 22:46:23 +01:00
Richard van der Hoff	a4daa899ec	Merge branch 'develop' into rav/saml2_client	2019-06-26 22:34:41 +01:00
Erik Johnston	82028d723b	Move changelog	2019-06-26 19:39:49 +01:00
Erik Johnston	8624db3194	Refactor and comment sync device list code	2019-06-26 19:39:49 +01:00
Erik Johnston	f335e77d53	Use batch_iter and correct docstring	2019-06-26 19:39:46 +01:00
Erik Johnston	806a06daf2	Rename get_users_whose_devices_changed	2019-06-26 19:39:19 +01:00
Richard van der Hoff	b051cefc75	Merge pull request #5552 from matrix-org/rav/github_templates ... Update github templates	2019-06-26 16:15:41 +01:00
Richard van der Hoff	befa116b31	changelog	2019-06-26 15:52:00 +01:00
Richard van der Hoff	28e30c6581	Docker: generate our own log config ... 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.	2019-06-26 15:48:38 +01:00
Richard van der Hoff	6347dc1bed	Add support for SYNAPSE_CONFIG_DIR	2019-06-26 15:48:38 +01:00
Richard van der Hoff	a0f2921ccf	changelog	2019-06-26 15:41:10 +01:00
Richard van der Hoff	7e433beb65	Docker image: add support for SYNAPSE_DATA_DIR parameter ... Fixes #4830.	2019-06-26 15:38:08 +01:00
Richard van der Hoff	c58a6e6108	document supported env vars for docker 'generate' option	2019-06-26 15:38:08 +01:00
Richard van der Hoff	7c453472e4	changelog	2019-06-26 15:32:55 +01:00
Richard van der Hoff	a5fba9c27c	Docker: only run --generate-keys when generating config on-the-fly. ... 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.)	2019-06-26 15:31:19 +01:00
Richard van der Hoff	a1732bbff9	improve logging for generate_config_from_template	2019-06-26 15:31:19 +01:00