020add5099 
								
									
								
							
								 
							
						 
						
							
							
								
								Update black to 19.10b0 ( #6304 )  
							
							... 
							
							
							
							* update version of black and also fix the mypy config being overridden 
							
						 
						
							2019-11-01 02:43:24 +11:00  
				
					
						
							
							
								 
						
							
							
								36adfaedab 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into cross-signing_sig_upload  
							
							
							
						 
						
							2019-10-18 18:34:42 +01:00  
				
					
						
							
							
								 
						
							
							
								125eb45e19 
								
							
								 
							
						 
						
							
							
								
								fix doc strings  
							
							
							
						 
						
							2019-10-18 16:56:16 +01:00  
				
					
						
							
							
								 
						
							
							
								cfc28325a6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into uhoreg/e2e_cross-signing_merged  
							
							
							
						 
						
							2019-10-18 11:39:40 +01:00  
				
					
						
							
							
								 
						
							
							
								7a0dce9259 
								
							
								 
							
						 
						
							
							
								
								make sure we actually return something  
							
							
							
						 
						
							2019-10-10 20:31:30 -04:00  
				
					
						
							
							
								 
						
							
							
								4908fb3b30 
								
							
								 
							
						 
						
							
							
								
								make storage layer in charge of interpreting the device key data  
							
							
							
						 
						
							2019-10-10 19:15:30 -04:00  
				
					
						
							
							
								 
						
							
							
								c3635c9459 
								
							
								 
							
						 
						
							
							
								
								make isort happy  
							
							
							
						 
						
							2019-09-24 16:21:03 -04:00  
				
					
						
							
							
								 
						
							
							
								f4b6d43ec3 
								
							
								 
							
						 
						
							
							
								
								add some comments  
							
							
							
						 
						
							2019-09-24 16:19:54 -04:00  
				
					
						
							
							
								 
						
							
							
								39864f45ec 
								
							
								 
							
						 
						
							
							
								
								drop some logger lines to debug  
							
							
							
						 
						
							2019-09-24 15:26:45 -04:00  
				
					
						
							
							
								 
						
							
							
								26113fb7de 
								
							
								 
							
						 
						
							
							
								
								make changes based on PR feedback  
							
							
							
						 
						
							2019-09-24 14:12:20 -04:00  
				
					
						
							
							
								 
						
							
							
								d3f2fbcfe5 
								
							
								 
							
						 
						
							
							
								
								add function docs  
							
							
							
						 
						
							2019-09-07 14:13:18 -04:00  
				
					
						
							
							
								 
						
							
							
								415d0a00e0 
								
							
								 
							
						 
						
							
							
								
								run black  
							
							
							
						 
						
							2019-09-06 16:46:45 -04:00  
				
					
						
							
							
								 
						
							
							
								561cbba057 
								
							
								 
							
						 
						
							
							
								
								split out signature processing into separate functions  
							
							
							
						 
						
							2019-09-06 16:44:24 -04:00  
				
					
						
							
							
								 
						
							
							
								369462da74 
								
							
								 
							
						 
						
							
							
								
								avoid modifying input parameter  
							
							
							
						 
						
							2019-09-05 17:03:31 -04:00  
				
					
						
							
							
								 
						
							
							
								c8dc740a94 
								
							
								 
							
						 
						
							
							
								
								update with newer coding style  
							
							
							
						 
						
							2019-09-04 22:30:45 -04:00  
				
					
						
							
							
								 
						
							
							
								7d6c70fc7a 
								
							
								 
							
						 
						
							
							
								
								make black happy  
							
							
							
						 
						
							2019-09-04 22:04:12 -04:00  
				
					
						
							
							
								 
						
							
							
								ac4746ac4b 
								
							
								 
							
						 
						
							
							
								
								allow uploading signatures of master key signed by devices  
							
							
							
						 
						
							2019-09-04 22:03:41 -04:00  
				
					
						
							
							
								 
						
							
							
								4bb4544784 
								
							
								 
							
						 
						
							
							
								
								implement device signature uploading/fetching  
							
							
							
						 
						
							2019-09-04 20:02:56 -04:00  
				
					
						
							
							
								 
						
							
							
								e3d3fbf63f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys  
							
							
							
						 
						
							2019-08-28 17:36:46 -07:00  
				
					
						
							
							
								 
						
							
							
								96bda56370 
								
							
								 
							
						 
						
							
							
								
								black  
							
							
							
						 
						
							2019-08-28 17:18:40 -07:00  
				
					
						
							
							
								 
						
							
							
								3b0b22cb05 
								
							
								 
							
						 
						
							
							
								
								use stream ID generator instead of timestamp  
							
							
							
						 
						
							2019-08-28 17:17:21 -07:00  
				
					
						
							
							
								 
						
							
							
								9a6f2be572 
								
									
								
							
								 
							
						 
						
							
							
								
								Opentrace e2e keys ( #5855 )  
							
							... 
							
							
							
							Add opentracing tags and logs for e2e keys 
							
						 
						
							2019-08-22 11:28:12 +01:00  
				
					
						
							
							
								 
						
							
							
								814f253f1b 
								
							
								 
							
						 
						
							
							
								
								make isort happy  
							
							
							
						 
						
							2019-08-21 13:22:15 -07:00  
				
					
						
							
							
								 
						
							
							
								7c3abc6572 
								
							
								 
							
						 
						
							
							
								
								apply PR review suggestions  
							
							
							
						 
						
							2019-08-21 13:19:35 -07:00  
				
					
						
							
							
								 
						
							
							
								fac1cdc562 
								
							
								 
							
						 
						
							
							
								
								make changes from PR review  
							
							
							
						 
						
							2019-08-01 21:51:19 -04:00  
				
					
						
							
							
								 
						
							
							
								336c546d6a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'cross-signing_hidden' into cross-signing_keys  
							
							
							
						 
						
							2019-08-01 16:31:40 -04:00  
				
					
						
							
							
								 
						
							
							
								1ec7d656dd 
								
							
								 
							
						 
						
							
							
								
								Unwrap error  
							
							
							
						 
						
							2019-07-30 13:09:02 +01:00  
				
					
						
							
							
								 
						
							
							
								458e51df7a 
								
							
								 
							
						 
						
							
							
								
								Fix error handling when fetching remote device keys  
							
							
							
						 
						
							2019-07-30 13:07:02 +01:00  
				
					
						
							
							
								 
						
							
							
								85b0bd8fe0 
								
							
								 
							
						 
						
							
							
								
								Update the device list cache when keys/query is called ( #5693 )  
							
							
							
						 
						
							2019-07-29 16:34:44 +01:00  
				
					
						
							
							
								 
						
							
							
								c659b9f94f 
								
							
								 
							
						 
						
							
							
								
								allow uploading keys for cross-signing  
							
							
							
						 
						
							2019-07-25 11:08:24 -04:00  
				
					
						
							
							
								 
						
							
							
								4806651744 
								
									
								
							
								 
							
						 
						
							
							
								
								Replace returnValue with return ( #5736 )  
							
							
							
						 
						
							2019-07-23 23:00:55 +10:00  
				
					
						
							
							
								 
						
							
							
								7b3bc755a3 
								
							
								 
							
						 
						
							
							
								
								remove unused and unnecessary check for FederationDeniedError ( #5645 )  
							
							... 
							
							
							
							FederationDeniedError is a subclass of SynapseError, which is a subclass of
CodeMessageException, so if e is a FederationDeniedError, then this check for
FederationDeniedError will never be reached since it will be caught by the
check for CodeMessageException above.  The check for CodeMessageException does
almost the same thing as this check (since FederationDeniedError initialises
with code=403 and msg="Federation denied with %s."), so may as well just keep
allowing it to handle this case. 
							
						 
						
							2019-07-09 18:37:39 +01:00  
				
					
						
							
							
								 
						
							
							
								463b072b12 
								
									
								
							
								 
							
						 
						
							
							
								
								Move logging utilities out of the side drawer of util/ and into logging/ ( #5606 )  
							
							
							
						 
						
							2019-07-04 00:07:04 +10:00  
				
					
						
							
							
								 
						
							
							
								32e7c9e7f2 
								
									
								
							
								 
							
						 
						
							
							
								
								Run Black. ( #5482 )  
							
							
							
						 
						
							2019-06-20 19:32:02 +10:00  
				
					
						
							
							
								 
						
							
							
								dc5db01ff2 
								
							
								 
							
						 
						
							
							
								
								Replaced all occurences of e.message with str(e)  
							
							... 
							
							
							
							Signed-off-by: Schnuffle  <schnuffle@github.com> 
							
						 
						
							2018-09-27 13:38:50 +02:00  
				
					
						
							
							
								 
						
							
							
								2608ebc04c 
								
									
								
							
								 
							
						 
						
							
							
								
								Port handlers/ to Python 3 ( #3803 )  
							
							
							
						 
						
							2018-09-07 00:22:23 +10:00  
				
					
						
							
							
								 
						
							
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
				
					
						
							
							
								 
						
							
							
								6350bf925e 
								
									
								
							
								 
							
						 
						
							
							
								
								Attempt to be more performant on PyPy ( #3462 )  
							
							
							
						 
						
							2018-06-28 14:49:57 +01:00  
				
					
						
							
							
								 
						
							
							
								784189b1f4 
								
							
								 
							
						 
						
							
							
								
								typos  
							
							
							
						 
						
							2018-06-25 17:37:16 +01:00  
				
					
						
							
							
								 
						
							
							
								933bf2dd35 
								
							
								 
							
						 
						
							
							
								
								replace some iteritems with six  
							
							... 
							
							
							
							Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-05-19 17:59:26 +02:00  
				
					
						
							
							
								 
						
							
							
								fc149b4eeb 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background  
							
							
							
						 
						
							2018-04-27 14:31:23 +01:00  
				
					
						
							
							
								 
						
							
							
								2a13af23bc 
								
							
								 
							
						 
						
							
							
								
								Use run_in_background in preference to preserve_fn  
							
							... 
							
							
							
							While I was going through uses of preserve_fn for other PRs, I converted places
which only use the wrapped function once to use run_in_background, to avoid
creating the function object. 
							
						 
						
							2018-04-27 12:55:51 +01:00  
				
					
						
							
							
								 
						
							
							
								605defb9e4 
								
							
								 
							
						 
						
							
							
								
								Add missing consumeErrors  
							
							... 
							
							
							
							In general we want defer.gatherResults to consumeErrors, rather than having
exceptions hanging around and getting logged as CRITICAL unhandled errors. 
							
						 
						
							2018-04-27 11:16:28 +01:00  
				
					
						
							
							
								 
						
							
							
								a134c572a6 
								
							
								 
							
						 
						
							
							
								
								Stringify exceptions for keys/{query,claim}  
							
							... 
							
							
							
							Make sure we stringify any exceptions we return from keys/query and keys/claim,
to avoid a 'not JSON serializable' error later
Fixes  #3010  
							
						 
						
							2018-03-27 17:15:06 +01:00  
				
					
						
							
							
								 
						
							
							
								c2a5cf2fe3 
								
							
								 
							
						 
						
							
							
								
								factor out exception handling for keys/claim and keys/query  
							
							... 
							
							
							
							this stuff is badly c&p'ed 
							
						 
						
							2018-03-27 17:11:23 +01:00  
				
					
						
							
							
								 
						
							
							
								fa72803490 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into develop  
							
							
							
						 
						
							2018-03-19 11:41:01 +00:00  
				
					
						
							
							
								 
						
							
							
								926ba76e23 
								
							
								 
							
						 
						
							
							
								
								Replace ujson with simplejson  
							
							
							
						 
						
							2018-03-15 23:43:31 +00:00  
				
					
						
							
							
								 
						
							
							
								cb9f8e527c 
								
							
								 
							
						 
						
							
							
								
								s/replication_client/federation_client/  
							
							
							
						 
						
							2018-03-13 13:26:52 +00:00  
				
					
						
							
							
								 
						
							
							
								265b993b8a 
								
							
								 
							
						 
						
							
							
								
								Split replication layer into two  
							
							
							
						 
						
							2018-03-13 10:55:47 +00:00  
				
					
						
							
							
								 
						
							
							
								c3f79c9da5 
								
							
								 
							
						 
						
							
							
								
								Split out edu/query registration to a separate class  
							
							
							
						 
						
							2018-03-13 10:24:27 +00:00