Merge remote-tracking branch 'upstream/pull/3985'

[rails.git] / config / initializers / sanitize.rb

diff --git a/config/initializers/sanitize.rb b/config/initializers/sanitize.rb
index d6bd6c3ee780c517ab0325f19279f8a2b82b1b4c..c9d6a5dbac75d48b693e7b1927c19b1c9a297f30 100644 (file)
--- a/config/initializers/sanitize.rb
+++ b/config/initializers/sanitize.rb
@@ -1,11 +1,28 @@
 Sanitize::Config::OSM = Sanitize::Config.merge(
   Sanitize::Config::RELAXED,
   :elements => Sanitize::Config::RELAXED[:elements] - %w[div style],
-  :add_attributes => { "a" => { "rel" => "nofollow noopener noreferrer" } },
   :remove_contents => %w[script style],
   :transformers => lambda do |env|
+    style = env[:node]["style"] || ""
+
     env[:node].remove_class
-    env[:node].kwattr_remove("style", nil)
+    env[:node].remove_attribute("style")
+
     env[:node].add_class("table table-sm w-auto") if env[:node_name] == "table"
+
+    case style
+    when /\btext-align:\s+left\b/
+      env[:node].add_class("text-start")
+    when /\btext-align:\s+center\b/
+      env[:node].add_class("text-center")
+    when /\btext-align:\s+right\b/
+      env[:node].add_class("text-end")
+    end
+
+    if env[:node_name] == "a"
+      rel = env[:node]["rel"] || ""
+
+      env[:node]["rel"] = rel.split.select { |r| r == "me" }.append("nofollow", "noopener", "noreferrer").sort.join(" ")
+    end
   end
 )