Improve cookie-session and query-parser

Author: simonwep

src/express/Express.java

@@ -86,7 +86,7 @@ private void addMiddleware(String requestMethod, String context, HttpRequest mid
   }
 
   /**
-   * Add an listener for GET request's.
+   * Add an listener for all request methods.
    *
    * @param context The context.
    * @param request An listener which will be fired if the context matches the requestpath.

src/express/expressfilter/ExpressFilterImpl.java

@@ -15,23 +15,30 @@
 public class ExpressFilterImpl implements HttpRequest {
 
   private final HttpRequest REQUEST;
-  private final String REQUEST_METHOD;
+  private final String REQ;
   private final String CONTEXT;
+  private final boolean REQ_ALL;
+  private final boolean CONTEXT_ALL;
 
   public ExpressFilterImpl(String requestMethod, String context, HttpRequest httpRequest) {
-    this.REQUEST_METHOD = requestMethod;
+    this.REQ = requestMethod;
     this.REQUEST = httpRequest;
     this.CONTEXT = context;
+
+    // Save some informations which don't need to be processed again
+    this.REQ_ALL = requestMethod.equals("*");
+    this.CONTEXT_ALL = context.equals("*");
   }
 
   @Override
   public void handle(Request req, Response res) {
     String requestMethod = req.getMethod();
     String requestPath = req.getRedirect() != null ? req.getRedirect() : req.getURI().getRawPath();
 
-    if (!(REQUEST_METHOD.equals("*") || REQUEST_METHOD.equals(requestMethod))) {
+    // Check if
+    if (!(REQ_ALL || REQ.equals(requestMethod))) {
       return;
-    } else if (CONTEXT.equals("*")) {
+    } else if (CONTEXT_ALL) {
       REQUEST.handle(req, res);
       return;
     }
@@ -45,6 +52,9 @@ public void handle(Request req, Response res) {
     REQUEST.handle(req, res);
   }
 
+  /**
+   * Extract and match the parameter from the url with an filter.
+   */
   private HashMap<String, String> matchURL(String filter, String url) {
     HashMap<String, String> params = new HashMap<>();
     StringBuilder key = new StringBuilder();
@@ -53,21 +63,18 @@ private HashMap<String, String> matchURL(String filter, String url) {
     char[] fc = filter.toCharArray();
     int ui = 0, fi = 0;
 
-
     for (; fi < fc.length; fi++, ui++) {
 
       if (fc[fi] == ':') {
         key.setLength(0);
         val.setLength(0);
 
         fi++;
-        while (fi < fc.length && fc[fi] != '/') {
+        while (fi < fc.length && fc[fi] != '/')
           key.append(fc[fi++]);
-        }
 
-        while (ui < uc.length && uc[ui] != '/') {
+        while (ui < uc.length && uc[ui] != '/')
           val.append(uc[ui++]);
-        }
 
         params.put(key.toString(), val.toString());
       } else if (fc[fi] != uc[ui]) {
@@ -84,4 +91,5 @@ private HashMap<String, String> matchURL(String filter, String url) {
     return params;
   }
 
+
 }

src/express/http/request/RequestUtils.java

@@ -3,12 +3,8 @@
 import com.sun.net.httpserver.Headers;
 import express.http.Cookie;
 
-import java.io.UnsupportedEncodingException;
-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 {
 
@@ -51,17 +47,31 @@ protected static HashMap<String, String> parseRawQuery(String rawQuery) {
     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();
-      }
+    StringBuilder key = new StringBuilder();
+    StringBuilder val = new StringBuilder();
+    char[] chars = rawQuery.toCharArray();
+    boolean keyac = false;
+    char c = '=';
+
+    for (int i = 0; i < chars.length; i++) {
+      c = chars[i];
+
+      if (c == '=')
+        keyac = true;
+      else if (c == '&') {
+        querys.put(key.toString(), val.toString());
+        key.setLength(0);
+        val.setLength(0);
+        keyac = false;
+      } else if (keyac)
+        val.append(c);
+      else
+        key.append(c);
     }
 
+    if (c != '=' && c != '&')
+      querys.put(key.toString(), val.toString());
+
     return querys;
   }
 

src/express/middleware/ExpressCookieSession.java

@@ -29,10 +29,13 @@ public void handle(Request req, Response res) {
     Cookie cookie = req.getCookie(COOKIE_NAME);
 
     if (cookie != null && COOKIES.containsKey(cookie.getValue())) {
-
       req.addMiddlewareContent(this, COOKIES.get(cookie.getValue()));
     } else {
-      String token = Utils.randomToken(32, 16);
+      String token;
+
+      do {
+        token = Utils.randomToken(32, 16);
+      } while (COOKIES.contains(token));
 
       cookie = new Cookie(COOKIE_NAME, token).setMaxAge(MAX_AGE);
       res.setCookie(cookie);
@@ -68,9 +71,9 @@ public long getDelay() {
   public void onUpdate() {
     long current = System.currentTimeMillis();
 
-    COOKIES.forEach((s, o) -> {
-      if (current > o.getCreated() + o.getMaxAge())
-        COOKIES.remove(s);
+    COOKIES.forEach((cookieHash, cookie) -> {
+      if (current > cookie.getCreated() + cookie.getMaxAge())
+        COOKIES.remove(cookieHash);
     });
   }