Adding minor fixes reported via IQA feedback.

dotCMS · Oct 11, 2023 · a961bf5 · a961bf5
1 parent 6489162
commit a961bf5
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 20 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/SecretTool.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/SecretTool.java
@@ -5,8 +5,8 @@
 import com.dotcms.rendering.velocity.viewtools.secrets.DotVelocitySecretAppConfig;
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.business.Role;
-import com.dotmarketing.business.UserAPI;
 import com.dotmarketing.business.web.WebAPILocator;
+import com.dotmarketing.filters.CMSUrlUtil;
 import com.dotmarketing.portlets.contentlet.model.Contentlet;
 import com.dotmarketing.util.Config;
 import com.dotmarketing.util.Logger;
@@ -19,8 +19,6 @@
 import org.apache.velocity.tools.view.tools.ViewTool;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
 import java.util.Optional;
 
 /**
@@ -132,10 +130,14 @@ protected void canUserEvaluate() {
 			this.internalContextAdapter    = new InternalContextAdapterImpl(context);
 			final String fieldResourceName = this.internalContextAdapter.getCurrentTemplateName();
 			if (UtilMethods.isSet(fieldResourceName)) {
-				final String contentletFileAssetInode = fieldResourceName.substring(fieldResourceName.indexOf("/") + 1, fieldResourceName.indexOf("_"));
-				final Contentlet contentlet = APILocator.getContentletAPI().find(contentletFileAssetInode, APILocator.systemUser(), true);
-				final User lastModifiedUser = APILocator.getUserAPI().loadUserById(contentlet.getModUser(), APILocator.systemUser(), true);
-				hasScriptingRole = APILocator.getRoleAPI().doesUserHaveRole(lastModifiedUser, scripting);
+				try {
+					final String contentletFileAssetInode = CMSUrlUtil.getInstance().getIdentifierFromUrlPath(fieldResourceName);
+					final Contentlet contentlet = APILocator.getContentletAPI().find(contentletFileAssetInode, APILocator.systemUser(), true);
+					final User lastModifiedUser = APILocator.getUserAPI().loadUserById(contentlet.getModUser(), APILocator.systemUser(), true);
+					hasScriptingRole = APILocator.getRoleAPI().doesUserHaveRole(lastModifiedUser, scripting);
+				} catch (final Exception e) {
+					// Quiet and continue with the next check
+				}
 			}
 
 			if (!hasScriptingRole) {

diff --git a/dotCMS/src/main/java/com/dotmarketing/filters/CMSUrlUtil.java b/dotCMS/src/main/java/com/dotmarketing/filters/CMSUrlUtil.java
@@ -1,11 +1,5 @@
 package com.dotmarketing.filters;
 
-import static com.dotmarketing.business.PermissionAPI.PERMISSION_READ;
-import static com.dotmarketing.filters.CMSFilter.CMS_INDEX_PAGE;
-import static com.dotmarketing.filters.Constants.CMS_FILTER_QUERY_STRING_OVERRIDE;
-import static com.dotmarketing.filters.Constants.CMS_FILTER_URI_OVERRIDE;
-import static java.util.stream.Collectors.toSet;
-
 import com.dotcms.contenttype.model.type.BaseContentType;
 import com.dotmarketing.beans.Host;
 import com.dotmarketing.beans.Identifier;
@@ -31,6 +25,10 @@
 import com.liferay.util.Xss;
 import io.vavr.Tuple;
 import io.vavr.Tuple2;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
@@ -42,9 +40,12 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import static com.dotmarketing.business.PermissionAPI.PERMISSION_READ;
+import static com.dotmarketing.filters.CMSFilter.CMS_INDEX_PAGE;
+import static com.dotmarketing.filters.Constants.CMS_FILTER_QUERY_STRING_OVERRIDE;
+import static com.dotmarketing.filters.Constants.CMS_FILTER_URI_OVERRIDE;
+import static java.util.stream.Collectors.toSet;
 
 /**
  * Utilitary class used by the CMS Filter
@@ -576,4 +577,25 @@ public static String getCurrentURI(final HttpServletRequest request)  {
 			throw new DotRuntimeException(e);
 		}
 	}
+
+	/**
+	 * Tries to recover the identifier from the URL path. The URL could be a page, such as:
+	 * {@code /LIVE/27e8f845c3bd21ad1c601b8fe005caa6/dotParser_1695072095296.container} , or a call
+	 * to a resource, such as: {@code Content/27e8f845c3bd21ad1c601b8fe005caa6_1695072095296}
+	 *
+	 * @param urlPath The URL path from a Contentlet.
+	 *
+	 * @return The Identifier of the Contentlet.
+	 */
+	public String getIdentifierFromUrlPath(final String urlPath) {
+		final PageMode[] modes = PageMode.values();
+		for (final PageMode mode : modes) {
+			if (urlPath.startsWith("/" + mode.name() + "/")) {
+				final String urlPathWithoutMode = urlPath.substring(mode.name().length() + 2);
+				return urlPathWithoutMode.substring(0, urlPathWithoutMode.indexOf("/"));
+			}
+		}
+		return urlPath.substring(urlPath.indexOf("/") + 1, urlPath.indexOf("_"));
+	}
+
 }
diff --git a/dotCMS/src/test/java/com/dotmarketing/filters/CMSUrlUtilTest.java b/dotCMS/src/test/java/com/dotmarketing/filters/CMSUrlUtilTest.java
@@ -1,14 +1,15 @@
 package com.dotmarketing.filters;
 
+import org.junit.Test;
+
+import javax.servlet.http.HttpServletRequest;
+
 import static com.dotmarketing.filters.Constants.CMS_FILTER_URI_OVERRIDE;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import org.junit.Test;
-
 /**
  * @author nollymar 
  */
@@ -44,4 +45,22 @@ public void testGetURIFromRequestWhenFilterIsSet() {
         assertEquals("dotcms+test.txt", result);
     }
 
+    /**
+     * Method To Test: {@link CMSUrlUtil#getIdentifierFromUrlPath(String)}
+     * Given Scenario: Invoke with a page live url
+     * ExpectedResult: the contentlet identifier will be returned
+     */
+    @Test
+    public void test_getIdentifierFromUrlPath() {
+        final String liveUrlPath = "/LIVE/27e8f845c3bd21ad1c601b8fe005caa6/dotParser_1695072095296.container";
+        final String contentIdentifier = CMSUrlUtil.getInstance().getIdentifierFromUrlPath(liveUrlPath);
+        assertNotNull(contentIdentifier);
+        assertEquals("27e8f845c3bd21ad1c601b8fe005caa6", contentIdentifier);
+
+        final String templateUrlPath = "CONTENT/27e8f845c3bd21ad1c601b8fe005caa6_1695072095296.content";
+        final String contentIdentifier2 = CMSUrlUtil.getInstance().getIdentifierFromUrlPath(templateUrlPath);
+        assertNotNull(contentIdentifier2);
+        assertEquals("27e8f845c3bd21ad1c601b8fe005caa6", contentIdentifier2);
+    }
+
 }