2009-08-03 Gonzalo Paniagua Javier <gonzalo@novell.com>

[mono.git] / mcs / class / System / System.Net / ChunkStream.cs

diff --git a/mcs/class/System/System.Net/ChunkStream.cs b/mcs/class/System/System.Net/ChunkStream.cs
index 16d2b291f2568f2d1c012c083daa712b2cdcebf8..3e4c08f193010c04dfb05cfa6932b09e72b7f320 100644 (file)
--- a/mcs/class/System/System.Net/ChunkStream.cs
+++ b/mcs/class/System/System.Net/ChunkStream.cs
@@ -62,7 +62,7 @@ namespace System.Net
                        }
                }
 
-               WebHeaderCollection headers;
+               internal WebHeaderCollection headers;
                int chunkSize;
                int chunkRead;
                State state;
@@ -70,15 +70,21 @@ namespace System.Net
                StringBuilder saved;
                bool sawCR;
                bool gotit;
+               int trailerState;
                ArrayList chunks;
                
                public ChunkStream (byte [] buffer, int offset, int size, WebHeaderCollection headers)
+                                       : this (headers)
+               {
+                       Write (buffer, offset, size);
+               }
+
+               public ChunkStream (WebHeaderCollection headers)
                {
                        this.headers = headers;
                        saved = new StringBuilder ();
                        chunks = new ArrayList ();
                        chunkSize = -1;
-                       Write (buffer, offset, size);
                }
 
                public void ResetBuffer ()
@@ -90,7 +96,8 @@ namespace System.Net
                
                public void WriteAndReadBack (byte [] buffer, int offset, int size, ref int read)
                {
-                       Write (buffer, offset, offset+read);
+                       if (offset + read > 0)
+                               Write (buffer, offset, offset+read);
                        read = Read (buffer, offset, size);
                }
 
@@ -167,7 +174,7 @@ namespace System.Net
                }
 
                public bool WantMore {
-                       get { return (chunkRead != chunkSize || chunkSize != 0); }
+                       get { return (chunkRead != chunkSize || chunkSize != 0 || state != State.None); }
                }
 
                public int ChunkLeft {
@@ -199,7 +206,7 @@ namespace System.Net
                                c = (char) buffer [offset++];
                                if (c == '\r') {
                                        if (sawCR)
-                                               throw new ProtocolViolationException ("2 CR found");
+                                               ThrowProtocolViolation ("2 CR found");
 
                                        sawCR = true;
                                        continue;
@@ -213,15 +220,36 @@ namespace System.Net
 
                                if (!gotit)
                                        saved.Append (c);
+
+                               if (saved.Length > 20)
+                                       ThrowProtocolViolation ("chunk size too long.");
                        }
 
-                       if (!sawCR || c != '\n')
+                       if (!sawCR || c != '\n') {
+                               if (offset < size)
+                                       ThrowProtocolViolation ("Missing \\n");
+
+                               try {
+                                       if (saved.Length > 0)
+                                               chunkSize = Int32.Parse (saved.ToString (), NumberStyles.HexNumber);
+                               } catch (Exception) {
+                                       ThrowProtocolViolation ("Cannot parse chunk size.");
+                               }
+
                                return State.None;
+                       }
 
                        chunkRead = 0;
-                       chunkSize = Int32.Parse (saved.ToString (), NumberStyles.HexNumber);
-                       if (chunkSize == 0)
+                       try {
+                               chunkSize = Int32.Parse (saved.ToString (), NumberStyles.HexNumber);
+                       } catch (Exception) {
+                               ThrowProtocolViolation ("Cannot parse chunk size.");
+                       }
+                       
+                       if (chunkSize == 0) {
+                               trailerState = 2;
                                return State.Trailer;
+                       }
 
                        return State.Body;
                }
@@ -230,15 +258,15 @@ namespace System.Net
                {
                        if (!sawCR) {
                                if ((char) buffer [offset++] != '\r')
-                                       throw new ProtocolViolationException ("Expecting \\r");
+                                       ThrowProtocolViolation ("Expecting \\r");
 
                                sawCR = true;
                                if (offset == size)
                                        return State.BodyFinished;
                        }
                        
-                       if ((char) buffer [offset++] != '\n')
-                               throw new ProtocolViolationException ("Expecting \\n");
+                       if (sawCR && (char) buffer [offset++] != '\n')
+                               ThrowProtocolViolation ("Expecting \\n");
 
                        return State.None;
                }
@@ -248,16 +276,16 @@ namespace System.Net
                        char c = '\0';
 
                        // short path
-                       if ((char) buffer [offset] == '\r') {
+                       if (trailerState == 2 && (char) buffer [offset] == '\r' && saved.Length == 0) {
                                offset++;
-                               if ((char) buffer [offset] == '\n') {
+                               if (offset < size && (char) buffer [offset] == '\n') {
                                        offset++;
                                        return State.None;
                                }
                                offset--;
                        }
                        
-                       int st = 0;
+                       int st = trailerState;
                        string stString = "\r\n\r";
                        while (offset < size && st < 4) {
                                c = (char) buffer [offset++];
@@ -272,13 +300,18 @@ namespace System.Net
                                }
 
                                if (st > 0) {
-                                       saved.Append (stString.Substring (0, st));
+                                       saved.Append (stString.Substring (0, saved.Length == 0? st-2: st));
                                        st = 0;
                                }
                        }
 
-                       if (st < 4)
+                       if (st < 4) {
+                               trailerState = st;
+                               if (offset <  size)
+                                       ThrowProtocolViolation ("Error reading trailer.");
+
                                return State.Trailer;
+                       }
 
                        StringReader reader = new StringReader (saved.ToString ());
                        string line;
@@ -287,6 +320,12 @@ namespace System.Net
 
                        return State.None;
                }
+
+               static void ThrowProtocolViolation (string message)
+               {
+                       WebException we = new WebException (message, null, WebExceptionStatus.ServerProtocolViolation, null);
+                       throw we;
+               }
        }
 }