From 016ee5c55b1f36c5c318a314eb5526b5b526ebfa Mon Sep 17 00:00:00 2001
From: fabrizzio-dotCMS <fabrizzio@dotCMS.com>
Date: Mon, 29 Jul 2024 09:00:37 -0600
Subject: [PATCH] #28593

---
 .../java/com/dotcms/common/AssetsUtils.java   | 41 ++++---------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AssetsUtils.java b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AssetsUtils.java
index a1803c3b1c95..91cd88d2d1ef 100644
--- a/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AssetsUtils.java
+++ b/tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/common/AssetsUtils.java
@@ -1,8 +1,8 @@
 package com.dotcms.common;
 
 import static com.dotcms.common.LocationUtils.encodePath;
-import static com.dotcms.model.config.Workspace.FILES_NAMESPACE;
 import static com.dotcms.common.WorkspaceManager.resolvePath;
+import static com.dotcms.model.config.Workspace.FILES_NAMESPACE;
 
 import com.dotcms.model.asset.AbstractAssetSync.PushType;
 import com.dotcms.model.asset.AssetSync;
@@ -10,8 +10,6 @@
 import com.dotcms.model.asset.FolderSync;
 import com.dotcms.model.asset.FolderView;
 import com.google.common.base.Strings;
-import java.util.function.Function;
-import java.util.Map;
 import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -20,7 +18,9 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -195,38 +195,15 @@ public static List<String> parseRootPaths(final File workspace, final File sourc
         var sourceCount = sourcePath.getNameCount();
 
         if (sourceCount < workspaceCount) {
-            logger.error("Source path cannot be outside of the workspace");
-            //throw new IllegalArgumentException("Source path cannot be outside of the workspace");
-            return List.of();
+            throw new IllegalArgumentException("Source path cannot be outside of the workspace");
         }
 
+        final Path filesPath = Path.of(workspace.getAbsolutePath(), FILES_NAMESPACE)
+                .toAbsolutePath().normalize();
         // Check if we are inside the workspace but also inside the files folder
-        if (sourceCount > workspaceCount + 1) {
-            final Path files = Path.of(workspace.getAbsolutePath(), FILES_NAMESPACE)
-                    .toAbsolutePath().normalize();
-            if (!sourcePath.startsWith(files)) {
-                /*
-                throw new IllegalArgumentException(
-                        String.format(
-                                "Invalid source path [%s]. Source path must be inside the files folder or "
-                                        +
-                                        "at the root of the workspace [%s] ", sourcePath,
-                                workspacePath));
-                 */
-                logger.error("Invalid source path. Source path must be inside the files folder or at the root of the workspace");
-                return List.of();
-            }
-        } else if (sourceCount == workspaceCount + 1) {
-            final Path files = Path.of(FILES_NAMESPACE).toAbsolutePath().normalize();
-            if (!sourcePath.startsWith(files)) {
-                /*
-                throw new IllegalArgumentException(
-                        "Invalid source path. Source path must be inside the files folder or " +
-                                "at the root of the workspace");
-                 */
-                logger.error("Invalid source path. Source path must be inside the files folder or at the root of the workspace");
-                return List.of();
-            }
+        if (sourceCount > workspaceCount + 1 || (sourceCount == workspaceCount + 1 && !sourcePath.startsWith(filesPath))) {
+            logger.warn("Invalid source path provided for a files push {}. Source path must be inside the files folder will fallback to workspace. {}", sourcePath, workspacePath);
+            return parseRootPaths(workspacePath, workspaceCount, workspaceCount);
         }
 
         return parseRootPaths(sourcePath, workspaceCount, sourceCount);