Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1871a5ddb4 
								
							 
						 
						
							
							
								
								[ #2497 ] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing.  
							
							
							
						 
						
							2020-05-20 20:26:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5f0a3ac74d 
								
							 
						 
						
							
							
								
								added tests  
							
							
							
						 
						
							2020-05-19 06:05:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c33a4315fb 
								
							 
						 
						
							
							
								
								updated docs  
							
							
							
						 
						
							2020-05-18 06:48:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3f8d68bdf3 
								
							 
						 
						
							
							
								
								added example cache purge script  
							
							
							
						 
						
							2020-05-17 05:56:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cb40602a16 
								
							 
						 
						
							
							
								
								added media proxy invalidation  
							
							
							
						 
						
							2020-05-15 21:39:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f1f588fd52 
								
							 
						 
						
							
							
								
								[ #2497 ] Added support for :eimp for image resizing.  
							
							
							
						 
						
							2020-05-14 20:18:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1b23acf164 
								
							 
						 
						
							
							
								
								[ #2497 ] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.  
							
							
							
						 
						
							2020-05-11 23:21:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bbdad85568 
								
							 
						 
						
							
							
								
								Initial implementation of image preview proxy. Media proxy tests refactoring.  
							
							
							
						 
						
							2020-05-08 23:06:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f685cbd309 
								
							 
						 
						
							
							
								
								Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.  
							
							
							
						 
						
							2020-04-21 16:29:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								05da5f5cca 
								
							 
						 
						
							
							
								
								Update Copyrights  
							
							
							
						 
						
							2020-03-03 16:44:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d93d777915 
								
							 
						 
						
							
							
								
								Fix/mediaproxy whitelist base url  
							
							
							
						 
						
							2019-08-02 17:07:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								1d906ffa82 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into match-file-name  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex 
							
						 
						
							2019-07-15 21:30:56 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								fa17879c20 
								
							 
						 
						
							
							
								
								added tests for Web.MediaProxy  
							
							
							
						 
						
							2019-07-14 21:01:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								f8e3ae6154 
								
							 
						 
						
							
							
								
								try to always match the filename for proxy url  
							
							
							
						 
						
							2019-07-12 22:56:14 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								6a6c4d134b 
								
							 
						 
						
							
							
								
								preserve the original path/filename (no encoding/decoding) for proxy  
							
							
							
						 
						
							2019-07-12 21:05:01 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sachin Joshi 
								
							 
						 
						
							
							
							
							
								
							
							
								f5ad430974 
								
							 
						 
						
							
							
								
								make sure the url used by proxy is same as origin url  
							
							... 
							
							
							
							encoding or decoding it breaks some of the signed url 
							
						 
						
							2019-07-07 14:13:40 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								99f70c7e20 
								
							 
						 
						
							
							
								
								Use Pleroma.Config everywhere  
							
							
							
						 
						
							2019-05-30 15:33:58 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								24c3e2db2c 
								
							 
						 
						
							
							
								
								Add mediaproxy whitelist capability  
							
							
							
						 
						
							2019-04-25 18:11:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c42d34b2ec 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.MaxLineLength  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								907306174b 
								
							 
						 
						
							
							
								
								fix S3 links encoding in Mediaproxy  
							
							
							
						 
						
							2019-02-14 15:55:21 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bcfac93a8 
								
							 
						 
						
							
							
								
								Make credo happy  
							
							
							
						 
						
							2019-02-09 14:59:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e94c3442f4 
								
							 
						 
						
							
							
								
								updates  
							
							
							
						 
						
							2018-12-10 13:27:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								074fa790ba 
								
							 
						 
						
							
							
								
								fix compile warnings  
							
							
							
						 
						
							2018-12-09 20:50:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bdc8112e40 
								
							 
						 
						
							
							
								
								Media proxy: fix url encoding  
							
							
							
						 
						
							2018-12-07 21:57:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d8fcf7c5cf 
								
							 
						 
						
							
							
								
								Media proxy: follow HTTP redirects by default  
							
							
							
						 
						
							2018-12-07 19:36:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								43d5e4f7fa 
								
							 
						 
						
							
							
								
								Fix media proxy config defaults  
							
							
							
						 
						
							2018-12-02 11:24:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								680716b3c9 
								
							 
						 
						
							
							
								
								Config docs  
							
							
							
						 
						
							2018-11-30 18:02:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602 
								
							 
						 
						
							
							
								
								reverse proxy / uploads  
							
							
							
						 
						
							2018-11-30 18:00:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7f4c3a1e99 
								
							 
						 
						
							
							
								
								mediaproxy: fix empty url & add some tests  
							
							
							
						 
						
							2018-11-20 17:50:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f52a1d1ec5 
								
							 
						 
						
							
							
								
								media_proxy: use path only to retrieve filename  
							
							
							
						 
						
							2018-11-13 23:41:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9b553a1087 
								
							 
						 
						
							
							
								
								media_proxy: CSP, content-disposition  
							
							... 
							
							
							
							* Adds CSP headers to the media proxy endpoint
* Sends `content-disposition: attachment; …` for non-image/video/audio
content types
The default list can be overwritten with `:media_proxy,
:safe_content_types` in the configuration.
* Also now appends the filename to the proxy URL (fixes some mobile apps,
it was requested a while ago) 
							
						 
						
							2018-11-13 15:58:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4afbef39f4 
								
							 
						 
						
							
							
								
								Format the code.  
							
							
							
						 
						
							2018-03-30 15:01:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ec83175100 
								
							 
						 
						
							
							
								
								Use connection pools.  
							
							
							
						 
						
							2018-03-19 17:42:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeff Becker 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1e185b9301 
								
							 
						 
						
							
							
								
								apply proxy settings to media_proxy  
							
							
							
						 
						
							2017-12-31 09:25:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0ccd0e5cc9 
								
							 
						 
						
							
							
								
								Remove a useless URI.encode call in MediaProxy  
							
							
							
						 
						
							2017-12-21 20:59:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f909aec050 
								
							 
						 
						
							
							
								
								proxy emojis  
							
							... 
							
							
							
							(i fix emojos better than gargon but sshhhhh) 
							
						 
						
							2017-12-12 12:30:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8e82547179 
								
							 
						 
						
							
							
								
								fix content-type and fallback to image/jpeg  
							
							
							
						 
						
							2017-12-12 11:45:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								077faaed8c 
								
							 
						 
						
							
							
								
								Limit body size to 25MB  
							
							
							
						 
						
							2017-12-11 02:31:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1cb5cbdc6c 
								
							 
						 
						
							
							
								
								Improve error handling, add configuration  
							
							
							
						 
						
							2017-11-28 21:44:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e28c110eba 
								
							 
						 
						
							
							
								
								mandatory typo fix...  
							
							
							
						 
						
							2017-11-28 20:50:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5f35fdcf5d 
								
							 
						 
						
							
							
								
								media proxy: good enough wip  
							
							
							
						 
						
							2017-11-28 20:50:34 +01:00