255c229f23 
								
							
								 
							
						 
						
							
							
								
								Work around TLS bug in twisted  
							
							... 
							
							
							
							Wrap up twisted's FileBodyProducer to work around
https://twistedmatrix.com/trac/ticket/8473 . Hopefully this fixes
https://matrix.org/jira/browse/SYN-700 . 
							
						 
						
							2016-06-15 10:39:08 +01:00  
				
					
						
							
							
								 
						
							
							
								eb79110beb 
								
							
								 
							
						 
						
							
							
								
								Clean up the blacklist/whitelist handling.  
							
							... 
							
							
							
							Always set the config key with an empty list, even if a list isn't specified.
This means that the codepaths are the same for both the empty list and
for a missing key. Since the behaviour is the same for both cases this
makes the code somewhat easier to reason about. 
							
						 
						
							2016-05-16 13:03:59 +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  
				
					
						
							
							
								 
						
							
							
								351b50a887 
								
							
								 
							
						 
						
							
							
								
								Fix more typos in per-request metrics  
							
							
							
						 
						
							2016-04-28 15:29:46 +01:00  
				
					
						
							
							
								 
						
							
							
								dcfc10b129 
								
							
								 
							
						 
						
							
							
								
								Fix typo in request metrics  
							
							
							
						 
						
							2016-04-28 15:11:06 +01:00  
				
					
						
							
							
								 
						
							
							
								1a12766e3b 
								
							
								 
							
						 
						
							
							
								
								Add a comment explaining why automatic metric reporting is disabled for JsonResource  
							
							
							
						 
						
							2016-04-28 12:31:26 +01:00  
				
					
						
							
							
								 
						
							
							
								6037349512 
								
							
								 
							
						 
						
							
							
								
								Check if report_metrics is True  
							
							
							
						 
						
							2016-04-28 12:26:07 +01:00  
				
					
						
							
							
								 
						
							
							
								8d7ad44331 
								
							
								 
							
						 
						
							
							
								
								Report per request metrics for all of the things using request_handler  
							
							
							
						 
						
							2016-04-28 10:57:49 +01:00  
				
					
						
							
							
								 
						
							
							
								e856036f4c 
								
							
								 
							
						 
						
							
							
								
								Move SynapseSite to its own file  
							
							
							
						 
						
							2016-04-22 16:09:55 +01:00  
				
					
						
							
							
								 
						
							
							
								f505575f69 
								
							
								 
							
						 
						
							
							
								
								Make InsecureInterceptableContextFactory work with SpiderEndpoint  
							
							
							
						 
						
							2016-04-19 16:08:14 +01:00  
				
					
						
							
							
								 
						
							
							
								4bd3d25218 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #688  from matrix-org/matthew/preview_urls  
							
							... 
							
							
							
							URL previewing support 
							
						 
						
							2016-04-11 10:40:29 +01:00  
				
					
						
							
							
								 
						
							
							
								83b2f83da0 
								
							
								 
							
						 
						
							
							
								
								actually throw meaningful errors  
							
							
							
						 
						
							2016-04-08 21:36:59 +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  
				
					
						
							
							
								 
						
							
							
								a28d066732 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache  
							
							
							
						 
						
							2016-04-07 11:11:17 +01:00  
				
					
						
							
							
								 
						
							
							
								9f7dc2bef7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/preview_urls  
							
							
							
						 
						
							2016-04-04 00:38:21 +01:00  
				
					
						
							
							
								 
						
							
							
								8b98a7e8c3 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							
							
						 
						
							2016-04-03 12:56:29 +01:00  
				
					
						
							
							
								 
						
							
							
								7426c86eb8 
								
							
								 
							
						 
						
							
							
								
								add a persistent cache of URL lookups, and fix up the in-memory one to work  
							
							
							
						 
						
							2016-04-03 00:31:57 +01:00  
				
					
						
							
							
								 
						
							
							
								d1b154a10f 
								
							
								 
							
						 
						
							
							
								
								support gzip compression, and don't pass through error msgs  
							
							
							
						 
						
							2016-04-02 03:06:39 +01:00  
				
					
						
							
							
								 
						
							
							
								2a37467fa1 
								
							
								 
							
						 
						
							
							
								
								Use google style doc strings.  
							
							... 
							
							
							
							pycharm supports them so there is no need to use the other format.
Might as well convert the existing strings to reduce the risk of
people accidentally cargo culting the wrong doc string format. 
							
						 
						
							2016-04-01 16:12:07 +01:00  
				
					
						
							
							
								 
						
							
							
								683e564815 
								
							
								 
							
						 
						
							
							
								
								handle spidered relative images correctly  
							
							
							
						 
						
							2016-03-31 23:52:58 +01:00  
				
					
						
							
							
								 
						
							
							
								0d3d7de6fc 
								
							
								 
							
						 
						
							
							
								
								sync in changes from matrixfederationclient  
							
							
							
						 
						
							2016-03-31 12:42:27 +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  
				
					
						
							
							
								 
						
							
							
								a8a5dd3b44 
								
							
								 
							
						 
						
							
							
								
								handle requests with missing content-length headers (e.g. YouTube)  
							
							
							
						 
						
							2016-03-31 01:55:21 +01:00  
				
					
						
							
							
								 
						
							
							
								721b2bfa85 
								
							
								 
							
						 
						
							
							
								
								implement redirects  
							
							
							
						 
						
							2016-03-29 03:32:52 +01:00  
				
					
						
							
							
								 
						
							
							
								64b4aead15 
								
							
								 
							
						 
						
							
							
								
								make it work  
							
							
							
						 
						
							2016-03-29 03:13:25 +01:00  
				
					
						
							
							
								 
						
							
							
								dd4287ca5d 
								
							
								 
							
						 
						
							
							
								
								make it build  
							
							
							
						 
						
							2016-03-29 02:07:57 +01:00  
				
					
						
							
							
								 
						
							
							
								e0c2490a14 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/preview_urls  
							
							
							
						 
						
							2016-03-29 01:20:25 +01:00  
				
					
						
							
							
								 
						
							
							
								d9d48aad2d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/preview_urls  
							
							
							
						 
						
							2016-03-27 22:54:42 +01:00  
				
					
						
							
							
								 
						
							
							
								acdfef7b14 
								
							
								 
							
						 
						
							
							
								
								Intern all the things  
							
							
							
						 
						
							2016-03-23 16:25:54 +00:00  
				
					
						
							
							
								 
						
							
							
								398cd1edfb 
								
							
								 
							
						 
						
							
							
								
								Fix regression where synapse checked whether push rules were valid JSON before the compatibility hack that handled clients sending invalid JSON  
							
							
							
						 
						
							2016-03-14 14:16:41 +00:00  
				
					
						
							
							
								 
						
							
							
								e9c1cabac2 
								
							
								 
							
						 
						
							
							
								
								Use parse_json_object_from_request to parse JSON out of request bodies  
							
							
							
						 
						
							2016-03-11 16:41:03 +00:00  
				
					
						
							
							
								 
						
							
							
								b7dbe5147a 
								
							
								 
							
						 
						
							
							
								
								Add a parse_json_object function  
							
							... 
							
							
							
							to deduplicate all the copy+pasted _parse_json functions. Also document
the parse_.* functions. 
							
						 
						
							2016-03-09 11:26:26 +00:00  
				
					
						
							
							
								 
						
							
							
								9a3c80a348 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							
							
						 
						
							2016-03-08 10:09:07 +00:00  
				
					
						
							
							
								 
						
							
							
								7bcee4733a 
								
							
								 
							
						 
						
							
							
								
								Encode unicode objects given to post_urlencode* otherwise urllib.urlencode chokes.  
							
							
							
						 
						
							2016-03-08 10:04:38 +00:00  
				
					
						
							
							
								 
						
							
							
								58c9f20692 
								
							
								 
							
						 
						
							
							
								
								Catch the exceptions thrown by twisted when you write to a closed connection  
							
							
							
						 
						
							2016-02-12 13:46:59 +00:00  
				
					
						
							
							
								 
						
							
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
				
					
						
							
							
								 
						
							
							
								13e6262659 
								
							
								 
							
						 
						
							
							
								
								Add metrics to pushers  
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
				
					
						
							
							
								 
						
							
							
								d4f72a5bfb 
								
							
								 
							
						 
						
							
							
								
								Allowing tagging log contexts  
							
							
							
						 
						
							2016-02-03 13:52:27 +00:00  
				
					
						
							
							
								 
						
							
							
								d83d004ccd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for new flake8  
							
							
							
						 
						
							2016-02-02 17:18:50 +00:00  
				
					
						
							
							
								 
						
							
							
								7dd0c1730a 
								
							
								 
							
						 
						
							
							
								
								initial WIP of a tentative preview_url endpoint - incomplete, untested, experimental, etc. just putting it here for safekeeping for now  
							
							
							
						 
						
							2016-01-24 18:47:27 -05: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  
				
					
						
							
							
								 
						
							
							
								2b0f8a9482 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2015-12-16 17:59:44 +01:00  
				
					
						
							
							
								 
						
							
							
								338c0a8a69 
								
							
								 
							
						 
						
							
							
								
								Include errcode on Internal Server Error  
							
							
							
						 
						
							2015-12-14 13:50:50 +00:00  
				
					
						
							
							
								 
						
							
							
								6a5ff5f223 
								
							
								 
							
						 
						
							
							
								
								Track the time spent in the database per request.  
							
							... 
							
							
							
							and track the number of transactions that request started. 
							
						 
						
							2015-12-07 17:56:11 +00:00  
				
					
						
							
							
								 
						
							
							
								99e1d6777f 
								
							
								 
							
						 
						
							
							
								
								Add metrics to track the cpu on the main thread consumed by each type of request  
							
							
							
						 
						
							2015-12-04 14:42:24 +00:00  
				
					
						
							
							
								 
						
							
							
								14d7acfad4 
								
							
								 
							
						 
						
							
							
								
								Host /unstable and /r0 versions of r0 APIs  
							
							
							
						 
						
							2015-12-01 17:34:32 +00:00  
				
					
						
							
							
								 
						
							
							
								0eabfa55f6 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2015-11-20 17:17:58 +00:00