This is an automated email from the ASF dual-hosted git repository. mraible pushed a commit to branch scoped-media-file-lookup-6.1.x in repository https://gitbox.apache.org/repos/asf/roller.git
commit f04840d925d4e7e1c3e50c8cd0717c440514a20f Author: Matt Raible <[email protected]> AuthorDate: Tue Nov 17 20:20:09 2026 -0700 Look a media file up in the addressed weblog before loading its content 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. --- .../ui/rendering/servlets/MediaResourceServlet.java | 15 +++++---------- .../ui/rendering/servlets/MediaResourceServletTest.java | 4 ++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java index 465e6a1a0..01c207d51 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java @@ -94,13 +94,14 @@ public class MediaResourceServlet extends HttpServlet { MediaFile mediaFile; try { - mediaFile = mfMgr.getMediaFile(resourceRequest.getResourceId(), - true); - // a media file is only served at its own weblog's address - if (mediaFile == null || !belongsTo(mediaFile, weblog)) { + // a media file is only served at its own weblog's address, so look + // it up in that weblog before loading its content + if (mfMgr.getMediaFile(weblog, resourceRequest.getResourceId()) == null) { throw new WebloggerException("media file " + resourceRequest.getResourceId() + " is not in weblog " + weblog.getHandle()); } + mediaFile = mfMgr.getMediaFile(resourceRequest.getResourceId(), + true); resourceLastMod = mediaFile.getLastModified(); } catch (Exception ex) { @@ -169,10 +170,4 @@ public class MediaResourceServlet extends HttpServlet { } - - private static boolean belongsTo(MediaFile mediaFile, Weblog weblog) { - Weblog owner = mediaFile.getWeblog(); - return owner != null && owner.getId() != null && owner.getId().equals(weblog.getId()); - } - } diff --git a/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServletTest.java b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServletTest.java index fe3fc579a..a04613dee 100644 --- a/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServletTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServletTest.java @@ -74,6 +74,7 @@ class MediaResourceServletTest { when(file.getLastModified()).thenReturn(0L); when(file.getInputStream()).thenAnswer(call -> new ByteArrayInputStream("jpeg".getBytes(StandardCharsets.UTF_8))); + when(media.getMediaFile(owner, FILE_ID)).thenReturn(file); when(media.getMediaFile(FILE_ID, true)).thenReturn(file); servlet = new MediaResourceServlet(); @@ -100,10 +101,13 @@ class MediaResourceServletTest { verify(response).sendError(HttpServletResponse.SC_NOT_FOUND); assertEquals("", written.toString(StandardCharsets.UTF_8.name())); + // the other weblog's file is never loaded + verify(media, never()).getMediaFile(FILE_ID, true); } @Test void anUnknownFileIsNotFound() throws Exception { + when(media.getMediaFile(owner, FILE_ID)).thenReturn(null); when(media.getMediaFile(FILE_ID, true)).thenReturn(null); HttpServletResponse response = serve(owner, new ByteArrayOutputStream());
