03b086647f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4512  from matrix-org/anoa/consent_dir  
							
							... 
							
							
							
							Check consent dir path on startup 
							
						 
						
							2019-01-29 20:08:18 +00:00  
				
					
						
							
							
								 
						
							
							
								d02c5ccb11 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4498  from matrix-org/travis/fix-docs-public_baseurl  
							
							... 
							
							
							
							Don't recommend :8448 to people on public_baseurl 
							
						 
						
							2019-01-29 09:06:16 -07:00  
				
					
						
							
							
								 
						
							
							
								e65a17b26f 
								
							
								 
							
						 
						
							
							
								
								Check consent dir path on startup  
							
							
							
						 
						
							2019-01-29 15:30:33 +00:00  
				
					
						
							
							
								 
						
							
							
								6bd4374636 
								
									
								
							
								 
							
						 
						
							
							
								
								Do not generate self-signed TLS certificates by default. ( #4509 )  
							
							
							
						 
						
							2019-01-29 14:09:10 +00:00  
				
					
						
							
							
								 
						
							
							
								6901ac7e9d 
								
									
								
							
								 
							
						 
						
							
							
								
								Don't recommend :8448 to people on public_baseurl  
							
							
							
						 
						
							2019-01-28 12:15:22 -07:00  
				
					
						
							
							
								 
						
							
							
								4a3f138832 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix quoting for allowed_local_3pids example config ( #4476 )  
							
							... 
							
							
							
							If you use double-quotes here, you have to escape your backslashes. It's much
easier with single-quotes.
(Note that the existing double-backslashes are already interpreted by python's
""" parsing.) 
							
						 
						
							2019-01-25 13:57:52 +00:00  
				
					
						
							
							
								 
						
							
							
								10b89d5c2e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4435  from matrix-org/neilj/fix_threepid_auth_check  
							
							... 
							
							
							
							Neilj/fix threepid auth check 
							
						 
						
							2019-01-24 13:02:50 +00:00  
				
					
						
							
							
								 
						
							
							
								92d8a068ad 
								
							
								 
							
						 
						
							
							
								
								Clarify docs for public_baseurl  
							
							... 
							
							
							
							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. 
							
						 
						
							2019-01-24 10:52:06 +00:00  
				
					
						
							
							
								 
						
							
							
								6129e52f43 
								
									
								
							
								 
							
						 
						
							
							
								
								Support ACME for certificate provisioning ( #4384 )  
							
							
							
						 
						
							2019-01-23 19:39:06 +11:00  
				
					
						
							
							
								 
						
							
							
								c99c2d58d7 
								
							
								 
							
						 
						
							
							
								
								move guard out of is_threepid_reserved and into register.py  
							
							
							
						 
						
							2019-01-22 17:47:00 +00:00  
				
					
						
							
							
								 
						
							
							
								d619b113ed 
								
							
								 
							
						 
						
							
							
								
								Fix None guard in config.server.is_threepid_reserved  
							
							
							
						 
						
							2019-01-22 16:52:29 +00:00  
				
					
						
							
							
								 
						
							
							
								388c164aea 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4423  from matrix-org/neilj/disable_msisdn_on_registration  
							
							... 
							
							
							
							Config option to disable requesting MSISDN on registration 
							
						 
						
							2019-01-22 16:23:08 +00:00  
				
					
						
							
							
								 
						
							
							
								23b0813599 
								
									
								
							
								 
							
						 
						
							
							
								
								Require ECDH key exchange & remove dh_params ( #4429 )  
							
							... 
							
							
							
							* remove dh_params and set better cipher string 
							
						 
						
							2019-01-22 21:58:50 +11:00  
				
					
						
							
							
								 
						
							
							
								1b53cc3cb4 
								
							
								 
							
						 
						
							
							
								
								fix line length  
							
							
							
						 
						
							2019-01-21 15:17:20 +00:00  
				
					
						
							
							
								 
						
							
							
								5349262302 
								
							
								 
							
						 
						
							
							
								
								Config option to disable requesting MSISDN on registration  
							
							
							
						 
						
							2019-01-21 14:59:37 +00:00  
				
					
						
							
							
								 
						
							
							
								3982a6ee07 
								
									
								
							
								 
							
						 
						
							
							
								
								Changing macaroon_secret_key no longer logs you out ( #4387 )  
							
							
							
						 
						
							2019-01-16 23:14:41 +00:00  
				
					
						
							
							
								 
						
							
							
								e0910d0145 
								
							
								 
							
						 
						
							
							
								
								Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1  
							
							... 
							
							
							
							Fixes  #4371  
						
							2019-01-10 14:12:50 +00:00  
				
					
						
							
							
								 
						
							
							
								ba41aeed6a 
								
							
								 
							
						 
						
							
							
								
								Revert "Fix macaroon_secret_key fallback logic"  
							
							... 
							
							
							
							This is already fixed in 0.34.1, by 59f93bbefc522c55e 
							
						 
						
							2019-01-10 14:09:26 +00:00  
				
					
						
							
							
								 
						
							
							
								aa70d24125 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34  
							
							
							
						 
						
							2019-01-10 12:58:33 +00:00  
				
					
						
							
							
								 
						
							
							
								efc522c55e 
								
							
								 
							
						 
						
							
							
								
								Fix macaroon_secret_key fallback logic  
							
							
							
						 
						
							2019-01-10 12:57:27 +00:00  
				
					
						
							
							
								 
						
							
							
								353f2407b7 
								
							
								 
							
						 
						
							
							
								
								Fix fallback to signing key for macaroon-secret-key  
							
							
							
						 
						
							2019-01-10 12:42:56 +00:00  
				
					
						
							
							
								 
						
							
							
								1dcb086f33 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix synapse.config.__main__ on python 3 ( #4356 )  
							
							
							
						 
						
							2019-01-08 10:03:09 +11:00  
				
					
						
							
							
								 
						
							
							
								b7c0218812 
								
									
								
							
								 
							
						 
						
							
							
								
								Check jinja version for consent resource ( #4327 )  
							
							... 
							
							
							
							* Raise a ConfigError if an invalid resource is specified
* Require Jinja 2.9 for the consent resource
* changelog 
							
						 
						
							2019-01-07 10:14:31 +00:00  
				
					
						
							
							
								 
						
							
							
								9c2af7b2c5 
								
							
								 
							
						 
						
							
							
								
								Add a script to generate a clean config file ( #4315 )  
							
							
							
						 
						
							2018-12-22 02:04:57 +11:00  
				
					
						
							
							
								 
						
							
							
								f3561f8d86 
								
							
								 
							
						 
						
							
							
								
								Fix indentation in default config ( #4313 )  
							
							... 
							
							
							
							These settings are not supposed to be under 'listeners'. 
							
						 
						
							2018-12-22 02:01:43 +11:00  
				
					
						
							
							
								 
						
							
							
								f208f608cb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'release-v0.34.0' into develop  
							
							
							
						 
						
							2018-12-11 15:43:20 +00:00  
				
					
						
							
							
								 
						
							
							
								df96177ca7 
								
							
								 
							
						 
						
							
							
								
								Stop installing Matrix Console by default  
							
							... 
							
							
							
							This is based on the work done by @krombel in #2601 . 
							
						 
						
							2018-12-11 13:20:33 +00:00  
				
					
						
							
							
								 
						
							
							
								c7401a697f 
								
									
								
							
								 
							
						 
						
							
							
								
								Implement SAML2 authentication ( #4267 )  
							
							... 
							
							
							
							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. 
							
						 
						
							2018-12-07 13:11:11 +01:00  
				
					
						
							
							
								 
						
							
							
								b0c24a66ec 
								
							
								 
							
						 
						
							
							
								
								Rip out half-implemented m.login.saml2 support ( #4265 )  
							
							... 
							
							
							
							* 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. 
							
						 
						
							2018-12-06 19:44:38 +11:00  
				
					
						
							
							
								 
						
							
							
								e8d98466b0 
								
									
								
							
								 
							
						 
						
							
							
								
								Implement .well-known handling ( #4262 )  
							
							... 
							
							
							
							Sometimes it's useful for synapse to generate its own .well-known file. 
							
						 
						
							2018-12-05 14:38:58 +01:00  
				
					
						
							
							
								 
						
							
							
								1737753a62 
								
							
								 
							
						 
						
							
							
								
								Add an option to enable recording IPs for appservice users ( #3831 )  
							
							
							
						 
						
							2018-12-04 12:44:41 +01:00  
				
					
						
							
							
								 
						
							
							
								158ffb92f1 
								
							
								 
							
						 
						
							
							
								
								Add an option to disable search for homeservers which may not be interested in it ( #4230 )  
							
							... 
							
							
							
							This is useful for homeservers not intended for users, such as bot-only homeservers or ones that only process IoT data. 
							
						 
						
							2018-12-04 12:01:02 +01:00  
				
					
						
							
							
								 
						
							
							
								78ba0e7ab8 
								
							
								 
							
						 
						
							
							
								
								Remove riot.im from the list of trusted Identity Servers in the default configuration ( #4207 )  
							
							
							
						 
						
							2018-11-20 12:29:25 +01:00  
				
					
						
							
							
								 
						
							
							
								835779f7fb 
								
							
								 
							
						 
						
							
							
								
								Add option to track MAU stats (but not limit people) ( #3830 )  
							
							
							
						 
						
							2018-11-15 18:08:27 +00:00  
				
					
						
							
							
								 
						
							
							
								0f5e51f726 
								
							
								 
							
						 
						
							
							
								
								Add config variables for enabling terms auth and the policy name ( #4142 )  
							
							... 
							
							
							
							So people can still collect consent the old way if they want to. 
							
						 
						
							2018-11-06 10:32:34 +00:00  
				
					
						
							
							
								 
						
							
							
								0467384d2f 
								
									
								
							
								 
							
						 
						
							
							
								
								Set the encoding to UTF8 in the default logconfig ( #4138 )  
							
							
							
						 
						
							2018-11-03 02:28:07 +11:00  
				
					
						
							
							
								 
						
							
							
								b94a43d5b5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disallow_list  
							
							
							
						 
						
							2018-10-25 15:25:31 +01:00  
				
					
						
							
							
								 
						
							
							
								e5481b22aa 
								
							
								 
							
						 
						
							
							
								
								Use allow/deny  
							
							
							
						 
						
							2018-10-25 15:25:21 +01:00  
				
					
						
							
							
								 
						
							
							
								f7f487e14c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocreate_autojoin  
							
							
							
						 
						
							2018-10-25 14:40:06 +01:00  
				
					
						
							
							
								 
						
							
							
								9ec2186586 
								
							
								 
							
						 
						
							
							
								
								isort  
							
							
							
						 
						
							2018-10-24 16:09:21 +01:00  
				
					
						
							
							
								 
						
							
							
								ef771cc4c2 
								
							
								 
							
						 
						
							
							
								
								Fix a number of flake8 errors  
							
							... 
							
							
							
							Broadly three things here:
* disable W504 which seems a bit whacko
* remove a bunch of `as e` expressions from exception handlers that don't use
  them
* use `r""` for strings which include backslashes
Also, we don't use pep8 any more, so we can get rid of the duplicate config
there. 
							
						 
						
							2018-10-24 10:39:03 +01:00  
				
					
						
							
							
								 
						
							
							
								47a9ba435d 
								
							
								 
							
						 
						
							
							
								
								Use match rather than search  
							
							
							
						 
						
							2018-10-24 09:54:57 +01:00  
				
					
						
							
							
								 
						
							
							
								a67d8ace9b 
								
							
								 
							
						 
						
							
							
								
								remove errant exception and style  
							
							
							
						 
						
							2018-10-23 17:44:39 +01:00  
				
					
						
							
							
								 
						
							
							
								e1728dfcbe 
								
									
								
							
								 
							
						 
						
							
							
								
								Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on py3) ( #4068 )  
							
							
							
						 
						
							2018-10-20 11:16:55 +11:00  
				
					
						
							
							
								 
						
							
							
								cc325c7069 
								
							
								 
							
						 
						
							
							
								
								Calculate absolute path for email templates  
							
							
							
						 
						
							2018-10-19 14:01:59 +01:00  
				
					
						
							
							
								 
						
							
							
								084046456e 
								
							
								 
							
						 
						
							
							
								
								Add config option to control alias creation  
							
							
							
						 
						
							2018-10-19 10:22:45 +01:00  
				
					
						
							
							
								 
						
							
							
								c8f2c19991 
								
							
								 
							
						 
						
							
							
								
								Put the warning blob at the top of the file  
							
							
							
						 
						
							2018-10-17 16:56:22 +01:00  
				
					
						
							
							
								 
						
							
							
								1519572961 
								
							
								 
							
						 
						
							
							
								
								Ship the email templates as package_data  
							
							... 
							
							
							
							move the example email templates into the synapse package so that they can be
used as package data, which should mean that all of the packaging mechanisms
(pip, docker, debian, arch, etc) should now come with the example templates.
In order to grandfather in people who relied on the templates being in the old
place, check for that situation and fall back to using the defaults if the
templates directory does not exist. 
							
						 
						
							2018-10-17 16:46:02 +01:00  
				
					
						
							
							
								 
						
							
							
								c6584f4b5f 
								
							
								 
							
						 
						
							
							
								
								clean up config error logic and imports  
							
							
							
						 
						
							2018-10-17 11:36:41 +01:00  
				
					
						
							
							
								 
						
							
							
								a2bfb778c8 
								
							
								 
							
						 
						
							
							
								
								improve auto room join logic, comments and tests  
							
							
							
						 
						
							2018-10-12 18:17:36 +01:00