diff --git a/src/HtmlSanitizer/ReadmeImageSanitizer.php b/src/HtmlSanitizer/ReadmeImageSanitizer.php index 444b98d73..4d6866304 100644 --- a/src/HtmlSanitizer/ReadmeImageSanitizer.php +++ b/src/HtmlSanitizer/ReadmeImageSanitizer.php @@ -34,7 +34,7 @@ public function sanitizeAttribute(string $element, string $attribute, string $va } if (str_starts_with($value, 'https://private-user-images.githubusercontent.com/')) { - return Preg::replace('{^https://private-}', 'https://', $value, 1); + return Preg::replace('{^https://private-user-images.githubusercontent.com/\d+/\d+-([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\.\w+\?.*$}', 'https://github.com/user-attachments/assets/$1', $value, 1); } return $value; diff --git a/src/HtmlSanitizer/ReadmeLinkSanitizer.php b/src/HtmlSanitizer/ReadmeLinkSanitizer.php index 8bdae3db6..42476dfac 100644 --- a/src/HtmlSanitizer/ReadmeLinkSanitizer.php +++ b/src/HtmlSanitizer/ReadmeLinkSanitizer.php @@ -2,6 +2,7 @@ namespace App\HtmlSanitizer; +use Composer\Pcre\Preg; use Symfony\Component\HtmlSanitizer\HtmlSanitizerConfig; use Symfony\Component\HtmlSanitizer\Visitor\AttributeSanitizer\AttributeSanitizerInterface; @@ -59,6 +60,10 @@ public function sanitizeAttribute(string $element, string $attribute, string $va return 'https://gitlab.com/'.$this->ownerRepo.'/-/blob/HEAD/'.$this->basePath.$value; } + if (str_starts_with($value, 'https://private-user-images.githubusercontent.com/')) { + return Preg::replace('{^https://private-user-images.githubusercontent.com/\d+/\d+-([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\.\w+\?.*$}', 'https://github.com/user-attachments/assets/$1', $value, 1); + } + return $value; } }