Call ajaxFail on receiving non-SimpleSerializable content from HTTP server (may be modified by ISP)

zhourenjian@gmail.com · zhourenjian@gmail.com · commit 6982cab1ca1e · 2014-02-09T12:51:44.000Z
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeRequest.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeRequest.java
@@ -442,14 +442,12 @@ private static void pipeRequest(final SimplePipeRunnable runnable) {
 		request.registerOnReadyStateChange(new XHRCallbackAdapter() {
 			public void onLoaded() {
 				String responseText = request.getResponseText();
-				if (responseText == null || responseText.length() == 0) {
+				if (responseText == null || responseText.length() == 0
+						|| !runnable.deserialize(responseText)) {
 					runnable.ajaxFail(); // should seldom fail!
 					return;
 				}
-				runnable.deserialize(responseText);
-				
 				runnable.ajaxOut();
-				
 				ajaxPipe(runnable);
 			}
 		});
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
@@ -122,8 +122,9 @@ public boolean ignoreDefaultFields() {
 
 		});
 		if (instance instanceof SimpleRPCRunnable) {
-			instance.deserialize(request);
-			return (SimpleRPCRunnable) instance;
+			if (instance.deserialize(request)) {
+				return (SimpleRPCRunnable) instance;
+			}
 		}
 		return 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
@@ -155,11 +155,11 @@ private static void ajaxRequest(final SimpleRPCRunnable runnable) {
 		request.registerOnReadyStateChange(new XHRCallbackAdapter() {
 			public void onLoaded() {
 				String responseText = request.getResponseText();
-				if (responseText == null || responseText.length() == 0) {
+				if (responseText == null || responseText.length() == 0
+						|| !runnable.deserialize(responseText)) {
 					runnable.ajaxFail(); // should seldom fail!
 					return;
 				}
-				runnable.deserialize(responseText);
 				runnable.ajaxOut();
 			}
 		});
@@ -574,8 +574,11 @@ static void xssNotify(String nameID, String response, String session) {
 			 * 	return; // already failed, should not call #ajaxOut!
 			 * }
 			 */ {}
-			runnable.deserialize(response);
-			runnable.ajaxOut();
+			if (!runnable.deserialize(response)) {
+				runnable.ajaxFail();
+			} else {
+				runnable.ajaxOut();
+			}
 		}
 	}
 }
diff --git a/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/SimplePipeSWTRequest.java b/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/SimplePipeSWTRequest.java
@@ -188,11 +188,11 @@ private static void swtPipeRequest(final SimplePipeRunnable runnable) {
 		request.registerOnReadyStateChange(new XHRCallbackSWTAdapter() {
 			public void swtOnLoaded() {
 				String responseText = request.getResponseText();
-				if (responseText == null || responseText.length() == 0) {
+				if (responseText == null || responseText.length() == 0
+						|| !runnable.deserialize(responseText)) {
 					runnable.ajaxFail(); // should seldom fail!
 					return;
 				}
-				runnable.deserialize(responseText);
 				runnable.ajaxOut();
 				
 				SimplePipeHelper.registerPipe(runnable.pipeKey, runnable);
diff --git a/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/SimpleRPCSWTRequest.java b/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/SimpleRPCSWTRequest.java
@@ -86,11 +86,11 @@ private static void swtAJAXRequest(final SimpleRPCRunnable runnable) {
 		request.registerOnReadyStateChange(new XHRCallbackSWTAdapter() {
 			public void swtOnLoaded() {
 				String responseText = request.getResponseText();
-				if (responseText == null || responseText.length() == 0) {
+				if (responseText == null || responseText.length() == 0
+						|| !runnable.deserialize(responseText)) {
 					runnable.ajaxFail(); // should seldom fail!
 					return;
 				}
-				runnable.deserialize(responseText);
 				runnable.ajaxOut();
 			}
 		});

Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,9 @@ public boolean ignoreDefaultFields() {`
`122`	`122`
`123`	`123`	`});`
`124`	`124`	`if (instance instanceof SimpleRPCRunnable) {`
`125`		`- instance.deserialize(request);`
`126`		`- return (SimpleRPCRunnable) instance;`
	`125`	`+ if (instance.deserialize(request)) {`
	`126`	`+ return (SimpleRPCRunnable) instance;`
	`127`	`+ }`
`127`	`128`	`}`
`128`	`129`	`return null;`
`129`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,11 +155,11 @@ private static void ajaxRequest(final SimpleRPCRunnable runnable) {`
`155`	`155`	`request.registerOnReadyStateChange(new XHRCallbackAdapter() {`
`156`	`156`	`public void onLoaded() {`
`157`	`157`	`String responseText = request.getResponseText();`
`158`		`- if (responseText == null \|\| responseText.length() == 0) {`
	`158`	`+ if (responseText == null \|\| responseText.length() == 0`
	`159`	`+ \|\| !runnable.deserialize(responseText)) {`
`159`	`160`	`runnable.ajaxFail(); // should seldom fail!`
`160`	`161`	`return;`
`161`	`162`	`}`
`162`		`- runnable.deserialize(responseText);`
`163`	`163`	`runnable.ajaxOut();`
`164`	`164`	`}`
`165`	`165`	`});`
`@@ -574,8 +574,11 @@ static void xssNotify(String nameID, String response, String session) {`
`574`	`574`	`* return; // already failed, should not call #ajaxOut!`
`575`	`575`	`* }`
`576`	`576`	`*/ {}`
`577`		`- runnable.deserialize(response);`
`578`		`- runnable.ajaxOut();`
	`577`	`+ if (!runnable.deserialize(response)) {`
	`578`	`+ runnable.ajaxFail();`
	`579`	`+ } else {`
	`580`	`+ runnable.ajaxOut();`
	`581`	`+ }`
`579`	`582`	`}`
`580`	`583`	`}`
`581`	`584`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,11 @@ private static void swtAJAXRequest(final SimpleRPCRunnable runnable) {`
`86`	`86`	`request.registerOnReadyStateChange(new XHRCallbackSWTAdapter() {`
`87`	`87`	`public void swtOnLoaded() {`
`88`	`88`	`String responseText = request.getResponseText();`
`89`		`- if (responseText == null \|\| responseText.length() == 0) {`
	`89`	`+ if (responseText == null \|\| responseText.length() == 0`
	`90`	`+ \|\| !runnable.deserialize(responseText)) {`
`90`	`91`	`runnable.ajaxFail(); // should seldom fail!`
`91`	`92`	`return;`
`92`	`93`	`}`
`93`		`- runnable.deserialize(responseText);`
`94`	`94`	`runnable.ajaxOut();`
`95`	`95`	`}`
`96`	`96`	`});`