security(deps): upgrade bundled DOMPurify in TinyMCE / Monaco / Swagger UI assets#36622
Open
mbiuki wants to merge 1 commit into
Open
security(deps): upgrade bundled DOMPurify in TinyMCE / Monaco / Swagger UI assets#36622mbiuki wants to merge 1 commit into
mbiuki wants to merge 1 commit into
Conversation
…er UI assets CVE-2025-26791 follow-up (#35996). The npm-level DOMPurify was already patched via the mermaid bump, but three vendored third-party UI bundles still shipped older DOMPurify copies that pen-test scanners fingerprint inside the WAR: - TinyMCE 7.2.1 -> 7.9.3 (ext/tinymcev7, DOMPurify 3.0.5 -> 3.2.6) - Monaco 0.33.0 -> 0.55.1 (html/assets/monaco-editor, DOMPurify 2.3.1 -> 3.2.7) - Swagger UI ~5.17 -> 5.32.9 (apiplayground, DOMPurify 3.1.4 -> 3.4.11) Notes: - Monaco 0.53+ deprecated but still ships the AMD build; 0.55.1's min/vs keeps define("vs/editor/editor.main") so the Dojo AMD loader in top_inc.jsp / edit_contentlet.jsp keeps working. 0.52.2 (the last non-deprecated AMD release) still bundles DOMPurify 3.1.7 < 3.2.4, so it does not remediate the CVE. - dotCMS-added ext/tinymcev7/langs/ is preserved; everything else in the TinyMCE dir is verbatim from the tinymce@7.9.3 npm package. - Swagger UI files are verbatim from swagger-ui-dist@5.32.9; index.jsp cache-buster bumped so browsers pick up the new assets. - The Angular apps load their own Monaco copy from core-web's monaco-editor@0.33.0 npm dep (built into dotAdmin assets, not in git); upgrading that is a separate follow-up. Verified: no DOMPurify < 3.2.4 version strings remain under the three vendored asset paths. Fixes: CVE-2025-26791 fingerprinting in bundled assets Issue: #35996 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Contributor
|
Claude finished @mbiuki's task in 9m 1s —— View job PR Review: Upgrade bundled DOMPurify (TinyMCE / Monaco / Swagger UI)
This is a vendored-asset bundle upgrade — no dotCMS Java/Angular source changes, so the review focuses on remediation completeness and integration-path integrity rather than logic. Verification results (all pass)DOMPurify remediation — confirmed ✅
Monaco integration — confirmed ✅
TinyMCE integration — confirmed ✅
Swagger UI integration — confirmed ✅
Notes (non-blocking)
Verdict: Remediation is complete and all vendored integration points check out statically. No blocking issues found. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Fixes #35996 (CVE-2025-26791 follow-up). Upgrades the three vendored third-party UI bundles that still ship pre-3.2.4 DOMPurify copies inside the WAR:
ext/tinymcev7html/assets/monaco-editorhtml/portlet/ext/apiplaygroundCompatibility notes
top_inc.jspmodulePaths: {vs: …},edit_contentlet.jsprequire(["vs/editor/editor.main"])). Monaco 0.53+ deprecated the AMD build but 0.55.1 still ships it —min/vs/editor/editor.main.jsremainsdefine("vs/editor/editor.main", …). The alternative (0.52.2, last non-deprecated AMD release) still bundles DOMPurify 3.1.7 < 3.2.4, so it wouldn't remediate the CVE./ext/tinymcev7/tinymce.min.js); 7.x minor-line bump, same plugin set (verified 29/29 plugins present). dotCMS-addedlangs/directory preserved; everything else is verbatimtinymce@7.9.3npm content.SwaggerUIBundleinit API inindex.jspunchanged in 5.32.9; the three dist files are verbatimswagger-ui-dist@5.32.9. Cache-buster query strings bumped (?v=20240819→?v=20260717).monaco-editor@0.33.0npm dependency — that upgrade is a code-level change (typings) and should be a follow-up issue.Verification
grepsweep confirms no DOMPurify < 3.2.4 version strings remain under the three vendored asset paths.define("vs/editor/editor.main"present in the neweditor.main.js;editor.main.csspath referenced bytop_inc.jsp:44unchanged.🤖 Generated with Claude Code