revert(urlmap): revert PR #35345 #35622
Merged
Merged
Conversation
… multi-tenant content bleed Reverts all changes introduced by PR #35345 (fix: url map 404 on different host). The unrestricted cross-site fallback added in that PR — which removed the conhost filter from the ES query when the host-restricted query returned no results — caused a production incident (#35616): in multi-brand/multi-tenant setups, content from one site was silently rendered on a different site's pages. This revert restores the original host-restricted single-query behavior. The getDetailPageUri() fallback (which allowed detail pages on a different host) is also reverted; it will be reintroduced correctly in the follow-up fix. Closes #35621 See also: #35616, #35268 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Contributor
|
Claude finished @gortiz-dotcms's task in 53s —— View job dotCMS Backend Review — Complete ✅
SummaryThis is a clean revert that restores the original host-restricted ES query behavior in No backend findings flagged across security, database, Java standards, or REST API dimensions. |
Contributor
|
✅ dotCMS Backend Review: no issues found. |
dsilvam
approved these changes
May 8, 2026
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
2 participants
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.
cross-site URL map fallback caused multi-tenant content bleed
Reverts all changes introduced by PR #35345 (fix: url map 404 on different host).
The unrestricted cross-site fallback added in that PR — which removed the conhost filter from the ES query when the host-restricted query returned no results — caused a production incident (#35616): in multi-brand/multi-tenant setups, content from one site was silently rendered on a different site's pages.
This revert restores the original host-restricted single-query behavior. The getDetailPageUri() fallback (which allowed detail pages on a different host) is also reverted; it will be reintroduced correctly in the follow-up fix.
This PR fixes: #35621
This PR fixes: #35621