Skip to content

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

FIX: Encode Unicode avatar URLs in Markdown endpoints (#44106)

Penar Musaraje04b7446e211
diff --git a/lib/markdown_endpoint/topic_renderer.rb b/lib/markdown_endpoint/topic_renderer.rb
index a236b750b7b..07a49b13741 100644
--- a/lib/markdown_endpoint/topic_renderer.rb
+++ b/lib/markdown_endpoint/topic_renderer.rb
@@ -78,7 +78,7 @@ module MarkdownEndpoint
if post.user
avatar_url = UrlHelper.absolute(post.user.avatar_template.gsub("{size}", "32"))
avatar_url = "#{Discourse.base_protocol}:#{avatar_url}" if avatar_url.start_with?("//")
- avatar_url = URI::DEFAULT_PARSER.escape(avatar_url, /[\s<>"()\\]/)
+ avatar_url = URI::DEFAULT_PARSER.escape(avatar_url, /[^\x21-\x7E]|[<>"()\\]/)
author = escape_text(post.user.username)
author_link = "![#{author}](#{avatar_url}) [@#{author}](#{post.user.full_url})"
lines << "### #{I18n.t("markdown_endpoints.post_author", author: author_link)}"
diff --git a/spec/requests/markdown_endpoints_spec.rb b/spec/requests/markdown_endpoints_spec.rb
index 9b927f6fd21..1dc8a20084d 100644
--- a/spec/requests/markdown_endpoints_spec.rb
+++ b/spec/requests/markdown_endpoints_spec.rb
@@ -356,6 +356,21 @@ RSpec.describe "Markdown endpoints" do
end
end
+ it "renders Unicode post authors with percent-encoded avatar URLs" do
+ SiteSetting.unicode_usernames = true
+ SiteSetting.min_username_length = 2
+ SiteSetting.external_system_avatars_url = ""
+ user.update!(username: "依云")
+
+ get "/t/#{topic.slug}/#{topic.id}.md"
+
+ expect(response).to have_http_status(:ok)
+ expect(response.body).to include(
+ "### Author: ![依云](#{Discourse.base_url}/letter_avatar/%E4%BE%9D%E4%BA%91/32/#{LetterAvatar.version}.png) [@依云](#{user.full_url})",
+ post.raw,
+ )
+ end
+
it "uses absolute, Markdown-safe URLs for custom post avatars" do
SiteSetting.default_avatars = "//cdn.example.com/avatar(1).png"