Merge pull request #981 from methane/websocket

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

diff --git a/mcs/class/System/System.Net/HttpConnection.cs b/mcs/class/System/System.Net/HttpConnection.cs
index 0cffe96b4eb80d6c91ab3394075ee18209e80cc2..d554309b695de23d85e86e7df53800aa518248c3 100644 (file)
--- a/mcs/class/System/System.Net/HttpConnection.cs
+++ b/mcs/class/System/System.Net/HttpConnection.cs
@@ -2,9 +2,10 @@
 // System.Net.HttpConnection
 //
 // Author:
-//     Gonzalo Paniagua Javier (gonzalo@novell.com)
+//     Gonzalo Paniagua Javier (gonzalo.mono@gmail.com)
 //
-// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2005-2009 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2012 Xamarin, Inc. (http://xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -28,6 +29,13 @@
 
 #if SECURITY_DEP
 
+#if MONOTOUCH || MONODROID
+using Mono.Security.Protocol.Tls;
+#else
+extern alias MonoSecurity;
+using MonoSecurity::Mono.Security.Protocol.Tls;
+#endif
+
 using System.IO;
 using System.Net.Sockets;
 using System.Reflection;
@@ -35,7 +43,6 @@ using System.Text;
 using System.Threading;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
-using Mono.Security.Protocol.Tls;
 
 namespace System.Net {
        sealed class HttpConnection
@@ -61,6 +68,8 @@ namespace System.Net {
                Timer timer;
                IPEndPoint local_ep;
                HttpListener last_listener;
+               int [] client_cert_errors;
+               X509Certificate2 client_cert;
 
                public HttpConnection (Socket sock, EndPointListener epl, bool secure, X509Certificate2 cert, AsymmetricAlgorithm key)
                {
@@ -71,14 +80,35 @@ namespace System.Net {
                        if (secure == false) {
                                stream = new NetworkStream (sock, false);
                        } else {
-                               SslServerStream ssl_stream = new SslServerStream (new NetworkStream (sock, false), cert, false, false);
+                               SslServerStream ssl_stream = new SslServerStream (new NetworkStream (sock, false), cert, false, true, false);
                                ssl_stream.PrivateKeyCertSelectionDelegate += OnPVKSelection;
+                               ssl_stream.ClientCertValidationDelegate += OnClientCertificateValidation;
                                stream = ssl_stream;
                        }
                        timer = new Timer (OnTimeout, null, Timeout.Infinite, Timeout.Infinite);
                        Init ();
                }
 
+               internal int [] ClientCertificateErrors {
+                       get { return client_cert_errors; }
+               }
+
+               internal X509Certificate2 ClientCertificate {
+                       get { return client_cert; }
+               }
+
+               bool OnClientCertificateValidation (X509Certificate certificate, int[] errors)
+               {
+                       if (certificate == null)
+                               return true;
+                       X509Certificate2 cert = certificate as X509Certificate2;
+                       if (cert == null)
+                               cert = new X509Certificate2 (certificate.GetRawCertData ());
+                       client_cert = cert;
+                       client_cert_errors = errors;
+                       return true;
+               }
+
                AsymmetricAlgorithm OnPVKSelection (X509Certificate certificate, string targetHost)
                {
                        return key;
@@ -147,6 +177,7 @@ namespace System.Net {
                        } catch {
                                timer.Change (Timeout.Infinite, Timeout.Infinite);
                                CloseSocket ();
+                               Unbind ();
                        }
                }
 
@@ -178,6 +209,17 @@ namespace System.Net {
                        return o_stream;
                }
 
+               internal Socket Hijack (out ArraySegment<byte> buffered)
+               {
+                       // TODO: disable normal request/response.
+                       buffered = new ArraySegment<byte> (ms.GetBuffer(), position, (int)ms.Length - position);
+                       RemoveConnection ();
+                       var s = sock;
+                       sock = null;
+                       o_stream = null;
+                       return s;
+               }
+
                static void OnRead (IAsyncResult ares)
                {
                        HttpConnection cnc = (HttpConnection) ares.AsyncState;
@@ -199,8 +241,10 @@ namespace System.Net {
                        } catch {
                                if (ms != null && ms.Length > 0)
                                        SendError ();
-                               if (sock != null)
+                               if (sock != null) {
                                        CloseSocket ();
+                                       Unbind ();
+                               }
                                return;
                        }
 
@@ -208,6 +252,7 @@ namespace System.Net {
                                //if (ms.Length > 0)
                                //      SendError (); // Why bother?
                                CloseSocket ();
+                               Unbind ();
                                return;
                        }
 
@@ -224,22 +269,30 @@ namespace System.Net {
                                if (!epl.BindContext (context)) {
                                        SendError ("Invalid host", 400);
                                        Close (true);
+                                       return;
                                }
-                               if (last_listener == null)
-                                       epl.RemoveConnection (this);
-                               else
-                                       last_listener.RemoveConnection (this);
-
-                               if (context.Listener != null) {
-                                       context.Listener.AddConnection (this);
-                                       context_bound = true;
+                               HttpListener listener = context.Listener;
+                               if (last_listener != listener) {
+                                       RemoveConnection ();
+                                       listener.AddConnection (this);
+                                       last_listener = listener;
                                }
-                               last_listener = context.Listener;
+
+                               context_bound = true;
+                               listener.RegisterContext (context);
                                return;
                        }
                        stream.BeginRead (buffer, 0, BufferSize, onread_cb, this);
                }
 
+               void RemoveConnection ()
+               {
+                       if (last_listener == null)
+                               epl.RemoveConnection (this);
+                       else
+                               last_listener.RemoveConnection (this);
+               }
+
                enum InputState {
                        RequestLine,
                        Headers
@@ -375,7 +428,6 @@ namespace System.Net {
                void Unbind ()
                {
                        if (context_bound) {
-                               context.Listener.RemoveConnection (this);
                                epl.UnbindContext (context);
                                context_bound = false;
                        }
@@ -397,15 +449,16 @@ namespace System.Net {
                        } finally {
                                sock = null;
                        }
-                       if (last_listener == null)
-                               epl.RemoveConnection (this);
+                       RemoveConnection ();
                }
 
                internal void Close (bool force_close)
                {
                        if (sock != null) {
                                Stream st = GetResponseStream ();
-                               st.Close ();
+                               if (st != null)
+                                       st.Close ();
+
                                o_stream = null;
                        }
 
@@ -451,8 +504,7 @@ namespace System.Net {
                                                s.Close ();
                                }
                                Unbind ();
-                               if (last_listener == null)
-                                       epl.RemoveConnection (this);
+                               RemoveConnection ();
                                return;
                        }
                }