Merge branch 'develop@Sacrilege' into develop

stefancruz · stefancruz · commit f16dc0b1f425 · 2022-12-22T18:41:55.000Z
Cherry picked from ThreeMammals#1521
diff --git a/src/Ocelot/Configuration/Creator/HttpHandlerOptionsCreator.cs b/src/Ocelot/Configuration/Creator/HttpHandlerOptionsCreator.cs
@@ -22,7 +22,7 @@ public HttpHandlerOptions Create(FileHttpHandlerOptions options)
             int maxConnectionPerServer = (options.MaxConnectionsPerServer > 0) ? maxConnectionPerServer = options.MaxConnectionsPerServer : maxConnectionPerServer = int.MaxValue;
 
             return new HttpHandlerOptions(options.AllowAutoRedirect,
-                options.UseCookieContainer, useTracing, options.UseProxy, maxConnectionPerServer);
+                options.UseCookieContainer, useTracing, options.UseProxy, maxConnectionPerServer, options.UseDefaultCredentials);
         }
     }
 }
diff --git a/src/Ocelot/Configuration/File/FileHttpHandlerOptions.cs b/src/Ocelot/Configuration/File/FileHttpHandlerOptions.cs
@@ -8,6 +8,7 @@ public FileHttpHandlerOptions()
             UseCookieContainer = false;
             UseProxy = true;
             MaxConnectionsPerServer = int.MaxValue;
+            UseDefaultCredentials = false;
         }
 
         public bool AllowAutoRedirect { get; set; }
@@ -19,5 +20,7 @@ public FileHttpHandlerOptions()
         public bool UseProxy { get; set; }
 
         public int MaxConnectionsPerServer { get; set; }
+
+        public bool UseDefaultCredentials { get; set; }
     }
 }
diff --git a/src/Ocelot/Configuration/HttpHandlerOptions.cs b/src/Ocelot/Configuration/HttpHandlerOptions.cs
@@ -6,16 +6,16 @@
     /// </summary>
     public class HttpHandlerOptions
     {
-        public HttpHandlerOptions(bool allowAutoRedirect, bool useCookieContainer, bool useTracing, bool useProxy, int maxConnectionsPerServer)
+        public HttpHandlerOptions(bool allowAutoRedirect, bool useCookieContainer, bool useTracing, bool useProxy, int maxConnectionsPerServer, bool useDefaultCredentials)
         {
             AllowAutoRedirect = allowAutoRedirect;
             UseCookieContainer = useCookieContainer;
             UseTracing = useTracing;
             UseProxy = useProxy;
             MaxConnectionsPerServer = maxConnectionsPerServer;
+            UseDefaultCredentials = useDefaultCredentials;
         }
 
-
         /// <summary>
         /// Specify if auto redirect is enabled
         /// </summary>
@@ -44,6 +44,12 @@ public HttpHandlerOptions(bool allowAutoRedirect, bool useCookieContainer, bool
         /// Specify the maximum of concurrent connection to a network endpoint
         /// </summary>
         /// <value>MaxConnectionsPerServer</value>
-        public int MaxConnectionsPerServer { get; private set; }
+        public int MaxConnectionsPerServer { get; private set; }
+
+        /// <summary>
+        /// Specify is UseDefaultCredentials set on HttpClientHandler.
+        /// </summary>
+        /// <value>UseDefaultCredentials</value>
+        public bool UseDefaultCredentials { get; private set; }
     }
 }
diff --git a/src/Ocelot/Configuration/HttpHandlerOptionsBuilder.cs b/src/Ocelot/Configuration/HttpHandlerOptionsBuilder.cs
@@ -7,6 +7,7 @@ public class HttpHandlerOptionsBuilder
         private bool _useTracing;
         private bool _useProxy;
         private int _maxConnectionPerServer;
+        private bool _useDefaultCredentials;
 
         public HttpHandlerOptionsBuilder WithAllowAutoRedirect(bool input)
         {
@@ -31,16 +32,22 @@ public HttpHandlerOptionsBuilder WithUseProxy(bool useProxy)
             _useProxy = useProxy;
             return this;
         }
+
         public HttpHandlerOptionsBuilder WithUseMaxConnectionPerServer(int maxConnectionPerServer)
         {
             _maxConnectionPerServer = maxConnectionPerServer;
             return this;
         }
 
+        public HttpHandlerOptionsBuilder WithUseDefaultCredentials(bool input)
+        {
+            _useDefaultCredentials = input;
+            return this;
+        }
 
         public HttpHandlerOptions Build()
         {
-            return new HttpHandlerOptions(_allowAutoRedirect, _useCookieContainer, _useTracing, _useProxy, _maxConnectionPerServer);
+            return new HttpHandlerOptions(_allowAutoRedirect, _useCookieContainer, _useTracing, _useProxy, _maxConnectionPerServer, _useDefaultCredentials);
         }
     }
 }
diff --git a/src/Ocelot/Requester/HttpClientBuilder.cs b/src/Ocelot/Requester/HttpClientBuilder.cs
@@ -69,34 +69,23 @@ public IHttpClient Create(DownstreamRoute downstreamRoute)
 
         private HttpClientHandler CreateHandler(DownstreamRoute downstreamRoute)
         {
-            // Dont' create the CookieContainer if UseCookies is not set or the HttpClient will complain
-            // under .Net Full Framework
-            var useCookies = downstreamRoute.HttpHandlerOptions.UseCookieContainer;
-
-            return useCookies ? UseCookiesHandler(downstreamRoute) : UseNonCookiesHandler(downstreamRoute);
-        }
-
-        private HttpClientHandler UseNonCookiesHandler(DownstreamRoute downstreamRoute)
-        {
-            return new HttpClientHandler
+            var handler = new HttpClientHandler
             {
                 AllowAutoRedirect = downstreamRoute.HttpHandlerOptions.AllowAutoRedirect,
                 UseCookies = downstreamRoute.HttpHandlerOptions.UseCookieContainer,
                 UseProxy = downstreamRoute.HttpHandlerOptions.UseProxy,
                 MaxConnectionsPerServer = downstreamRoute.HttpHandlerOptions.MaxConnectionsPerServer,
+                UseDefaultCredentials = downstreamRoute.HttpHandlerOptions.UseDefaultCredentials,
             };
-        }
 
-        private HttpClientHandler UseCookiesHandler(DownstreamRoute downstreamRoute)
-        {
-            return new HttpClientHandler
+            // Dont' create the CookieContainer if UseCookies is not set or the HttpClient will complain
+            // under .Net Full Framework
+            if (downstreamRoute.HttpHandlerOptions.UseCookieContainer)
             {
-                AllowAutoRedirect = downstreamRoute.HttpHandlerOptions.AllowAutoRedirect,
-                UseCookies = downstreamRoute.HttpHandlerOptions.UseCookieContainer,
-                UseProxy = downstreamRoute.HttpHandlerOptions.UseProxy,
-                MaxConnectionsPerServer = downstreamRoute.HttpHandlerOptions.MaxConnectionsPerServer,
-                CookieContainer = new CookieContainer(),
-            };
+                handler.CookieContainer = new CookieContainer();
+            }
+
+            return handler;
         }
 
         public void Save()
diff --git a/test/Ocelot.UnitTests/Configuration/HttpHandlerOptionsCreatorTests.cs b/test/Ocelot.UnitTests/Configuration/HttpHandlerOptionsCreatorTests.cs
@@ -41,7 +41,7 @@ public void should_not_use_tracing_if_fake_tracer_registered()
                 }
             };
 
-            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue);
+            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, false);
 
             this.Given(x => GivenTheFollowing(fileRoute))
                 .When(x => WhenICreateHttpHandlerOptions())
@@ -60,7 +60,7 @@ public void should_use_tracing_if_real_tracer_registered()
                 }
             };
 
-            var expectedOptions = new HttpHandlerOptions(false, false, true, true, int.MaxValue);
+            var expectedOptions = new HttpHandlerOptions(false, false, true, true, int.MaxValue, false);
 
             this.Given(x => GivenTheFollowing(fileRoute))
                 .And(x => GivenARealTracer())
@@ -73,7 +73,7 @@ public void should_use_tracing_if_real_tracer_registered()
         public void should_create_options_with_useCookie_false_and_allowAutoRedirect_true_as_default()
         {
             var fileRoute = new FileRoute();
-            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue);
+            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, false);
 
             this.Given(x => GivenTheFollowing(fileRoute))
                 .When(x => WhenICreateHttpHandlerOptions())
@@ -94,7 +94,7 @@ public void should_create_options_with_specified_useCookie_and_allowAutoRedirect
                 }
             };
 
-            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue);
+            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, false);
 
             this.Given(x => GivenTheFollowing(fileRoute))
                 .When(x => WhenICreateHttpHandlerOptions())
@@ -110,7 +110,7 @@ public void should_create_options_with_useproxy_true_as_default()
                 HttpHandlerOptions = new FileHttpHandlerOptions()
             };
 
-            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue);
+            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, false);
 
             this.Given(x => GivenTheFollowing(fileRoute))
                 .When(x => WhenICreateHttpHandlerOptions())
@@ -129,7 +129,7 @@ public void should_create_options_with_specified_useproxy()
                 }
             };
 
-            var expectedOptions = new HttpHandlerOptions(false, false, false, false, int.MaxValue);
+            var expectedOptions = new HttpHandlerOptions(false, false, false, false, int.MaxValue, false);
 
             this.Given(x => GivenTheFollowing(fileRoute))
                 .When(x => WhenICreateHttpHandlerOptions())
@@ -148,7 +148,7 @@ public void should_create_options_with_specified_MaxConnectionsPerServer()
                 }
             };
 
-            var expectedOptions = new HttpHandlerOptions(false, false, false, true, 10);
+            var expectedOptions = new HttpHandlerOptions(false, false, false, true, 10, false);
 
             this.Given(x => GivenTheFollowing(fileRoute))
                 .When(x => WhenICreateHttpHandlerOptions())
@@ -167,7 +167,7 @@ public void should_create_options_fixing_specified_MaxConnectionsPerServer_range
                 }
             };
 
-            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue);
+            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, false);
 
             this.Given(x => GivenTheFollowing(fileRoute))
                 .When(x => WhenICreateHttpHandlerOptions())
@@ -186,7 +186,7 @@ public void should_create_options_fixing_specified_MaxConnectionsPerServer_range
                 }
             };
 
-            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue);
+            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, false);
 
             this.Given(x => GivenTheFollowing(fileRoute))
                 .When(x => WhenICreateHttpHandlerOptions())
diff --git a/test/Ocelot.UnitTests/Requester/DelegatingHandlerHandlerProviderFactoryTests.cs b/test/Ocelot.UnitTests/Requester/DelegatingHandlerHandlerProviderFactoryTests.cs
@@ -52,7 +52,7 @@ public void should_follow_ordering_add_specifics()
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue))
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue, false))
                 .WithDelegatingHandlers(new List<string>
                 {
                     "FakeDelegatingHandler",
@@ -88,7 +88,7 @@ public void should_follow_ordering_order_specifics_and_globals()
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue))
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue, false))
                 .WithDelegatingHandlers(new List<string>
                 {
                     "FakeDelegatingHandlerTwo",
@@ -125,7 +125,7 @@ public void should_follow_ordering_order_specifics()
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue))
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue, false))
                 .WithDelegatingHandlers(new List<string>
                 {
                     "FakeDelegatingHandlerTwo",
@@ -161,7 +161,7 @@ public void should_follow_ordering_order_and_only_add_specifics_in_config()
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue))
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue, false))
                 .WithDelegatingHandlers(new List<string>
                 {
                     "FakeDelegatingHandler",
@@ -195,7 +195,7 @@ public void should_follow_ordering_dont_add_specifics()
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue))
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue, false))
                 .WithLoadBalancerKey("")
                 .Build();
 
@@ -221,7 +221,7 @@ public void should_apply_re_route_specific()
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, false, true, int.MaxValue))
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, false, true, int.MaxValue, false))
                 .WithDelegatingHandlers(new List<string>
                 {
                     "FakeDelegatingHandler",
@@ -249,7 +249,7 @@ public void should_all_from_all_routes_provider_and_qos()
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, false, true, int.MaxValue)).WithLoadBalancerKey("").Build();
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, false, true, int.MaxValue, false)).WithLoadBalancerKey("").Build();
 
             this.Given(x => GivenTheFollowingRequest(route))
                 .And(x => GivenTheQosFactoryReturns(new FakeQoSHandler()))
@@ -269,7 +269,7 @@ public void should_return_provider_with_no_delegates()
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, false, true, int.MaxValue)).WithLoadBalancerKey("").Build();
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, false, true, int.MaxValue, false)).WithLoadBalancerKey("").Build();
 
             this.Given(x => GivenTheFollowingRequest(route))
                 .And(x => GivenTheServiceProviderReturnsNothing())
@@ -289,7 +289,7 @@ public void should_return_provider_with_qos_delegate()
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, false, true, int.MaxValue)).WithLoadBalancerKey("").Build();
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, false, true, int.MaxValue, false)).WithLoadBalancerKey("").Build();
 
             this.Given(x => GivenTheFollowingRequest(route))
                 .And(x => GivenTheQosFactoryReturns(new FakeQoSHandler()))
@@ -309,7 +309,7 @@ public void should_return_provider_with_qos_delegate_when_timeout_value_set()
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, false, true, int.MaxValue)).WithLoadBalancerKey("").Build();
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, false, true, int.MaxValue, false)).WithLoadBalancerKey("").Build();
 
             this.Given(x => GivenTheFollowingRequest(route))
                 .And(x => GivenTheQosFactoryReturns(new FakeQoSHandler()))
@@ -331,7 +331,7 @@ public void should_log_error_and_return_no_qos_provider_delegate_when_qos_factor
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue))
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue, false))
                 .WithLoadBalancerKey("")
                 .Build();
 
@@ -361,7 +361,7 @@ public void should_log_error_and_return_no_qos_provider_delegate_when_qos_factor
 
             var route = new DownstreamRouteBuilder()
                 .WithQosOptions(qosOptions)
-                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue))
+                .WithHttpHandlerOptions(new HttpHandlerOptions(true, true, true, true, int.MaxValue, false))
                 .WithLoadBalancerKey("")
                 .Build();
 
diff --git a/test/Ocelot.UnitTests/Requester/HttpClientBuilderTests.cs b/test/Ocelot.UnitTests/Requester/HttpClientBuilderTests.cs
diff --git a/test/Ocelot.UnitTests/Requester/HttpClientHttpRequesterTest.cs b/test/Ocelot.UnitTests/Requester/HttpClientHttpRequesterTest.cs

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public HttpHandlerOptions Create(FileHttpHandlerOptions options)`
`22`	`22`	`int maxConnectionPerServer = (options.MaxConnectionsPerServer > 0) ? maxConnectionPerServer = options.MaxConnectionsPerServer : maxConnectionPerServer = int.MaxValue;`
`23`	`23`
`24`	`24`	`return new HttpHandlerOptions(options.AllowAutoRedirect,`
`25`		`- options.UseCookieContainer, useTracing, options.UseProxy, maxConnectionPerServer);`
	`25`	`+ options.UseCookieContainer, useTracing, options.UseProxy, maxConnectionPerServer, options.UseDefaultCredentials);`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ public FileHttpHandlerOptions()`
`8`	`8`	`UseCookieContainer = false;`
`9`	`9`	`UseProxy = true;`
`10`	`10`	`MaxConnectionsPerServer = int.MaxValue;`
	`11`	`+ UseDefaultCredentials = false;`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`public bool AllowAutoRedirect { get; set; }`
`@@ -19,5 +20,7 @@ public FileHttpHandlerOptions()`
`19`	`20`	`public bool UseProxy { get; set; }`
`20`	`21`
`21`	`22`	`public int MaxConnectionsPerServer { get; set; }`
	`23`	`+`
	`24`	`+ public bool UseDefaultCredentials { get; set; }`
`22`	`25`	`}`
`23`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ public class HttpHandlerOptionsBuilder`
`7`	`7`	`private bool _useTracing;`
`8`	`8`	`private bool _useProxy;`
`9`	`9`	`private int _maxConnectionPerServer;`
	`10`	`+ private bool _useDefaultCredentials;`
`10`	`11`
`11`	`12`	`public HttpHandlerOptionsBuilder WithAllowAutoRedirect(bool input)`
`12`	`13`	`{`
`@@ -31,16 +32,22 @@ public HttpHandlerOptionsBuilder WithUseProxy(bool useProxy)`
`31`	`32`	`_useProxy = useProxy;`
`32`	`33`	`return this;`
`33`	`34`	`}`
	`35`	`+`
`34`	`36`	`public HttpHandlerOptionsBuilder WithUseMaxConnectionPerServer(int maxConnectionPerServer)`
`35`	`37`	`{`
`36`	`38`	`_maxConnectionPerServer = maxConnectionPerServer;`
`37`	`39`	`return this;`
`38`	`40`	`}`
`39`	`41`
	`42`	`+ public HttpHandlerOptionsBuilder WithUseDefaultCredentials(bool input)`
	`43`	`+ {`
	`44`	`+ _useDefaultCredentials = input;`
	`45`	`+ return this;`
	`46`	`+ }`
`40`	`47`
`41`	`48`	`public HttpHandlerOptions Build()`
`42`	`49`	`{`
`43`		`- return new HttpHandlerOptions(_allowAutoRedirect, _useCookieContainer, _useTracing, _useProxy, _maxConnectionPerServer);`
	`50`	`+ return new HttpHandlerOptions(_allowAutoRedirect, _useCookieContainer, _useTracing, _useProxy, _maxConnectionPerServer, _useDefaultCredentials);`
`44`	`51`	`}`
`45`	`52`	`}`
`46`	`53`	`}`