diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-07 16:21:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 16:21:42 +0200 |
| commit | c4e1b82caf5c932a3c19bc77726c9e3ab3d2c46a (patch) | |
| tree | 432bd5bc0c7ec19aac3175150e397b5336c71a4d /app/controllers/media_proxy_controller.rb | |
| parent | 94e09d309cb068ea92919767e40e655260ac43cb (diff) | |
| parent | 6c7ac1b48f7d4c6d0a1e0cf7f663c3188421d7c7 (diff) | |
Merge pull request #1373 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/media_proxy_controller.rb')
| -rw-r--r-- | app/controllers/media_proxy_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb index a8261ec2b..0b1d09de9 100644 --- a/app/controllers/media_proxy_controller.rb +++ b/app/controllers/media_proxy_controller.rb @@ -2,6 +2,7 @@ class MediaProxyController < ApplicationController include RoutingHelper + include Authorization skip_before_action :store_current_location skip_before_action :require_functional! @@ -10,12 +11,14 @@ class MediaProxyController < ApplicationController rescue_from ActiveRecord::RecordInvalid, with: :not_found rescue_from Mastodon::UnexpectedResponseError, with: :not_found + rescue_from Mastodon::NotPermittedError, with: :not_found rescue_from HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, with: :internal_server_error def show RedisLock.acquire(lock_options) do |lock| if lock.acquired? - @media_attachment = MediaAttachment.remote.find(params[:id]) + @media_attachment = MediaAttachment.remote.attached.find(params[:id]) + authorize @media_attachment.status, :show? redownload! if @media_attachment.needs_redownload? && !reject_media? else raise Mastodon::RaceConditionError |