Merge conflict Gerrit cannot merge this change. It needs a rebase onto main.

Review main Ready for review Quiet

95737[BUGFIX] Allow dots in site identifiers

Georg Ringer CR 0 V 0 Normal +69 −3 updated 11/03/26, 20:00

Commit message

Site identifiers may contain characters that are not allowed in
cache entry identifiers, most notably dots. Both tree builders for
page TSconfig and sys_template used the identifier verbatim, which
made TYPO3 throw

  "pagetsconfig-site-foo.bar_8b3395f969f83b83" is not a valid
  cache entry identifier

in the frontend and in every backend module using the page tree.

TsConfigTreeBuilder passed the include name - which carries the site
identifier or a set name - to PackageDependentCacheIdentifier as
prefix. That prefix is meant to be static, so the name is hashed
along with the TypoScript string now. SysTemplateTreeBuilder does
not use that class and hashes the site identifier itself.

Test this change

Run a command in your clone of the TYPO3 Core. Then try what the change does and vote on Verified in Gerrit. How to review a patch

Check out patch set 2
git fetch https://review.typo3.org/Packages/TYPO3.CMS refs/changes/37/95737/2 && git checkout FETCH_HEAD
Cherry-pick onto main
git fetch https://review.typo3.org/Packages/TYPO3.CMS refs/changes/37/95737/2 && git cherry-pick FETCH_HEAD

Review

  • Code review CR 0 Needs a vote
  • Verified V 0 Needs a vote
    • core-ci +1 CI

Issues 1

Files 4

Review log 810

  1. Georg Ringer uploaded patch set 1 09/08/26, 20:44

  2. Georg Ringer commented on patch set 1 09/08/26, 20:44

    This change is ready for review.
  3. core-ci voted on patch set 1 V +1 09/08/26, 20:57 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/108119

  4. Wouter Wolters voted on patch set 1 CR +1 09/08/26, 21:04

  5. Simon Schaufelberger voted on patch set 1 CR +1 V +1 09/09/26, 05:54

  6. Josef Glatz voted on patch set 1 CR +1 V +1 09/09/26, 06:31

  7. Benjamin Franzke commented on patch set 1 CR -1 09/09/26, 06:34

    PackageDependentCacheIdentifier.php:81

    The prefix is meant to be a static prefix, dynamic stuff is to be hashed via `withAdditionalHashedIdentifier()`. Let's avoid introducing expensive regex operations in cache key generation, as this is meant to be fast in general. Please adapt this in `typo3/sysext/core/Classes/TypoScript/IncludeTree/TsConfigTreeBuilder.php` if it *really* needs to use a dynamic prefix.
  8. Georg Ringer uploaded patch set 2 CR +1 V +1 09/09/26, 14:28

  9. core-ci voted on patch set 2 V +1 09/09/26, 14:40 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/108194

  10. Georg Ringer commented on patch set 2 11/03/26, 20:00

    PackageDependentCacheIdentifier.php:81 Reply

    Done