Add possibility to set Connection to Close ( request.Headers.Connecti…

…onClose = ConnectionClose ) in order to prevent persistent connections.
ThreeMammals · Feb 22, 2021 · d562ced · d562ced
1 parent 3ef6abd
commit d562ced
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 7 deletions.
diff --git a/src/Ocelot/Configuration/Builder/DownstreamReRouteBuilder.cs b/src/Ocelot/Configuration/Builder/DownstreamReRouteBuilder.cs
@@ -44,6 +44,7 @@ public class DownstreamRouteBuilder
         private SecurityOptions _securityOptions;
         private string _downstreamHttpMethod;
         private Version _downstreamHttpVersion;
+        private bool _connectionClose;
 
         public DownstreamRouteBuilder()
         {
@@ -263,6 +264,12 @@ public DownstreamRouteBuilder WithDownstreamHttpVersion(Version downstreamHttpVe
             return this;
         }
 
+        public DownstreamRouteBuilder WithConnectionClose(bool connectionClose)
+        {
+            _connectionClose = connectionClose;
+            return this;
+        }
+
         public DownstreamRoute Build()
         {
             return new DownstreamRoute(
@@ -299,7 +306,8 @@ public DownstreamRoute Build()
                 _dangerousAcceptAnyServerCertificateValidator,
                 _securityOptions,
                 _downstreamHttpMethod,
-                _downstreamHttpVersion);
+                _downstreamHttpVersion,
+                _connectionClose);
         }
     }
 }
diff --git a/src/Ocelot/Configuration/Creator/ConnectionCloseCreator.cs b/src/Ocelot/Configuration/Creator/ConnectionCloseCreator.cs
@@ -0,0 +1,14 @@
+using Ocelot.Configuration.File;
+
+namespace Ocelot.Configuration.Creator
+{
+    public class ConnectionCloseCreator : IConnectionCloseCreator
+    {
+        public bool Create(bool fileRouteConnectionClose, FileGlobalConfiguration globalConfiguration)
+        {
+            var globalConnectionClose = globalConfiguration.ConnectionClose;
+
+            return fileRouteConnectionClose || globalConnectionClose;
+        }
+    }
+}
diff --git a/src/Ocelot/Configuration/Creator/IConnectionCloseCreator.cs b/src/Ocelot/Configuration/Creator/IConnectionCloseCreator.cs
@@ -0,0 +1,9 @@
+using Ocelot.Configuration.File;
+
+namespace Ocelot.Configuration.Creator
+{
+    public interface IConnectionCloseCreator
+    {
+        bool Create(bool fileRouteConnectionClose, FileGlobalConfiguration globalConfiguration);
+    }
+}
diff --git a/src/Ocelot/Configuration/Creator/RoutesCreator.cs b/src/Ocelot/Configuration/Creator/RoutesCreator.cs
@@ -23,6 +23,7 @@ public class RoutesCreator : IRoutesCreator
         private readonly IRouteKeyCreator _routeKeyCreator;
         private readonly ISecurityOptionsCreator _securityOptionsCreator;
         private readonly IVersionCreator _versionCreator;
+        private readonly IConnectionCloseCreator _connectionCloseCreator;
 
         public RoutesCreator(
             IClaimsToThingCreator claimsToThingCreator,
@@ -39,7 +40,8 @@ public class RoutesCreator : IRoutesCreator
             ILoadBalancerOptionsCreator loadBalancerOptionsCreator,
             IRouteKeyCreator routeKeyCreator,
             ISecurityOptionsCreator securityOptionsCreator,
-            IVersionCreator versionCreator
+            IVersionCreator versionCreator,
+            IConnectionCloseCreator connectionCloseCreator
             )
         {
             _routeKeyCreator = routeKeyCreator;
@@ -58,6 +60,7 @@ IVersionCreator versionCreator
             _loadBalancerOptionsCreator = loadBalancerOptionsCreator;
             _securityOptionsCreator = securityOptionsCreator;
             _versionCreator = versionCreator;
+            _connectionCloseCreator = connectionCloseCreator;
         }
 
         public List<Route> Create(FileConfiguration fileConfiguration)
@@ -109,6 +112,8 @@ private DownstreamRoute SetUpDownstreamRoute(FileRoute fileRoute, FileGlobalConf
 
             var downstreamHttpVersion = _versionCreator.Create(fileRoute.DownstreamHttpVersion);
 
+            var connectionClose = _connectionCloseCreator.Create(fileRoute.ConnectionClose, globalConfiguration);
+
             var route = new DownstreamRouteBuilder()
                 .WithKey(fileRoute.Key)
                 .WithDownstreamPathTemplate(fileRoute.DownstreamPathTemplate)
@@ -145,6 +150,7 @@ private DownstreamRoute SetUpDownstreamRoute(FileRoute fileRoute, FileGlobalConf
                 .WithSecurityOptions(securityOptions)
                 .WithDownstreamHttpVersion(downstreamHttpVersion)
                 .WithDownStreamHttpMethod(fileRoute.DownstreamHttpMethod)
+                .WithConnectionClose(connectionClose)
                 .Build();
 
             return route;

diff --git a/src/Ocelot/Configuration/DownstreamRoute.cs b/src/Ocelot/Configuration/DownstreamRoute.cs
@@ -41,7 +41,8 @@ public class DownstreamRoute
             bool dangerousAcceptAnyServerCertificateValidator,
             SecurityOptions securityOptions,
             string downstreamHttpMethod,
-            Version downstreamHttpVersion)
+            Version downstreamHttpVersion, 
+            bool connectionClose)
         {
             DangerousAcceptAnyServerCertificateValidator = dangerousAcceptAnyServerCertificateValidator;
             AddHeadersToDownstream = addHeadersToDownstream;
@@ -77,6 +78,7 @@ public class DownstreamRoute
             SecurityOptions = securityOptions;
             DownstreamHttpMethod = downstreamHttpMethod;
             DownstreamHttpVersion = downstreamHttpVersion;
+            ConnectionClose = connectionClose;
         }
 
         public string Key { get; }
@@ -112,6 +114,7 @@ public class DownstreamRoute
         public bool DangerousAcceptAnyServerCertificateValidator { get; }
         public SecurityOptions SecurityOptions { get; }
         public string DownstreamHttpMethod { get; }
-        public Version DownstreamHttpVersion { get;  }
+        public Version DownstreamHttpVersion { get;  }
+        public bool ConnectionClose { get; }
     }
 }
diff --git a/src/Ocelot/Configuration/File/FileGlobalConfiguration.cs b/src/Ocelot/Configuration/File/FileGlobalConfiguration.cs
@@ -9,6 +9,7 @@ public FileGlobalConfiguration()
             LoadBalancerOptions = new FileLoadBalancerOptions();
             QoSOptions = new FileQoSOptions();
             HttpHandlerOptions = new FileHttpHandlerOptions();
+            ConnectionClose = false;
         }
 
         public string RequestIdKey { get; set; }
@@ -28,5 +29,7 @@ public FileGlobalConfiguration()
         public FileHttpHandlerOptions HttpHandlerOptions { get; set; }
 
         public string DownstreamHttpVersion { get; set; }
+
+        public bool ConnectionClose { get; set; }
     }
 }
diff --git a/src/Ocelot/Configuration/File/FileRoute.cs b/src/Ocelot/Configuration/File/FileRoute.cs
@@ -24,6 +24,7 @@ public FileRoute()
             LoadBalancerOptions = new FileLoadBalancerOptions();
             SecurityOptions = new FileSecurityOptions();
             Priority = 1;
+            ConnectionClose = false;
         }
 
         public string DownstreamPathTemplate { get; set; }
@@ -56,6 +57,7 @@ public FileRoute()
         public int Timeout { get; set; }
         public bool DangerousAcceptAnyServerCertificateValidator { get; set; }
         public FileSecurityOptions SecurityOptions { get; set; }
-        public string DownstreamHttpVersion { get; set; }
+        public string DownstreamHttpVersion { get; set; }
+        public bool ConnectionClose { get; set; }
     }
 }
diff --git a/src/Ocelot/DependencyInjection/OcelotBuilder.cs b/src/Ocelot/DependencyInjection/OcelotBuilder.cs
@@ -78,6 +78,7 @@ public OcelotBuilder(IServiceCollection services, IConfiguration configurationRo
             Services.TryAddSingleton<IAuthenticationOptionsCreator, AuthenticationOptionsCreator>();
             Services.TryAddSingleton<IUpstreamTemplatePatternCreator, UpstreamTemplatePatternCreator>();
             Services.TryAddSingleton<IRequestIdKeyCreator, RequestIdKeyCreator>();
+            Services.TryAddSingleton<IConnectionCloseCreator, ConnectionCloseCreator>();
             Services.TryAddSingleton<IServiceProviderConfigurationCreator, ServiceProviderConfigurationCreator>();
             Services.TryAddSingleton<IQoSOptionsCreator, QoSOptionsCreator>();
             Services.TryAddSingleton<IRouteOptionsCreator, RouteOptionsCreator>();

diff --git a/src/Ocelot/Requester/HttpClientBuilder.cs b/src/Ocelot/Requester/HttpClientBuilder.cs
@@ -62,7 +62,7 @@ public IHttpClient Create(DownstreamRoute downstreamRoute)
                 Timeout = timeout
             };
 
-            _client = new HttpClientWrapper(_httpClient);
+            _client = new HttpClientWrapper(_httpClient, downstreamRoute.ConnectionClose);
 
             return _client;
         }
@@ -84,6 +84,7 @@ private HttpClientHandler UseNonCookiesHandler(DownstreamRoute downstreamRoute)
                 UseCookies = downstreamRoute.HttpHandlerOptions.UseCookieContainer,
                 UseProxy = downstreamRoute.HttpHandlerOptions.UseProxy,
                 MaxConnectionsPerServer = downstreamRoute.HttpHandlerOptions.MaxConnectionsPerServer,
+
             };
         }
 

diff --git a/src/Ocelot/Requester/HttpClientWrapper.cs b/src/Ocelot/Requester/HttpClientWrapper.cs
@@ -11,13 +11,17 @@ public class HttpClientWrapper : IHttpClient
     {
         public HttpClient Client { get; }
 
-        public HttpClientWrapper(HttpClient client)
+        public bool ConnectionClose { get; }
+
+        public HttpClientWrapper(HttpClient client, bool connectionClose = false)
         {
             Client = client;
+            ConnectionClose = connectionClose;
         }
 
         public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken = default)
         {
+            request.Headers.ConnectionClose = ConnectionClose;
             return Client.SendAsync(request, cancellationToken);
         }
     }