Clean up.

Author: imcarolwang

src/System.ServiceModel.Http/src/System/ServiceModel/Channels/ClientWebSocketTransportDuplexSessionChannel.cs

@@ -78,36 +78,13 @@ protected internal override async Task OnOpenAsync(TimeSpan timeout)
 
                 try
                 {
-                    //old implementation:
-                    //var clientWebSocket = new ClientWebSocket();
-                    //await ConfigureClientWebSocketAsync(clientWebSocket, helper.RemainingTime());
-                    //await clientWebSocket.ConnectAsync(Via, await helper.GetCancellationTokenAsync());
-                    //ValidateWebSocketConnection(clientWebSocket);
-                    //WebSocket = clientWebSocket;
-
-                    /* new implementation:
-                    1.	Create a SocketsHttpHandler, set certificate, certificate validation callback, and credentials. Wrap in an HttpMessageInvoker.
-                    2.	Create an HttpRequestMessage. Set the required WebSocket headers, including any sub protocols, set the service url etc.
-                    3.	Send the request using the invoker
-                    4.	Validate the response headers, including upgrade status code, websocket specific headers, sub protocol.
-                    5.	Fetch the content stream from the response content
-                    6.	Wrap the content stream in a websocket
-                    */
-
                     try
                     {
                         while (true)
                         {
                             try
                             {
                                 HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, Via) { Version = HttpVersion.Version11 };
-                                //if (options._requestHeaders?.Count > 0) // use field to avoid lazily initializing the collection
-                                //{
-                                //    foreach (string key in options.RequestHeaders)
-                                //    {
-                                //        request.Headers.TryAddWithoutValidation(key, options.RequestHeaders[key]);
-                                //    }
-                                //}
 
                                 // These headers were added for WCF specific handshake to avoid encoder or transfermode mismatch between client and server.
                                 // For BinaryMessageEncoder, since we are using a sessionful channel for websocket, the encoder is actually different when
@@ -320,7 +297,7 @@ private static void ValidateHeader(HttpHeaders headers, string name, string expe
             SecurityTokenContainer clientCertificateToken = null;
             if (_channelFactory is HttpsChannelFactory<IDuplexSessionChannel> httpsChannelFactory)
             {
-                if(httpsChannelFactory.RequireClientCertificate)
+                if (httpsChannelFactory.RequireClientCertificate)
                 {
                     SecurityTokenProvider certificateProvider = await httpsChannelFactory.CreateAndOpenCertificateTokenProviderAsync(RemoteAddress, Via, channelParameterCollection, helper.RemainingTime());
                     clientCertificateToken = await httpsChannelFactory.GetCertificateSecurityTokenAsync(certificateProvider, RemoteAddress, Via, channelParameterCollection, helper);
@@ -334,7 +311,7 @@ private static void ValidateHeader(HttpHeaders headers, string name, string expe
                         };
                     }
                 }
-                
+                //Fix for issue #5729: Removed the httpsChannelFactory.RequireClientCertificate condition from the following if statement.
                 if (httpsChannelFactory.WebSocketCertificateCallback != null)
                 {
                     handler.SslOptions.RemoteCertificateValidationCallback = httpsChannelFactory.WebSocketCertificateCallback;
@@ -343,7 +320,7 @@ private static void ValidateHeader(HttpHeaders headers, string name, string expe
 
             //configure handler.Proxy
             (NetworkCredential credential, TokenImpersonationLevel impersonationLevel, AuthenticationLevel authenticationLevel) =
-                await HttpChannelUtilities.GetCredentialAsync(_channelFactory.AuthenticationScheme, _webRequestTokenProvider, timeout);            
+                await HttpChannelUtilities.GetCredentialAsync(_channelFactory.AuthenticationScheme, _webRequestTokenProvider, timeout);
             if (_channelFactory.Proxy != null)
             {
                 handler.Proxy = _channelFactory.Proxy;
@@ -418,7 +395,7 @@ private string AddWebSocketHeaders(HttpRequestMessage request)
             {
                 request.Headers.TryAddWithoutValidation(HttpKnownHeaderNames.SecWebSocketProtocol, WebSocketSettings.SubProtocol);
             }
-            
+
             return secValue;
         }
 
@@ -502,4 +479,3 @@ private void CleanupTokenProviders()
         }
     }
 }
-

src/System.ServiceModel.Http/src/System/ServiceModel/Channels/HttpKnownHeaderNames.cs

@@ -3,7 +3,6 @@
 
 namespace System.ServiceModel.Channels
 {
-    // from https://source.dot.net/#System.Net.WebSockets.Client/src/libraries/Common/src/System/Net/HttpKnownHeaderNames.cs
     internal static partial class HttpKnownHeaderNames
     {
         public const string Accept = "Accept";