github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 08:43:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: rescue InvalidURIError when removing user ids from links

Browse Source
This commit is contained in:
Arpit Jalan 2019-04-25 12:36:31 +05:30
parent 84cfe30c1f
commit 6f5d7f987e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cooked_post_processor.rb
View File

@ -598,7 +598,11 @@ class CookedPostProcessor
def remove_user_ids
@doc.css("a[href]").each do |a|
uri = URI(a["href"])
uri = begin
URI(a["href"])
rescue URI::Error
next
end
next if uri.hostname != Discourse.current_hostname
query = Rack::Utils.parse_nested_query(uri.query)

3
spec/components/cooked_post_processor_spec.rb
View File

@ -1047,6 +1047,8 @@ describe CookedPostProcessor do
a tricky link to a topic: #{topic.url}?bob=bob;u=sam&jane=jane
link to an external topic: https://google.com/?u=bar
a malformed url: https://www.example.com/#123#4
RAW
end
@ -1058,6 +1060,7 @@ describe CookedPostProcessor do
expect(cpp.html).to have_tag('a', with: { href: topic.url })
expect(cpp.html).to have_tag('a', with: { href: "#{topic.url}?bob=bob&jane=jane" })
expect(cpp.html).to have_tag('a', with: { href: "https://google.com/?u=bar" })
expect(cpp.html).to have_tag('a', with: { href: "https://www.example.com/#123#4" })
end
end