Skip to content

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

FIX: Skip crawler localization for direct upload requests (#39849)

Rafael dos Santos Silva410f75066b58
diff --git a/lib/middleware/crawler_hooks.rb b/lib/middleware/crawler_hooks.rb
index bf3ded0af8d..09d3cd297ad 100644
--- a/lib/middleware/crawler_hooks.rb
+++ b/lib/middleware/crawler_hooks.rb
@@ -14,6 +14,7 @@ module Middleware
if status == 200 && headers["X-Discourse-Crawler-View"] &&
headers["Content-Type"]&.include?("text/html") &&
+ !non_localizable_path?(request_path_without_base_path(request)) &&
SiteSetting.content_localization_enabled &&
SiteSetting.content_localization_crawler_param
response = transform_response(request:, response:)
@@ -51,5 +52,16 @@ module Middleware
return false if path.blank?
NON_LOCALIZABLE_PATH_PREFIXES.any? { |prefix| path.start_with?(prefix) }
end
+
+ def request_path_without_base_path(request)
+ path = request.path
+ base_path = Discourse.base_path
+
+ if base_path.present? && path.start_with?(base_path)
+ path.delete_prefix(base_path)
+ else
+ path
+ end
+ end
end
end
diff --git a/spec/lib/middleware/crawler_hooks_spec.rb b/spec/lib/middleware/crawler_hooks_spec.rb
index 8a7a6436b9e..4b04122506a 100644
--- a/spec/lib/middleware/crawler_hooks_spec.rb
+++ b/spec/lib/middleware/crawler_hooks_spec.rb
@@ -132,6 +132,85 @@ describe Middleware::CrawlerHooks do
expect(response).to eq(["PK\x03\x04binarydata".b])
end
+ it "does not parse direct upload requests served with an HTML content type" do
+ SiteSetting.content_localization_enabled = true
+ SiteSetting.content_localization_crawler_param = true
+
+ response_body = ["<div>" * 500]
+ def response_body.body
+ join("")
+ end
+
+ middleware =
+ Middleware::CrawlerHooks.new(
+ lambda do |_|
+ [
+ 200,
+ {
+ "Content-Type" => "text/html; charset=utf-8",
+ "X-Discourse-Crawler-View" => "true",
+ },
+ response_body,
+ ]
+ end,
+ )
+
+ status, headers, response =
+ middleware.call(
+ env(
+ :path => "https://discourse.site/uploads/short-url/abc.zip",
+ :params => {
+ Discourse::LOCALE_PARAM => "fr",
+ },
+ "HTTP_USER_AGENT" => crawler_user_agent,
+ ),
+ )
+
+ expect(status).to eq(200)
+ expect(headers["Content-Type"]).to include("text/html")
+ expect(response).to eq(response_body)
+ end
+
+ it "does not parse direct upload requests served from a base path" do
+ SiteSetting.content_localization_enabled = true
+ SiteSetting.content_localization_crawler_param = true
+ Discourse.stubs(:base_path).returns("/forum")
+
+ response_body = ["<div>" * 500]
+ def response_body.body
+ join("")
+ end
+
+ middleware =
+ Middleware::CrawlerHooks.new(
+ lambda do |_|
+ [
+ 200,
+ {
+ "Content-Type" => "text/html; charset=utf-8",
+ "X-Discourse-Crawler-View" => "true",
+ },
+ response_body,
+ ]
+ end,
+ )
+
+ status, headers, response =
+ middleware.call(
+ env(
+ :path => "https://discourse.site/forum/uploads/short-url/abc.zip",
+ :params => {
+ Discourse::LOCALE_PARAM => "fr",
+ },
+ "HTTP_USER_AGENT" => crawler_user_agent,
+ ),
+ )
+
+ expect(status).to eq(200)
+ expect(headers["Content-Type"]).to include("text/html")
+ expect(response).to eq(response_body)
+ end
+
it "does not modify responses for non-200 status codes" do
status, headers, response =
error_middleware.call(env("HTTP_USER_AGENT" => crawler_user_agent))