When accessing uncached media attachment, redownload it (#4955)

* When accessing uncached media attachment, redownload it

* Prevent re-download of rejected media

diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb
new file mode 100644 (file)
index 0000000..6a83cf9
--- /dev/null
+++ b/app/controllers/media_proxy_controller.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class MediaProxyController < ApplicationController
+  include RoutingHelper
+
+  def show
+    RedisLock.acquire(lock_options) do |lock|
+      if lock.acquired?
+        @media_attachment = MediaAttachment.remote.find(params[:id])
+        redownload! if @media_attachment.needs_redownload? && !reject_media?
+      end
+    end
+
+    redirect_to full_asset_url(@media_attachment.file.url(version))
+  end
+
+  private
+
+  def redownload!
+    @media_attachment.file_remote_url = @media_attachment.remote_url
+    @media_attachment.touch(:created_at)
+    @media_attachment.save!
+  end
+
+  def version
+    if request.path.ends_with?('/small')
+      :small
+    else
+      :original
+    end
+  end
+
+  def lock_options
+    { redis: Redis.current, key: "media_download:#{params[:id]}" }
+  end
+
+  def reject_media?
+    DomainBlock.find_by(domain: @media_attachment.account.domain)&.reject_media?
+  end
+end

diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index d83ca44f173c50f79080ca95d6af3e676b7c03b6..d913e7372a73fbcffdfa085f266e675c2524543c 100644 (file)
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -56,15 +56,21 @@ class MediaAttachment < ApplicationRecord
 
   validates :account, presence: true
 
 
   validates :account, presence: true
 

-  scope :attached, -> { where.not(status_id: nil) }
+  scope :attached,   -> { where.not(status_id: nil) }

   scope :unattached, -> { where(status_id: nil) }
   scope :unattached, -> { where(status_id: nil) }

-  scope :local, -> { where(remote_url: '') }
+  scope :local,      -> { where(remote_url: '') }
+  scope :remote,     -> { where.not(remote_url: '') }
+

   default_scope { order(id: :asc) }
 
   def local?
     remote_url.blank?
   end
 
   default_scope { order(id: :asc) }
 
   def local?
     remote_url.blank?
   end
 

+  def needs_redownload?
+    file.blank? && remote_url.present?
+  end
+

   def to_param
     shortcode
   end
   def to_param
     shortcode
   end

diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb
index 9055b8db478732ec1b38cc7fcb17757bd1a8868f..31189406a1ad4a8b2130bb0d202c7d99de4f22e1 100644 (file)
--- a/app/serializers/rest/media_attachment_serializer.rb
+++ b/app/serializers/rest/media_attachment_serializer.rb
@@ -7,11 +7,19 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer
              :remote_url, :text_url, :meta
 
   def url
              :remote_url, :text_url, :meta
 
   def url

-    full_asset_url(object.file.url(:original))
+    if object.needs_redownload?
+      media_proxy_url(object.id, :original)
+    else
+      full_asset_url(object.file.url(:original))
+    end

   end
 
   def preview_url
   end
 
   def preview_url

-    full_asset_url(object.file.url(:small))
+    if object.needs_redownload?
+      media_proxy_url(object.id, :small)
+    else
+      full_asset_url(object.file.url(:small))
+    end

   end
 
   def text_url
   end
 
   def text_url

diff --git a/config/routes.rb b/config/routes.rb
index 63e94fb495b2c895f0895f5ba7e453dd50a639f2..bf542886981acbe211b4d1d70e926bd9010542d2 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -98,6 +98,8 @@ Rails.application.routes.draw do
   resources :media, only: [:show]
   resources :tags,  only: [:show]
 
   resources :media, only: [:show]
   resources :tags,  only: [:show]
 

+  get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy
+

   # Remote follow
   resource :authorize_follow, only: [:show, :create]
   resource :share, only: [:show, :create]
   # Remote follow
   resource :authorize_follow, only: [:show, :create]
   resource :share, only: [:show, :create]

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 2aef752ca7342da5da84ededae541077864ae907..5614ddf48f6b07319043473c8084a28817b2e763 100644 (file)
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -83,7 +83,6 @@ namespace :mastodon do
 
       MediaAttachment.where.not(remote_url: '').where('created_at < ?', time_ago).find_each do |media|
         media.file.destroy
 
       MediaAttachment.where.not(remote_url: '').where('created_at < ?', time_ago).find_each do |media|
         media.file.destroy

-        media.type = :unknown

         media.save
       end
     end
         media.save
       end
     end