Issue #3311595 by fjgarlin, mfb, pooja saraah, colorfield, alexpott, Wim...

Issue #3311595 by fjgarlin, mfb, pooja saraah, colorfield, alexpott, Wim Leers, longwave: Html::transformRootRelativeUrlsToAbsolute() replaces "\r\n" with "\n"

Issue #3311595 by fjgarlin, mfb, pooja saraah, colorfield, alexpott, Wim...
3589a503 · Jess · 2193f767 · 3589a503 · 3589a503
Verified Commit 3589a503 authored 2 years ago by Jess
--- a/core/lib/Drupal/Component/Utility/Html.php
+++ b/core/lib/Drupal/Component/Utility/Html.php
@@ -279,6 +279,11 @@ public static function load($html) {
 <body>!html</body>
 </html>
 EOD;
+
+    // PHP's \DOMDocument::saveXML() encodes carriage returns as &#13; so
+    // normalize all newlines to line feeds.
+    $html = str_replace(["\r\n", "\r"], "\n", $html);
+
    // PHP's \DOMDocument serialization adds extra whitespace when the markup
    // of the wrapping document contains newlines, so ensure we remove all
    // newlines before injecting the actual HTML body to be processed.

--- a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
@@ -390,6 +390,11 @@ public function providerTestTransformRootRelativeUrlsToAbsolute() {
      }
    }

+    // Double-character carriage return should be normalized.
+    $data['line break with double special character'] = ["Test without links but with\r\nsome special characters", 'http://example.com', "Test without links but with\nsome special characters"];
+    $data['line break with single special character'] = ["Test without links but with&#13;\nsome special characters", 'http://example.com', FALSE];
+    $data['carriage return within html'] = ["<a\rhref='/node'>My link</a>", 'http://example.com', '<a href="http://example.com/node">My link</a>'];
+
    return $data;
  }