Fix uncaught errors in media proxy controller (#11811)

6 years ago · 16cdaa1110
parent 3a3b40e0c3
commit 16cdaa1110
1 changed files with 2 additions and 0 deletions
--- 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|