lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

caching sitecultureselector and sslsettingspart (#8289)

Browse Source
This commit is contained in:
Matteo Piovanelli 2019-12-05 21:10:18 +01:00 committed by Sébastien Ros
parent 104d18aa06
commit abfe7a022e
3 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Handlers/SslSettingsPartHandler.cs
View File

@ -3,12 +3,24 @@ using Orchard.Data;
using Orchard.ContentManagement.Handlers; using Orchard.ContentManagement.Handlers;
using Orchard.Localization; using Orchard.Localization;
using Orchard.SecureSocketsLayer.Models; using Orchard.SecureSocketsLayer.Models;
using Orchard.Caching;
namespace Orchard.SecureSocketsLayer.Handlers { namespace Orchard.SecureSocketsLayer.Handlers {
public class SslSettingsPartHandler : ContentHandler { public class SslSettingsPartHandler : ContentHandler {
public SslSettingsPartHandler() { private readonly ISignals _signals;
public SslSettingsPartHandler(ISignals signals) {
_signals = signals;
T = NullLocalizer.Instance; T = NullLocalizer.Instance;
Filters.Add(new ActivatingFilter<SslSettingsPart>("Site")); Filters.Add(new ActivatingFilter<SslSettingsPart>("Site"));
// Evict cached content when updated, removed or destroyed.
OnPublished<SslSettingsPart>((context, part) => Invalidate(part));
OnRemoved<SslSettingsPart>((context, part) => Invalidate(part));
OnDestroyed<SslSettingsPart>((context, part) => Invalidate(part));
} }
public Localizer T { get; set; } public Localizer T { get; set; }
@ -22,5 +34,10 @@ namespace Orchard.SecureSocketsLayer.Handlers {
Position = "2" Position = "2"
}); });
} }
private void Invalidate(SslSettingsPart content) {
_signals.Trigger($"SslSettingsPart_{content.Id}");
_signals.Trigger("SslSettingsPart_EvictAll");
}
} }
} }

19
src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Services/StrictTransportSecurityMiddlewareProvider.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using Orchard.Caching;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Logging; using Orchard.Logging;
using Orchard.Owin; using Orchard.Owin;
@ -8,11 +9,19 @@ using Owin;
namespace Orchard.SecureSocketsLayer.Services { namespace Orchard.SecureSocketsLayer.Services {
public class StrictTransportSecurityMiddlewareProvider : IOwinMiddlewareProvider { public class StrictTransportSecurityMiddlewareProvider : IOwinMiddlewareProvider {
private readonly IWorkContextAccessor _wca; private readonly IWorkContextAccessor _wca;
private readonly ICacheManager _cacheManager;
private readonly ISignals _signals;
public ILogger Logger { get; set; } public ILogger Logger { get; set; }
public StrictTransportSecurityMiddlewareProvider(IWorkContextAccessor wca) { public StrictTransportSecurityMiddlewareProvider(
IWorkContextAccessor wca,
ICacheManager cacheManager,
ISignals signals) {
_wca = wca; _wca = wca;
_cacheManager = cacheManager;
_signals = signals;
Logger = NullLogger.Instance; Logger = NullLogger.Instance;
} }
@ -22,7 +31,13 @@ namespace Orchard.SecureSocketsLayer.Services {
new OwinMiddlewareRegistration { new OwinMiddlewareRegistration {
Configure = app => Configure = app =>
app.Use(async (context, next) => { app.Use(async (context, next) => {
var sslSettings = _wca.GetContext().CurrentSite.As<SslSettingsPart>(); var cacheKey = "Orchard.SecureSocketsLayer.Services.StrictTransportSecurityMiddlewareProvider.GetOwinMiddlewares";
var sslSettings = _cacheManager.Get(cacheKey, true, ctx =>{
// check whether the cache should be invalidated
ctx.Monitor(_signals.When("SslSettingsPart_EvictAll"));
// cache this and save recomputing it each call
return _wca.GetContext().CurrentSite.As<SslSettingsPart>();
});
if (sslSettings.SendStrictTransportSecurityHeaders) { if (sslSettings.SendStrictTransportSecurityHeaders) {
string responseValue = "max-age=" + sslSettings.StrictTransportSecurityMaxAge; string responseValue = "max-age=" + sslSettings.StrictTransportSecurityMaxAge;

28
src/Orchard/Localization/Services/SiteCultureSelector.cs
View File

@ -1,22 +1,36 @@
using System; using System;
using System.Web; using System.Web;
using Orchard.Caching;
namespace Orchard.Localization.Services { namespace Orchard.Localization.Services {
public class SiteCultureSelector : ICultureSelector { public class SiteCultureSelector : ICultureSelector {
private readonly IWorkContextAccessor _workContextAccessor; private readonly IWorkContextAccessor _workContextAccessor;
private readonly ICacheManager _cacheManager;
private readonly ISignals _signals;
public SiteCultureSelector(
IWorkContextAccessor workContextAccessor,
ICacheManager cacheManager,
ISignals signals) {
public SiteCultureSelector(IWorkContextAccessor workContextAccessor) {
_workContextAccessor = workContextAccessor; _workContextAccessor = workContextAccessor;
_cacheManager = cacheManager;
_signals = signals;
} }
public CultureSelectorResult GetCulture(HttpContextBase context) { public CultureSelectorResult GetCulture(HttpContextBase context) {
string currentCultureName = _workContextAccessor.GetContext().CurrentSite.SiteCulture; var cacheKey = "Orchard.Localization.Services.SiteCultureSelector.GetCulture";
return _cacheManager.Get(cacheKey, true, ctx => {
// this is the same signal used in Orchard.Framework.DefaultCultureManager
ctx.Monitor(_signals.When("culturesChanged"));
if (String.IsNullOrEmpty(currentCultureName)) { string currentCultureName = _workContextAccessor.GetContext().CurrentSite.SiteCulture;
return null; if (String.IsNullOrEmpty(currentCultureName)) {
} return null;
}
return new CultureSelectorResult { Priority = -5, CultureName = currentCultureName }; return new CultureSelectorResult { Priority = -5, CultureName = currentCultureName };
});
} }
} }
} }