02aa41809b 
								
									
								
							
								 
							
						 
						
							
							
								
								Port rest/ to Python 3 ( #3823 )  
							
							
							
						 
						
							2018-09-12 20:41:31 +10:00  
				
					
						
							
							
								 
						
							
							
								c151b32b1d 
								
							
								 
							
						 
						
							
							
								
								Add GET media/v1/config ( #3184 )  
							
							
							
						 
						
							2018-08-16 14:23:38 +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  
				
					
						
							
							
								 
						
							
							
								018d75a148 
								
							
								 
							
						 
						
							
							
								
								Refactor code for turning HttpResponseException into SynapseError  
							
							... 
							
							
							
							This commit replaces SynapseError.from_http_response_exception with
HttpResponseException.to_synapse_error.
The new method actually returns a ProxiedRequestError, which allows us to pass
through additional metadata from the API call. 
							
						 
						
							2018-08-01 16:02:46 +01:00  
				
					
						
							
							
								 
						
							
							
								03751a6420 
								
							
								 
							
						 
						
							
							
								
								Fix some looping_call calls which were broken in  #3604  
							
							... 
							
							
							
							It turns out that looping_call does check the deferred returned by its
callback, and (at least in the case of client_ips), we were relying on this,
and I broke it in #3604 .
Update run_as_background_process to return the deferred, and make sure we
return it to clock.looping_call. 
							
						 
						
							2018-07-26 11:48:08 +01:00  
				
					
						
							
							
								 
						
							
							
								371da42ae4 
								
							
								 
							
						 
						
							
							
								
								Wrap a number of things that run in the background  
							
							... 
							
							
							
							This will reduce the number of "Starting db connection from sentinel context"
warnings, and will help with our metrics. 
							
						 
						
							2018-07-25 09:41:12 +01:00  
				
					
						
							
							
								 
						
							
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
				
					
						
							
							
								 
						
							
							
								77ac14b960 
								
									
								
							
								 
							
						 
						
							
							
								
								Pass around the reactor explicitly ( #3385 )  
							
							
							
						 
						
							2018-06-22 09:37:10 +01:00  
				
					
						
							
							
								 
						
							
							
								933bf2dd35 
								
							
								 
							
						 
						
							
							
								
								replace some iteritems with six  
							
							... 
							
							
							
							Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-05-19 17:59:26 +02: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  
				
					
						
							
							
								 
						
							
							
								1f881e0746 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2791  from matrix-org/erikj/media_storage_refactor  
							
							... 
							
							
							
							Ensure media is in local cache before thumbnailing 
							
						 
						
							2018-02-05 11:28:52 +00: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  
				
					
						
							
							
								 
						
							
							
								8ff6726c0d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2812  from matrix-org/erikj/media_storage_provider_config  
							
							... 
							
							
							
							Make storage providers configurable 
							
						 
						
							2018-01-18 18:33:57 +00:00  
				
					
						
							
							
								 
						
							
							
								0af5dc63a8 
								
							
								 
							
						 
						
							
							
								
								Make storage providers more configurable  
							
							
							
						 
						
							2018-01-18 14:07:21 +00:00  
				
					
						
							
							
								 
						
							
							
								4a53f3a3e8 
								
							
								 
							
						 
						
							
							
								
								Ensure media is in local cache before thumbnailing  
							
							
							
						 
						
							2018-01-18 12:00:46 +00:00  
				
					
						
							
							
								 
						
							
							
								05f98a2224 
								
							
								 
							
						 
						
							
							
								
								Keep track of last access time for local media  
							
							
							
						 
						
							2018-01-17 10:24:43 +00:00  
				
					
						
							
							
								 
						
							
							
								d728c47142 
								
							
								 
							
						 
						
							
							
								
								Add docstring  
							
							
							
						 
						
							2018-01-17 10:06:14 +00:00  
				
					
						
							
							
								 
						
							
							
								d863f68cab 
								
							
								 
							
						 
						
							
							
								
								Use local vars  
							
							
							
						 
						
							2018-01-16 16:24:15 +00:00  
				
					
						
							
							
								 
						
							
							
								6368e5c0ab 
								
							
								 
							
						 
						
							
							
								
								Change _generate_thumbnails to take media_type  
							
							
							
						 
						
							2018-01-16 16:17:38 +00:00  
				
					
						
							
							
								 
						
							
							
								0a90d9ede4 
								
							
								 
							
						 
						
							
							
								
								Move setting of file_id up to caller  
							
							
							
						 
						
							2018-01-16 16:03:05 +00:00  
				
					
						
							
							
								 
						
							
							
								307f88dfb6 
								
							
								 
							
						 
						
							
							
								
								Fix up log lines  
							
							
							
						 
						
							2018-01-16 13:53:52 +00:00  
				
					
						
							
							
								 
						
							
							
								9795b9ebb1 
								
							
								 
							
						 
						
							
							
								
								Correctly use server_name/file_id when generating/fetching remote thumbnails  
							
							
							
						 
						
							2018-01-16 12:02:06 +00:00  
				
					
						
							
							
								 
						
							
							
								c5b589f2e8 
								
							
								 
							
						 
						
							
							
								
								Log when we respond with 404  
							
							
							
						 
						
							2018-01-16 12:01:40 +00:00  
				
					
						
							
							
								 
						
							
							
								a4c5e4a645 
								
							
								 
							
						 
						
							
							
								
								Fix thumbnailing remote files  
							
							
							
						 
						
							2018-01-16 11:37:50 +00:00  
				
					
						
							
							
								 
						
							
							
								694f1c1b18 
								
							
								 
							
						 
						
							
							
								
								Fix up comments  
							
							
							
						 
						
							2018-01-12 15:02:46 +00:00  
				
					
						
							
							
								 
						
							
							
								1e4edd1717 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary condition  
							
							
							
						 
						
							2018-01-12 11:28:32 +00:00  
				
					
						
							
							
								 
						
							
							
								4d88958cf6 
								
							
								 
							
						 
						
							
							
								
								Make class var local  
							
							
							
						 
						
							2018-01-12 11:23:54 +00:00  
				
					
						
							
							
								 
						
							
							
								227c491510 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							
							
						 
						
							2018-01-12 11:22:41 +00:00  
				
					
						
							
							
								 
						
							
							
								8f03aa9f61 
								
							
								 
							
						 
						
							
							
								
								Add StorageProvider concept  
							
							
							
						 
						
							2018-01-09 16:16:12 +00:00  
				
					
						
							
							
								 
						
							
							
								2442e9876c 
								
							
								 
							
						 
						
							
							
								
								Make PreviewUrlResource use MediaStorage  
							
							
							
						 
						
							2018-01-09 16:15:07 +00:00  
				
					
						
							
							
								 
						
							
							
								9d30a7691c 
								
							
								 
							
						 
						
							
							
								
								Make ThumbnailResource use MediaStorage  
							
							
							
						 
						
							2018-01-09 16:15:07 +00:00  
				
					
						
							
							
								 
						
							
							
								9e20840e02 
								
							
								 
							
						 
						
							
							
								
								Use MediaStorage for remote media  
							
							
							
						 
						
							2018-01-09 16:15:07 +00:00  
				
					
						
							
							
								 
						
							
							
								dd3092c3a3 
								
							
								 
							
						 
						
							
							
								
								Use MediaStorage for local files  
							
							
							
						 
						
							2018-01-09 16:15:07 +00:00  
				
					
						
							
							
								 
						
							
							
								eaaabc6c4f 
								
							
								 
							
						 
						
							
							
								
								replace 'except:' with 'except Exception:'  
							
							... 
							
							
							
							what could possibly go wrong 
							
						 
						
							2017-10-23 15:52:32 +01:00  
				
					
						
							
							
								 
						
							
							
								bd5718d0ad 
								
							
								 
							
						 
						
							
							
								
								Fix typo in thumbnail generation  
							
							
							
						 
						
							2017-10-19 10:27:18 +01:00  
				
					
						
							
							
								 
						
							
							
								a6245478c8 
								
							
								 
							
						 
						
							
							
								
								fix thumbnailing ( #2548 )  
							
							... 
							
							
							
							in commit 0e28281a 
							
						 
						
							2017-10-17 12:45:33 +02:00  
				
					
						
							
							
								 
						
							
							
								1b6b0b1e66 
								
							
								 
							
						 
						
							
							
								
								Add try/finally block to close t_byte_source  
							
							
							
						 
						
							2017-10-13 15:34:08 +01:00  
				
					
						
							
							
								 
						
							
							
								6b725cf56a 
								
							
								 
							
						 
						
							
							
								
								Remove old comment  
							
							
							
						 
						
							2017-10-13 15:23:41 +01:00  
				
					
						
							
							
								 
						
							
							
								2b24416e90 
								
							
								 
							
						 
						
							
							
								
								Don't reuse source but instead copy from primary media store to backup  
							
							
							
						 
						
							2017-10-13 14:11:34 +01:00  
				
					
						
							
							
								 
						
							
							
								b92a8e6e4a 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							
							
						 
						
							2017-10-13 13:58:57 +01:00  
				
					
						
							
							
								 
						
							
							
								31aa7bd8d1 
								
							
								 
							
						 
						
							
							
								
								Move type into key  
							
							
							
						 
						
							2017-10-13 13:47:38 +01:00  
				
					
						
							
							
								 
						
							
							
								ad1911bbf4 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							
							
						 
						
							2017-10-13 13:47:05 +01:00  
				
					
						
							
							
								 
						
							
							
								c021c39cbd 
								
							
								 
							
						 
						
							
							
								
								Remove spurious addition  
							
							
							
						 
						
							2017-10-13 13:46:53 +01:00  
				
					
						
							
							
								 
						
							
							
								4d7e1dde70 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary diff  
							
							
							
						 
						
							2017-10-13 11:36:32 +01:00  
				
					
						
							
							
								 
						
							
							
								9732ec6797 
								
							
								 
							
						 
						
							
							
								
								s/write_to_file/write_to_file_and_backup/  
							
							
							
						 
						
							2017-10-13 11:34:41 +01:00  
				
					
						
							
							
								 
						
							
							
								0e28281a02 
								
							
								 
							
						 
						
							
							
								
								Fix up  
							
							
							
						 
						
							2017-10-13 11:33:49 +01:00  
				
					
						
							
							
								 
						
							
							
								505371414f 
								
							
								 
							
						 
						
							
							
								
								Fix up thumbnailing function  
							
							
							
						 
						
							2017-10-13 11:23:53 +01:00  
				
					
						
							
							
								 
						
							
							
								e3428d26ca 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2017-10-13 10:39:59 +01:00  
				
					
						
							
							
								 
						
							
							
								35332298ef 
								
							
								 
							
						 
						
							
							
								
								Fix up comments  
							
							
							
						 
						
							2017-10-13 10:39:32 +01:00  
				
					
						
							
							
								 
						
							
							
								64db043a71 
								
							
								 
							
						 
						
							
							
								
								Move makedirs to thread  
							
							
							
						 
						
							2017-10-13 10:25:01 +01:00