RenderingHelper: Replace object links before html injection

Icinga · Apr 12, 2024 · f170f90 · f170f90
1 parent 01d6721
commit f170f90
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/library/Jira/Web/RenderingHelper.php b/library/Jira/Web/RenderingHelper.php
@@ -108,23 +108,11 @@ public function getIssueComment($author, string $time, string $body): array
      */
     public function formatBody(string $body): HtmlString
     {
-        $html = Html::wantHtml($body)->render();
-
-        // This is safe.
-        return new HtmlString($this->replaceLinks($html) ?? '');
-    }
+        $urls = [];
 
-    /**
-     * Replace object urls in the given string with link elements
-     *
-     * @param string $string
-     *
-     * @return ?string
-     */
-    protected function replaceLinks(string $string): ?string
-    {
-        return preg_replace_callback('/\[([^|]+)\|([^]]+)]/', function ($match) {
-            $url = Url::fromPath(htmlspecialchars_decode($match[2]));
+        // Replace object urls in the given string with link elements
+        $body = preg_replace_callback('/\[([^|]+)\|([^]]+)]/', function ($match) use (&$urls) {
+            $url = Url::fromPath($match[2]);
             $link = new Link(
                 $match[1],
                 $url,
@@ -176,8 +164,19 @@ protected function replaceLinks(string $string): ?string
                 $this->setHostLink($hostLink);
             }
 
-            return $link->render();
-        }, $string);
+            $urls[] = $link->render();
+
+            return '$objectLink' . (count($urls) - 1) . '$';
+        }, $body);
+
+        $html = Html::wantHtml($body)->render();
+
+        foreach ($urls as $i => $url) {
+            $html = str_replace('$objectLink' . $i . '$', $url, $html);
+        }
+
+        // This is safe.
+        return new HtmlString($html);
     }
 
     public function linkToJira($caption, $url, $attributes = [])