This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch roller-6.1.x
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/roller-6.1.x by this push:
     new dfb0af67e Require a role in the weblog for page and resource previews 
(#223)
dfb0af67e is described below

commit dfb0af67e62977c88f01a03bf919d29345e9898b
Author: David M. Johnson <[email protected]>
AuthorDate: Thu Oct 29 22:43:29 2026 -0400

    Require a role in the weblog for page and resource previews (#223)
    
    * Require a role in the weblog for page and resource previews
    * Test previews by a global admin without a weblog role; note the change in 
CHANGES.md
    * Move the preview check to PreviewAccess and test it in both servlets
---
 CHANGES.md                                         |   3 +
 .../rendering/servlets/PreviewResourceServlet.java |   6 ++
 .../ui/rendering/servlets/PreviewServlet.java      |   8 +-
 .../weblogger/ui/rendering/util/PreviewAccess.java |  50 ++++++++++
 .../servlets/PreviewResourceServletTest.java       |  32 +++++-
 .../servlets/PreviewServletAccessTest.java         |  64 ++++++++++++
 .../ui/rendering/util/PreviewAccessTest.java       | 109 +++++++++++++++++++++
 7 files changed, 270 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5c97aae97..23072ab37 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -75,6 +75,9 @@
   member), only user names are matched. Global admins can still search by
   email address. For other users the picker lists enabled users only, at
   most 50 at a time. `%` and `_` in the search text match only themselves.
+- **Previews need a role in the weblog.** Previewing a weblog's pages or
+  theme resources now requires an enabled user with a role in that weblog
+  (Limited, Author or Admin), or a global admin.
 
 ### Bug fixes
 
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
index b484e5c46..ec6abdcf2 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
@@ -40,6 +40,7 @@ import org.apache.roller.weblogger.pojos.ThemeResource;
 import org.apache.roller.weblogger.pojos.WeblogTheme;
 import org.apache.roller.weblogger.pojos.Weblog;
 import org.apache.roller.weblogger.ui.rendering.util.ModDateHeaderUtil;
+import org.apache.roller.weblogger.ui.rendering.util.PreviewAccess;
 import 
org.apache.roller.weblogger.ui.rendering.util.WeblogPreviewResourceRequest;
 
 /**
@@ -91,6 +92,11 @@ public class PreviewResourceServlet extends HttpServlet {
             return;
         }
 
+        if (!PreviewAccess.canPreview(weblog, resourceRequest.getUser())) {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            return;
+        }
+
         log.debug("Resource requested [" + resourceRequest.getResourcePath()
                 + "]");
 
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
index a2ed8ced8..40274f045 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
@@ -34,6 +34,7 @@ import org.apache.roller.weblogger.ui.core.RollerContext;
 import org.apache.roller.weblogger.ui.rendering.Renderer;
 import org.apache.roller.weblogger.ui.rendering.RendererManager;
 import org.apache.roller.weblogger.ui.rendering.model.ModelLoader;
+import org.apache.roller.weblogger.ui.rendering.util.PreviewAccess;
 import org.apache.roller.weblogger.ui.rendering.util.WeblogPreviewRequest;
 import org.apache.roller.weblogger.util.cache.CachedContent;
 
@@ -102,6 +103,11 @@ public class PreviewServlet extends HttpServlet {
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
             return;
         }
+
+        if (!PreviewAccess.canPreview(weblog, previewRequest.getUser())) {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            return;
+        }
         
         // Get the deviceType from user agent
         MobileDeviceRepository.DeviceType deviceType = 
previewRequest.getDeviceType();
@@ -292,5 +298,5 @@ public class PreviewServlet extends HttpServlet {
         
         log.debug("Exiting");
     }
-    
+
 }
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/PreviewAccess.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/PreviewAccess.java
new file mode 100644
index 000000000..15ed72acc
--- /dev/null
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/PreviewAccess.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.roller.weblogger.ui.rendering.util;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+
+/**
+ * Decides who may see a weblog's page and resource previews.
+ */
+public final class PreviewAccess {
+
+    private static final Log log = LogFactory.getLog(PreviewAccess.class);
+
+    private PreviewAccess() {
+    }
+
+    /**
+     * Previews show unpublished content, so only an enabled user with a role
+     * in the weblog (or a global admin) may see them.
+     */
+    public static boolean canPreview(Weblog weblog, User user) {
+        boolean allowed = weblog != null && user != null
+                && Boolean.TRUE.equals(user.getEnabled())
+                && weblog.hasUserPermission(user, WeblogPermission.EDIT_DRAFT);
+        if (!allowed && log.isDebugEnabled()) {
+            log.debug("Preview refused: user " + (user == null ? null : 
user.getUserName())
+                    + ", weblog " + (weblog == null ? null : 
weblog.getHandle()));
+        }
+        return allowed;
+    }
+}
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServletTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServletTest.java
index beecb8dbc..1315ef3a3 100644
--- 
a/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServletTest.java
+++ 
b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServletTest.java
@@ -32,7 +32,9 @@ import org.apache.roller.weblogger.business.Weblogger;
 import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.business.themes.WeblogCustomTheme;
 import org.apache.roller.weblogger.pojos.MediaFile;
+import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
 import 
org.apache.roller.weblogger.ui.rendering.util.WeblogPreviewResourceRequest;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -53,11 +55,13 @@ import static org.mockito.Mockito.when;
 /**
  * Preview finds a resource either in the theme being previewed or in the
  * weblog's own theme. With a custom theme, both reach the media library.
+ * Only an enabled user with a role in the weblog gets a preview.
  */
 class PreviewResourceServletTest {
 
     private MockedStatic<WebloggerFactory> factory;
     private MediaFileManager media;
+    private User user;
     private Weblog weblog;
     private PreviewResourceServlet servlet;
 
@@ -66,11 +70,14 @@ class PreviewResourceServletTest {
         media = mock(MediaFileManager.class);
         Weblogger roller = mock(Weblogger.class);
         when(roller.getMediaFileManager()).thenReturn(media);
+        user = mock(User.class);
+        when(user.getEnabled()).thenReturn(Boolean.TRUE);
         factory = mockStatic(WebloggerFactory.class);
         factory.when(WebloggerFactory::getWeblogger).thenReturn(roller);
 
         weblog = mock(Weblog.class);
         when(weblog.getTheme()).thenReturn(new WeblogCustomTheme(weblog));
+        when(weblog.hasUserPermission(user, 
WeblogPermission.EDIT_DRAFT)).thenReturn(true);
 
         ServletContext context = mock(ServletContext.class);
         when(context.getMimeType("page.html")).thenReturn("text/html");
@@ -116,8 +123,30 @@ class PreviewResourceServletTest {
         verify(response, never()).setHeader(eq("Content-Disposition"), 
anyString());
     }
 
+    @Test
+    void userWithoutWeblogRoleGetsNotFound() throws Exception {
+        when(weblog.hasUserPermission(user, 
WeblogPermission.EDIT_DRAFT)).thenReturn(false);
+        HttpServletResponse response = serve(null, "/css/site.css", "body {}", 
"");
+
+        verify(response).sendError(HttpServletResponse.SC_NOT_FOUND);
+        verify(response, never()).setContentType(anyString());
+    }
+
+    @Test
+    void disabledUserGetsNotFound() throws Exception {
+        when(user.getEnabled()).thenReturn(Boolean.FALSE);
+        HttpServletResponse response = serve(null, "/css/site.css", "body {}", 
"");
+
+        verify(response).sendError(HttpServletResponse.SC_NOT_FOUND);
+    }
+
     private HttpServletResponse serve(String themeName, String path, String 
body)
             throws Exception {
+        return serve(themeName, path, body, body);
+    }
+
+    private HttpServletResponse serve(String themeName, String path, String 
body, String expected)
+            throws Exception {
         MediaFile file = mock(MediaFile.class);
         when(file.getOriginalPath()).thenReturn(path);
         when(file.getInputStream()).thenReturn(
@@ -133,6 +162,7 @@ class PreviewResourceServletTest {
         try (MockedConstruction<WeblogPreviewResourceRequest> parsed = 
mockConstruction(
                 WeblogPreviewResourceRequest.class, (mocked, ctx) -> {
                     when(mocked.getWeblog()).thenReturn(weblog);
+                    when(mocked.getUser()).thenReturn(user);
                     when(mocked.getResourcePath()).thenReturn(path);
                     when(mocked.getThemeName()).thenReturn(themeName);
                     if (themeName != null) {
@@ -142,7 +172,7 @@ class PreviewResourceServletTest {
             servlet.doGet(request, response);
         }
 
-        assertEquals(body, written.toString(StandardCharsets.UTF_8.name()));
+        assertEquals(expected, 
written.toString(StandardCharsets.UTF_8.name()));
         return response;
     }
 
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServletAccessTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServletAccessTest.java
new file mode 100644
index 000000000..ea9894767
--- /dev/null
+++ 
b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServletAccessTest.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.roller.weblogger.ui.rendering.servlets;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.rendering.util.WeblogPreviewRequest;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedConstruction;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockConstruction;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * The page preview servlet refuses users without a role in the weblog.
+ */
+class PreviewServletAccessTest {
+
+    @Test
+    void userWithoutWeblogRoleGetsNotFound() throws Exception {
+        User user = mock(User.class);
+        when(user.getEnabled()).thenReturn(Boolean.TRUE);
+        Weblog weblog = mock(Weblog.class);
+        when(weblog.hasUserPermission(user, 
WeblogPermission.EDIT_DRAFT)).thenReturn(false);
+
+        HttpServletRequest request = mock(HttpServletRequest.class);
+        HttpServletResponse response = mock(HttpServletResponse.class);
+
+        try (MockedConstruction<WeblogPreviewRequest> parsed = 
mockConstruction(
+                WeblogPreviewRequest.class, (mocked, ctx) -> {
+                    when(mocked.getWeblog()).thenReturn(weblog);
+                    when(mocked.getUser()).thenReturn(user);
+                })) {
+            new PreviewServlet().doGet(request, response);
+        }
+
+        verify(response).sendError(HttpServletResponse.SC_NOT_FOUND);
+        verify(response, never()).setContentType(anyString());
+        verify(response, never()).getWriter();
+        verify(response, never()).getOutputStream();
+    }
+}
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/PreviewAccessTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/PreviewAccessTest.java
new file mode 100644
index 000000000..2817713ed
--- /dev/null
+++ 
b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/PreviewAccessTest.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.roller.weblogger.ui.rendering.util;
+
+import java.util.Collections;
+
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Previews are for users with a role in the weblog being previewed.
+ */
+class PreviewAccessTest {
+
+    private User owner;
+    private User other;
+    private Weblog weblog;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        TestUtils.setupWeblogger();
+        owner = TestUtils.setupUser("previewOwner");
+        other = TestUtils.setupUser("previewOther");
+        weblog = TestUtils.setupWeblog("previewWeblog", owner);
+        TestUtils.endSession(true);
+    }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        TestUtils.teardownWeblog(weblog.getId());
+        TestUtils.teardownUser(owner.getUserName());
+        TestUtils.teardownUser(other.getUserName());
+        TestUtils.endSession(true);
+    }
+
+    @Test
+    void ownerCanPreview() throws Exception {
+        
assertTrue(PreviewAccess.canPreview(TestUtils.getManagedWebsite(weblog), 
user(owner)));
+    }
+
+    @Test
+    void userWithoutRoleCannotPreview() throws Exception {
+        
assertFalse(PreviewAccess.canPreview(TestUtils.getManagedWebsite(weblog), 
user(other)));
+        
assertFalse(PreviewAccess.canPreview(TestUtils.getManagedWebsite(weblog), 
null));
+    }
+
+    @Test
+    void memberWithDraftRoleCanPreview() throws Exception {
+        UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+        mgr.grantWeblogPermission(TestUtils.getManagedWebsite(weblog), 
user(other),
+                Collections.singletonList(WeblogPermission.EDIT_DRAFT));
+        TestUtils.endSession(true);
+        
assertTrue(PreviewAccess.canPreview(TestUtils.getManagedWebsite(weblog), 
user(other)));
+    }
+
+    @Test
+    void pendingInviteCannotPreview() throws Exception {
+        UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+        mgr.grantWeblogPermissionPending(TestUtils.getManagedWebsite(weblog), 
user(other),
+                Collections.singletonList(WeblogPermission.EDIT_DRAFT));
+        TestUtils.endSession(true);
+        
assertFalse(PreviewAccess.canPreview(TestUtils.getManagedWebsite(weblog), 
user(other)));
+    }
+
+    @Test
+    void globalAdminWithoutRoleCanPreview() throws Exception {
+        UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+        mgr.grantRole("admin", user(other));
+        TestUtils.endSession(true);
+        
assertTrue(PreviewAccess.canPreview(TestUtils.getManagedWebsite(weblog), 
user(other)));
+    }
+
+    @Test
+    void disabledOwnerCannotPreview() throws Exception {
+        // a detached copy, so the stored owner stays enabled
+        User disabled = new User();
+        disabled.setUserName(owner.getUserName());
+        disabled.setEnabled(Boolean.FALSE);
+        
assertFalse(PreviewAccess.canPreview(TestUtils.getManagedWebsite(weblog), 
disabled));
+    }
+
+    private static User user(User u) throws Exception {
+        return 
WebloggerFactory.getWeblogger().getUserManager().getUserByUserName(u.getUserName());
+    }
+}

Reply via email to