Adding proxy support to HTTP

Author: mconnew

src/Common/test-runtime/project.json

@@ -12,6 +12,7 @@
         "xunit.console.netcore": "1.0.3-prerelease-00925-01",
         "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
         "System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
+        "System.Net.Http.WinHttpHandler": "4.4.0-preview2-25309-01",
         "System.ServiceModel.Duplex": "4.4.0-preview1-25302-01",
         "System.ServiceModel.Http": "4.4.0-preview1-25302-01",
         "System.ServiceModel.NetTcp": "4.4.0-preview1-25302-01",
@@ -38,6 +39,7 @@
         "System.Linq.Parallel": "4.4.0-beta-24911-02",
         "System.Linq.Queryable": "4.4.0-beta-24911-02",
         "System.Net.Http": "4.4.0-preview1-25218-03",
+        "System.Net.Http.WinHttpHandler": "4.4.0-preview2-25309-01",
         "System.Net.WebHeaderCollection": "4.4.0-beta-24911-02",
         "System.Net.WebSockets.Client": "4.4.0-beta-24911-02",
         "System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
@@ -73,6 +75,7 @@
         "System.Linq.Parallel": "4.4.0-beta-24911-02",
         "System.Linq.Queryable": "4.4.0-beta-24911-02",
         "System.Net.Http": "4.4.0-preview1-25218-03",
+        "System.Net.Http.WinHttpHandler": "4.4.0-preview2-25309-01",
         "System.Net.WebHeaderCollection": "4.4.0-beta-24911-02",
         "System.Net.WebSockets.Client": "4.4.0-beta-24911-02",
         "System.Reflection.DispatchProxy": "4.4.0-preview2-25309-01",
@@ -99,6 +102,7 @@
         "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
         "xunit.console.netcore": "1.0.3-prerelease-00925-01",
         "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
+        "System.Net.Http.WinHttpHandler": "4.4.0-preview2-25309-01",
         "System.ServiceModel.Duplex": "4.4.0-preview1-25302-01",
         "System.ServiceModel.Http": "4.4.0-preview1-25302-01",
         "System.ServiceModel.NetTcp": "4.4.0-preview1-25302-01",

src/System.Private.ServiceModel/src/Resources/Strings.resx

@@ -606,6 +606,18 @@
   <data name="RequestChannelWaitForReplyTimedOut" xml:space="preserve">
     <value>The request channel timed out while waiting for a reply after {0}. Increase the timeout value passed to the call to Request or increase the SendTimeout value on the Binding. The time allotted to this operation may have been a portion of a longer timeout.</value>
   </data>
+  <data name="HttpProxyRequiresSingleAuthScheme" xml:space="preserve">
+    <value>The '{0}' authentication scheme has been specified for the proxy on the HTTP factory. However, the factory only supports specification of exactly one authentication scheme. Valid authentication schemes are Digest, Negotiate, NTLM, Basic, or Anonymous.</value>
+  </data>
+  <data name="UseDefaultWebProxyCantBeUsedWithExplicitProxyAddress" xml:space="preserve">
+    <value>You cannot specify an explicit Proxy Address as well as UseDefaultWebProxy=true in your HTTP Transport Binding Element.</value>
+  </data>
+  <data name="ProxyImpersonationLevelMismatch" xml:space="preserve">
+    <value>The HTTP proxy authentication credential specified an impersonation level restriction ({0}) that is stricter than the restriction for target server authentication ({1}).</value>
+  </data>
+  <data name="ProxyAuthenticationLevelMismatch" xml:space="preserve">
+    <value>The HTTP proxy authentication credential specified an mutual authentication requirement ({0}) that is stricter than the requirement for target server authentication ({1}).</value>
+  </data>
   <data name="HttpIfModifiedSinceParseError" xml:space="preserve">
     <value>The value specified, '{0}', for the If-Modified-Since header does not parse into a valid date. Check the property value and ensure that it is of the proper format.</value>
   </data>

src/System.Private.ServiceModel/src/System/ServiceModel/Channels/HttpChannelFactory.cs

@@ -17,13 +17,16 @@ public class HttpTransportBindingElement
     {
         private bool _allowCookies;
         private AuthenticationSchemes _authenticationScheme;
+        private bool _bypassProxyOnLocal;
         private bool _decompressionEnabled;
         private HostNameComparisonMode _hostNameComparisonMode;
         private bool _keepAliveEnabled;
         private bool _inheritBaseAddressSettings;
         private int _maxBufferSize;
         private bool _maxBufferSizeInitialized;
         private string _method;
+        private Uri _proxyAddress;
+        private AuthenticationSchemes _proxyAuthenticationScheme;
         private string _realm;
         private TimeSpan _requestInitializationTimeout;
         private TransferMode _transferMode;
@@ -41,6 +44,7 @@ public HttpTransportBindingElement()
         {
             _allowCookies = HttpTransportDefaults.AllowCookies;
             _authenticationScheme = HttpTransportDefaults.AuthenticationScheme;
+            _bypassProxyOnLocal = HttpTransportDefaults.BypassProxyOnLocal;
             _decompressionEnabled = HttpTransportDefaults.DecompressionEnabled;
             _hostNameComparisonMode = HttpTransportDefaults.HostNameComparisonMode;
             _keepAliveEnabled = HttpTransportDefaults.KeepAliveEnabled;
@@ -60,6 +64,7 @@ protected HttpTransportBindingElement(HttpTransportBindingElement elementToBeClo
         {
             _allowCookies = elementToBeCloned._allowCookies;
             _authenticationScheme = elementToBeCloned._authenticationScheme;
+            _bypassProxyOnLocal = elementToBeCloned._bypassProxyOnLocal;
             _decompressionEnabled = elementToBeCloned._decompressionEnabled;
             _hostNameComparisonMode = elementToBeCloned._hostNameComparisonMode;
             _inheritBaseAddressSettings = elementToBeCloned.InheritBaseAddressSettings;
@@ -107,6 +112,19 @@ public AuthenticationSchemes AuthenticationScheme
             }
         }
 
+        [DefaultValue(HttpTransportDefaults.BypassProxyOnLocal)]
+        public bool BypassProxyOnLocal
+        {
+            get
+            {
+                return _bypassProxyOnLocal;
+            }
+            set
+            {
+                _bypassProxyOnLocal = value;
+            }
+        }
+
         [DefaultValue(HttpTransportDefaults.DecompressionEnabled)]
         public bool DecompressionEnabled
         {
@@ -271,6 +289,40 @@ internal string Method
             }
         }
 
+        [DefaultValue(HttpTransportDefaults.ProxyAddress)]
+        [TypeConverter(typeof(UriTypeConverter))]
+        public Uri ProxyAddress
+        {
+            get
+            {
+                return _proxyAddress;
+            }
+            set
+            {
+                _proxyAddress = value;
+            }
+        }
+
+        [DefaultValue(HttpTransportDefaults.ProxyAuthenticationScheme)]
+        public AuthenticationSchemes ProxyAuthenticationScheme
+        {
+            get
+            {
+                return _proxyAuthenticationScheme;
+            }
+
+            set
+            {
+                if (!value.IsSingleton())
+                {
+                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument(nameof(value), SR.Format(SR.HttpProxyRequiresSingleAuthScheme,
+                        value));
+                }
+
+                _proxyAuthenticationScheme = value;
+            }
+        }
+
         [DefaultValue(HttpTransportDefaults.Realm)]
         public string Realm
         {
@@ -371,12 +423,17 @@ public bool UnsafeConnectionNtlmAuthentication
             }
         }
 
+        [DefaultValue(HttpTransportDefaults.UseDefaultWebProxy)]
         public bool UseDefaultWebProxy
         {
             get
             {
                 return _useDefaultWebProxy;
             }
+            set
+            {
+                _useDefaultWebProxy = value;
+            }
         }
 
         internal string GetWsdlTransportUri(bool useWebSocketTransport)

src/System.Private.ServiceModel/src/System/ServiceModel/Channels/HttpTransportBindingElement.cs

@@ -10,7 +10,7 @@
 
 namespace System.ServiceModel.Channels
 {
-#if FEATURE_CORECLR
+#if FEATURE_CORECLR && !TARGETS_WINDOWS
     public partial class ServiceModelHttpMessageHandler
     {
         private readonly HttpClientHandler _innerHandler;
@@ -68,6 +68,12 @@ public bool SupportsProxy
             get { return _innerHandler.SupportsProxy; }
         }
 
+        public IWebProxy Proxy
+        {
+            get { return null; }
+            set { throw new PlatformNotSupportedException(); }
+        }
+
         public bool SupportsClientCertificates
         {
             get { return true; } 

…erviceModelHttpMessageHandler.CoreClr.cs …eModelHttpMessageHandler.CoreClr.Unix.cssrc/System.Private.ServiceModel/src/System/ServiceModel/Channels/ServiceModelHttpMessageHandler.CoreClr.cs renamed to src/System.Private.ServiceModel/src/System/ServiceModel/Channels/ServiceModelHttpMessageHandler.CoreClr.Unix.cs src/System.Private.ServiceModel/src/System/ServiceModel/Channels/ServiceModelHttpMessageHandler.CoreClr.cs renamed to src/System.Private.ServiceModel/src/System/ServiceModel/Channels/ServiceModelHttpMessageHandler.CoreClr.Unix.cs

@@ -0,0 +1,95 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
+
+namespace System.ServiceModel.Channels
+{
+#if FEATURE_CORECLR && TARGETS_WINDOWS
+    public partial class ServiceModelHttpMessageHandler
+    {
+        private readonly WinHttpHandler _innerHandler;
+
+        public ServiceModelHttpMessageHandler()
+        {
+            _innerHandler = new WinHttpHandler();
+            InnerHandler = _innerHandler;
+        }
+
+        public ICredentials Credentials
+        {
+            get { return _innerHandler.ServerCredentials; }
+            set { _innerHandler.ServerCredentials = value; }
+        }
+
+        public bool UseCookies
+        {
+            get { return (_innerHandler.CookieUsePolicy == CookieUsePolicy.UseSpecifiedCookieContainer); }
+            set { _innerHandler.CookieUsePolicy = value ? CookieUsePolicy.UseSpecifiedCookieContainer : CookieUsePolicy.IgnoreCookies; }
+        }
+
+        public bool UseDefaultCredentials
+        {
+            // WinHttpHandler doesn't have a separate UseDefaultCredentials property.  There
+            // is just a ServerCredentials property.  So, we need to map the behavior.
+            //
+            // This property only affect .ServerCredentials and not .DefaultProxyCredentials.
+
+            get { return (_innerHandler.ServerCredentials == CredentialCache.DefaultCredentials); }
+
+            set
+            {
+                if (value)
+                {
+                    _innerHandler.ServerCredentials = CredentialCache.DefaultCredentials;
+                }
+                else
+                {
+                    if (_innerHandler.ServerCredentials == CredentialCache.DefaultCredentials)
+                    {
+                        // Only clear out the ServerCredentials property if it was a DefaultCredentials.
+                        _innerHandler.ServerCredentials = null;
+                    }
+                }
+            }
+        }
+
+        public bool UseProxy { get; set; }
+
+        public bool CheckCertificateRevocationList
+        {
+            get { return false; }
+            set { throw ExceptionHelper.PlatformNotSupported("CheckCertificateRevocationList not yet support"); }
+        }
+
+        public X509CertificateCollection ClientCertificates
+        {
+            get { return _innerHandler.ClientCertificates; }
+        }
+
+        public Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool>
+            ServerCertificateValidationCallback
+        {
+            get { return _innerHandler.ServerCertificateValidationCallback; }
+            set { _innerHandler.ServerCertificateValidationCallback = value; }
+        }
+
+        public bool SupportsProxy => true;
+
+        public IWebProxy Proxy
+        {
+            get { return _innerHandler.Proxy; }
+            set { _innerHandler.Proxy = value; }
+        }
+
+        public bool SupportsClientCertificates => true;
+
+        public bool SupportsCertificateValidationCallback => true;
+    }
+#endif
+}

src/System.Private.ServiceModel/src/System/ServiceModel/Channels/ServiceModelHttpMessageHandler.CoreClr.Windows.cs

@@ -70,6 +70,12 @@ public bool SupportsProxy
             get { return false; /* Only uses wininet configured proxy */ }
         }
 
+        public IWebProxy Proxy
+        {
+            get { return null; }
+            set { throw new PlatformNotSupportedException(); }
+        }
+
         public bool SupportsClientCertificates
         {
             get { return true; } 

src/System.Private.ServiceModel/src/System/ServiceModel/Channels/ServiceModelHttpMessageHandler.NetNative.cs

@@ -242,45 +242,36 @@ public static class ApplicationContainerSettingsDefaults
         public const int ServiceSession = 0;
     }
 
-    public static class HttpTransportDefaults
+    internal static class HttpTransportDefaults
     {
-        public const bool AllowCookies = false;
-        public const AuthenticationSchemes AuthenticationScheme = AuthenticationSchemes.Anonymous;
-        public const bool DecompressionEnabled = true;
-        public const HostNameComparisonMode HostNameComparisonMode = System.ServiceModel.HostNameComparisonMode.StrongWildcard;
-        public const bool KeepAliveEnabled = true;
-        public const string Realm = "";
-        public const TransferMode TransferMode = System.ServiceModel.TransferMode.Buffered;
-        public const bool UnsafeConnectionNtlmAuthentication = false;
-        public const bool UseDefaultWebProxy = true;
-        public const string UpgradeHeader = "Upgrade";
-        public const string ConnectionHeader = "Connection";
-        public const HttpMessageHandlerFactory MessageHandlerFactory = null;
-
-        public static TimeSpan RequestInitializationTimeout { get { return TimeSpanHelper.FromMilliseconds(0, RequestInitializationTimeoutString); } }
-        public const string RequestInitializationTimeoutString = "00:00:00";
-
-        // We use 0 as the default value of the MaxPendingAccepts property on HttpTransportBindingElement. In 4.5 we always
-        // use 10 under the hood if the default value is picked. In future releases, we could adjust the underlying default
-        // value when we have the dynamic expending pattern of BeginGetContext call implemented and the heap fragmentation issue
-        // from NCL layer solved.
-        private const int PendingAcceptsConstant = 10;
-        public const int DefaultMaxPendingAccepts = 0;
-        public const int MaxPendingAcceptsUpperLimit = 100000;
-        public static int GetEffectiveMaxPendingAccepts(int maxPendingAccepts)
-        {
-            return maxPendingAccepts == HttpTransportDefaults.DefaultMaxPendingAccepts ?
-                                        PendingAcceptsConstant :
-                                        maxPendingAccepts;
-        }
-
-
-        public static WebSocketTransportSettings GetDefaultWebSocketTransportSettings()
+        internal const bool AllowCookies = false;
+        internal const AuthenticationSchemes AuthenticationScheme = AuthenticationSchemes.Anonymous;
+        internal const bool BypassProxyOnLocal = false;
+        internal const bool DecompressionEnabled = true;
+        internal const HostNameComparisonMode HostNameComparisonMode = System.ServiceModel.HostNameComparisonMode.StrongWildcard;
+        internal const bool KeepAliveEnabled = true;
+        internal const Uri ProxyAddress = null;
+        internal const AuthenticationSchemes ProxyAuthenticationScheme = AuthenticationSchemes.Anonymous;
+        internal const string Realm = "";
+        internal const TransferMode TransferMode = System.ServiceModel.TransferMode.Buffered;
+        internal const bool UnsafeConnectionNtlmAuthentication = false;
+        internal const bool UseDefaultWebProxy = true;
+        internal const string UpgradeHeader = "Upgrade";
+        internal const string ConnectionHeader = "Connection";
+        internal const HttpMessageHandlerFactory MessageHandlerFactory = null;
+
+        internal static TimeSpan RequestInitializationTimeout => TimeSpanHelper.FromMilliseconds(0, RequestInitializationTimeoutString);
+        internal const string RequestInitializationTimeoutString = "00:00:00";
+
+        internal const int DefaultMaxPendingAccepts = 0;
+        internal const int MaxPendingAcceptsUpperLimit = 100000;
+
+        internal static WebSocketTransportSettings GetDefaultWebSocketTransportSettings()
         {
             return new WebSocketTransportSettings();
         }
 
-        public static MessageEncoderFactory GetDefaultMessageEncoderFactory()
+        internal static MessageEncoderFactory GetDefaultMessageEncoderFactory()
         {
             return new TextMessageEncoderFactory(MessageVersion.Default, TextEncoderDefaults.Encoding, EncoderDefaults.MaxReadPoolSize, EncoderDefaults.MaxWritePoolSize, EncoderDefaults.ReaderQuotas);
         }