-made code work with flash based sockets( as it was before in 2c10a04 )

Author: Davidiusdadi

src/net/tootallnate/websocket/Draft.java

@@ -2,6 +2,7 @@
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -43,7 +44,7 @@ public HandshakeBuilder postProcessHandshakeResponseAsServer(  Handshakedata req
 			bui.append ( " HTTP/1.1" );
 		}
 		else if( ownrole == Role.SERVER ){
-			bui.append ( "HTTP/1.1 101 Switching Protocols" );
+			bui.append ( "HTTP/1.1 101 "+handshakedata.getHttpStatusMessage() );
 		}
 		else{
 			throw new RuntimeException ( "unknow role" );
@@ -58,14 +59,13 @@ else if( ownrole == Role.SERVER ){
 			bui.append ( fieldvalue );
 			bui.append ( "\r\n" );
 		}
+		bui.append ( "\r\n" );
 		byte[] httpheader = bui.toString ().getBytes ( UTF8_CHARSET );
 		byte[] content = handshakedata.getContent ();
-		ByteBuffer bytebuffer = ByteBuffer.allocate ( ( content==null ? 0 : content.length ) + httpheader.length + 2 );
+		ByteBuffer bytebuffer = ByteBuffer.allocate ( ( content==null ? 0 : content.length ) + httpheader.length );
 		bytebuffer.put ( httpheader );
 		if( content!=null )
 			bytebuffer.put ( content );
-		bytebuffer.put (  ( byte )'\r' );
-		bytebuffer.put (  ( byte )'\n' );
 		return bytebuffer;
 
 	}
@@ -80,6 +80,9 @@ public static Handshakedata translateHandshake( byte[] buffer, int readcount ){
 		if ( index == lines.length )
 			return null;
 		String line = new String ( lines , previndex , index - previndex );
+		String[] firstLineTokens = line.split(" ");
+		String path = firstLineTokens[1];
+		draft.setResourceDescriptor( path );
 		//TODO Care about resources here like: GET /chat HTTP/1.1 
 		//if ( line.startsWith ( "GET" ) == false ) 
 		//if ( line.startsWith ( "HTTP" ) == false ) 
@@ -88,18 +91,20 @@ public static Handshakedata translateHandshake( byte[] buffer, int readcount ){
 		index = findNewLine ( lines , previndex );
 		int length = index - previndex;
 		while ( length != 0 ) {
-			
 			line = new String ( lines , previndex , length );
 			if ( index != previndex ) {
 				String[] pair = line.split ( ":" , 2 );
 				if ( pair.length != 2 )
-					draft.setContent ( ByteBuffer.allocate ( length ).put ( lines, previndex,length).array () ); //this approach will also accept suspicious looking handshakes...
-				draft.put ( pair[ 0 ] , pair[ 1 ] );
+					return null;
+				draft.put ( pair[ 0 ] , pair[ 1 ].replaceFirst( "^ +" , "" ) );
 			}
 			previndex = index + 2;
 			index = findNewLine ( lines , previndex );
 			length = index - previndex;
 		}
+		previndex = index + 2;
+		length = lines.length - previndex;
+		draft.setContent ( ByteBuffer.allocate ( length ).put ( lines, previndex , length ).array () );
 		return draft;
 	}
 
@@ -112,4 +117,15 @@ public static int findNewLine( byte[] arr , int offset ) {
 				return i;
 		return i;//the end of input will be handled like newline
 	}
+	
+	public static boolean isFlashEdgeCase( byte[] request , int requestsize ){
+		byte[] req = "<policy-file-request/>".getBytes( UTF8_CHARSET );
+		for( int i = 0 ; i < requestsize && i < req.length ; i++ ){
+			if( req[i] != request[i] ){
+				return false;
+			}
+		}
+		return requestsize >= req.length;
+	}
+
 }

src/net/tootallnate/websocket/WebSocket.java

@@ -61,6 +61,12 @@ public enum Role{
   public static final byte END_OF_FRAME = (byte)0xFF;
 
   public static final boolean DEBUG = false;
+  
+  static{
+	if ( DEBUG ) {
+		System.out.println("WebSocket debug mode enabled");
+	}
+  }
 
 
   // INSTANCE PROPERTIES /////////////////////////////////////////////////////
@@ -173,8 +179,16 @@ else if( bytesRead > maxpayloadsize ){
     else if ( bytesRead > 0) {
 		if(DEBUG) System.out.println( "got: {" + new String( socketBuffer.array() , 0 , bytesRead ) + "}" );
 		if( !handshakeComplete ){
+			if(draft.isFlashEdgeCase( socketBuffer.array() , bytesRead )){
+				channelWrite( ByteBuffer.wrap( wsl.getFlashPolicy( this ).getBytes( UTF8_CHARSET ) ) );
+				return;
+			}
 			try{
 				Handshakedata handshake = Draft.translateHandshake ( socketBuffer.array () , bytesRead );
+				if( handshake == null){
+					abort("This valid http header ");
+					return;
+				}
 				if( role == Role.SERVER ){
 					for( Draft d : known_drafts ){
 						if(  d.acceptHandshakeAsServer( handshake ) ){
@@ -369,5 +383,9 @@ private void printBytes(ByteBuffer buf, int len){
 	  }
 
   }
+  
+  public int getPort(){
+	  return socketChannel.socket().getLocalPort();
+  }
 
 }

src/net/tootallnate/websocket/WebSocketAdapter.java

@@ -38,4 +38,26 @@ public void onMessage( WebSocket conn , byte[] blob ) {
 	@Override
 	public void onPong( ) {
 	}
+
+	/**
+	* Gets the XML string that should be returned if a client requests a Flash
+	* security policy.
+	*
+	* The default implementation allows access from all remote domains, but
+	* only on the port that this WebSocketServer is listening on.
+	*
+	* This is specifically implemented for gitime's WebSocket client for Flash:
+	*     http://github.com/gimite/web-socket-js
+	*
+	* @return An XML String that comforms to Flash's security policy. You MUST
+	*         not include the null char at the end, it is appended automatically.
+	*/
+	
+	
+	@Override
+	public String getFlashPolicy( WebSocket conn ) {
+		return "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\""
+        + conn.getPort() + "\" /></cross-domain-policy>\0";
+	}	
+
 }

src/net/tootallnate/websocket/WebSocketListener.java

@@ -51,4 +51,6 @@ interface WebSocketListener {
   public void onError( Throwable ex );
 
   public void onPong();
+  
+  public String getFlashPolicy( WebSocket conn);
 }