755 Commits

Author	SHA1	Message	Date
Brendan Abolivier	9e937c28ee	Merge branch 'develop' into babolivier/message_retention	2019-11-26 17:53:57 +00:00
Andrew Morgan	3916e1b97a	Clean up newline quote marks around the codebase (#6362)	2019-11-21 12:00:14 +00:00
Brendan Abolivier	97b863fe32	Lint again	2019-11-19 13:33:58 +00:00
Brendan Abolivier	bf9a11c54d	Lint again	2019-11-19 13:30:04 +00:00
Brendan Abolivier	7c24d0f443	Lint	2019-11-19 13:22:37 +00:00
Andrew Morgan	473acedcdd	Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_copy ... * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5	2019-11-14 10:26:27 +00:00
Brendan Abolivier	a42567e4a8	Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 ... Set room version default to 5	2019-11-14 10:21:00 +00:00
Andrew Morgan	73d091be48	A couple more instances	2019-11-12 13:12:25 +00:00
Andrew Morgan	bc29a19731	Replace instance variations of homeserver with correct case/spacing	2019-11-12 13:08:12 +00:00
Brendan Abolivier	09957ce0e4	Implement per-room message retention policies	2019-11-04 17:09:22 +00:00
Andrew Morgan	fe1f2b4520	Remove last usages of deprecated logging.warn method (#6314)	2019-11-01 12:03:44 +00:00
Andrew Morgan	54fef094b3	Remove usage of deprecated logger.warn method from codebase (#6271) ... Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated.	2019-10-31 10:23:24 +00:00
Andrew Morgan	46c12918ad	Fix typo in domain name in account_threepid_delegates config option (#6273)	2019-10-30 11:07:42 +00:00
Neil Johnson	2794b79052	Option to suppress resource exceeded alerting (#6173) ... The expected use case is to suppress MAU limiting on small instances	2019-10-24 11:48:46 +01:00
Andrew Morgan	409c62b27b	Add config linting script that checks for bool casing (#6203) ... Add a linting script that enforces all boolean values in the default config be lowercase. This has annoyed me for a while so I decided to fix it.	2019-10-23 13:22:54 +01:00
Neil Johnson	82c8799ec7	Set room version default to 5	2019-10-19 09:06:15 +01:00
Richard van der Hoff	560c122267	Fix logging config for the docker image (#6197) ... Turns out that loggers that are instantiated before the config is loaded get turned off. Also bring the logging config that is generated by --generate-config into line. Fixes #6194.	2019-10-18 13:34:33 +02:00
Valérian Rousset	be9b55e0d2	cas: support setting display name (#6114) ... Now, the CAS server can return an attribute stating what's the desired displayname, instead of using the username directly.	2019-10-11 12:33:12 +01:00
Amber Brown	f743108a94	Refactor HomeserverConfig so it can be typechecked (#6137)	2019-10-10 09:39:35 +01:00
Amber Brown	864f144543	Fix up some typechecking (#6150) ... * type checking fixes * changelog	2019-10-02 05:29:01 -07:00
Erik Johnston	3423633d50	Fix 'redaction_retention_period' sampel config to match guidelines	2019-09-26 16:43:52 +01:00
Neil Johnson	8b8f8c7b3c	Explicitly log when a homeserver does not have a trusted key server configured (#6090)	2019-09-26 12:57:01 +01:00
Erik Johnston	4fb3c129aa	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips_2	2019-09-25 17:53:13 +01:00
Neil Johnson	a4f3ca48b5	Enable cleaning up extremities with dummy events by default to prevent undue build up of forward extremities. (#5884)	2019-09-25 17:27:35 +01:00
Erik Johnston	39b50ad42a	Review comments	2019-09-25 17:22:33 +01:00
Richard van der Hoff	9b7c4f4078	Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work	2019-09-24 17:03:50 +01:00
Erik Johnston	242017db8b	Prune rows in user_ips older than configured period ... Defaults to pruning everything older than 28d.	2019-09-24 15:53:17 +01:00
Richard van der Hoff	bb82be9851	Merge pull request #6069 from matrix-org/rav/fix_attribute_mapping ... Fix a bug with saml attribute maps.	2019-09-24 15:07:26 +01:00
Richard van der Hoff	ed8b92f0d2	Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work	2019-09-24 12:57:32 +01:00
Richard van der Hoff	a25b66d3f9	docstrings and comments	2019-09-24 11:15:08 +01:00
Andrew Morgan	50776261e1	Add submit_url response parameter to msisdn /requestToken (#6079) ... Second part of solving #6076 Fixes #6076 We return a submit_url parameter on calls to POST */msisdn/requestToken so that clients know where to submit token information to.	2019-09-23 21:21:03 +01:00
Richard van der Hoff	78e8ec368e	Merge pull request #6064 from matrix-org/rav/saml_config_cleanup ... Make the sample saml config closer to our standards	2019-09-23 20:36:51 +01:00
Andrew Morgan	e08ea43463	Use the federation blacklist for requests to untrusted Identity Servers (#6000) ... Uses a SimpleHttpClient instance equipped with the federation_ip_range_blacklist list for requests to identity servers provided by user input. Does not use a blacklist when contacting identity servers specified by account_threepid_delegates. The homeserver trusts the latter and we don't want to prevent homeserver admins from specifying delegates that are on internal IP addresses. Fixes #5935	2019-09-23 20:23:20 +01:00
Matthew Hodgson	7ef319aefe	fix broken copyrights	2019-09-23 12:28:01 +01:00
Andrew Morgan	df3401a71d	Allow HS to send emails when adding an email to the HS (#6042)	2019-09-20 15:21:30 +01:00
Richard van der Hoff	284e1cb027	Merge branch 'develop' into rav/fix_attribute_mapping	2019-09-19 20:32:25 +01:00
Richard van der Hoff	b74606ea22	Fix a bug with saml attribute maps. ... Fixes a bug where the default attribute maps were prioritised over user-specified ones, resulting in incorrect mappings. The problem is that if you call SPConfig.load() multiple times, it adds new attribute mappers to a list. So by calling it with the default config first, and then the user-specified config, we would always get the default mappers before the user-specified mappers. To solve this, let's merge the config dicts first, and then pass them to SPConfig.	2019-09-19 20:32:14 +01:00
Richard van der Hoff	b65327ff66	Merge branch 'develop' into rav/saml_mapping_work	2019-09-19 18:13:31 +01:00
Richard van der Hoff	b789c7eb03	Merge branch 'develop' into rav/saml_config_cleanup	2019-09-19 15:05:31 +01:00
Jorik Schellekens	38fd1f8e3f	Fix typo in account_threepid_delegates config (#6028)	2019-09-18 22:30:44 +01:00
dstipp	379d2a8c39	(#5849) Convert rst to markdown (#6040) ... Converting some of the rst documentation to markdown. Attempted to preserve whitespace and line breaks to minimize cosmetic change.	2019-09-17 12:55:29 +01:00
Amber Brown	850dcfd2d3	Fix well-known lookups with the federation certificate whitelist (#5997)	2019-09-14 04:58:38 +10:00
Richard van der Hoff	a8ac40445c	Record mappings from saml users in an external table ... We want to assign unique mxids to saml users based on an incrementing suffix. For that to work, we need to record the allocated mxid in a separate table.	2019-09-13 16:01:46 +01:00
Richard van der Hoff	785cbd3999	Make the sample saml config closer to our standards ... It' still not great, thanks to the nested dictionaries, but it's better.	2019-09-13 12:07:03 +01:00
Amber Brown	b617864cd9	Fix for structured logging tests stomping on logs (#6023)	2019-09-13 02:29:55 +10:00
Sorunome	dd2e5b0038	add report_stats_endpoint config option (#6012) ... This PR adds the optional `report_stats_endpoint` to configure where stats are reported to, if enabled.	2019-09-12 11:24:57 +01:00
Jorik Schellekens	a8251da10f	Blow up config if opentracing is missing (#5985) ... * Blow up config if opentracing is missing	2019-09-12 10:57:37 +01:00
Erik Johnston	cbcbfe64a2	Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction ... Allow use of different ratelimits for admin redactions.	2019-09-11 15:39:38 +01:00
Jorik Schellekens	6604b64fae	Check dependencies on setup in the nicer way. (#5989)	2019-09-11 14:00:37 +01:00
Erik Johnston	57dd41a45b	Fix comments ... Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>	2019-09-11 13:54:50 +01:00