fixed script move/rename issue

Author: dprzybyl

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

@@ -23,12 +23,14 @@
 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.cognifide.apm.core.scripts.ScriptStorageImpl;
 import com.day.cq.commons.jcr.JcrConstants;
 import com.day.cq.commons.jcr.JcrUtil;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Pattern;
 import javax.jcr.Session;
 import javax.servlet.Servlet;
 import org.apache.commons.lang3.StringUtils;
@@ -41,6 +43,8 @@
 import org.apache.sling.models.factory.ModelFactory;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Component(
     service = Servlet.class,
@@ -53,6 +57,14 @@
 )
 public class ScriptMoveServlet extends SlingAllMethodsServlet {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(ScriptMoveServlet.class);
+
+  private static final Pattern SCRIPT_PATTERN = Pattern.compile("[0-9a-zA-Z_\\-]+\\.apm");
+
+  private static final Pattern FOLDER_PATTERN = Pattern.compile("[0-9a-zA-Z_\\-]+");
+
+  private static final Pattern DESTINATION_PATTERN = Pattern.compile("(/[0-9a-zA-Z_\\-]+)+");
+
   @Reference
   private ModelFactory modelFactory;
 
@@ -77,8 +89,10 @@ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse
           valueMap.put(JcrConstants.JCR_TITLE, form.getRename());
         }
         resourceResolver.commit();
+        LOGGER.info("Item successfully moved from {} to {}", form.getPath(), destPath);
         return ResponseEntity.ok("Item successfully moved");
       } catch (Exception e) {
+        LOGGER.error("Errors while moving item", e);
         return ResponseEntity.badRequest(StringUtils.defaultString(e.getMessage(), "Errors while moving item"));
       }
     });
@@ -99,7 +113,10 @@ private String createUniquePath(String pathWithExtension, ResourceResolver resol
   }
 
   private void validate(String path, String name) {
-    List<String> validationErrors = new FileDescriptor(path, name, null).validate();
+    List<String> validationErrors = new ArrayList<>();
+    ScriptStorageImpl.ensurePropertyMatchesPattern(validationErrors, "rename", name,
+        containsExtension(name) ? SCRIPT_PATTERN : FOLDER_PATTERN);
+    ScriptStorageImpl.ensurePropertyMatchesPattern(validationErrors, "destination", path, DESTINATION_PATTERN);
     if (!validationErrors.isEmpty()) {
       throw new ScriptStorageException("Script errors", validationErrors);
     }

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

@@ -21,19 +21,12 @@
 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;
 
-public class FileDescriptor {
+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;
@@ -88,17 +81,4 @@ 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,11 +28,13 @@
 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;
@@ -58,6 +60,10 @@ 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
@@ -153,10 +159,25 @@ private String generateFileName(String fileName, Node saveNode) throws Repositor
 
   private void validate(Collection<FileDescriptor> fileDescriptors) {
     List<String> validationErrors = fileDescriptors.stream()
-        .flatMap(fileDescriptor -> fileDescriptor.validate().stream())
+        .flatMap(fileDescriptor -> validate(fileDescriptor).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;
+  }
+
+  public 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));
+    }
+  }
+
 }