FIX: Stop secure media URLs being censored too liberally in emails (#8817)

For example /t/ URLs were being replaced if they contained secure-media-uploads so if you made a topic called "Secure Media Uploads Are Cool" the View Topic link in the user notifications would be stripped out.

Refactored code so this secure URL detection happens in one place.
This commit is contained in:
Martin Brennan
2020-01-30 16:19:14 +10:00
committed by GitHub
parent c84652eb8b
commit 1150cd4621
4 changed files with 12 additions and 7 deletions

View File

@@ -128,7 +128,9 @@ class Upload < ActiveRecord::Base
end
def self.secure_media_url?(url)
url.include?(SECURE_MEDIA_ROUTE)
# we do not want to exclude topic links that for whatever reason
# have secure-media-uploads in the URL e.g. /t/secure-media-uploads-are-cool/223452
url.include?(SECURE_MEDIA_ROUTE) && !url.include?("/t/") && FileHelper.is_supported_media?(url)
end
def self.signed_url_from_secure_media_url(url)