fix

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/UploadManagerImpl.java

@@ -60,7 +60,8 @@
 
 public class UploadManagerImpl extends ManagerBase implements UploadManager {
 
-    protected static final String BASE_EXTRACT_DIR = "/var/www/html/userdata/";
+    protected static final String EXTRACT_USERDATA_DIR = "userdata";
+    protected static final String BASE_EXTRACT_PATH = String.format("/var/www/html/%s/", EXTRACT_USERDATA_DIR);
 
     public class Completion implements UploadCompleteCallback {
         private final String jobId;
@@ -271,7 +272,7 @@ public CreateEntityDownloadURLAnswer handleCreateEntityURLCommand(CreateEntityDo
             return new CreateEntityDownloadURLAnswer(errorString, CreateEntityDownloadURLAnswer.RESULT_FAILURE);
         }
         // Create the directory structure so that its visible under apache server root
-        String extractDir = BASE_EXTRACT_DIR;
+        String extractDir = BASE_EXTRACT_PATH;
         extractDir = extractDir + cmd.getFilepathInExtractURL() + File.separator;
         Script command = new Script("/bin/su", logger);
         command.add("-s");
@@ -335,15 +336,20 @@ public Answer handleDeleteEntityDownloadURLCommand(DeleteEntityDownloadURLComman
         String extractUrl = cmd.getExtractUrl();
         String result;
         if (extractUrl != null) {
-            String linkPath = extractUrl.substring(extractUrl.lastIndexOf(File.separator) + 1);
-            command.add("unlink " + BASE_EXTRACT_DIR + linkPath);
+            URI uri = URI.create(extractUrl);
+            String uriPath = uri.getPath();
+            String marker = String.format("/%s/", EXTRACT_USERDATA_DIR);
+            String linkPath = uriPath.startsWith(marker)
+                    ? uriPath.substring(marker.length())
+                    : uriPath.substring(uriPath.indexOf(marker) + marker.length());
+            command.add("unlink " + BASE_EXTRACT_PATH + linkPath);
             result = command.execute();
             if (result != null) {
                 // FIXME - Ideally should bail out if you can't delete symlink. Not doing it right now.
                 // This is because the ssvm might already be destroyed and the symlinks do not exist.
                 logger.warn("Error in deleting symlink :" + result);
             } else {
-                deleteEntitySymlinkRootPathIfNeeded(cmd, linkPath);
+                deleteEntitySymlinkRootDirectoryIfNeeded(cmd, linkPath);
             }
         }
 
@@ -364,7 +370,7 @@ public Answer handleDeleteEntityDownloadURLCommand(DeleteEntityDownloadURLComman
         return new Answer(cmd, true, "");
     }
 
-    protected void deleteEntitySymlinkRootPathIfNeeded(DeleteEntityDownloadURLCommand cmd, String linkPath) {
+    protected void deleteEntitySymlinkRootDirectoryIfNeeded(DeleteEntityDownloadURLCommand cmd, String linkPath) {
         if (StringUtils.isEmpty(linkPath)) {
             return;
         }
@@ -377,7 +383,7 @@ protected void deleteEntitySymlinkRootPathIfNeeded(DeleteEntityDownloadURLComman
             return;
         }
         logger.info("Deleting symlink root directory: {} for {}", rootDir, cmd.getExtractUrl());
-        Path rootDirPath = Path.of(BASE_EXTRACT_DIR + rootDir);
+        Path rootDirPath = Path.of(BASE_EXTRACT_PATH + rootDir);
         String failMsg = "Failed to delete symlink root directory: {} for {}";
         try {
             if (!FileUtil.deleteRecursively(rootDirPath)) {

services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/template/UploadManagerImplTest.java

@@ -58,21 +58,21 @@ public void tearDown() {
     @Test
     public void doesNotDeleteWhenLinkPathIsEmpty() {
         String emptyLinkPath = "";
-        uploadManager.deleteEntitySymlinkRootPathIfNeeded(mock(DeleteEntityDownloadURLCommand.class), emptyLinkPath);
+        uploadManager.deleteEntitySymlinkRootDirectoryIfNeeded(mock(DeleteEntityDownloadURLCommand.class), emptyLinkPath);
         fileUtilMock.verify(() -> FileUtil.deleteRecursively(any(Path.class)), never());
     }
 
     @Test
     public void doesNotDeleteWhenRootDirIsNotUuid() {
         String invalidLinkPath = "invalidRootDir/file";
-        uploadManager.deleteEntitySymlinkRootPathIfNeeded(mock(DeleteEntityDownloadURLCommand.class), invalidLinkPath);
+        uploadManager.deleteEntitySymlinkRootDirectoryIfNeeded(mock(DeleteEntityDownloadURLCommand.class), invalidLinkPath);
         fileUtilMock.verify(() -> FileUtil.deleteRecursively(any(Path.class)), never());
     }
 
     @Test
     public void deletesSymlinkRootDirectoryWhenValidUuid() {
         String validLinkPath = "123e4567-e89b-12d3-a456-426614174000/file";
-        uploadManager.deleteEntitySymlinkRootPathIfNeeded(mock(DeleteEntityDownloadURLCommand.class), validLinkPath);
+        uploadManager.deleteEntitySymlinkRootDirectoryIfNeeded(mock(DeleteEntityDownloadURLCommand.class), validLinkPath);
         fileUtilMock.verify(() -> FileUtil.deleteRecursively(any(Path.class)), times(1));
     }
 }