Fix uncaught errors in media proxy controller (mastodon#11811)

ProjectMyosotis · Oct 2, 2019 · 7a387aa · 7a387aa
1 parent 7f3f583
commit 7a387aa
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb
@@ -8,6 +8,8 @@ class MediaProxyController < ApplicationController
   before_action :authenticate_user!, if: :whitelist_mode?
 
   rescue_from ActiveRecord::RecordInvalid, with: :not_found
+  rescue_from Mastodon::UnexpectedResponseError, with: :not_found
+  rescue_from HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, with: :internal_server_error
 
   def show
     RedisLock.acquire(lock_options) do |lock|