Skip to content

A platform for community discussion. Free, open, simple.

FIX: Support Dropbox /scl/ URL format in video and image oneboxes (#38394)

Mark Doerr2fb976fab160
diff --git a/lib/onebox/engine/image_onebox.rb b/lib/onebox/engine/image_onebox.rb
index 28d446ca5ff..b0246aa7c0e 100644
--- a/lib/onebox/engine/image_onebox.rb
+++ b/lib/onebox/engine/image_onebox.rb
@@ -13,12 +13,8 @@ module Onebox
end
def to_html
- # Fix Dropbox image links
- if @url[%r{^https://www.dropbox.com/s/}]
- @url.sub!("https://www.dropbox.com", "https://dl.dropboxusercontent.com")
- end
-
- escaped_url = ::Onebox::Helpers.normalize_url_for_output(@url)
+ url = ::Onebox::Helpers.normalize_dropbox_url(@url)
+ escaped_url = ::Onebox::Helpers.normalize_url_for_output(url)
<<-HTML
<a href="#{escaped_url}" target="_blank" rel="noopener" class="onebox">
<img src="#{escaped_url}">
diff --git a/lib/onebox/engine/video_onebox.rb b/lib/onebox/engine/video_onebox.rb
index 3c810d7556c..d4edd2627c1 100644
--- a/lib/onebox/engine/video_onebox.rb
+++ b/lib/onebox/engine/video_onebox.rb
@@ -12,17 +12,13 @@ module Onebox
end
def to_html
- # Fix Dropbox image links
- if @url[%r{^https://www.dropbox.com/s/}]
- @url.sub!("https://www.dropbox.com", "https://dl.dropboxusercontent.com")
- end
-
- escaped_url = ::Onebox::Helpers.normalize_url_for_output(@url)
+ url = ::Onebox::Helpers.normalize_dropbox_url(@url)
+ escaped_url = ::Onebox::Helpers.normalize_url_for_output(url)
<<-HTML
<div class="onebox video-onebox">
<video width='100%' height='100%' controls #{@options[:disable_media_download_controls] ? 'controlslist="nodownload"' : ""}>
<source src='#{escaped_url}'>
- <a href='#{escaped_url}'>#{@url}</a>
+ <a href='#{escaped_url}'>#{url}</a>
</video>
</div>
HTML
diff --git a/lib/onebox/helpers.rb b/lib/onebox/helpers.rb
index 7c57c0411e8..034d7fc9cbc 100644
--- a/lib/onebox/helpers.rb
+++ b/lib/onebox/helpers.rb
@@ -286,5 +286,20 @@ module Onebox
def self.generic_placeholder_html
"<div class='onebox-placeholder-container'><span class='placeholder-icon generic'></span></div>"
end
+
+ def self.normalize_dropbox_url(url)
+ return url unless url.start_with?("https://www.dropbox.com/")
+
+ uri = URI.parse(url)
+ uri.host = "dl.dropboxusercontent.com"
+
+ if url.include?("/scl/")
+ params = URI.decode_www_form(uri.query.to_s).to_h
+ params["raw"] = "1"
+ uri.query = URI.encode_www_form(params)
+ end
+
+ uri.to_s
+ end
end
end
diff --git a/spec/lib/onebox/engine/image_onebox_spec.rb b/spec/lib/onebox/engine/image_onebox_spec.rb
index 0b77ca280e0..46befddc432 100644
--- a/spec/lib/onebox/engine/image_onebox_spec.rb
+++ b/spec/lib/onebox/engine/image_onebox_spec.rb
@@ -76,4 +76,12 @@ RSpec.describe Onebox::Engine::ImageOnebox do
Onebox.preview("http://www.discourse.org/images/logo", { content_type: "image/png" }).to_s,
).to match(/<img/)
end
+
+ context "with Dropbox URL" do
+ let(:html) { Onebox.preview("https://www.dropbox.com/scl/fi/abc123/image.png?rlkey=xyz").to_s }
+
+ it "transforms to direct download link" do
+ expect(html).to include("dl.dropboxusercontent.com")
+ end
+ end
end
diff --git a/spec/lib/onebox/engine/video_onebox_spec.rb b/spec/lib/onebox/engine/video_onebox_spec.rb
index 69bcb5e670c..3dea8b75c79 100644
--- a/spec/lib/onebox/engine/video_onebox_spec.rb
+++ b/spec/lib/onebox/engine/video_onebox_spec.rb
@@ -49,4 +49,12 @@ RSpec.describe Onebox::Engine::VideoOnebox do
).to_s,
).to include("controlslist=\"nodownload\"")
end
+
+ context "with Dropbox URL" do
+ let(:html) { Onebox.preview("https://www.dropbox.com/scl/fi/abc123/video.mp4?rlkey=xyz").to_s }
+
+ it "transforms to direct download link" do
+ expect(html).to include("dl.dropboxusercontent.com")
+ end
+ end
end
diff --git a/spec/lib/onebox/helpers_spec.rb b/spec/lib/onebox/helpers_spec.rb
index 762071abb5f..fa29daaa513 100644
--- a/spec/lib/onebox/helpers_spec.rb
+++ b/spec/lib/onebox/helpers_spec.rb
@@ -414,4 +414,48 @@ RSpec.describe Onebox::Helpers do
expect(described_class.uri_encode(url)).to eq(url)
end
end
+
+ describe ".normalize_dropbox_url" do
+ subject(:result) { described_class.normalize_dropbox_url(url) }
+
+ context "with non-Dropbox URL" do
+ let(:url) { "https://example.com/video.mp4" }
+
+ it "returns unchanged" do
+ expect(result).to eq(url)
+ end
+ end
+
+ context "with old /s/ format" do
+ let(:url) { "https://www.dropbox.com/s/abc123/file.mp4" }
+
+ it "converts to direct download domain" do
+ expect(result).to eq("https://dl.dropboxusercontent.com/s/abc123/file.mp4")
+ end
+ end
+
+ context "with new /scl/ format" do
+ let(:url) { "https://www.dropbox.com/scl/fi/abc123/file.mp4?rlkey=xyz789&st=test" }
+
+ it "converts to direct download domain" do
+ expect(result).to include("dl.dropboxusercontent.com")
+ end
+
+ it "adds raw=1 for direct file access" do
+ expect(result).to include("raw=1")
+ end
+
+ it "preserves authentication parameters" do
+ expect(result).to include("rlkey=xyz789", "st=test")
+ end
+ end
+
+ context "with /scl/ format without query string" do
+ let(:url) { "https://www.dropbox.com/scl/fi/abc123/file.mp4" }
+
+ it "adds raw=1 for direct file access" do
+ expect(result).to include("raw=1")
+ end
+ end
+ end
end