Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Added support for configuring Cookie SameSite in appsettings

supportd08ea4be42ff
diff --git a/src/Core/Grand.Infrastructure/Configuration/SecurityConfig.cs b/src/Core/Grand.Infrastructure/Configuration/SecurityConfig.cs
index c02c66842..ceea1294d 100644
--- a/src/Core/Grand.Infrastructure/Configuration/SecurityConfig.cs
+++ b/src/Core/Grand.Infrastructure/Configuration/SecurityConfig.cs
@@ -1,4 +1,7 @@
-namespace Grand.Infrastructure.Configuration
+
+using Microsoft.AspNetCore.Http;
+
+namespace Grand.Infrastructure.Configuration
{
public class SecurityConfig
{
@@ -31,6 +34,16 @@
/// </summary>
public string CookiePrefix { get; set; }
+ /// <summary>
+ /// Gets or sets a value for Cookie SameSite
+ /// </summary>
+ public SameSiteMode CookieSameSite { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value for Cookie SameSite for external authentication
+ /// </summary>
+ public SameSiteMode CookieSameSiteExternalAuth { get; set; }
+
/// <summary>
/// Gets or sets a value for Cookie claim issuer
/// </summary>
diff --git a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
index f9abfe19b..012ee821f 100644
--- a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
@@ -169,6 +169,7 @@ namespace Grand.Web.Common.Infrastructure
options.Cookie.SecurePolicy = securityConfig.CookieSecurePolicyAlways
? CookieSecurePolicy.Always
: CookieSecurePolicy.SameAsRequest;
+ options.Cookie.SameSite = securityConfig.CookieSameSite;
});
//add external authentication
@@ -182,6 +183,8 @@ namespace Grand.Web.Common.Infrastructure
options.Cookie.SecurePolicy = securityConfig.CookieSecurePolicyAlways
? CookieSecurePolicy.Always
: CookieSecurePolicy.SameAsRequest;
+ options.Cookie.SameSite = securityConfig.CookieSameSiteExternalAuth;
+
});
//register external authentication plugins now
@@ -190,11 +193,11 @@ namespace Grand.Web.Common.Infrastructure
var externalAuthInstances = externalAuthConfigurations
.Where(PluginExtensions.OnlyInstalledPlugins)
.Select(x => (IAuthenticationBuilder)Activator.CreateInstance(x))
- .OrderBy(x => x!.Priority);
+ .OrderBy(x => x?.Priority);
//add new Authentication
foreach (var instance in externalAuthInstances)
- instance.AddAuthentication(authenticationBuilder, configuration);
+ instance?.AddAuthentication(authenticationBuilder, configuration);
}
/// <summary>
diff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.json
index 8288f093c..6d0a0c45e 100644
--- a/src/Web/Grand.Web/App_Data/appsettings.json
+++ b/src/Web/Grand.Web/App_Data/appsettings.json
@@ -94,6 +94,11 @@
//This is the one you should be targeting if your production environment fully runs on HTTPS
"CookieSecurePolicyAlways": false,
+ //Controls whether or not a cookie is sent with cross-site requests, providing some protection against cross-site request forgery attacks
+ //Available values Unspecified, None, Lax, Strict
+ "CookieSameSite": "Lax",
+ "CookieSameSiteExternalAuth": "None",
+
//Enabling this setting allows for verification of access to a specific controller and action in the admin panel using menu configuration.
"AuthorizeAdminMenu": false
},