Add x-www-form-urlencoded body parser / clean up some code

Author: simonwep

src/express/Express.java

@@ -18,7 +18,7 @@
  * @author Simon Reinisch
  * @implNote Core modul, don't change anything.
  * <p>
- * An NodeJS like clone written in Java, see README for more information.
+ * An NodeJS like clone written in Java.
  */
 public class Express {
 
@@ -40,7 +40,7 @@ public void use(HttpRequest middleware) {
   /**
    * Add an middleware which will be firea BEFORE EACH request-type listener will be fired.
    *
-   * @param context    The context where the middleware should listen, see README for information about placeholder.
+   * @param context    The context where the middleware should listen.
    * @param middleware An middleware which will be fired if the context matches the requestpath.
    */
   public void use(String context, HttpRequest middleware) {
@@ -69,7 +69,7 @@ private void addMiddleware(String requestMethod, String context, HttpRequest mid
   /**
    * Add an listener for GET request's.
    *
-   * @param context The context, see README for information about placeholder.
+   * @param context The context.
    * @param request An listener which will be fired if the context matches the requestpath.
    */
   public void all(String context, HttpRequest request) {
@@ -89,7 +89,7 @@ public void get(String context, HttpRequest request) {
   /**
    * Add an listener for POST request's.
    *
-   * @param context The context, see README for information about placeholder.
+   * @param context The context.
    * @param request An listener which will be fired if the context matches the requestpath.
    */
   public void post(String context, HttpRequest request) {
@@ -109,7 +109,7 @@ public void put(String context, HttpRequest request) {
   /**
    * Add an listener for DELETE request's.
    *
-   * @param context The context, see README for information about placeholder.
+   * @param context The context.
    * @param request An listener which will be fired if the context matches the requestpath.
    */
   public void delete(String context, HttpRequest request) {

src/express/expressfilter/ExpressFilterImpl.java

@@ -30,7 +30,7 @@ public ExpressFilterImpl(String requestMethod, String context, HttpRequest httpR
 
     this.CONTEXT = context;
     this.CONTEXT_PARAMS = context.split("(/)(:|[^:]+|)(:|)");
-    this.CONTEXT_REGEX = "\\Q" + context.replaceAll(":([^/]+)", "\\\\E([^/]+)\\\\Q") + "\\E";
+    this.CONTEXT_REGEX = "^\\Q" + context.replaceAll(":([^/]+)", "\\\\E([^/]+)\\\\Q") + "\\E$";
     this.CONTEXT_PATTERN = Pattern.compile(CONTEXT_REGEX);
   }
 
@@ -46,7 +46,7 @@ public void handle(Request req, Response res) {
       return;
     }
 
-    // Parse params, see README
+    // Parse params
     HashMap<String, String> params = new HashMap<>();
     Matcher matcher = CONTEXT_PATTERN.matcher(requestPath);
 

src/express/http/Request.java

@@ -8,47 +8,55 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
-import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @author Simon Reinisch
  * @implNote Core modul of express, don't change anything.
  */
 public class Request {
 
-  private final URI URI;
   private final HttpExchange HTTP_EXCHANGE;
-  private final InputStream BODY;
-  private final Headers HEADER;
-  private final String CONTENT_TYPE;
-  private final Authorization AUTH;
+  private final URI URI;                              // Request URI
+  private final InputStream BODY;                     // Request body
+  private final Headers HEADERS;                       // Request Headers
+  private final String CONTENT_TYPE;                  // Request content-type
+  private final Authorization AUTH;                   // Authorization header parsed
 
-  private final HashMap<String, Object> MIDDLEWARE;
+  private final HashMap<String, Object> MIDDLEWARE;   // Middleware Data
+  private final HashMap<String, Cookie> COOKIES;      // Request cookies
+  private final HashMap<String, String> QUERYS;       // URL Querys
+  private final HashMap<String, String> FORM_QUERYS;  // Form Querys (application/x-www-form-urlencoded)
 
-  private final HashMap<String, Cookie> COOKIES;
-  private final HashMap<String, String> QUERYS;
-  private HashMap<String, String> params;
+  private HashMap<String, String> params;             // URL Params, would be added in ExpressFilterImpl
+
+  {
+    this.MIDDLEWARE = new HashMap<>();
+    this.params = new HashMap<>();
+  }
 
   public Request(HttpExchange exchange) {
     this.HTTP_EXCHANGE = exchange;
     this.URI = exchange.getRequestURI();
-    this.HEADER = exchange.getRequestHeaders();
+    this.HEADERS = exchange.getRequestHeaders();
     this.BODY = exchange.getRequestBody();
 
-    this.CONTENT_TYPE = HEADER.get("Content-Type") == null ? "" : HEADER.get("Content-Type").get(0);
-    this.AUTH = HEADER.get("Authorization") == null ? null : new Authorization(HEADER.get("Authorization").get(0));
+    // Check if the request contains an body-content
+    this.CONTENT_TYPE = HEADERS.get("Content-Type") == null ? "" : HEADERS.get("Content-Type").get(0);
 
-    this.MIDDLEWARE = new HashMap<>();
-    this.params = new HashMap<>();
+    // Check if the request has an Authorization header
+    this.AUTH = HEADERS.get("Authorization") == null ? null : new Authorization(HEADERS.get("Authorization").get(0));
 
-    this.QUERYS = parseRawQuery(exchange.getRequestURI());
-    this.COOKIES = parseCookies(exchange.getRequestHeaders());
+    // Check if the request contains x-www-form-urlencoded form data
+    this.FORM_QUERYS = CONTENT_TYPE.equals("application/x-www-form-urlencoded")
+        ? RequestUtils.parseRawQuery(RequestUtils.streamToString(BODY))
+        : new HashMap<>();
+
+    // Parse query and cookies, both returns not null if there is nothing
+    this.QUERYS = RequestUtils.parseRawQuery(exchange.getRequestURI().getRawQuery());
+    this.COOKIES = RequestUtils.parseCookies(exchange.getRequestHeaders());
   }
 
   /**
@@ -92,10 +100,23 @@ public HashMap<String, Cookie> getCookies() {
     return COOKIES;
   }
 
+  /**
+   * Add an the content from an middleware
+   *
+   * @param middleware     The middleware
+   * @param middlewareData The data from the middleware
+   */
   public void addMiddlewareContent(ExpressFilter middleware, Object middlewareData) {
     MIDDLEWARE.put(middleware.getName(), middlewareData);
   }
 
+  /**
+   * Get the data from a specific middleware by name (Also the reason
+   * why the interface ExpressFilter implements a getName())
+   *
+   * @param name The middleware name
+   * @return The middleware object
+   */
   public Object getMiddlewareContent(String name) {
     return MIDDLEWARE.get(name);
   }
@@ -104,14 +125,14 @@ public Object getMiddlewareContent(String name) {
    * @return The request user-agent.
    */
   public String getUserAgent() {
-    return HEADER.get("User-agent").get(0);
+    return HEADERS.get("User-agent").get(0);
   }
 
   /**
    * @return The request host.
    */
   public String getHost() {
-    return HEADER.get("Host").get(0);
+    return HEADERS.get("Host").get(0);
   }
 
   /**
@@ -159,9 +180,18 @@ public boolean hasAuthorization() {
     return AUTH != null;
   }
 
+  /**
+   * Returns a query from a form which uses the 'application/x-www-form-urlencoded' request header.
+   *
+   * @param name The name.
+   * @return The value, null if there is none.
+   */
+  public String getFormQuery(String name) {
+    return FORM_QUERYS.get(name);
+  }
+
   /**
    * Returns an param from a dynamic url.
-   * see README
    *
    * @param param The param.
    * @return The value, null if there is none.
@@ -181,76 +211,48 @@ public String getQuery(String name) {
   }
 
   /**
-   * Set the params.
+   * Returns all querys from an x-www-form-urlencoded body.
    *
-   * @param params
+   * @return An entire list of key-values
    */
-  public void setParams(HashMap<String, String> params) {
-    this.params = params;
+  public HashMap<String, String> getFormQuerys() {
+    return FORM_QUERYS;
   }
 
   /**
-   * Returns an header value.
+   * Returns all params from the url.
    *
-   * @param header The header name
-   * @return An list with values.
+   * @return An entire list of key-values
    */
-  public List<String> getHeader(String header) {
-    return HEADER.get(header);
+  public HashMap<String, String> getParams() {
+    return params;
   }
 
   /**
-   * Extract the cookies from the 'Cookie' header.
+   * Return all url-querys.
    *
-   * @param headers The Headers
-   * @return An hashmap with the cookie name as key and the complete cookie as value.
+   * @return An entire list of key-values
    */
-  private static HashMap<String, Cookie> parseCookies(Headers headers) {
-    HashMap<String, Cookie> cookieList = new HashMap<>();
-    List<String> headerCookies = headers.get("Cookie");
-
-    if (headerCookies == null || headerCookies.size() == 0) {
-      return cookieList;
-    }
-
-    String hcookies = headerCookies.get(0);
-
-    String[] cookies = hcookies.split(";");
-    for (String cookie : cookies) {
-      String[] split = cookie.split("=");
-      String name = split[0].trim();
-      String value = split[1].trim();
-      cookieList.put(name, new Cookie(name, value));
-    }
-
-    return cookieList;
+  public HashMap<String, String> getQuerys() {
+    return QUERYS;
   }
 
   /**
-   * Method to extract the querys from an url.
+   * Set the params.
    *
-   * @param uri The uri.
-   * @return An list with key-values which are encoded in UTF8.
+   * @param params
    */
-  private static HashMap<String, String> parseRawQuery(URI uri) {
-    HashMap<String, String> querys = new HashMap<>();
-    String rawQuery = uri.getRawQuery();
-
-    if (rawQuery == null)
-      return querys;
-
-    Matcher mat = Pattern.compile("(.+?)=(.+?)(&|$)").matcher(rawQuery);
-    while (mat.find()) {
-      try {
-        String key = URLDecoder.decode(mat.group(1), "UTF8");
-        String val = URLDecoder.decode(mat.group(2), "UTF8");
-        querys.put(key, val);
-      } catch (UnsupportedEncodingException e) {
-        e.printStackTrace();
-      }
-    }
-
-    return querys;
+  public void setParams(HashMap<String, String> params) {
+    this.params = params;
   }
 
+  /**
+   * Returns an header value.
+   *
+   * @param header The header name
+   * @return An list with values.
+   */
+  public List<String> getHeader(String header) {
+    return HEADERS.get(header);
+  }
 }

src/express/http/RequestUtils.java

@@ -0,0 +1,91 @@
+package express.http;
+
+import com.sun.net.httpserver.Headers;
+import express.http.cookie.Cookie;
+
+import java.io.*;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class RequestUtils {
+
+  /**
+   * Extract the cookies from the 'Cookie' header.
+   *
+   * @param headers The Headers
+   * @return An hashmap with the cookie name as key and the complete cookie as value.
+   */
+  protected static HashMap<String, Cookie> parseCookies(Headers headers) {
+    HashMap<String, Cookie> cookieList = new HashMap<>();
+    List<String> headerCookies = headers.get("Cookie");
+
+    if (headerCookies == null || headerCookies.size() == 0) {
+      return cookieList;
+    }
+
+    String hcookies = headerCookies.get(0);
+
+    String[] cookies = hcookies.split(";");
+    for (String cookie : cookies) {
+      String[] split = cookie.split("=");
+      String name = split[0].trim();
+      String value = split[1].trim();
+      cookieList.put(name, new Cookie(name, value));
+    }
+
+    return cookieList;
+  }
+
+  /**
+   * Method to extract the querys from an url.
+   *
+   * @param rawQuery The raw query
+   * @return An list with key-values which are encoded in UTF8.
+   */
+  protected static HashMap<String, String> parseRawQuery(String rawQuery) {
+    HashMap<String, String> querys = new HashMap<>();
+
+    if (rawQuery == null)
+      return querys;
+
+    Matcher mat = Pattern.compile("(.+?)=(.+?)(&|$)").matcher(rawQuery);
+    while (mat.find()) {
+      try {
+        String key = URLDecoder.decode(mat.group(1), "UTF8");
+        String val = URLDecoder.decode(mat.group(2), "UTF8");
+        querys.put(key, val);
+      } catch (UnsupportedEncodingException e) {
+        e.printStackTrace();
+      }
+    }
+
+    return querys;
+  }
+
+  /**
+   * Write all data from an InputStream in an String
+   *
+   * @param is The source inputstream
+   * @return The data as string
+   */
+  public static String streamToString(InputStream is) {
+    try {
+      BufferedReader br = new BufferedReader(new InputStreamReader(is));
+      StringBuffer buffer = new StringBuffer();
+      String line;
+
+      while ((line = br.readLine()) != null)
+        buffer.append(line);
+
+      return buffer.toString();
+    } catch (IOException e) {
+      // TODO: Handle error
+      e.printStackTrace();
+    }
+    return null;
+  }
+
+}