Allow feature cache to be updated+invalidated

benaadams · benaadams · commit 1c0487353db2 · 2015-12-11T05:37:17.000Z
diff --git a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs b/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs
@@ -14,11 +14,10 @@ namespace Microsoft.AspNet.Http.Authentication.Internal
 {
     public class DefaultAuthenticationManager : AuthenticationManager, IFeatureCache
     {
-        private readonly IFeatureCollection _features;
+        private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpAuthenticationFeature _authentication;
-        private IHttpResponseFeature _response;
 
         public DefaultAuthenticationManager(IFeatureCollection features)
         {
@@ -29,12 +28,22 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _authentication = null;
-                _response = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _authentication = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpAuthenticationFeature HttpAuthenticationFeature
         {
             get
@@ -47,11 +56,6 @@ private IHttpAuthenticationFeature HttpAuthenticationFeature
             }
         }
 
-        private IHttpResponseFeature HttpResponseFeature
-        {
-            get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }
-        }
-
         public override IEnumerable<AuthenticationDescription> GetAuthenticationSchemes()
         {
             var handler = HttpAuthenticationFeature.Handler;
diff --git a/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs b/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultConnectionInfo : ConnectionInfo, IFeatureCache
     {
-        private readonly IFeatureCollection _features;
+        private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpConnectionFeature _connection;
@@ -27,12 +27,23 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _connection = null;
-                _tlsConnection = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _connection = null;
+            _tlsConnection = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpConnectionFeature HttpConnectionFeature
         {
             get
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs
@@ -16,17 +16,18 @@ namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultHttpContext : HttpContext, IFeatureCache
     {
-        private readonly HttpRequest _request;
-        private readonly HttpResponse _response;
-        private ConnectionInfo _connection;
-        private AuthenticationManager _authenticationManager;
+        private readonly DefaultHttpRequest _request;
+        private readonly DefaultHttpResponse _response;
+
+        private DefaultAuthenticationManager _authenticationManager;
+        private DefaultConnectionInfo _connection;
+        private DefaultWebSocketManager _websockets;
 
         private IItemsFeature _items;
         private IServiceProvidersFeature _serviceProviders;
         private IHttpAuthenticationFeature _authentication;
         private IHttpRequestLifetimeFeature _lifetime;
         private ISessionFeature _session;
-        private WebSocketManager _websockets;
 
         private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
@@ -49,15 +50,33 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision !=_features.Revision)
             {
-                _items = null;
-                _serviceProviders = null;
-                _authentication = null;
-                _lifetime = null;
-                _session = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+
+            _request.UpdateFeatures(features);
+            _response.UpdateFeatures(features);
+
+            _authenticationManager?.UpdateFeatures(features);
+            _connection?.UpdateFeatures(features);
+            _websockets?.UpdateFeatures(features);
+        }
+
+        private void ResetFeatures()
+        {
+            _items = null;
+            _serviceProviders = null;
+            _authentication = null;
+            _lifetime = null;
+            _session = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         IItemsFeature ItemsFeature
         {
             get
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs b/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Http.Internal
     public class DefaultHttpRequest : HttpRequest, IFeatureCache
     {
         private readonly DefaultHttpContext _context;
-        private readonly IFeatureCollection _features;
+        private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpRequestFeature _request;
@@ -32,14 +32,25 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _request = null;
-                _query = null;
-                _form = null;
-                _cookies = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _request = null;
+            _query = null;
+            _form = null;
+            _cookies = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpRequestFeature HttpRequestFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Http.Internal
     public class DefaultHttpResponse : HttpResponse, IFeatureCache
     {
         private readonly DefaultHttpContext _context;
-        private readonly IFeatureCollection _features;
+        private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpResponseFeature _response;
@@ -29,12 +29,23 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _response = null;
-                _cookies = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _response = null;
+            _cookies = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpResponseFeature HttpResponseFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }
diff --git a/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs b/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs
@@ -27,12 +27,23 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _request = null;
-                _webSockets = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _request = null;
+            _webSockets = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpRequestFeature HttpRequestFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
diff --git a/src/Microsoft.AspNet.Http/Features/IFeatureCache.cs b/src/Microsoft.AspNet.Http/Features/IFeatureCache.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.AspNet.Http.Features
 {
-    internal interface IFeatureCache
+    public interface IFeatureCache
     {
         void CheckFeaturesRevision();
     }

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,10 @@ namespace Microsoft.AspNet.Http.Authentication.Internal`
`14`	`14`	`{`
`15`	`15`	`public class DefaultAuthenticationManager : AuthenticationManager, IFeatureCache`
`16`	`16`	`{`
`17`		`- private readonly IFeatureCollection _features;`
	`17`	`+ private IFeatureCollection _features;`
`18`	`18`	`private int _cachedFeaturesRevision = -1;`
`19`	`19`
`20`	`20`	`private IHttpAuthenticationFeature _authentication;`
`21`		`- private IHttpResponseFeature _response;`
`22`	`21`
`23`	`22`	`public DefaultAuthenticationManager(IFeatureCollection features)`
`24`	`23`	`{`
`@@ -29,12 +28,22 @@ void IFeatureCache.CheckFeaturesRevision()`
`29`	`28`	`{`
`30`	`29`	`if (_cachedFeaturesRevision != _features.Revision)`
`31`	`30`	`{`
`32`		`- _authentication = null;`
`33`		`- _response = null;`
`34`		`- _cachedFeaturesRevision = _features.Revision;`
	`31`	`+ ResetFeatures();`
`35`	`32`	`}`
`36`	`33`	`}`
`37`	`34`
	`35`	`+ public void UpdateFeatures(IFeatureCollection features)`
	`36`	`+ {`
	`37`	`+ _features = features;`
	`38`	`+ ResetFeatures();`
	`39`	`+ }`
	`40`	`+`
	`41`	`+ private void ResetFeatures()`
	`42`	`+ {`
	`43`	`+ _authentication = null;`
	`44`	`+ _cachedFeaturesRevision = _features.Revision;`
	`45`	`+ }`
	`46`	`+`
`38`	`47`	`private IHttpAuthenticationFeature HttpAuthenticationFeature`
`39`	`48`	`{`
`40`	`49`	`get`
`@@ -47,11 +56,6 @@ private IHttpAuthenticationFeature HttpAuthenticationFeature`
`47`	`56`	`}`
`48`	`57`	`}`
`49`	`58`
`50`		`- private IHttpResponseFeature HttpResponseFeature`
`51`		`- {`
`52`		`- get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }`
`53`		`- }`
`54`		`-`
`55`	`59`	`public override IEnumerable<AuthenticationDescription> GetAuthenticationSchemes()`
`56`	`60`	`{`
`57`	`61`	`var handler = HttpAuthenticationFeature.Handler;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Http.Internal`
`12`	`12`	`{`
`13`	`13`	`public class DefaultConnectionInfo : ConnectionInfo, IFeatureCache`
`14`	`14`	`{`
`15`		`- private readonly IFeatureCollection _features;`
	`15`	`+ private IFeatureCollection _features;`
`16`	`16`	`private int _cachedFeaturesRevision = -1;`
`17`	`17`
`18`	`18`	`private IHttpConnectionFeature _connection;`
`@@ -27,12 +27,23 @@ void IFeatureCache.CheckFeaturesRevision()`
`27`	`27`	`{`
`28`	`28`	`if (_cachedFeaturesRevision != _features.Revision)`
`29`	`29`	`{`
`30`		`- _connection = null;`
`31`		`- _tlsConnection = null;`
`32`		`- _cachedFeaturesRevision = _features.Revision;`
	`30`	`+ ResetFeatures();`
`33`	`31`	`}`
`34`	`32`	`}`
`35`	`33`
	`34`	`+ public void UpdateFeatures(IFeatureCollection features)`
	`35`	`+ {`
	`36`	`+ _features = features;`
	`37`	`+ ResetFeatures();`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ private void ResetFeatures()`
	`41`	`+ {`
	`42`	`+ _connection = null;`
	`43`	`+ _tlsConnection = null;`
	`44`	`+ _cachedFeaturesRevision = _features.Revision;`
	`45`	`+ }`
	`46`	`+`
`36`	`47`	`private IHttpConnectionFeature HttpConnectionFeature`
`37`	`48`	`{`
`38`	`49`	`get`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Http.Internal`
`13`	`13`	`public class DefaultHttpResponse : HttpResponse, IFeatureCache`
`14`	`14`	`{`
`15`	`15`	`private readonly DefaultHttpContext _context;`
`16`		`- private readonly IFeatureCollection _features;`
	`16`	`+ private IFeatureCollection _features;`
`17`	`17`	`private int _cachedFeaturesRevision = -1;`
`18`	`18`
`19`	`19`	`private IHttpResponseFeature _response;`
`@@ -29,12 +29,23 @@ void IFeatureCache.CheckFeaturesRevision()`
`29`	`29`	`{`
`30`	`30`	`if (_cachedFeaturesRevision != _features.Revision)`
`31`	`31`	`{`
`32`		`- _response = null;`
`33`		`- _cookies = null;`
`34`		`- _cachedFeaturesRevision = _features.Revision;`
	`32`	`+ ResetFeatures();`
`35`	`33`	`}`
`36`	`34`	`}`
`37`	`35`
	`36`	`+ public void UpdateFeatures(IFeatureCollection features)`
	`37`	`+ {`
	`38`	`+ _features = features;`
	`39`	`+ ResetFeatures();`
	`40`	`+ }`
	`41`	`+`
	`42`	`+ private void ResetFeatures()`
	`43`	`+ {`
	`44`	`+ _response = null;`
	`45`	`+ _cookies = null;`
	`46`	`+ _cachedFeaturesRevision = _features.Revision;`
	`47`	`+ }`
	`48`	`+`
`38`	`49`	`private IHttpResponseFeature HttpResponseFeature`
`39`	`50`	`{`
`40`	`51`	`get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Microsoft.AspNet.Http.Features`
`5`	`5`	`{`
`6`		`- internal interface IFeatureCache`
	`6`	`+ public interface IFeatureCache`
`7`	`7`	`{`
`8`	`8`	`void CheckFeaturesRevision();`
`9`	`9`	`}`