a334e1cace 
								
							
								 
							
						 
						
							
							
								
								Update to use new timeout function everywhere.  
							
							... 
							
							
							
							The existing deferred timeout helper function (and the one into twisted)
suffer from a bug when a deferred's canceller throws an exception, #3842 .
The new helper function doesn't suffer from this problem. 
							
						 
						
							2018-09-19 10:39:40 +01:00  
				
					
						
							
							
								 
						
							
							
								35aec19f0a 
								
							
								 
							
						 
						
							
							
								
								Destination is a string  
							
							
							
						 
						
							2018-09-18 15:29:30 -06:00  
				
					
						
							
							
								 
						
							
							
								31c15dcb80 
								
									
								
							
								 
							
						 
						
							
							
								
								Refactor matrixfederationclient to fix logging ( #3906 )  
							
							... 
							
							
							
							We want to wait until we have read the response body before we log the request
as complete, otherwise a confusing thing happens where the request appears to
have completed, but we later fail it.
To do this, we factor the salient details of a request out to a separate
object, which can then keep track of the txn_id, so that it can be logged. 
							
						 
						
							2018-09-18 18:17:15 +01:00  
				
					
						
							
							
								 
						
							
							
								f00a9d2636 
								
							
								 
							
						 
						
							
							
								
								Fix some b'abcd' noise in logs and metrics  
							
							... 
							
							
							
							Python 3 compatibility: make sure that we decode some byte sequences before we
use them to create log lines and metrics labels. 
							
						 
						
							2018-09-17 16:15:42 +01:00  
				
					
						
							
							
								 
						
							
							
								fcfe7a850d 
								
							
								 
							
						 
						
							
							
								
								Add an awful secondary timeout to fix wedged requests  
							
							... 
							
							
							
							This is an attempt to mitigate #3842  by adding yet-another-timeout 
							
						 
						
							2018-09-14 19:23:07 +01:00  
				
					
						
							
							
								 
						
							
							
								3e6e94fe9f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3872  from matrix-org/hawkowl/timeouts-2  
							
							... 
							
							
							
							timeouts 2: electric boogaloo 
							
						 
						
							2018-09-14 16:58:44 +01:00  
				
					
						
							
							
								 
						
							
							
								9e2f9a7b57 
								
							
								 
							
						 
						
							
							
								
								Measure outbound requests  
							
							
							
						 
						
							2018-09-14 15:11:26 +01:00  
				
					
						
							
							
								 
						
							
							
								63755fa4c2 
								
							
								 
							
						 
						
							
							
								
								we do that higher up  
							
							
							
						 
						
							2018-09-14 03:21:47 +10:00  
				
					
						
							
							
								 
						
							
							
								1c3f4d9ca5 
								
							
								 
							
						 
						
							
							
								
								buffer?  
							
							
							
						 
						
							2018-09-14 03:09:13 +10:00  
				
					
						
							
							
								 
						
							
							
								bfa0b759e0 
								
									
								
							
								 
							
						 
						
							
							
								
								Attempt to figure out what's going on with timeouts ( #3857 )  
							
							
							
						 
						
							2018-09-14 00:15:51 +10:00  
				
					
						
							
							
								 
						
							
							
								8c5b84441b 
								
							
								 
							
						 
						
							
							
								
								Log outbound requests when we retry  
							
							
							
						 
						
							2018-09-12 16:22:14 +01:00  
				
					
						
							
							
								 
						
							
							
								4084a774a8 
								
							
								 
							
						 
						
							
							
								
								Timeout reading body for outbound HTTP requests  
							
							
							
						 
						
							2018-09-12 10:10:20 +01:00  
				
					
						
							
							
								 
						
							
							
								2d2828dcbc 
								
									
								
							
								 
							
						 
						
							
							
								
								Port http/ to Python 3 ( #3771 )  
							
							
							
						 
						
							2018-09-06 00:10:47 +10:00  
				
					
						
							
							
								 
						
							
							
								1d67b13674 
								
							
								 
							
						 
						
							
							
								
								Fix bug when federation_domain_whitelist is an emtpy list  
							
							... 
							
							
							
							Outbound federation were incorrectly allowed when the config option was
set to an empty list 
							
						 
						
							2018-08-24 12:13:12 +01:00  
				
					
						
							
							
								 
						
							
							
								b37c472419 
								
									
								
							
								 
							
						 
						
							
							
								
								Rename async to async_helpers because `async` is a keyword on Python 3.7 ( #3678 )  
							
							
							
						 
						
							2018-08-10 23:50:21 +10:00  
				
					
						
							
							
								 
						
							
							
								3c0213a217 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3439  from vojeroen/send_sni_for_federation_requests  
							
							... 
							
							
							
							send SNI for federation requests 
							
						 
						
							2018-08-10 12:23:54 +01:00  
				
					
						
							
							
								 
						
							
							
								f900d50824 
								
							
								 
							
						 
						
							
							
								
								include known room versions in outgoing make_joins  
							
							
							
						 
						
							2018-08-06 13:45:37 +01:00  
				
					
						
							
							
								 
						
							
							
								505530f36a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_requests  
							
							... 
							
							
							
							# Conflicts:
#	synapse/crypto/context_factory.py 
							
						 
						
							2018-07-14 20:24:46 +02:00  
				
					
						
							
							
								 
						
							
							
								b5e157d895 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into send_sni_for_federation_requests  
							
							... 
							
							
							
							# Conflicts:
#	synapse/http/endpoint.py 
							
						 
						
							2018-07-09 08:51:11 +02: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  
				
					
						
							
							
								 
						
							
							
								07b4f88de9 
								
							
								 
							
						 
						
							
							
								
								formatting changes for pep8  
							
							
							
						 
						
							2018-06-25 12:31:16 +02:00  
				
					
						
							
							
								 
						
							
							
								3d605853c8 
								
							
								 
							
						 
						
							
							
								
								send SNI for federation requests  
							
							
							
						 
						
							2018-06-24 22:38:43 +02:00  
				
					
						
							
							
								 
						
							
							
								77ac14b960 
								
									
								
							
								 
							
						 
						
							
							
								
								Pass around the reactor explicitly ( #3385 )  
							
							
							
						 
						
							2018-06-22 09:37:10 +01:00  
				
					
						
							
							
								 
						
							
							
								187a546bff 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3276  from matrix-org/dbkr/unbind  
							
							... 
							
							
							
							Remove email addresses / phone numbers from ID servers when they're removed from synapse 
							
						 
						
							2018-06-11 16:02:00 +01:00  
				
					
						
							
							
								 
						
							
							
								bf54c1cf6c 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							
							
						 
						
							2018-06-06 10:15:33 +01:00  
				
					
						
							
							
								 
						
							
							
								3e4bc4488c 
								
							
								 
							
						 
						
							
							
								
								More doc fixes  
							
							
							
						 
						
							2018-06-06 09:44:10 +01:00  
				
					
						
							
							
								 
						
							
							
								607bd27c83 
								
							
								 
							
						 
						
							
							
								
								fix pep8  
							
							
							
						 
						
							2018-06-05 18:10:35 +01:00  
				
					
						
							
							
								 
						
							
							
								d62162bbec 
								
							
								 
							
						 
						
							
							
								
								doc fixes  
							
							
							
						 
						
							2018-06-05 18:09:13 +01:00  
				
					
						
							
							
								 
						
							
							
								c5930d513a 
								
							
								 
							
						 
						
							
							
								
								Docstring  
							
							
							
						 
						
							2018-06-04 12:05:58 +01:00  
				
					
						
							
							
								 
						
							
							
								754826a830 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into 3218-official-prom  
							
							
							
						 
						
							2018-05-28 18:57:23 +10:00  
				
					
						
							
							
								 
						
							
							
								77a23e2e05 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/unbind  
							
							
							
						 
						
							2018-05-24 16:20:53 +01:00  
				
					
						
							
							
								 
						
							
							
								2c7866d664 
								
							
								 
							
						 
						
							
							
								
								Hit the 3pid unbind endpoint on deactivation  
							
							
							
						 
						
							2018-05-23 14:38:56 +01:00  
				
					
						
							
							
								 
						
							
							
								53cc2cde1f 
								
							
								 
							
						 
						
							
							
								
								cleanup  
							
							
							
						 
						
							2018-05-22 17:32:57 -05:00  
				
					
						
							
							
								 
						
							
							
								df9f72d9e5 
								
							
								 
							
						 
						
							
							
								
								replacing portions  
							
							
							
						 
						
							2018-05-21 19:47:37 -05:00  
				
					
						
							
							
								 
						
							
							
								d9fe2b2d9d 
								
							
								 
							
						 
						
							
							
								
								Replace some more comparisons with six  
							
							... 
							
							
							
							plus a bonus b"" string I missed last time
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-05-19 17:56:31 +02:00  
				
					
						
							
							
								 
						
							
							
								9e2601f830 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3108  from NotAFile/py3-six-urlparse  
							
							... 
							
							
							
							Use six.moves.urlparse 
							
						 
						
							2018-04-30 00:33:05 +01:00  
				
					
						
							
							
								 
						
							
							
								9d2c1b8429 
								
							
								 
							
						 
						
							
							
								
								Backport deferred.addTimeout  
							
							... 
							
							
							
							Twisted 16.0 doesn't have addTimeout, so let's backport it. 
							
						 
						
							2018-04-27 12:52:30 +01:00  
				
					
						
							
							
								 
						
							
							
								1ea904b9f0 
								
							
								 
							
						 
						
							
							
								
								Use deferred.addTimeout instead of time_bound_deferred  
							
							... 
							
							
							
							This doesn't feel like a wheel we need to reinvent. 
							
						 
						
							2018-04-23 00:53:18 +01:00  
				
					
						
							
							
								 
						
							
							
								2a3c33ff03 
								
							
								 
							
						 
						
							
							
								
								Use six.moves.urlparse  
							
							... 
							
							
							
							The imports were shuffled around a bunch in py3
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-15 21:22:43 +02:00  
				
					
						
							
							
								 
						
							
							
								1d71f484d4 
								
							
								 
							
						 
						
							
							
								
								use PUT instead of POST for federating groups/m.join_policy  
							
							
							
						 
						
							2018-04-06 12:54:09 +02:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								eaaabc6c4f 
								
							
								 
							
						 
						
							
							
								
								replace 'except:' with 'except Exception:'  
							
							... 
							
							
							
							what could possibly go wrong 
							
						 
						
							2017-10-23 15:52:32 +01:00  
				
					
						
							
							
								 
						
							
							
								27955056e0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into erikj/groups_merged  
							
							
							
						 
						
							2017-10-02 16:20:41 +01:00  
				
					
						
							
							
								 
						
							
							
								e43de3ae4b 
								
							
								 
							
						 
						
							
							
								
								Improve logging of failures in matrixfederationclient  
							
							... 
							
							
							
							* don't log exception types twice
* not all exceptions have a meaningful 'message'. Use the repr rather than
  attempting to build a string ourselves. 
							
						 
						
							2017-09-28 15:38:09 +01:00  
				
					
						
							
							
								 
						
							
							
								e884ff31d8 
								
							
								 
							
						 
						
							
							
								
								Add DELETE  
							
							
							
						 
						
							2017-07-18 16:41:44 +01:00  
				
					
						
							
							
								 
						
							
							
								05c13f6c22 
								
							
								 
							
						 
						
							
							
								
								Add 'args' param to post_json  
							
							
							
						 
						
							2017-07-18 16:40:21 +01:00  
				
					
						
							
							
								 
						
							
							
								4903ccf159 
								
							
								 
							
						 
						
							
							
								
								Fix some lies, and other clarifications, in docstrings  
							
							... 
							
							
							
							The documentation on get_json has been wrong ever since the very first commit
to synapse... 
							
						 
						
							2017-04-21 01:31:09 +01:00  
				
					
						
							
							
								 
						
							
							
								a380f041c2 
								
							
								 
							
						 
						
							
							
								
								try not to drop context after federation requests  
							
							... 
							
							
							
							preserve_context_over_fn uses a ContextPreservingDeferred, which only restores
context for the duration of its callbacks, which isn't really correct, and
means that subsequent operations in the same request can end up without their
logcontexts. 
							
						 
						
							2017-03-23 22:36:21 +00:00  
				
					
						
							
							
								 
						
							
							
								5a16cb4bf0 
								
							
								 
							
						 
						
							
							
								
								Ignore backoff history for invites, aliases, and roomdirs  
							
							... 
							
							
							
							Add a param to the federation client which lets us ignore historical backoff
data for federation queries, and set it for a handful of operations. 
							
						 
						
							2017-03-23 12:23:22 +00:00