diff options
author | Matt Jankowski <matt@jankowski.online> | 2023-03-25 19:38:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-26 00:38:32 +0100 |
commit | e633b26f4f69c068f6479e09254a6ae2277b73dd (patch) | |
tree | 0267898f58e46803e447f6d7f47c2de1b2556025 /app/controllers | |
parent | e63524f45792af83cf802270c3beebc76bada645 (diff) |
Add allow_other_host in redirects which may go outside app (#24252)
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/api/v1/streaming_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/media_proxy_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/statuses_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/api/v1/streaming_controller.rb b/app/controllers/api/v1/streaming_controller.rb index b23a60170..0cdd00d62 100644 --- a/app/controllers/api/v1/streaming_controller.rb +++ b/app/controllers/api/v1/streaming_controller.rb @@ -5,7 +5,7 @@ class Api::V1::StreamingController < Api::BaseController if Rails.configuration.x.streaming_api_base_url == request.host not_found else - redirect_to streaming_api_url, status: 301 + redirect_to streaming_api_url, status: 301, allow_other_host: true end end diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb index 3b228722f..f29b69a24 100644 --- a/app/controllers/media_proxy_controller.rb +++ b/app/controllers/media_proxy_controller.rb @@ -23,7 +23,7 @@ class MediaProxyController < ApplicationController redownload! if @media_attachment.needs_redownload? && !reject_media? end - redirect_to full_asset_url(@media_attachment.file.url(version)) + redirect_to full_asset_url(@media_attachment.file.url(version)), allow_other_host: true end private diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 0e0783b4b..fcb3cd4fa 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -70,6 +70,6 @@ class StatusesController < ApplicationController end def redirect_to_original - redirect_to ActivityPub::TagManager.instance.url_for(@status.reblog) if @status.reblog? + redirect_to(ActivityPub::TagManager.instance.url_for(@status.reblog), allow_other_host: true) if @status.reblog? end end |