diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java index bb5e0cee8..bec3933c5 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java @@ -22,6 +22,7 @@ import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.themes.SharedTheme; import org.apache.roller.weblogger.business.themes.ThemeManager; +import org.apache.roller.weblogger.business.themes.ThemeNotFoundException; import org.apache.roller.weblogger.pojos.ThemeResource; import java.io.IOException; @@ -80,6 +81,9 @@ public void doGet( } else { try { payload = dataFor(themeMgr.getTheme(themeId)); + } catch (ThemeNotFoundException e) { + response.sendError(HttpServletResponse.SC_NOT_FOUND, "No such theme"); + return; } catch (WebloggerException e) { response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "ERROR fetching theme data"); return; diff --git a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServletTest.java b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServletTest.java index c2b6041f4..5433229aa 100644 --- a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServletTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServletTest.java @@ -32,6 +32,7 @@ import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.themes.SharedTheme; import org.apache.roller.weblogger.business.themes.ThemeManager; +import org.apache.roller.weblogger.business.themes.ThemeNotFoundException; import org.apache.roller.weblogger.pojos.ThemeResource; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; @@ -40,6 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** @@ -111,4 +113,23 @@ public void theThemeListIncludesThemesWithoutAPreviewImage() throws Exception { assertEquals("/themes/basic/sm-theme-basic.png", list.get(0).get("previewPath").asText()); assertTrue(list.get(1).get("previewPath").isNull()); } + + @Test + public void anUnknownThemeIsNotFound() throws Exception { + ThemeManager themes = mock(ThemeManager.class); + when(themes.getTheme("nosuchtheme")) + .thenThrow(new ThemeNotFoundException("Couldn't find theme [nosuchtheme]")); + Weblogger weblogger = mock(Weblogger.class); + when(weblogger.getThemeManager()).thenReturn(themes); + + HttpServletRequest request = mock(HttpServletRequest.class); + when(request.getParameter("theme")).thenReturn("nosuchtheme"); + HttpServletResponse response = mock(HttpServletResponse.class); + + try (MockedStatic factory = mockStatic(WebloggerFactory.class)) { + factory.when(WebloggerFactory::getWeblogger).thenReturn(weblogger); + new ThemeDataServlet().doGet(request, response); + } + verify(response).sendError(HttpServletResponse.SC_NOT_FOUND, "No such theme"); + } }