Mark Haines
							
						 | 
						
							
							
							
							
								
							
								f8b865264a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into key_distribution
							
							
							
							
							
							
							
							Conflicts:
	synapse/crypto/keyring.py 
							
						 | 
						
							2015-04-27 18:29:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2c70849dc3
								
							
								
							
						 | 
						
							
							
								
								Fix newlines
							
							
							
							
							
						 | 
						
							2015-04-27 14:38:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								0a016b0525
								
							
								
							
						 | 
						
							
							
								
								Pull inner function out.
							
							
							
							
							
						 | 
						
							2015-04-27 14:37:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e701aec2d1
								
							
								
							
						 | 
						
							
							
								
								Implement locks using create_observer for fetching media and server keys
							
							
							
							
							
						 | 
						
							2015-04-27 14:20:26 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								288702170d
								
							
								
							
						 | 
						
							
							
								
								Add config for setting the perspective servers
							
							
							
							
							
						 | 
						
							2015-04-24 17:01:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								4bbf7156ef
								
							
								
							
						 | 
						
							
							
								
								Update to match the specification for key/v2
							
							
							
							
							
						 | 
						
							2015-04-23 16:39:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								f30d47c876
								
							
								
							
						 | 
						
							
							
								
								Implement remote key lookup api
							
							
							
							
							
						 | 
						
							2015-04-22 14:21:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								2f9157b427
								
							
								
							
						 | 
						
							
							
								
								Implement v2 key lookup
							
							
							
							
							
						 | 
						
							2015-04-20 16:23:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5b5c7a28d6
								
							
								
							
						 | 
						
							
							
								
								Log error message when we fail to fetch remote server keys
							
							
							
							
							
						 | 
						
							2015-03-05 17:09:13 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								9371019133
								
							
								
							
						 | 
						
							
							
								
								Try to only back off if we think we failed to connect to the remote
							
							
							
							
							
						 | 
						
							2015-02-17 18:13:34 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2b8f1a956c
								
							
								
							
						 | 
						
							
							
								
								Add per server retry limiting.
							
							
							
							
							
							
							
							Factor out the pre destination retry logic from TransactionQueue so it
can be reused in both get_pdu and crypto.keyring 
							
						 | 
						
							2015-02-17 17:20:56 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5025305fb2
								
							
								
							
						 | 
						
							
							
								
								Rate limit retries when fetching server keys.
							
							
							
							
							
						 | 
						
							2015-02-17 15:57:42 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								adb04b1e57
								
							
								
							
						 | 
						
							
							
								
								Update copyright notices
							
							
							
							
							
						 | 
						
							2015-01-06 13:21:39 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								32090aee16
								
							
								
							
						 | 
						
							
							
								
								Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts
							
							
							
							
							
						 | 
						
							2014-11-20 16:24:00 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7d709542ca
								
							
								
							
						 | 
						
							
							
								
								Fix pep8 warnings
							
							
							
							
							
						 | 
						
							2014-10-30 11:10:17 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								3187b5ba2d
								
							
								
							
						 | 
						
							
							
								
								add log line for checking verifying signatures
							
							
							
							
							
						 | 
						
							2014-10-17 20:56:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								34034af1c9
								
							
								
							
						 | 
						
							
							
								
								Better response message when signature is missing or unsupported
							
							
							
							
							
						 | 
						
							2014-10-13 16:47:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								07639c79d9
								
							
								
							
						 | 
						
							
							
								
								Respond with more helpful error messages for unsigned requests
							
							
							
							
							
						 | 
						
							2014-10-13 16:39:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								b95a178584
								
							
								
							
						 | 
						
							
							
								
								SYN-75 Verify signatures on server to server transactions
							
							
							
							
							
						 | 
						
							2014-09-30 15:15:10 +01:00 |