fixed script move/rename issue

Author: dprzybyl

app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/ScriptMoveServlet.java

@@ -23,9 +23,12 @@
 import com.cognifide.apm.core.Property;
 import com.cognifide.apm.core.endpoints.response.ResponseEntity;
 import com.cognifide.apm.core.endpoints.utils.RequestProcessor;
+import com.cognifide.apm.core.scripts.FileDescriptor;
+import com.cognifide.apm.core.scripts.ScriptStorageException;
 import com.day.cq.commons.jcr.JcrConstants;
 import com.day.cq.commons.jcr.JcrUtil;
 import java.io.IOException;
+import java.util.List;
 import javax.jcr.Session;
 import javax.servlet.Servlet;
 import org.apache.commons.lang3.StringUtils;
@@ -62,6 +65,7 @@ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse
         String rename = containsExtension(form.getPath())
             ? (form.getRename() + (containsExtension(form.getRename()) ? "" : Apm.FILE_EXT))
             : JcrUtil.createValidName(form.getRename());
+        validate(dest, rename);
         String destPath = String.format("%s/%s", dest, rename);
         if (!StringUtils.equals(form.getPath(), destPath)) {
           destPath = createUniquePath(destPath, resourceResolver);
@@ -93,4 +97,11 @@ private String createUniquePath(String pathWithExtension, ResourceResolver resol
     }
     return path + (counter > 0 ? counter : "") + extension;
   }
+
+  private void validate(String path, String name) {
+    List<String> validationErrors = new FileDescriptor(path, name, null).validate();
+    if (!validationErrors.isEmpty()) {
+      throw new ScriptStorageException("Script errors", validationErrors);
+    }
+  }
 }

app/aem/core/src/main/java/com/cognifide/apm/core/scripts/FileDescriptor.java

@@ -21,12 +21,19 @@
 package com.cognifide.apm.core.scripts;
 
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
 import org.apache.commons.lang3.StringUtils;
 
-class FileDescriptor {
+public class FileDescriptor {
 
   private static final String SCRIPT_PATH = "/conf/apm/scripts";
 
+  private static final Pattern FILE_NAME_PATTERN = Pattern.compile("[0-9a-zA-Z_\\-]+\\.apm");
+
+  private static final Pattern PATH_PATTERN = Pattern.compile("(/[0-9a-zA-Z_\\-]+)+");
+
   private final String path;
 
   private final String name;
@@ -81,4 +88,17 @@ public String getName() {
   public InputStream getInputStream() {
     return inputStream;
   }
+
+  public List<String> validate() {
+    List<String> errors = new ArrayList<>();
+    ensurePropertyMatchesPattern(errors, "file name", name, FILE_NAME_PATTERN);
+    ensurePropertyMatchesPattern(errors, "file path", path, PATH_PATTERN);
+    return errors;
+  }
+
+  private void ensurePropertyMatchesPattern(List<String> errors, String property, String value, Pattern pattern) {
+    if (!pattern.matcher(value).matches()) {
+      errors.add(String.format("Invalid %s: \"%s\"", property, value));
+    }
+  }
 }

app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptStorageImpl.java

@@ -28,13 +28,11 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.time.OffsetDateTime;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.jcr.Binary;
 import javax.jcr.Node;
@@ -60,10 +58,6 @@ public class ScriptStorageImpl implements ScriptStorage {
 
   private static final Logger LOG = LoggerFactory.getLogger(ScriptStorageImpl.class);
 
-  private static final Pattern FILE_NAME_PATTERN = Pattern.compile("[0-9a-zA-Z_\\-]+\\.apm");
-
-  private static final Pattern PATH_PATTERN = Pattern.compile("/[0-9a-zA-Z_\\-/]+");
-
   private static final Charset SCRIPT_ENCODING = StandardCharsets.UTF_8;
 
   @Reference
@@ -159,25 +153,10 @@ private String generateFileName(String fileName, Node saveNode) throws Repositor
 
   private void validate(Collection<FileDescriptor> fileDescriptors) {
     List<String> validationErrors = fileDescriptors.stream()
-        .flatMap(fileDescriptor -> validate(fileDescriptor).stream())
+        .flatMap(fileDescriptor -> fileDescriptor.validate().stream())
         .collect(Collectors.toList());
     if (!validationErrors.isEmpty()) {
       throw new ScriptStorageException("Script errors", validationErrors);
     }
   }
-
-  private List<String> validate(FileDescriptor file) {
-    List<String> errors = new ArrayList<>();
-    ensurePropertyMatchesPattern(errors, "file name", file.getName(), FILE_NAME_PATTERN);
-    ensurePropertyMatchesPattern(errors, "file path", file.getPath(), PATH_PATTERN);
-    return errors;
-  }
-
-  private static void ensurePropertyMatchesPattern(List<String> errors, String property, String value,
-      Pattern pattern) {
-    if (!pattern.matcher(value).matches()) {
-      errors.add(String.format("Invalid %s: \"%s\"", property, value));
-    }
-  }
-
 }