Hubert Chathi
							
						 
						
							 
							
							
							
								
							
								6f4bc6d01d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into cross-signing_federation  
							
							 
							
							
							
						 
						
							2019-10-31 22:38:21 -04:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								dfe0cd71b6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6294  from matrix-org/erikj/add_state_storage  
							
							 
							
							... 
							
							
							
							Add StateGroupStorage interface 
							
						 
						
							2019-10-31 16:17:53 +01: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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								69f0054ce6 
								
							
								 
							
						 
						
							
							
								
								Port to use state storage  
							
							 
							
							
							
						 
						
							2019-10-30 14:46:54 +00:00  
						
					 
				
					
						
							
							
								 
								Hubert Chathi
							
						 
						
							 
							
							
							
								
							
								1fabf82d50 
								
							
								 
							
						 
						
							
							
								
								update to work with newer code, and fix formatting  
							
							 
							
							
							
						 
						
							2019-10-22 21:44:58 -04:00  
						
					 
				
					
						
							
							
								 
								Hubert Chathi
							
						 
						
							 
							
							
							
								
							
								8d3542a64e 
								
							
								 
							
						 
						
							
							
								
								implement federation parts of cross-signing  
							
							 
							
							
							
						 
						
							2019-10-22 19:04:35 -04:00  
						
					 
				
					
						
							
							
								 
								Hubert Chathi
							
						 
						
							 
							
							
							
								
							
								faf72a4c40 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into cross-signing_keys  
							
							 
							
							
							
						 
						
							2019-09-04 19:12:29 -04:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
								
								
							
							
								
							
								a90d16dabc 
								
									
								
							
								 
							
						 
						
							
							
								
								Opentrace device lists ( #5853 )  
							
							 
							
							... 
							
							
							
							Trace device list changes. 
							
						 
						
							2019-09-03 10:21:30 +01:00  
						
					 
				
					
						
							
							
								 
								Hubert Chathi
							
						 
						
							 
							
							
							
								
							
								336c546d6a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'cross-signing_hidden' into cross-signing_keys  
							
							 
							
							
							
						 
						
							2019-08-01 16:31:40 -04:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								85b0bd8fe0 
								
							
								 
							
						 
						
							
							
								
								Update the device list cache when keys/query is called ( #5693 )  
							
							 
							
							
							
						 
						
							2019-07-29 16:34:44 +01:00  
						
					 
				
					
						
							
							
								 
								Hubert Chathi
							
						 
						
							 
							
							
							
								
							
								c659b9f94f 
								
							
								 
							
						 
						
							
							
								
								allow uploading keys for cross-signing  
							
							 
							
							
							
						 
						
							2019-07-25 11:08:24 -04:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								4806651744 
								
									
								
							
								 
							
						 
						
							
							
								
								Replace returnValue with return ( #5736 )  
							
							 
							
							
							
						 
						
							2019-07-23 23:00:55 +10:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								806a06daf2 
								
							
								 
							
						 
						
							
							
								
								Rename get_users_whose_devices_changed  
							
							 
							
							
							
						 
						
							2019-06-26 19:39:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a2f6d31a63 
								
							
								 
							
						 
						
							
							
								
								Refactor get_user_ids_changed to pull less from DB  
							
							 
							
							... 
							
							
							
							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  
							
						 
						
							2019-06-26 12:03:44 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								32e7c9e7f2 
								
									
								
							
								 
							
						 
						
							
							
								
								Run Black. ( #5482 )  
							
							 
							
							
							
						 
						
							2019-06-20 19:32:02 +10:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								469b66c102 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4829  from matrix-org/erikj/device_list_seen_updates  
							
							 
							
							... 
							
							
							
							When re-syncing device lists reset the state 
							
						 
						
							2019-03-08 09:54:54 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d42b41544a 
								
							
								 
							
						 
						
							
							
								
								When re-syncing device lists reset the state  
							
							 
							
							... 
							
							
							
							We keep track of what stream IDs we've seen so that we know what updates
we've handled or missed. If we re-sync we don't know if the updates
we've seen are included in the re-sync (there may be a race), so we
should reset the seen updates. 
							
						 
						
							2019-03-07 16:04:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c633fc02d7 
								
							
								 
							
						 
						
							
							
								
								Add some debug logging for device list handling  
							
							 
							
							
							
						 
						
							2019-03-07 15:58:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bfa7d46a10 
								
							
								 
							
						 
						
							
							
								
								Allow /keys/{changes,query} API to run on worker  
							
							 
							
							
							
						 
						
							2019-03-04 18:30:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								157e5a8f27 
								
							
								 
							
						 
						
							
							
								
								Split DeviceHandler into master and worker  
							
							 
							
							
							
						 
						
							2019-03-04 18:29:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								94960cef03 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							 
							
							
							
						 
						
							2019-02-18 15:24:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e07cc31cb8 
								
							
								 
							
						 
						
							
							
								
								Correctly handle HttpResponseException  
							
							 
							
							
							
						 
						
							2019-02-18 14:55:09 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7fc1196a36 
								
							
								 
							
						 
						
							
							
								
								Correctly handle RequestSendFailed exceptions  
							
							 
							
							... 
							
							
							
							This mainly reduces the number of exceptions we log. 
							
						 
						
							2019-02-14 14:01:04 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								05e1296649 
								
									
								
							
								 
							
						 
						
							
							
								
								don't store more remote device lists if they have more than 1K devices ( #4397 )  
							
							 
							
							
							
						 
						
							2019-01-16 23:14:11 +00:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								b37c472419 
								
									
								
							
								 
							
						 
						
							
							
								
								Rename async to async_helpers because `async` is a keyword on Python 3.7 ( #3678 )  
							
							 
							
							
							
						 
						
							2018-08-10 23:50:21 +10:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ea752bdd99 
								
							
								 
							
						 
						
							
							
								
								s/becuase/because/g  
							
							 
							
							
							
						 
						
							2018-07-10 17:58:18 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							 
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								c936a52a9e 
								
									
								
							
								 
							
						 
						
							
							
								
								Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy ( #3307 )  
							
							 
							
							
							
						 
						
							2018-05-31 19:03:47 +10:00  
						
					 
				
					
						
							
							
								 
								Adrian Tschira
							
						 
						
							 
							
							
							
								
							
								933bf2dd35 
								
							
								 
							
						 
						
							
							
								
								replace some iteritems with six  
							
							 
							
							... 
							
							
							
							Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-05-19 17:59:26 +02:00  
						
					 
				
					
						
							
							
								 
								NotAFile
							
						 
						
							 
							
							
							
								
							
								2cc9f76bc3 
								
							
								 
							
						 
						
							
							
								
								replace old style error catching with 'as' keyword  
							
							 
							
							... 
							
							
							
							This is both easier to read and compatible with python3 (not that that
matters)
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-03-15 16:11:17 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cb9f8e527c 
								
							
								 
							
						 
						
							
							
								
								s/replication_client/federation_client/  
							
							 
							
							
							
						 
						
							2018-03-13 13:26:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								265b993b8a 
								
							
								 
							
						 
						
							
							
								
								Split replication layer into two  
							
							 
							
							
							
						 
						
							2018-03-13 10:55:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c3f79c9da5 
								
							
								 
							
						 
						
							
							
								
								Split out edu/query registration to a separate class  
							
							 
							
							
							
						 
						
							2018-03-13 10:24:27 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								ab9f844aaf 
								
									
								
							
								 
							
						 
						
							
							
								
								Add federation_domain_whitelist option ( #2820 )  
							
							 
							
							... 
							
							
							
							Add federation_domain_whitelist
gives a way to restrict which domains your HS is allowed to federate with.
useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network 
							
						 
						
							2018-01-22 19:11:18 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								ad7e570d07 
								
							
								 
							
						 
						
							
							
								
								Delete devices in various logout situations  
							
							 
							
							... 
							
							
							
							Make sure that we delete devices whenever a user is logged out due to any of
the following situations:
 * /logout
 * /logout_all
 * change password
 * deactivate account (by the user or by an admin)
 * invalidate access token from a dynamic module
Fixes  #2672 . 
							
						 
						
							2017-11-29 16:44:35 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4f0488b307 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into rav/refactor_accesstoken_delete  
							
							 
							
							
							
						 
						
							2017-11-01 16:20:19 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								dd13310fb8 
								
							
								 
							
						 
						
							
							
								
								Move access token deletion into auth handler  
							
							 
							
							... 
							
							
							
							Also move duplicated deactivation code into the auth handler.
I want to add some hooks when we deactivate an access token, so let's bring it
all in here so that there's somewhere to put it. 
							
						 
						
							2017-11-01 15:46:22 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								356bcafc44 
								
							
								 
							
						 
						
							
							
								
								Remove the last vestiges of refresh_tokens  
							
							 
							
							
							
						 
						
							2017-10-31 20:35:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d6dadd95ac 
								
							
								 
							
						 
						
							
							
								
								Correctly handle leaving room in /key/changes  
							
							 
							
							
							
						 
						
							2017-09-18 15:38:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4a94eb3ea4 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2017-09-15 09:56:54 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4f845a0713 
								
							
								 
							
						 
						
							
							
								
								Handle joining/leaving rooms in /keys/changes  
							
							 
							
							
							
						 
						
							2017-09-13 16:28:08 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								69ef4987a6 
								
							
								 
							
						 
						
							
							
								
								Add left section to /keys/changes  
							
							 
							
							
							
						 
						
							2017-09-08 14:44:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								53cc8ad35a 
								
							
								 
							
						 
						
							
							
								
								Send down device list change notif when member leaves/rejoins room  
							
							 
							
							
							
						 
						
							2017-09-07 15:08:39 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a0a561ae85 
								
							
								 
							
						 
						
							
							
								
								Fix up client ips to read from pending data  
							
							 
							
							
							
						 
						
							2017-06-27 14:46:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								653d90c1a5 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							 
							
							
							
						 
						
							2017-05-05 14:01:17 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b843631d71 
								
							
								 
							
						 
						
							
							
								
								Add comment and TODO  
							
							 
							
							
							
						 
						
							2017-05-05 10:59:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f346048a6e 
								
							
								 
							
						 
						
							
							
								
								Handle exceptions thrown in handling remote device list updates  
							
							 
							
							
							
						 
						
							2017-05-05 10:34:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6957bfdca6 
								
							
								 
							
						 
						
							
							
								
								Don't recreate so many sets  
							
							 
							
							
							
						 
						
							2017-03-16 11:54:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bb256ac96f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_list_speed  
							
							 
							
							
							
						 
						
							2017-03-14 11:35:05 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								bbeeb97f75 
								
							
								 
							
						 
						
							
							
								
								Implement _simple_delete_many_txn, use it to delete devices  
							
							 
							
							... 
							
							
							
							(But this doesn't implement the same for deleting access tokens or e2e keys.
Also respond to code review. 
							
						 
						
							2017-03-13 17:53:23 +00:00