jfServlets : add HttpRequest.Part

Author: pquiring

projects/jfpbx/src/jfpbx/core/WebConfig.java

@@ -954,7 +954,7 @@ private String doMsgsPage(String args[], WebRequest req) {
         if (WebUpload.isMultipartContent(req)) {
           String dirName = Paths.sounds + Paths.lang + "/";
           WebUpload webUpload = new WebUpload();
-          WebUpload.WebFile files[] = webUpload.processRequest(req, dirName);
+          WebFile[] files = webUpload.processRequest(req, dirName);
           JFLog.log("files=" + files.length);
           for(int a=0;a<files.length;a++) {
             String fileName = files[a].name;

projects/jfservlets/src/javax/servlet/http/HttpServletRequest.java

@@ -12,4 +12,5 @@ public interface HttpServletRequest extends ServletRequest {
   public StringBuffer getRequestURL();
   public String getMethod();
   public HttpSession getSession();
+  public Part getPart(String name);
 }

projects/jfservlets/src/javax/servlet/http/HttpServletRequestImpl.java

@@ -10,6 +10,7 @@
 
 import javax.servlet.*;
 
+import javaforce.service.*;
 
 public class HttpServletRequestImpl implements HttpServletRequest {
   private HashMap<String, Object> req;
@@ -105,4 +106,15 @@ public String getMethod() {
   public HttpSession getSession() {
     return session;
   }
+
+  public Part getPart(String name) {
+    WebFile[] files = (WebFile[])req.get("files");
+    if (files == null) return null;
+    for(WebFile file : files) {
+      if (file.name.equalsIgnoreCase(name)) {
+        return new PartImpl(file);
+      }
+    }
+    return null;
+  }
 }

projects/jfservlets/src/javax/servlet/http/Part.java

@@ -0,0 +1,13 @@
+package javax.servlet.http;
+
+/** HTTP Request Part
+ *
+ * @author pquiring
+ */
+
+import java.io.*;
+
+public interface Part {
+  public String getContentType();
+  public InputStream getInputStream();
+}

projects/jfservlets/src/javax/servlet/http/PartImpl.java

@@ -0,0 +1,27 @@
+package javax.servlet.http;
+
+/** HTTP Part Implementation
+ *
+ * @author pquiring
+ */
+
+import java.io.*;
+
+import javaforce.service.*;
+
+public class PartImpl implements Part {
+
+  private WebFile file;
+
+  public PartImpl(WebFile file) {
+    this.file = file;
+  }
+
+  public String getContentType() {
+    return file.getContentType();
+  }
+
+  public InputStream getInputStream() {
+    return file.getInputStream();
+  }
+}

src/javaforce/service/WebFile.java

@@ -0,0 +1,37 @@
+package javaforce.service;
+
+/** Web File uploaded to server.
+ *
+ * @author pquiring
+ */
+
+import java.io.*;
+
+import javaforce.*;
+
+public class WebFile {
+  private FileInputStream is;
+  /** Uploaded file. */
+  public File file;
+  /** Name of file (excluding any path info) */
+  public String name;
+  /** Content Type. */
+  public String contentType;
+  /** Moves uploaded file to dest file. (optional) */
+  public boolean move(File dest) throws Exception {
+    if (dest.exists()) return false;
+    return JF.moveFile(file, dest);
+  }
+  public String getName() {return name;}
+  public String getContentType() {return contentType;}
+  public InputStream getInputStream() {
+    if (is == null) {
+      try {
+        is = new FileInputStream(file);
+      } catch (Exception e) {
+        JFLog.log(e);
+      }
+    }
+    return is;
+  }
+}

src/javaforce/service/WebRequest.java

@@ -22,6 +22,7 @@ public class WebRequest {
   public int serverPort, remotePort;
   public String method;
   public HTTP.Parameters params;
+  public WebFile[] files;
   public boolean secure;
 
   public static class Session {
@@ -148,6 +149,16 @@ public String getParameter(String name) {
     return params.get(name);
   }
 
+  public WebFile getPart(String name) {
+    if (files == null) return null;
+    for(WebFile file : files) {
+      if (file.name.equalsIgnoreCase(name)) {
+        return file;
+      }
+    }
+    return null;
+  }
+
   /** Reads and returns POST data. */
   public byte[] getData() {
     String method = getMethod();
@@ -180,6 +191,7 @@ public HashMap<String, Object> toHashMap() {
     map.put("URL", getURL());
     map.put("Method", getMethod());
     map.put("session", session.props);
+    map.put("files", files);
     return map;
   }
 };

src/javaforce/service/WebServer.java

@@ -161,7 +161,7 @@ else if (WebUpload.isMultipartContent(req)) {
               res.setStatus(501, "Error - Uploads disabled");
             } else {
               WebUpload upload = new WebUpload();
-              upload.processRequest(req, upload_folder);
+              req.files = upload.processRequest(req, upload_folder);
             }
           }
           else if (req.fields0[0].equals("GET")) {

src/javaforce/service/WebUpload.java

@@ -27,20 +27,6 @@ public static boolean isMultipartContent(WebRequest req) {
     return (contentType.trim().startsWith("multipart/form-data;"));
   }
 
-  /** Uploaded file. */
-  public static class WebFile {
-    /** Uploaded file. */
-    public File file;
-    /** Name of file (excluding any path info) */
-    public String name;
-    /** Moves uploaded file to dest file. (optional) */
-    public boolean move(File dest) throws Exception {
-      if (dest.exists()) return false;
-      return JF.moveFile(file, dest);
-    }
-    public String getName() {return name;}
-  }
-
   private static long maxlength = 64 * JF.MB;  //64MBs
   /** Sets max file upload (-1 = unlimited) (default = 64MBs) */
   public static void setMaxLength(long maxlength) {
@@ -60,6 +46,7 @@ public static void setMaxLength(long maxlength) {
   public WebFile[] processRequest(WebRequest req, String out_folder) {
     String file_size = null;
     Status status = null;
+    String file_content_type = null;
     OutputStream fos = null;
     try {
       //Content-Type: multipart/form-data; boundary=----WebKitFormBoundary...
@@ -195,6 +182,10 @@ public WebFile[] processRequest(WebRequest req, String out_folder) {
               file_size = p_value;
               break;
             }
+            case "Content-Type": {
+              file_content_type = p_value;
+              break;
+            }
           }
         }
         int type = 0;
@@ -221,6 +212,7 @@ public WebFile[] processRequest(WebRequest req, String out_folder) {
           WebFile uploadFile = new WebFile();
           uploadFile.name = cd_filename;
           uploadFile.file = new File(out_folder + "/" + cd_filename);
+          uploadFile.contentType = file_content_type;
           files.add(uploadFile);
           fos = new FileOutputStream(uploadFile.file);
           if (status != null) {