From ab816b40e0f4ef048f8f3341a6295d2f54517783 Mon Sep 17 00:00:00 2001 From: YvesCesar Date: Fri, 13 Nov 2026 20:16:09 -0400 Subject: [PATCH] fix(i18n): escape translated HTML outside an allowlist and reject markup changes in translations Signed-off-by: YvesCesar --- scripts/validate-translations.php | 6 ++ source/_layouts/post_base.blade.php | 4 +- source/faq.blade.php | 2 +- .../Translation/TranslatedHtmlSanitizer.php | 27 ++++++++ .../TranslationMarkupValidator.php | 64 +++++++++++++++++++ .../TranslatedHtmlSanitizerTest.php | 47 ++++++++++++++ .../TranslationMarkupValidatorTest.php | 46 +++++++++++++ 7 files changed, 193 insertions(+), 3 deletions(-) create mode 100644 support/Translation/TranslatedHtmlSanitizer.php create mode 100644 support/Translation/TranslationMarkupValidator.php create mode 100644 tests/Unit/Support/Translation/TranslatedHtmlSanitizerTest.php create mode 100644 tests/Unit/Support/Translation/TranslationMarkupValidatorTest.php diff --git a/scripts/validate-translations.php b/scripts/validate-translations.php index 4b952e50..ae8a0434 100644 --- a/scripts/validate-translations.php +++ b/scripts/validate-translations.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use App\Support\Translation\TranslationMarkupValidator; use App\Support\Translation\TranslationTemplateSyntaxValidator; use LibreSign\JigsawLocalization\Catalog\JsonTranslationCatalog; use LibreSign\JigsawLocalization\Catalog\TranslationCatalogValidator; @@ -13,6 +14,7 @@ $source = (new JsonTranslationCatalog($sourcePath))->read(); $validator = new TranslationCatalogValidator(); $templateSyntaxValidator = new TranslationTemplateSyntaxValidator(); +$markupValidator = new TranslationMarkupValidator(); $errors = []; if (in_array('--canonical-source', $argv, true)) { @@ -35,6 +37,10 @@ foreach ($templateSyntaxValidator->validate($source, $translation) as $error) { $errors[] = "{$locale}: {$error}"; } + + foreach ($markupValidator->validate($source, $translation) as $error) { + $errors[] = "{$locale}: {$error}"; + } } if ($errors === []) { diff --git a/source/_layouts/post_base.blade.php b/source/_layouts/post_base.blade.php index 7e66e67b..7bd3b353 100644 --- a/source/_layouts/post_base.blade.php +++ b/source/_layouts/post_base.blade.php @@ -51,9 +51,9 @@ @endif @php - $author = ' ' . $page->author . ''; + $author = ' ' . e($page->author) . ''; @endphp - {!! $page->t("By %s", [$author]) !!} + {!! vsprintf(e($page->t('By %s')), [$author]) !!} diff --git a/source/faq.blade.php b/source/faq.blade.php index bce29c3d..e0685cf3 100644 --- a/source/faq.blade.php +++ b/source/faq.blade.php @@ -54,7 +54,7 @@ class="ud-faq-btn collapsed"
- {!! $page->t($frequentlyQuestion->answer)!!} + {!! \App\Support\Translation\TranslatedHtmlSanitizer::sanitize($page->t($frequentlyQuestion->answer)) !!}
diff --git a/support/Translation/TranslatedHtmlSanitizer.php b/support/Translation/TranslatedHtmlSanitizer.php new file mode 100644 index 00000000..c47f7b65 --- /dev/null +++ b/support/Translation/TranslatedHtmlSanitizer.php @@ -0,0 +1,27 @@ +', + '', + '<$1$2>', + ], + $escapedHtml, + ); + } +} diff --git a/support/Translation/TranslationMarkupValidator.php b/support/Translation/TranslationMarkupValidator.php new file mode 100644 index 00000000..a36e2768 --- /dev/null +++ b/support/Translation/TranslationMarkupValidator.php @@ -0,0 +1,64 @@ +"\']|"[^"]*"|\'[^\']*\')*)>/'; + private const HTML_ATTRIBUTE_PATTERN = '/([A-Za-z_:@][-\w:.]*)\s*(?:=\s*(?:"[^"]*"|\'[^\']*\'|[^\s>]+))?/'; + + /** + * @param array $source + * @param array $translation + * @return list + */ + public function validate(array $source, array $translation): array + { + $errors = []; + + foreach ($translation as $key => $translatedText) { + if (!array_key_exists($key, $source)) { + continue; + } + + $sourceMarkup = $this->markup($source[$key]); + $translatedMarkup = $this->markup($translatedText); + if ($sourceMarkup === $translatedMarkup) { + continue; + } + + $errors[] = sprintf( + 'HTML markup mismatch in translation of "%s": expected [%s], got [%s].', + strtok($key, "\n"), + implode(', ', $sourceMarkup), + implode(', ', $translatedMarkup), + ); + } + + return $errors; + } + + /** + * @return list + */ + private function markup(string $text): array + { + $markup = []; + preg_match_all(self::HTML_TAG_PATTERN, $text, $tags, PREG_SET_ORDER); + foreach ($tags as [, $tagName, $attributes]) { + $tagName = strtolower($tagName); + $markup[] = $tagName; + preg_match_all(self::HTML_ATTRIBUTE_PATTERN, $attributes, $attributeMatches); + foreach ($attributeMatches[1] as $attributeName) { + $markup[] = $tagName . '[' . strtolower($attributeName) . ']'; + } + } + + $markup = array_values(array_unique($markup)); + sort($markup); + + return $markup; + } +} diff --git a/tests/Unit/Support/Translation/TranslatedHtmlSanitizerTest.php b/tests/Unit/Support/Translation/TranslatedHtmlSanitizerTest.php new file mode 100644 index 00000000..63d5a75e --- /dev/null +++ b/tests/Unit/Support/Translation/TranslatedHtmlSanitizerTest.php @@ -0,0 +1,47 @@ + [ + 'Code on GitHub.', + 'Code on GitHub.', + ]; + + yield 'emphasis' => ['Yes, free.', 'Yes, free.']; + + yield 'image with event handler' => [ + 'Oui ', + 'Oui <img src=x onerror="alert(1)">', + ]; + + yield 'script tag' => ['', '<script>alert(1)</script>']; + + yield 'link with extra attribute' => [ + 'x', + '<a href="https://example.org" onclick="alert(1)">x', + ]; + + yield 'javascript link' => [ + 'x', + '<a href="javascript:alert(1)">x', + ]; + + yield 'existing entity' => ['Q&A', 'Q&A']; + } +} diff --git a/tests/Unit/Support/Translation/TranslationMarkupValidatorTest.php b/tests/Unit/Support/Translation/TranslationMarkupValidatorTest.php new file mode 100644 index 00000000..535a382a --- /dev/null +++ b/tests/Unit/Support/Translation/TranslationMarkupValidatorTest.php @@ -0,0 +1,46 @@ +GitHub.\n\n
\n \"Settings\"\n
"; + $translation = "Código no GitHub.\n\n
\n \"Configurações\"\n
"; + + self::assertSame([], (new TranslationMarkupValidator())->validate([$source => $source], [$source => $translation])); + } + + public function testRejectsTagMissingFromSource(): void + { + $source = "## Post title\n\nPost body."; + $translation = "## Titre\n\nTexte "; + + self::assertSame( + ['HTML markup mismatch in translation of "## Post title": expected [], got [img, img[src]].'], + (new TranslationMarkupValidator())->validate([$source => $source], [$source => $translation]), + ); + } + + public function testRejectsAttributeMissingFromSource(): void + { + $source = 'See the site.'; + $translation = 'Voir le site.'; + + self::assertSame( + ['HTML markup mismatch in translation of "See the site.": expected [a, a[href]], got [a, a[href], a[onclick]].'], + (new TranslationMarkupValidator())->validate([$source => $source], [$source => $translation]), + ); + } + + public function testIgnoresKeysMissingFromSource(): void + { + self::assertSame([], (new TranslationMarkupValidator())->validate([], ['Removed' => '