Bug-fix for dealing https protocol and others

zhourenjian · zhourenjian · commit 2b551a190b58 · 2008-01-29T16:37:36.000Z
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCHttpServlet.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCHttpServlet.java
@@ -196,31 +196,35 @@ protected boolean validateRunnable(String clazzName) {
 	protected void doPost(HttpServletRequest req, HttpServletResponse resp) 
 			throws ServletException, IOException {
 		String request = null;
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		byte[] buf = new byte[1024];
+		int read = 0;
 		InputStream res = req.getInputStream();
-		try {
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			byte[] buf = new byte[1024];
-			int read = 0;
-			while ((read = res.read(buf)) != -1) {
-				baos.write(buf, 0, read);
-				if (baos.size() > maxPostLimit()) {
-					/*
-					 * Some malicious request may try to allocate huge size of memory! 
-					 * DoS attack? Limit the data size of HTTP request! 
-					 */
-					res.close();
-					resp.sendError(HttpServletResponse.SC_FORBIDDEN, 
-							"Data size reaches the limit of Java2Script Simple RPC!");
-					return;
-				}
+		while (true) {
+			try {
+				read = res.read(buf);
+			} catch (IOException e) {
+				resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
+				res.close();
+				return;
+			}
+			if (read == -1) {
+				break;
+			}
+			baos.write(buf, 0, read);
+			if (baos.size() > maxPostLimit()) {
+				/*
+				 * Some malicious request may try to allocate huge size of memory! 
+				 * DoS attack? Limit the data size of HTTP request! 
+				 */
+				resp.sendError(HttpServletResponse.SC_FORBIDDEN, 
+						"Data size reaches the limit of Java2Script Simple RPC!");
+				res.close();
+				return;
 			}
-			res.close();
-			request = baos.toString();
-		} catch (IOException e) {
-			e.printStackTrace();
-			resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
-			return;
 		}
+		request = baos.toString();
+		res.close();
 		
 		SimpleRPCRunnable runnable = getRunnableByRequest(request);
 		if (runnable == null) {
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRequest.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRequest.java
@@ -139,13 +139,38 @@ protected static String adjustRequestURL(String method, String url, String seria
 if (url != null && (url.indexOf ("http://") == 0
 		|| url.indexOf ("https://") == 0)) {
 	var host = null;
-	var idx = url.indexOf ('/', 9);
-	if (idx != -1) {
-		host = url.substring (url.indexOf ("//") + 2, idx); 
+	var idx1 = url.indexOf ("//") + 2;
+	var idx2 = url.indexOf ('/', 9);
+	if (idx2 != -1) {
+		host = url.substring (idx1, idx2); 
 	} else {
-		host = url.substring (url.indexOf ("//") + 2); 
+		host = url.substring (idx1); 
 	}
-	return (window.location.host != host || window.location.protocol == "file:");
+	var protocol = null; // http: or https:
+	var idx0 = url.indexOf ("://");
+	if (idx0 != -1) {
+		protocol = url.substring (0, idx0 + 1);
+	} else {
+		protocol = window.location.protocol;
+	}
+	var port = null;
+	var idx3 = host.indexOf (':'); // there is port number
+	if (idx3 != -1) {
+		port = parseInt (host.substring (idx3 + 1));
+		host = host.substring (0, idx3);
+	} else {
+		if ("http:" == protocol) {
+			port = 80;
+		} else if ("https:" == protocol) {
+			port = 443;
+		} else {
+			port = window.location.port;
+		}
+	}
+	var loc = window.location;
+	return (loc.host != host || loc.protocol != protocol
+			|| loc.port != port
+			|| loc.protocol == "file:");
 }
 return false; // ftp ...
 	 */
