Added support for Client Certificates in the .NET client

- Incorporated changes as per code review feedback #1303
SignalR · Mar 29, 2013 · 7a1c24a · 7a1c24a
1 parent 243b894
commit 7a1c24a
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 1 deletion.
diff --git a/src/Microsoft.AspNet.SignalR.Client/Connection.cs b/src/Microsoft.AspNet.SignalR.Client/Connection.cs
@@ -18,6 +18,9 @@
 using Microsoft.AspNet.SignalR.Infrastructure;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+#if (NET4 || NET45)
+using System.Security.Cryptography.X509Certificates;
+#endif
 
 namespace Microsoft.AspNet.SignalR.Client
 {
@@ -66,6 +69,10 @@ public class Connection : IConnection
         //The json serializer for the connections
         private JsonSerializer _jsonSerializer = new JsonSerializer();
 
+#if (NET4 || NET45)
+        private X509CertificateCollection certCollection = new X509CertificateCollection();
+#endif
+
         /// <summary>
         /// Occurs when the <see cref="Connection"/> has received data from the server.
         /// </summary>
@@ -554,6 +561,25 @@ public Task Send(object value)
             return Send(this.JsonSerializeObject(value));
         }
 
+#if (NET4 || NET45)
+        /// <summary>
+        /// Adds a client certificate to the request
+        /// </summary>
+        /// <param name="certificate">Client Certificate</param>
+        public void AddClientCertificate(X509Certificate certificate)
+        {
+            lock (_stateLock)
+            {
+                if (State != ConnectionState.Disconnected)
+                {
+                    throw new InvalidOperationException(Resources.Error_CertsCanOnlyBeAddedWhenDisconnected);
+                }
+
+                certCollection.Add(certificate);
+            }
+        }
+#endif
+
         public void Trace(TraceLevels level, string format, params object[] args)
         {
             lock (_traceLock)
@@ -673,6 +699,10 @@ void IConnection.PrepareRequest(IRequest request)
             }
 #endif
             request.SetRequestHeaders(Headers);
+
+#if (NET4 || NET45)
+            request.AddClientCerts(certCollection);
+#endif
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Can be called via other clients.")]

diff --git a/src/Microsoft.AspNet.SignalR.Client/Http/HttpWebRequestWrapper.cs b/src/Microsoft.AspNet.SignalR.Client/Http/HttpWebRequestWrapper.cs
@@ -4,6 +4,9 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Net;
+#if (NET4 || NET45)
+using System.Security.Cryptography.X509Certificates;
+#endif
 
 namespace Microsoft.AspNet.SignalR.Client.Http
 {
@@ -125,5 +128,17 @@ public void SetRequestHeaders(IDictionary<string, string> headers)
                 }
             }
         }
+
+#if (NET4 || NET45)
+        public void AddClientCerts(X509CertificateCollection certificates)
+        {
+            if (certificates == null)
+            {
+                throw new ArgumentNullException("certificates");
+            }
+
+            _request.ClientCertificates = certificates;
+        }
+#endif
     }
 }
diff --git a/src/Microsoft.AspNet.SignalR.Client/Http/IRequest.cs b/src/Microsoft.AspNet.SignalR.Client/Http/IRequest.cs
@@ -3,6 +3,9 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Net;
+#if (NET4 || NET45)
+using System.Security.Cryptography.X509Certificates;
+#endif
 
 namespace Microsoft.AspNet.SignalR.Client.Http
 {
@@ -48,5 +51,13 @@ public interface IRequest
         /// </summary>
         /// <param name="headers">request headers</param>
         void SetRequestHeaders(IDictionary<string, string> headers);
+
+#if (NET4 || NET45)
+        /// <summary>
+        /// Sets client certificates
+        /// </summary>
+        /// <param name="certificates">client certificates</param>
+        void AddClientCerts(X509CertificateCollection certificates);
+#endif
     }
 }
diff --git a/src/Microsoft.AspNet.SignalR.Client/IConnection.cs b/src/Microsoft.AspNet.SignalR.Client/IConnection.cs
@@ -11,6 +11,9 @@
 using Microsoft.AspNet.SignalR.Client.Transports;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+#if (NET4 || NET45)
+using System.Security.Cryptography.X509Certificates;
+#endif
 
 namespace Microsoft.AspNet.SignalR.Client
 {
@@ -46,6 +49,9 @@ public interface IConnection
         void OnConnectionSlow();
         void PrepareRequest(IRequest request);
         void UpdateLastKeepAlive();
+#if (NET4 || NET45)
+        void AddClientCertificate(X509Certificate certificate);
+#endif
         void Trace(TraceLevels level, string format, params object[] args);
     }
 }
diff --git a/src/Microsoft.AspNet.SignalR.Client/Microsoft.AspNet.SignalR.Client.csproj b/src/Microsoft.AspNet.SignalR.Client/Microsoft.AspNet.SignalR.Client.csproj
@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CLIENT_NET4;NET4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Microsoft.AspNet.SignalR.Client.XML</DocumentationFile>

diff --git a/src/Microsoft.AspNet.SignalR.Client/Resources.Designer.cs b/src/Microsoft.AspNet.SignalR.Client/Resources.Designer.cs
diff --git a/src/Microsoft.AspNet.SignalR.Client45/Transports/WebSockets/WebSocketWrapperRequest.cs b/src/Microsoft.AspNet.SignalR.Client45/Transports/WebSockets/WebSocketWrapperRequest.cs
@@ -5,6 +5,7 @@
 using System.Net;
 using System;
 using System.Net.WebSockets;
+using System.Security.Cryptography.X509Certificates;
 using Microsoft.AspNet.SignalR.Client.Http;
 
 namespace Microsoft.AspNet.SignalR.Client.Transports
@@ -91,6 +92,16 @@ public void SetRequestHeaders(IDictionary<string, string> headers)
             }
         }
 
+        public void AddClientCerts(X509CertificateCollection certificates)
+        {
+            if (certificates == null)
+            {
+                throw new ArgumentNullException("certificates");
+            }
+
+            _clientWebSocket.Options.ClientCertificates = certificates;
+        }
+
         public void Abort()
         {
 

diff --git a/src/Microsoft.AspNet.SignalR.Hosting.Memory/Request.cs b/src/Microsoft.AspNet.SignalR.Hosting.Memory/Request.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
+using System.Security.Cryptography.X509Certificates;
 using Microsoft.AspNet.SignalR.Owin;
 using Microsoft.AspNet.SignalR.Owin.Infrastructure;
 using IClientRequest = Microsoft.AspNet.SignalR.Client.Http.IRequest;
@@ -85,5 +86,9 @@ public void SetRequestHeaders(IDictionary<string, string> headers)
                 _requestHeaders.SetHeader(headerEntry.Key, headerEntry.Value);
             }
         }
+
+        public void AddClientCerts(X509CertificateCollection certificates)
+        {
+        }
     }
 }