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  
				
					
						
							
							
								 
						
							
							
								546bc9e28b 
								
							
								 
							
						 
						
							
							
								
								More server_name validation  
							
							... 
							
							
							
							We need to do a bit more validation when we get a server name, but don't want
to be re-doing it all over the shop, so factor out a separate
parse_and_validate_server_name, and do the extra validation.
Also, use it to verify the server name in the config file. 
							
						 
						
							2018-07-04 18:59:51 +01:00  
				
					
						
							
							
								 
						
							
							
								508196e08a 
								
									
								
							
								 
							
						 
						
							
							
								
								Reject invalid server names ( #3480 )  
							
							... 
							
							
							
							Make sure that server_names used in auth headers are sane, and reject them with
a sensible error code, before they disappear off into the depths of the system. 
							
						 
						
							2018-07-03 14:36:14 +01:00  
				
					
						
							
							
								 
						
							
							
								b7f34ee348 
								
							
								 
							
						 
						
							
							
								
								allow self-signed certificates  
							
							
							
						 
						
							2018-06-26 20:41:05 +02:00  
				
					
						
							
							
								 
						
							
							
								947fea67cb 
								
							
								 
							
						 
						
							
							
								
								Need to pass reactor to endpoint fac  
							
							
							
						 
						
							2018-06-25 15:22:57 +01:00  
				
					
						
							
							
								 
						
							
							
								07cad26d65 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove all global reactor imports & pass it around explicitly ( #3424 )  
							
							
							
						 
						
							2018-06-25 14:08:28 +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  
				
					
						
							
							
								 
						
							
							
								2117f84323 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3182  from Half-Shot/hs/fix-twisted-shutdown  
							
							... 
							
							
							
							Fix 'Unhandled Error' logs with Twisted 18.4 
							
						 
						
							2018-05-03 12:40:11 +01:00  
				
					
						
							
							
								 
						
							
							
								2e7a94c36b 
								
							
								 
							
						 
						
							
							
								
								Don't abortConnection() if the transport connection has already closed.  
							
							
							
						 
						
							2018-05-03 12:31:47 +01:00  
				
					
						
							
							
								 
						
							
							
								e9143b6593 
								
							
								 
							
						 
						
							
							
								
								more bytes strings  
							
							... 
							
							
							
							Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-29 00:13:57 +02:00  
				
					
						
							
							
								 
						
							
							
								72251d1b97 
								
							
								 
							
						 
						
							
							
								
								Remove address resolution of hosts in SRV records  
							
							... 
							
							
							
							Signed-off-by: Silke Hofstra <silke@slxh.eu> 
							
						 
						
							2018-04-04 12:26:50 +02:00  
				
					
						
							
							
								 
						
							
							
								af19f5e9aa 
								
							
								 
							
						 
						
							
							
								
								Remove spurious log argument  
							
							... 
							
							
							
							... which would cause scary-looking and unhelpful errors in the log on dns fail 
							
						 
						
							2018-01-30 17:52:03 +00:00  
				
					
						
							
							
								 
						
							
							
								8b38096a89 
								
							
								 
							
						 
						
							
							
								
								Fix error handling on dns lookup  
							
							... 
							
							
							
							pass the right arguments to the errback handler
Fixes "TypeError('eb() takes exactly 2 arguments (1 given)',)" 
							
						 
						
							2017-11-24 16:47:48 +00:00  
				
					
						
							
							
								 
						
							
							
								75e67b9ee4 
								
							
								 
							
						 
						
							
							
								
								Handle SERVFAILs when doing AAAA lookups for federation ( #2477 )  
							
							... 
							
							
							
							... to cope with people with broken dnssec setups, mostly 
							
						 
						
							2017-09-28 15:24:00 +01:00  
				
					
						
							
							
								 
						
							
							
								f65e31d22f 
								
							
								 
							
						 
						
							
							
								
								Do an AAAA lookup on SRV record targets ( #2462 )  
							
							... 
							
							
							
							Support SRV records which point at AAAA records, as well as A records.
Fixes https://github.com/matrix-org/synapse/issues/2405  
							
						 
						
							2017-09-22 20:26:47 +01:00  
				
					
						
							
							
								 
						
							
							
								342fb8dae9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'release-v0.18.6' into develop  
							
							
							
						 
						
							2016-12-29 17:33:46 +00:00  
				
					
						
							
							
								 
						
							
							
								97ffc5690b 
								
							
								 
							
						 
						
							
							
								
								Manually abort the underlying TLS connection.  
							
							... 
							
							
							
							The abort() method calls loseConnection() which tries to shutdown the
TLS connection cleanly. We now call abortConnection() directly which
should promptly close both the TLS connection and the underlying TCP
connection.
I also added some TODO markers to consider cancelling the old previous
timeout rather than checking time.time(). But given how urgently we want
to get this code released I'd rather leave the existing code with the
duplicate timeouts and the time.time() check. 
							
						 
						
							2016-12-29 15:51:04 +00:00  
				
					
						
							
							
								 
						
							
							
								68030fd37b 
								
							
								 
							
						 
						
							
							
								
								Spelling and comments  
							
							
							
						 
						
							2016-12-29 00:10:49 +00:00  
				
					
						
							
							
								 
						
							
							
								b7336ff32d 
								
							
								 
							
						 
						
							
							
								
								Clean up  
							
							
							
						 
						
							2016-12-29 00:09:33 +00:00  
				
					
						
							
							
								 
						
							
							
								5b6672c66d 
								
							
								 
							
						 
						
							
							
								
								Wrap connections in an N minute timeout to ensure they get reaped correctly  
							
							
							
						 
						
							2016-12-29 00:06:53 +00:00  
				
					
						
							
							
								 
						
							
							
								d3bd94805f 
								
							
								 
							
						 
						
							
							
								
								Fixup for  #1689  and  #1690  
							
							... 
							
							
							
							Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> 
							
						 
						
							2016-12-12 16:32:47 +01:00  
				
					
						
							
							
								 
						
							
							
								9f07f4c559 
								
							
								 
							
						 
						
							
							
								
								IPv6 support for endpoint.py  
							
							... 
							
							
							
							Similar to https://github.com/matrix-org/synapse/pull/1689 , but for endpoint.py 
							
						 
						
							2016-12-11 11:10:32 +01:00  
				
					
						
							
							
								 
						
							
							
								792def4928 
								
							
								 
							
						 
						
							
							
								
								add a url_preview_ip_range_whitelist config param so we can whitelist the matrix.org IP space  
							
							
							
						 
						
							2016-05-01 12:44:24 +01:00  
				
					
						
							
							
								 
						
							
							
								4bd3d25218 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #688  from matrix-org/matthew/preview_urls  
							
							... 
							
							
							
							URL previewing support 
							
						 
						
							2016-04-11 10:40:29 +01:00  
				
					
						
							
							
								 
						
							
							
								dafef5a688 
								
							
								 
							
						 
						
							
							
								
								Add url_preview_enabled config option to turn on/off preview_url endpoint. defaults to off.  
							
							... 
							
							
							
							Add url_preview_ip_range_blacklist to let admins specify internal IP ranges that must not be spidered.
Add url_preview_url_blacklist to let admins specify URL patterns that must not be spidered.
Implement a custom SpiderEndpoint and associated support classes to implement url_preview_ip_range_blacklist
Add commentary and generally address PR feedback 
							
						 
						
							2016-04-08 18:37:15 +01:00  
				
					
						
							
							
								 
						
							
							
								f9d3665c88 
								
							
								 
							
						 
						
							
							
								
								Allow clock to be passed in to func  
							
							
							
						 
						
							2016-03-31 10:23:48 +01:00  
				
					
						
							
							
								 
						
							
							
								f699b8f997 
								
							
								 
							
						 
						
							
							
								
								Read from DNS cache if within TTL  
							
							
							
						 
						
							2016-03-31 10:04:28 +01:00  
				
					
						
							
							
								 
						
							
							
								c6549117a2 
								
							
								 
							
						 
						
							
							
								
								Fix AttributeError  
							
							
							
						 
						
							2016-01-21 14:02:14 +00:00  
				
					
						
							
							
								 
						
							
							
								191070123d 
								
							
								 
							
						 
						
							
							
								
								Cache dns lookups, and use the cache if we fail to lookup servers later  
							
							
							
						 
						
							2016-01-20 11:34:09 +00:00  
				
					
						
							
							
								 
						
							
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
				
					
						
							
							
								 
						
							
							
								adb04b1e57 
								
							
								 
							
						 
						
							
							
								
								Update copyright notices  
							
							
							
						 
						
							2015-01-06 13:21:39 +00:00  
				
					
						
							
							
								 
						
							
							
								610c2ea131 
								
							
								 
							
						 
						
							
							
								
								Fix pep8 and pyflakes warnings  
							
							
							
						 
						
							2014-11-20 18:00:10 +00:00  
				
					
						
							
							
								 
						
							
							
								e377d33652 
								
							
								 
							
						 
						
							
							
								
								Separate out the matrix http client completely because just about all of its code it now separate from the simple case we need for standard HTTP(S)  
							
							
							
						 
						
							2014-11-20 17:41:56 +00:00  
				
					
						
							
							
								 
						
							
							
								8a7c1d6a00 
								
							
								 
							
						 
						
							
							
								
								fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.  
							
							
							
						 
						
							2014-09-03 17:31:57 +01:00  
				
					
						
							
							
								 
						
							
							
								235f686da9 
								
							
								 
							
						 
						
							
							
								
								Update default endpoint port to match the default ports in the config  
							
							
							
						 
						
							2014-09-02 16:56:57 +01:00  
				
					
						
							
							
								 
						
							
							
								5452a8ee29 
								
							
								 
							
						 
						
							
							
								
								Fix SSL for federation http client  
							
							
							
						 
						
							2014-09-01 18:43:08 +01:00  
				
					
						
							
							
								 
						
							
							
								f98e6380f1 
								
							
								 
							
						 
						
							
							
								
								add in whitespace after copyright statements to improve legibility  
							
							
							
						 
						
							2014-08-13 03:14:34 +01:00  
				
					
						
							
							
								 
						
							
							
								4f475c7697 
								
							
								 
							
						 
						
							
							
								
								Reference Matrix Home Server  
							
							
							
						 
						
							2014-08-12 15:10:52 +01:00