Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: downloaded image URLs incorrectly replaced in post raw. (#9014) 

Previously, while replacing the downloaded image URL `http://wiki.mozilla.org/images/2/2e/Longcat1.png` similar non-image URL `http://wiki.mozilla.org/images/2` was replaced wrongly.
This commit is contained in:
Vinoth Kannan 2020-02-27 10:22:55 +05:30 committed by GitHub
parent 9f528f0ec2
commit 5774107a2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/jobs/regular/pull_hotlinked_images.rb
View File

@ -95,7 +95,7 @@ module Jobs
escaped_src = Regexp.escape(original_src) escaped_src = Regexp.escape(original_src)
replace_raw = ->(match, match_src, replacement, _index) { replace_raw = ->(match, match_src, replacement, _index) {
if src.include?(match_src) if remove_scheme(src) == remove_scheme(match_src)
replacement = replacement =
if replacement.include?(InlineUploads::PLACEHOLDER) if replacement.include?(InlineUploads::PLACEHOLDER)

11
spec/jobs/pull_hotlinked_images_spec.rb
View File

@ -83,6 +83,17 @@ describe Jobs::PullHotlinkedImages do
RAW RAW
end end
it 'replaces correct image URL' do
url = image_url.sub("/2e/Longcat1.png", '')
post = Fabricate(:post, raw: "[Images](#{url})\n![](#{image_url})")
expect do
Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
end.to change { Upload.count }.by(1)
expect(post.reload.raw).to eq("[Images](#{url})\n![](#{Upload.last.short_url})")
end
it 'replaces images without protocol' do it 'replaces images without protocol' do
url = image_url.sub(/^https?\:/, '') url = image_url.sub(/^https?\:/, '')
post = Fabricate(:post, raw: "<img alt='test' src='#{url}'>") post = Fabricate(:post, raw: "<img alt='test' src='#{url}'>")