Remove unnecessary "@j2sIgnore"

zhourenjian · zhourenjian · commit 1f335ae739b6 · 2008-09-20T21:07:36.000Z
Fixed bug that SimplePipe should not response with "Transfer-Encoding: chunked" header in cross site script (XSS) or query mode.
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/CompoundPipeSession.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/CompoundPipeSession.java
@@ -10,7 +10,6 @@ public static class PipeSessionClosedEvent extends CompoundSerializable {
 
 	@Override
 	public void ajaxRun() {
-		//pipeKey = SimplePipeHelper.registerPipe(this);
 		SimplePipeRunnable pipe = SimplePipeHelper.getPipe(pipeKey);
 		if (pipe != null) {
 			pipeAlive = pipeSetup();
@@ -45,9 +44,6 @@ public void pipeDestroy() {
 		}
 	}
 	
-	/**
-	 * @j2sIgnore
-	 */
 	@Override
 	final public SimpleSerializable[] through(Object... args) {
 		CompoundSerializable[] cs = convert(args);
@@ -63,9 +59,6 @@ final public SimpleSerializable[] through(Object... args) {
 	
 	public abstract CompoundSerializable[] convert(Object... args);
 
-	/**
-	 * @j2sIgnore
-	 */
 	@Override
 	protected void pipeThrough(Object... args) {
 		SimplePipeRunnable pipe = SimplePipeHelper.getPipe(pipeKey);
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeHttpServlet.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeHttpServlet.java
@@ -71,6 +71,10 @@ public void init() throws ServletException {
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 			throws ServletException, IOException {
 		String key = req.getParameter(SimplePipeRequest.FORM_PIPE_KEY);
+		if (key == null) {
+			resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
+			return;
+		}
 		String type = req.getParameter(SimplePipeRequest.FORM_PIPE_TYPE);
 		if (type == null) {
 			type = SimplePipeRequest.PIPE_TYPE_CONTINUUM;
@@ -118,8 +122,9 @@ protected void doPipe(final HttpServletResponse resp, String key, String type)
 			writer.write("\");");
 			return;
 		}
-		
-		resp.setHeader("Transfer-Encoding", "chunked");
+		if (SimplePipeRequest.PIPE_TYPE_CONTINUUM.equals(type)) {
+			resp.setHeader("Transfer-Encoding", "chunked");
+		}
 		if (SimplePipeRequest.PIPE_TYPE_SCRIPT.equals(type)) { // iframe
 			resp.setContentType("text/html; charset=utf-8");
 			writer = resp.getWriter();
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
@@ -668,8 +668,10 @@ public static String parseReceived(final String string) {
 				 * @j2sNative
 				 * var key = string.substring(start, end);
 				 * var pipe = net.sf.j2s.ajax.SimplePipeHelper.getPipe(key)
-				 * pipe.pipeAlive = false;
-				 * pipe.pipeClosed();
+				 * if (pipe != null) {
+				 * 	pipe.pipeAlive = false;
+				 * 	pipe.pipeClosed();
+				 * }
 				 * net.sf.j2s.ajax.SimplePipeHelper.removePipe(key);
 				 */ {}
 				return destroyedKey + ":" + string.substring(start, end) 
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeRunnable.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeRunnable.java
@@ -149,7 +149,6 @@ public void keepPipeLive() {
 	 * Start pipe monitor to monitor the pipe status. If pipe is non-active,
 	 * try to destroy pipe by calling {@link #pipeDestroy()}.
 	 * User may override this method to use its own monitoring method.
-	 * @j2sIgnore
 	 */
 	protected void pipeMonitoring() {
 		new Thread(new Runnable() {
@@ -180,7 +179,6 @@ public void run() {
 	 * If return interval is less than or equals to 0, the interval time will
 	 * be set to 1000 in {@link #pipeMonitoring()}. 
 	 * @return time interval in millisecond.
-	 * @j2sIgnore
 	 */
 	protected long pipeMonitoringInterval() {
 		return 1000;
@@ -262,7 +260,6 @@ public boolean deal(SimpleSerializable ss) {
 	 * 
 	 * Attention: Only visible inside {@link #pipeSetup()}.
 	 * @param args
-	 * @j2sIgnore
 	 */
 	protected void pipeThrough(Object ... args) {
 		SimplePipeRunnable pipe = SimplePipeHelper.getPipe(pipeKey);
