Repository navigation
Look a media file up in the addressed weblog before loading its content - #346
Merged
Merged
Conversation
MediaResourceServlet loaded the file and its content with getMediaFile(id, true) and only then checked its weblog. It now looks the file up with getMediaFile(weblog, id), which finds only files in the weblog named in the address, and loads the content only after that.
snoopdave
reviewed
Nov 20, 2026
snoopdave
left a comment
Contributor
There was a problem hiding this comment.
Review of f04840d92: The scoped lookup precedes content loading, and the updated test would fail without that ordering. The twin PR has the same functional hunks; I found no unexplained difference.
No new issues found.
snoopdave
approved these changes
Nov 20, 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
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.
Follows up #329 from review, with the same change as the master follow-up to #308.
MediaResourceServletloaded the file and its content withgetMediaFile(id, true)and only then checked its weblog. It now looks the file up withgetMediaFile(weblog, id), which finds only files in the weblog named in the address, and loads the content only after that.Tests:
MediaResourceServletTestnow also checks that a file requested at another weblog's address is never loaded.