New test.

[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 98a5808b75a91b9d005a49da9aef365f44a50962..3e4c08f193010c04dfb05cfa6932b09e72b7f320 100644 (file)
--- a/mcs/class/System/System.Net/ChunkStream.cs
+++ b/mcs/class/System/System.Net/ChunkStream.cs
@@ -7,6 +7,27 @@
 // (C) 2003 Ximian, Inc (http://www.ximian.com)
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Collections;
 using System.Globalization;
 using System.IO;
@@ -41,7 +62,7 @@ namespace System.Net
                        }
                }
 
-               WebHeaderCollection headers;
+               internal WebHeaderCollection headers;
                int chunkSize;
                int chunkRead;
                State state;
@@ -49,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 ()
@@ -69,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);
                }
 
@@ -146,7 +174,11 @@ namespace System.Net
                }
 
                public bool WantMore {
-                       get { return (chunkRead != chunkSize || chunkSize != 0); }
+                       get { return (chunkRead != chunkSize || chunkSize != 0 || state != State.None); }
+               }
+
+               public int ChunkLeft {
+                       get { return chunkSize - chunkRead; }
                }
                
                State ReadBody (byte [] buffer, ref int offset, int size)
@@ -174,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;
@@ -188,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;
                }
@@ -205,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;
                }
@@ -223,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++];
@@ -247,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;
@@ -262,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;
+               }
        }
 }