Changeset 1647

Timestamp:

2008-02-28 02:12:10 (9 months ago)

Author:

mosipov

Message:

ASSIGNED - #1896: [Connector] Reworking checking of type parameter

Location:

FCKeditor.Java/branches/2.4/src

Files:

• main/java/net/fckeditor/connector/ConnectorServlet.java (modified) (3 diffs)
• main/java/net/fckeditor/handlers/CommandHandler.java (added)
• main/java/net/fckeditor/response/XmlResponse.java (modified) (8 diffs)
• main/java/net/fckeditor/tool/UtilsFile.java (modified) (4 diffs)
• test/java/net/fckeditor/handlers/CommandHandlerTest.java (added)
• test/java/net/fckeditor/tool/UtilsFileTest.java (modified) (2 diffs)

FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java

@@ -31 +31 @@
 import javax.servlet.http.HttpServletResponse;
 
+import net.fckeditor.handlers.CommandHandler;
 import net.fckeditor.handlers.ExtensionsHandler;
 import net.fckeditor.handlers.ConnectorHandler;
@@ -105 +106 @@
                 String typeStr = request.getParameter("Type");
                 String currentFolderStr = request.getParameter("CurrentFolder");
-                ResourceTypeHandler fileType = ResourceTypeHandler.getDefaultResourceType(typeStr);
 
                 logger.debug("Parameter Command: {}", commandStr);
+                logger.debug("Parameter Type: {}", typeStr);
                 logger.debug("Parameter CurrentFolder: {}", currentFolderStr);
-                logger.debug("Parameter Type: {}", typeStr);
-
-                String currentPath = constructTypeBasedFolderString(fileType, currentFolderStr, request);
-                String currentDirPath = getServletContext().getRealPath(currentPath);
-
-                File currentDir = new File(currentDirPath);
-                if (!currentDir.exists() && SessionDataHandler.isEnabledForFileBrowsing(request)) {
-                        currentDir.mkdirs();
-                        logger.debug("Dir successfully created: {}", currentDirPath);
-                }
-
-                XmlResponse xr = new XmlResponse(commandStr, fileType, currentFolderStr, currentPath,
-                        request);
-
-                if (!SessionDataHandler.isEnabledForFileBrowsing(request)) {
-                        xr.setError(XmlResponse.EN_ERROR, XmlResponse.CM_NOT_AUTHORIZED);
-                } else if (commandStr.equals("GetFolders")) {
-                        xr.setFolders(currentDir);
-                } else if (commandStr.equals("GetFoldersAndFiles")) {
-                        xr.setFolders(currentDir);
-                        xr.setFiles(currentDir);
-                } else if (commandStr.equals("CreateFolder")) {
-                        String newFolderStr = UtilsFile.sanitizeFolderName(request.getParameter("NewFolderName"));
-                        File newFolder = new File(currentDir, newFolderStr);
-                        int errorNumber = XmlResponse.EN_UKNOWN;
-
-                        if (newFolder.exists()) {
-                                errorNumber = XmlResponse.EN_ALREADY_EXISTS;
-                        } else {
-                                try {
-                                        errorNumber = (newFolder.mkdir()) ? XmlResponse.EN_OK : XmlResponse.EN_INVALID;
-                                } catch (SecurityException e) {
-                                        errorNumber = XmlResponse.EN_SECURITY_ERROR;
+
+                XmlResponse xr;
+                
+                if (!SessionDataHandler.isEnabledForFileBrowsing(request))
+                        xr = new XmlResponse(XmlResponse.EN_ERROR,
+                                        XmlResponse.CM_NOT_AUTHORIZED);
+                else if (!CommandHandler.isValidForGet(commandStr))
+                        xr = new XmlResponse(XmlResponse.EN_ERROR,
+                                        XmlResponse.CM_INVALID_COMMAND);
+                else if (typeStr != null && !ResourceTypeHandler.isValid(typeStr))
+                        xr = new XmlResponse(XmlResponse.EN_ERROR,
+                                        XmlResponse.CM_INVALID_TYPE);
+                else if (!UtilsFile.isValidPath(currentFolderStr))
+                        xr = new XmlResponse(XmlResponse.EN_INVALID_FOLDER_NAME);
+                else {
+                        CommandHandler command = CommandHandler.getCommand(commandStr);
+                        ResourceTypeHandler resourceType = ResourceTypeHandler
+                                        .getDefaultResourceType(typeStr);
+                        // TODO clean up this folder handling mess somehow?!
+                        String typePath = constructSomething(resourceType, request);
+                        String typeDirPath = getServletContext().getRealPath(typePath);
+                        String currentPath = typePath + currentFolderStr;
+
+                        File typeDir = new File(typeDirPath);
+
+                        if (!typeDir.exists()) {
+                                typeDir.mkdirs();
+                                // FIXME log typePath or typeDirPath???
+                                logger.debug("Type dir '{}' successfully created", typePath);
+                        }
+
+                        File currentDir = new File(typeDir, currentFolderStr);
+
+                        if (!currentDir.exists())
+                                xr = new XmlResponse(XmlResponse.EN_INVALID_FOLDER_NAME);
+                        else {
+
+                                xr = new XmlResponse(command, resourceType, currentFolderStr,
+                                                currentPath, request);
+
+                                if (command.equals(CommandHandler.GET_FOLDERS))
+                                        xr.setFolders(currentDir);
+                                else if (command.equals(CommandHandler.GET_FOLDERS_AND_FILES))
+                                        xr.setFoldersAndFiles(currentDir);
+                                else if (command.equals(CommandHandler.CREATE_FOLDER)) {
+                                        String newFolderStr = UtilsFile.sanitizeFolderName(request
+                                                        .getParameter("NewFolderName"));
+                                        logger.debug("Parameter NewFolderName: {}", newFolderStr);
+
+                                        File newFolder = new File(currentDir, newFolderStr);
+                                        int errorNumber = XmlResponse.EN_UKNOWN;
+
+                                        if (newFolder.exists()) {
+                                                errorNumber = XmlResponse.EN_ALREADY_EXISTS;
+                                        } else {
+                                                try {
+                                                        errorNumber = (newFolder.mkdir()) ? XmlResponse.EN_OK
+                                                                        : XmlResponse.EN_INVALID_FOLDER_NAME;
+                                                } catch (SecurityException e) {
+                                                        errorNumber = XmlResponse.EN_SECURITY_ERROR;
+                                                }
+                                        }
+                                        xr.setError(errorNumber);
                                 }
                         }
-                        xr.setError(errorNumber);
                 }
 
@@ -289 +319 @@
                 sb.append(ConnectorHandler.getUserFilesPath(request));
                 sb.append(fileType.getPath());
-                sb.append(currentFolderString);
+                if (Utils.isNotEmpty(currentFolderString))
+                        sb.append(currentFolderString);
                 return Utils.replaceAll(sb.toString(), "//", "/");
         }
+        
+        /**
+         * TODO document me
+         * FIXME give me a more proper name
+         * @param resourceType
+         * @param request
+         * @return
+         */
+        private String constructSomething(final ResourceTypeHandler resourceType, final HttpServletRequest request) {
+                return constructTypeBasedFolderString(resourceType, null, request);
+        }
 
 }

FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/response/XmlResponse.java

@@ -35 +35 @@
 import javax.xml.transform.stream.StreamResult;
 
+import net.fckeditor.handlers.CommandHandler;
 import net.fckeditor.handlers.ResourceTypeHandler;
 import net.fckeditor.tool.Utils;
@@ -43 +44 @@
 import org.w3c.dom.Element;
 
+/**
+ * static error objects won't probably provided due to performance reasons of 
+ * Document instance creation
+ * 
+ * TODO document me!
+ * @author mosipov
+ *
+ */
 public class XmlResponse {
 
@@ -59 +68 @@
         public static final int EN_ALREADY_EXISTS = 101;
 
-        /** Error number INVALID */
-        public static final int EN_INVALID = 102;
+        /** Error number INVALID FOLDER NAME */
+        public static final int EN_INVALID_FOLDER_NAME = 102;
 
         /** Error number SECURITY ERROR */
@@ -70 +79 @@
         /** Error message NOT AUTHORIZED FOR BROWSING */
         public static final String CM_NOT_AUTHORIZED = "The current user isn't authorized for file browsing!";
+        
+        /** Error message INVALID TYPE SUPPLIED */
+        public static final String CM_INVALID_TYPE = "Invalid resource type specified";
+        
+        /** Error message INVALID TYPE SUPPLIED */
+        public static final String CM_INVALID_COMMAND = "Invalid command specified";
 
         /**
@@ -77 +92 @@
          *            TODO
          */
-        public XmlResponse(String command, ResourceTypeHandler type, String currentFolder,
+        public XmlResponse(CommandHandler command, ResourceTypeHandler type, String currentFolder,
                         String constructedUrl, HttpServletRequest request) {
 
@@ -91 +106 @@
                 Element root = document.createElement("Connector");
                 document.appendChild(root);
-                root.setAttribute("command", command);
+                root.setAttribute("command", command.toString());
                 root.setAttribute("resourceType", type.toString());
 
@@ -101 +116 @@
                 root.appendChild(currentFolderElement);
 
+        }
+        
+        /**
+         * TODO document me!
+         * @param number
+         * @param text
+         */
+        public XmlResponse(int number, String text) {
+                try {
+                        DocumentBuilderFactory factory = DocumentBuilderFactory
+                                        .newInstance();
+                        DocumentBuilder builder = factory.newDocumentBuilder();
+                        document = builder.newDocument();
+                } catch (ParserConfigurationException e) {
+                        throw new RuntimeException(e);
+                }
+
+                Element root = document.createElement("Connector");
+                document.appendChild(root);
+                setError(number, text);
+        }
+        
+        /***
+         * TODO document me!
+         * @param number
+         */
+        public XmlResponse(int number) {
+                this(number, null);
         }
 
@@ -161 +204 @@
                 }
         }
-
+        
+        public void setFoldersAndFiles(File dir) {
+                setFolders(dir);
+                setFiles(dir);
+        }
+        
         @Override
         public String toString() {

FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/UtilsFile.java

@@ -40 +40 @@
      * 
      * @param fileName
-     * @return folder name where \ / | : ? * " < > replaced by '_'
+     * @return folder name where \ / | : ? * " < > 'control chars' replaced by '_'
      */
     public static String sanitizeFileName(final String fileName) {
@@ -52 +52 @@
     
         // Remove \ / | : ? * " < > with _
-        return name.replaceAll("\\/|\\/|\\||:|\\?|\\*|\"|<|>", "_");
+        return name.replaceAll("\\/|\\/|\\||:|\\?|\\*|\"|<|>|[\u0000-\u001F]|\u007F", "_");
     }
 
@@ -59 +59 @@
      * 
      * @param folderName
-     * @return folder name where . \ / | : ? * &quot; &lt; &gt; replaced by '_'
+     * @return folder name where . \ / | : ? * &quot; &lt; &gt; 'control chars' replaced by '_'
      */
     public static String sanitizeFolderName(final String folderName) {
@@ -68 +68 @@
     
         // Remove . \ / | : ? * " < > with _
-        return folderName.replaceAll("\\.|\\/|\\/|\\||:|\\?|\\*|\"|<|>", "_");
+        return folderName.replaceAll("\\.|\\/|\\/|\\||:|\\?|\\*|\"|<|>|[\u0000-\u001F]|\u007F", "_");
     }
 

FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/UtilsFileTest.java

@@ -163 +163 @@
         assertEquals("a_b_c_d_e_f_g_h_i_", UtilsFile.sanitizeFolderName("a.b|c<d>e:f?g*h<i>"));
     }
+        
+        @Test
+        public void sanitizeFolder02() {
+                assertEquals("a_b_c_d_e_f_g_h_i_", UtilsFile.sanitizeFolderName("a.b|c\u007Fd>e:f\u0005g*h<i>"));
+        }
 
         @Test
@@ -174 +179 @@
     }
 
+        @Test
+        public void sanitizeFile03() {
+                assertEquals("b_c_d_e_f_g_h_i_", UtilsFile.sanitizeFileName("b|c\u007Fd>e:f\u0005g*h<i>"));
+        }
 }