A platform for community discussion. Free, open, simple.
SECURITY: Escape LIKE metacharacters in upload paths to prevent disclosure
Isaac Janzen20c48bef712e
diff --git a/app/models/concerns/has_url.rb b/app/models/concerns/has_url.rbindex 407de22d03f..dea88c940d9 100644--- a/app/models/concerns/has_url.rb+++ b/app/models/concerns/has_url.rb@@ -43,7 +43,7 @@ module HasUrlresult = find_by(sha1: sha1) if sha1&.length == Upload::SHA1_LENGTHend- result || find_by("url LIKE ?", "%#{data[1]}")+ result || find_by("url LIKE ?", "%#{sanitize_sql_like(data[1])}")enddef get_from_urls(upload_urls)diff --git a/lib/pretty_text.rb b/lib/pretty_text.rbindex c112eaa32a3..6f176324799 100644--- a/lib/pretty_text.rb+++ b/lib/pretty_text.rb@@ -449,7 +449,8 @@ module PrettyTextvideo_src = video["data-video-src"]next if video_src == "/404" || video_src.nil?video_sha1 = File.basename(video_src, File.extname(video_src))- thumbnail = Upload.where("original_filename LIKE ?", "#{video_sha1}.%").last+ thumbnail =+ Upload.where("original_filename LIKE ?", "#{Upload.sanitize_sql_like(video_sha1)}.%").lastif thumbnailvideo["data-thumbnail-src"] = UrlHelper.absolute(GlobalPath.upload_cdn_path(thumbnail.url),diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rbindex d5ecfd10a35..2bf6f2d39db 100644--- a/lib/pretty_text/helpers.rb+++ b/lib/pretty_text/helpers.rb@@ -45,10 +45,17 @@ module PrettyTexturls.each do |url|sha1 = Upload.sha1_from_short_url(url)if url.split(".")[1].nil? # video sha1 without extension for thumbnail- thumbnail = Upload.where("original_filename LIKE ?", "#{sha1}.%").last if sha1+ thumbnail =+ Upload.where(+ "original_filename LIKE ?",+ "#{Upload.sanitize_sql_like(sha1)}.%",+ ).last if sha1# Fallback for old posts that don't contain data-video-base62-sha1- thumbnail = Upload.where("original_filename LIKE ?", "#{url}.%").last if thumbnail.nil? &&- sha1.nil?+ thumbnail =+ Upload.where(+ "original_filename LIKE ?",+ "#{Upload.sanitize_sql_like(url)}.%",+ ).last if thumbnail.nil? && sha1.nil?sha1 = thumbnail.sha1 if thumbnailendmap[url] = sha1 if sha1diff --git a/spec/lib/pretty_text/helpers_spec.rb b/spec/lib/pretty_text/helpers_spec.rbindex cec7fe7d0db..6c623070af2 100644--- a/spec/lib/pretty_text/helpers_spec.rb+++ b/spec/lib/pretty_text/helpers_spec.rb@@ -4,6 +4,23 @@ RSpec.describe PrettyText::Helpers dodescribe ".lookup_upload_urls" dolet(:upload) { Fabricate(:upload) }+ it "resolves thumbnails by their exact video SHA1" do+ thumbnail = Fabricate(:upload, original_filename: "#{upload.sha1}.png")+ short_url = Upload.base62_sha1(upload.sha1)++ result = PrettyText::Helpers.lookup_upload_urls([short_url])++ expect(result[short_url][:url]).to eq(thumbnail.url)+ end++ it "resolves legacy non-ASCII video thumbnails" do+ thumbnail = Fabricate(:upload, original_filename: "動画.png")++ result = PrettyText::Helpers.lookup_upload_urls(["動画"])++ expect(result["動画"][:url]).to eq(thumbnail.url)+ end+it "should return cdn url if available" doshort_url = upload.short_urlresult = PrettyText::Helpers.lookup_upload_urls([short_url])diff --git a/spec/lib/pretty_text_spec.rb b/spec/lib/pretty_text_spec.rbindex 7dcf6f46c86..2dd44607296 100644--- a/spec/lib/pretty_text_spec.rb+++ b/spec/lib/pretty_text_spec.rb@@ -3135,6 +3135,18 @@ HTMLexpect(doc.to_html).to eq(html)end+ it "does not link thumbnails from SQL LIKE wildcards" do+ private_thumbnail = Fabricate(:upload, original_filename: "private-thumbnail.png")+ html = <<~HTML+ <p></p><div class="video-placeholder-container" data-video-src="/uploads/%"></div><p></p>+ HTML+ doc = Nokogiri::HTML5.fragment(html)++ described_class.add_video_placeholder_image(doc)++ expect(doc.to_html).not_to include(private_thumbnail.url)+ end+it "links to a thumbnail image if the video source is valid" dothumbnail =Fabricate(:upload, original_filename: "#{@video_upload.sha1}.png", extension: "png")diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rbindex edb65c92e66..1f7a6ebf5cc 100644--- a/spec/requests/uploads_controller_spec.rb+++ b/spec/requests/uploads_controller_spec.rb@@ -814,6 +814,45 @@ RSpec.describe UploadsController doenddescribe "#lookup_urls" do+ it "does not resolve private uploads from SQL LIKE wildcards" do+ setup_s3+ SiteSetting.authorized_extensions = "pdf"+ SiteSetting.secure_uploads = true++ owner = Fabricate(:user)+ private_post = Fabricate(:post, user: owner)+ private_post.topic.change_category_to_id(+ Fabricate(:private_category, group: Fabricate(:group)).id,+ )+ private_upload =+ Fabricate(+ :upload_s3,+ user: owner,+ sha1: "a#{"1" * 39}",+ original_filename: "confidential-attachment.pdf",+ extension: "pdf",+ secure: true,+ access_control_post: private_post,+ )++ sign_in(user)++ post "/uploads/lookup-metadata.json",+ params: {+ url: private_upload.url.sub(private_upload.sha1, "a#{"_" * 39}"),+ }++ expect(response.status).to eq(404)+ expect(response.body).not_to include(private_upload.original_filename)++ post "/uploads/lookup-urls.json", params: { short_urls: ["%"] }++ expect(response.status).to eq(200)+ expect(response.body).not_to include(+ Upload.secure_uploads_url_from_upload_url(private_upload.url),+ )+ end+it "can look up long urls" dosign_in(user)upload = Fabricate(:upload)