81316[BUGFIX] Add CKEditor5 migrator for {extraA,disa,a}llowedContent
Commit message
Review
-
Code review CR +2 Done
- Benjamin Franzke +2
- Stefan Bürk +1
- Oliver Hader +1
-
Verified V +2 Done
- Benjamin Franzke +2
- Stefan Bürk +1
- Oliver Hader +1
- core-ci +1 CI
Issues 1
Files 6
- Build/Sources/TypeScript/rte_ckeditor/ckeditor5.ts3+33 −2
- typo3/sysext/core/Classes/Configuration/CKEditor5Migrator.php+138 −0
- typo3/sysext/core/Documentation/Changelog/12.0/Feature-96874-CKEditor5.rst+1 −1
- typo3/sysext/core/Tests/Unit/Configuration/CKEditor5MigratorTest.php+170 −0
- typo3/sysext/rte_ckeditor/Configuration/RTE/Editor/Base.yaml2+4 −0
- typo3/sysext/rte_ckeditor/Resources/Public/JavaScript/ckeditor5.js+2 −2
Review log 1622
-
Benjamin Franzke uploaded patch set 1 10/04/23, 05:07
-
core-ci voted on patch set 1 V -1 10/04/23, 05:15 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/47378
-
Benjamin Franzke uploaded patch set 2
V -110/04/23, 11:08 -
core-ci voted on patch set 2 V +1 10/04/23, 11:16 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/47391
-
Benjamin Franzke uploaded patch set 3
V +110/05/23, 09:31 -
Benjamin Kott voted on patch set 3 V +1 CR +1 10/05/23, 09:35
-
core-ci voted on patch set 3 V +1 10/05/23, 09:39 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/47432
-
Benjamin Franzke rebased onto patch set 4
CR +1V +110/06/23, 08:40 -
Benjamin Franzke rebased onto patch set 5 10/06/23, 08:55
Rebase -
core-ci voted on patch set 4 V -1 10/06/23, 08:56 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/47460
-
core-ci voted on patch set 5 V +1 10/06/23, 09:08 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/47465
-
Stefan Bürk voted on patch set 5 V +1 CR +1 10/06/23, 09:18
-
Oliver Hader commented on patch set 5 10/06/23, 10:54
ckeditor5.ts:253Should `key` be checked against prototype pollution like in JavaScriptHandler.js?Base.yaml:18Checked 👍 It was `extraAllowedContent: "*(*)[data-*]"` in TYPO3 v11 -
Oliver Hader voted on patch set 5 V +1 10/06/23, 11:22
-
Benjamin Franzke commented on patch set 5 10/06/23, 13:11
ckeditor5.ts:253ReplyHm, good question. I think I'd say: no Reason: https://github.com/TYPO3/typo3/blob/main/Build/Sources/TypeScript/core/java-script-item-processor.ts#L22 prohibts `'__proto__', 'prototype', 'constructor'` to be set on arbitrary objects, because the "issue" would be if some classes/objects could be altered with the JavaScriptModuleInstruction "assign". In this this case we create a cloned object (with a certain subfield changed), so I'd say it's fine to copy all properties. (as the resulting objects are never `new`ed). WDYT?Base.yaml:18ReplyRight – and just because I didn't mention that explicitly: `extraAllowedContent: "*(*)[data-*]"` would actually also work now, thanks to the migration, but I wanted to use the new syntax directly. -
Benjamin Franzke uploaded patch set 6
CR +1V +110/06/23, 13:54Rebase -
core-ci voted on patch set 6 V +1 10/06/23, 14:01 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/47498
-
Oliver Hader commented on patch set 6 10/06/23, 14:02
ckeditor5.ts:253ReplyAs you found out (via Slack), it's not relevant here for `Object.keys`, `Object.values` or `Object.entries`. -
Oliver Hader voted on patch set 6 V +1 CR +1 10/06/23, 14:02
-
Stefan Bürk voted on patch set 6 V +1 CR +1 10/06/23, 14:19
-
Benjamin Franzke voted on patch set 6 V +2 CR +2 10/06/23, 14:21
-
Benjamin Franzke merged patch set 7 10/06/23, 14:27