c8fa620d7a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5902  from matrix-org/hs/exempt-support-users-from-consent  
							
							... 
							
							
							
							Exempt support users from consent 
							
						 
						
							2019-08-28 16:31:40 +01:00  
				
					
						
							
							
								 
						
							
							
								deca277d09 
								
									
								
							
								 
							
						 
						
							
							
								
								Let synctl use a config directory. ( #5904 )  
							
							... 
							
							
							
							* Let synctl use a config directory. 
							
						 
						
							2019-08-28 15:55:58 +01:00  
				
					
						
							
							
								 
						
							
							
								71fc04069a 
								
									
								
							
								 
							
						 
						
							
							
								
								Use the v2 lookup API for 3PID invites ( #5897 )  
							
							... 
							
							
							
							Fixes https://github.com/matrix-org/synapse/issues/5861 
Adds support for the v2 lookup API as defined in [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134 ). Currently this is only used for 3PID invites.
Sytest PR: https://github.com/matrix-org/sytest/pull/679  
							
						 
						
							2019-08-28 14:59:26 +02:00  
				
					
						
							
							
								 
						
							
							
								6d97843793 
								
									
								
							
								 
							
						 
						
							
							
								
								Config templating ( #5900 )  
							
							... 
							
							
							
							Template config files
* Imagine a system composed entirely of x, y, z etc and the basic operations..
Wait George, why XOR? Why not just neq?
George: Eh, I didn't think of that..
Co-Authored-By: Erik Johnston <erik@matrix.org> 
							
						 
						
							2019-08-28 13:12:22 +01:00  
				
					
						
							
							
								 
						
							
							
								7dc398586c 
								
									
								
							
								 
							
						 
						
							
							
								
								Implement a structured logging output system. ( #5680 )  
							
							
							
						 
						
							2019-08-28 21:18:53 +10:00  
				
					
						
							
							
								 
						
							
							
								49ef8ec399 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix a cache-invalidation bug for worker-based deployments ( #5920 )  
							
							... 
							
							
							
							Some of the caches on worker processes were not being correctly invalidated
when a room's state was changed in a way that did not affect the membership
list of the room.
We need to make sure we send out cache invalidations even when no memberships
are changing. 
							
						 
						
							2019-08-28 10:18:16 +01:00  
				
					
						
							
							
								 
						
							
							
								a3f0635686 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5914  from matrix-org/rei/admin_getadmin  
							
							... 
							
							
							
							Add GET method to admin API /users/@user:dom/admin 
							
						 
						
							2019-08-28 09:44:22 +01:00  
				
					
						
							
							
								 
						
							
							
								7ccc251415 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5859  from matrix-org/rei/msc2197  
							
							... 
							
							
							
							MSC2197 Search Filters over Federation 
							
						 
						
							2019-08-28 09:00:21 +01:00  
				
					
						
							
							
								 
						
							
							
								dfd10f5133 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5864  from matrix-org/erikj/reliable_lookups  
							
							... 
							
							
							
							Refactor MatrixFederationAgent to retry SRV. 
							
						 
						
							2019-08-27 16:54:06 +01:00  
				
					
						
							
							
								 
						
							
							
								91caa5b430 
								
							
								 
							
						 
						
							
							
								
								Fix off by one error in SRV result shuffling  
							
							
							
						 
						
							2019-08-27 13:56:42 +01:00  
				
					
						
							
							
								 
						
							
							
								c88a119259 
								
							
								 
							
						 
						
							
							
								
								Add GET method to admin API /users/@user:dom/admin  
							
							... 
							
							
							
							Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> 
							
						 
						
							2019-08-27 13:12:27 +01:00  
				
					
						
							
							
								 
						
							
							
								322ccac33f 
								
									
								
							
								 
							
						 
						
							
							
								
								Allow schema deltas to be engine-specific ( #5911 )  
							
							... 
							
							
							
							* Allow schema deltas to be engine-specific
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* Newsfile
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* Code style (Black)
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> 
							
						 
						
							2019-08-27 11:53:21 +01:00  
				
					
						
							
							
								 
						
							
							
								ccb15a5bbe 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5906  from matrix-org/neilj/increase_display_name_limit  
							
							... 
							
							
							
							Increase profile display name limit 
							
						 
						
							2019-08-27 11:52:59 +01:00  
				
					
						
							
							
								 
						
							
							
								f5b50d0871 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5895  from matrix-org/erikj/notary_key  
							
							... 
							
							
							
							Add config option to sign remote key query responses with a separate key. 
							
						 
						
							2019-08-27 11:51:37 +01:00  
				
					
						
							
							
								 
						
							
							
								7837a5f2ea 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5909  from aaronraimist/public_base_url  
							
							... 
							
							
							
							public_base_url is actually public_baseurl 
							
						 
						
							2019-08-27 11:49:59 +01:00  
				
					
						
							
							
								 
						
							
							
								1a7e6eb633 
								
									
								
							
								 
							
						 
						
							
							
								
								Add Admin API capability to set adminship of a user ( #5878 )  
							
							... 
							
							
							
							Admin API: Set adminship of a user 
							
						 
						
							2019-08-27 10:14:00 +01:00  
				
					
						
							
							
								 
						
							
							
								d1e0b91083 
								
							
								 
							
						 
						
							
							
								
								Code style (Black)  
							
							... 
							
							
							
							Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> 
							
						 
						
							2019-08-27 09:39:11 +01:00  
				
					
						
							
							
								 
						
							
							
								aefa76f5cd 
								
							
								 
							
						 
						
							
							
								
								Allow schema deltas to be engine-specific  
							
							... 
							
							
							
							Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> 
							
						 
						
							2019-08-27 09:14:00 +01:00  
				
					
						
							
							
								 
						
							
							
								e8e3e033ee 
								
									
								
							
								 
							
						 
						
							
							
								
								public_base_url is actually public_baseurl  
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2019-08-26 21:01:56 -05:00  
				
					
						
							
							
								 
						
							
							
								27d3fc421a 
								
							
								 
							
						 
						
							
							
								
								Increase max display name limit  
							
							
							
						 
						
							2019-08-24 22:33:43 +01:00  
				
					
						
							
							
								 
						
							
							
								fbb758a7ce 
								
							
								 
							
						 
						
							
							
								
								Fixup comments  
							
							
							
						 
						
							2019-08-23 15:37:20 +01:00  
				
					
						
							
							
								 
						
							
							
								e70f0081da 
								
							
								 
							
						 
						
							
							
								
								Fix logcontexts  
							
							
							
						 
						
							2019-08-23 15:37:20 +01:00  
				
					
						
							
							
								 
						
							
							
								fe0ac98e66 
								
							
								 
							
						 
						
							
							
								
								Don't implicitly include server signing key  
							
							
							
						 
						
							2019-08-23 15:36:28 +01:00  
				
					
						
							
							
								 
						
							
							
								7af5a63063 
								
							
								 
							
						 
						
							
							
								
								Fixup review comments  
							
							
							
						 
						
							2019-08-23 15:36:28 +01:00  
				
					
						
							
							
								 
						
							
							
								c998f25006 
								
									
								
							
								 
							
						 
						
							
							
								
								Apply suggestions from code review  
							
							... 
							
							
							
							Co-Authored-By: Erik Johnston <erik@matrix.org> 
							
						 
						
							2019-08-23 10:28:54 +01:00  
				
					
						
							
							
								 
						
							
							
								9ba32f6573 
								
							
								 
							
						 
						
							
							
								
								Exempt bot users  
							
							
							
						 
						
							2019-08-23 09:56:31 +01:00  
				
					
						
							
							
								 
						
							
							
								ffa5b757c7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consent  
							
							
							
						 
						
							2019-08-23 09:55:57 +01:00  
				
					
						
							
							
								 
						
							
							
								d9b8cf81be 
								
							
								 
							
						 
						
							
							
								
								Add bot type  
							
							
							
						 
						
							2019-08-23 09:52:09 +01:00  
				
					
						
							
							
								 
						
							
							
								ae38e0569f 
								
							
								 
							
						 
						
							
							
								
								Ignore consent for support users  
							
							
							
						 
						
							2019-08-23 09:15:10 +01:00  
				
					
						
							
							
								 
						
							
							
								886eceba3e 
								
							
								 
							
						 
						
							
							
								
								Return user_type in get_user_by_id  
							
							
							
						 
						
							2019-08-23 09:14:52 +01:00  
				
					
						
							
							
								 
						
							
							
								8767b63a82 
								
									
								
							
								 
							
						 
						
							
							
								
								Propagate opentracing contexts through EDUs ( #5852 )  
							
							... 
							
							
							
							Propagate opentracing contexts through EDUs
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> 
							
						 
						
							2019-08-22 18:21:10 +01:00  
				
					
						
							
							
								 
						
							
							
								0b39fa53b6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5877  from Awesome-Technologies/remove_shared_secret_registration  
							
							... 
							
							
							
							Remove shared secret registration 
							
						 
						
							2019-08-22 18:12:25 +01:00  
				
					
						
							
							
								 
						
							
							
								812ed6b0d5 
								
									
								
							
								 
							
						 
						
							
							
								
								Opentracing across workers ( #5771 )  
							
							... 
							
							
							
							Propagate opentracing contexts across workers
Also includes some Convenience modifications to opentracing for servlets, notably:
- Add boolean to skip the whitelisting check on inject
  extract methods. - useful when injecting into carriers
  locally. Otherwise we'd always have to include our
  own servername and whitelist our servername
- start_active_span_from_request instead of header
- Add boolean to decide whether to extract context
  from a request to a servlet 
							
						 
						
							2019-08-22 18:08:07 +01:00  
				
					
						
							
							
								 
						
							
							
								0bab582fd6 
								
							
								 
							
						 
						
							
							
								
								Remove shared secret registration from client/r0/register endpoint  
							
							... 
							
							
							
							This type of registration was probably never used. It only includes the
user name in the HMAC but not the password.
Shared secret registration is still available via
client/r0/admin/register.
Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de> 
							
						 
						
							2019-08-22 18:04:08 +02:00  
				
					
						
							
							
								 
						
							
							
								dbd46decad 
								
							
								 
							
						 
						
							
							
								
								Revert "Do not send consent notices if "no-consent-required" is set"  
							
							... 
							
							
							
							This reverts commit 27a686e53b 
							
						 
						
							2019-08-22 14:47:43 +01:00  
				
					
						
							
							
								 
						
							
							
								1c5b8c6222 
								
							
								 
							
						 
						
							
							
								
								Revert "Add "require_consent" parameter for registration"  
							
							... 
							
							
							
							This reverts commit 3320aaab3a 
							
						 
						
							2019-08-22 14:47:34 +01:00  
				
					
						
							
							
								 
						
							
							
								27a686e53b 
								
							
								 
							
						 
						
							
							
								
								Do not send consent notices if "no-consent-required" is set  
							
							
							
						 
						
							2019-08-22 14:22:04 +01:00  
				
					
						
							
							
								 
						
							
							
								3320aaab3a 
								
							
								 
							
						 
						
							
							
								
								Add "require_consent" parameter for registration  
							
							
							
						 
						
							2019-08-22 14:21:54 +01:00  
				
					
						
							
							
								 
						
							
							
								1e4b4d85e7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reliable_lookups  
							
							
							
						 
						
							2019-08-22 13:41:57 +01:00  
				
					
						
							
							
								 
						
							
							
								1b09cf8658 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5850  from matrix-org/erikj/retry_well_known_on_fail  
							
							... 
							
							
							
							Retry well known on fail 
							
						 
						
							2019-08-22 13:17:05 +01:00  
				
					
						
							
							
								 
						
							
							
								9a6f2be572 
								
									
								
							
								 
							
						 
						
							
							
								
								Opentrace e2e keys ( #5855 )  
							
							... 
							
							
							
							Add opentracing tags and logs for e2e keys 
							
						 
						
							2019-08-22 11:28:12 +01:00  
				
					
						
							
							
								 
						
							
							
								c9f11d09fc 
								
									
								
							
								 
							
						 
						
							
							
								
								Add missing index on users_in_public_rooms. ( #5894 )  
							
							
							
						 
						
							2019-08-22 10:43:13 +01:00  
				
					
						
							
							
								 
						
							
							
								119aa31b10 
								
									
								
							
								 
							
						 
						
							
							
								
								Servlet to purge old rooms ( #5845 )  
							
							
							
						 
						
							2019-08-22 10:42:59 +01:00  
				
					
						
							
							
								 
						
							
							
								ef1c524bb3 
								
									
								
							
								 
							
						 
						
							
							
								
								Improve error msg when key-fetch fails ( #5896 )  
							
							... 
							
							
							
							There's no point doing a raise_from here, because the exception is always
logged at warn with no stacktrace in the caller. Instead, let's try to give
better messages to reduce confusion.
In particular, this means that we won't log 'Failed to connect to remote
server' when we don't even attempt to connect to the remote server due to
blacklisting. 
							
						 
						
							2019-08-22 10:42:06 +01:00  
				
					
						
							
							
								 
						
							
							
								4dab867288 
								
									
								
							
								 
							
						 
						
							
							
								
								Drop some unused tables. ( #5893 )  
							
							... 
							
							
							
							These tables are never used, so we may as well drop them. 
							
						 
						
							2019-08-21 13:16:28 +01:00  
				
					
						
							
							
								 
						
							
							
								97cbc96093 
								
							
								 
							
						 
						
							
							
								
								Only sign when we respond to remote key requests  
							
							
							
						 
						
							2019-08-21 11:21:58 +01:00  
				
					
						
							
							
								 
						
							
							
								5906be8589 
								
							
								 
							
						 
						
							
							
								
								Add config option for keys to use to sign keys  
							
							... 
							
							
							
							This allows servers to separate keys that are used to sign remote keys
when acting as a notary server. 
							
						 
						
							2019-08-21 10:44:58 +01:00  
				
					
						
							
							
								 
						
							
							
								72bc285669 
								
									
								
							
								 
							
						 
						
							
							
								
								Refactor the Appservice scheduler code ( #5886 )  
							
							... 
							
							
							
							Get rid of the labyrinthine `recoverer_fn` code, and clean up the startup code
(it seemed to be previously inexplicably split between
`ApplicationServiceScheduler.start` and `_Recoverer.start`).
Add some docstrings too. 
							
						 
						
							2019-08-20 17:42:45 +01:00  
				
					
						
							
							
								 
						
							
							
								baa3f4a80d 
								
									
								
							
								 
							
						 
						
							
							
								
								Avoid deep recursion in appservice recovery ( #5885 )  
							
							... 
							
							
							
							Hopefully, this will fix a stack overflow when recovering an appservice.
The recursion here leads to a huge chain of deferred callbacks, which then
overflows the stack when the chain completes. `inlineCallbacks` makes a better
job of this if we use iteration instead.
Clean up the code a bit too, while we're there. 
							
						 
						
							2019-08-20 17:39:38 +01:00  
				
					
						
							
							
								 
						
							
							
								c886f976e0 
								
									
								
							
								 
							
						 
						
							
							
								
								Opentracing doc update ( #5776 )  
							
							... 
							
							
							
							Update opentracing docs to use the unified 'trace' method 
							
						 
						
							2019-08-20 13:56:03 +01:00