kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4712 from thabaum/language-switcher-cookie

Browse Source 
Fix #4710 - Adds language switcher component cookie set options for secure, httpOnly, sameSite + interop.cs/interop.js methods samesite and secure options
This commit is contained in:
Shaun Walker 2024-10-14 14:41:18 -04:00 committed by GitHub
commit 0e5b370ee8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Languages/Add.razor
View File

@ -130,7 +130,7 @@ else
{ {
var interop = new Interop(JSRuntime); var interop = new Interop(JSRuntime);
var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture)); var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360); await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360, true, "Lax");
} }
} }

2
Oqtane.Client/Modules/Admin/Languages/Edit.razor
View File

@ -103,7 +103,7 @@ else
{ {
var interop = new Interop(JSRuntime); var interop = new Interop(JSRuntime);
var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture)); var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360); await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360, true, "Lax");
} }
} }

17
Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
View File

@ -54,9 +54,18 @@
if (_supportedCultures.Any(item => item.Name == culture)) if (_supportedCultures.Any(item => item.Name == culture))
{ {
var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture)); var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
HttpContext.Response.Cookies.Append(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, new CookieOptions { Path = "/", Expires = DateTimeOffset.UtcNow.AddYears(365) });
HttpContext.Response.Cookies.Append(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, new CookieOptions
{
Path = "/",
Expires = DateTimeOffset.UtcNow.AddYears(365),
SameSite = Microsoft.AspNetCore.Http.SameSiteMode.Lax, // Set SameSite attribute
Secure = true, // Ensure the cookie is only sent over HTTPS
HttpOnly = true // Optional: Helps mitigate XSS attacks
});
} }
NavigationManager.NavigateTo(NavigationManager.Uri.Replace($"?culture={culture}", ""), forceLoad: true); NavigationManager.NavigateTo(NavigationManager.Uri.Replace($"?culture={culture}", ""), true);
} }
} }
@ -66,8 +75,8 @@
{ {
var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture)); var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
var interop = new Interop(JSRuntime); var interop = new Interop(JSRuntime);
await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360); await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360, true, "Lax");
NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true); NavigationManager.NavigateTo(NavigationManager.Uri, true);
} }
} }
} }

4
Oqtane.Client/UI/Interop.cs
View File

@ -16,13 +16,13 @@ namespace Oqtane.UI
_jsRuntime = jsRuntime; _jsRuntime = jsRuntime;
} }
public Task SetCookie(string name, string value, int days) public Task SetCookie(string name, string value, int days, bool secure, string sameSite)
{ {
try try
{ {
_jsRuntime.InvokeVoidAsync( _jsRuntime.InvokeVoidAsync(
"Oqtane.Interop.setCookie", "Oqtane.Interop.setCookie",
name, value, days); name, value, days, secure, sameSite);
return Task.CompletedTask; return Task.CompletedTask;
} }
catch catch

11
Oqtane.Maui/wwwroot/js/interop.js
View File

@ -1,11 +1,18 @@
var Oqtane = Oqtane || {}; var Oqtane = Oqtane || {};
Oqtane.Interop = { Oqtane.Interop = {
setCookie: function (name, value, days) { setCookie: function (name, value, days, secure, sameSite) {
var d = new Date(); var d = new Date();
d.setTime(d.getTime() + (days * 24 * 60 * 60 * 1000)); d.setTime(d.getTime() + (days * 24 * 60 * 60 * 1000));
var expires = "expires=" + d.toUTCString(); var expires = "expires=" + d.toUTCString();
document.cookie = name + "=" + value + ";" + expires + ";path=/"; var cookieString = name + "=" + value + ";" + expires + ";path=/";
if (sameSite === "Lax" || sameSite === "Strict" || sameSite === "None") {
cookieString += `; SameSite=${sameSite}`;
}
if (secure) {
cookieString += "; Secure";
}
document.cookie = cookieString;
}, },
getCookie: function (name) { getCookie: function (name) {
name = name + "="; name = name + "=";

11
Oqtane.Server/wwwroot/js/interop.js
View File

@ -1,11 +1,18 @@
var Oqtane = Oqtane || {}; var Oqtane = Oqtane || {};
Oqtane.Interop = { Oqtane.Interop = {
setCookie: function (name, value, days) { setCookie: function (name, value, days, secure, sameSite) {
var d = new Date(); var d = new Date();
d.setTime(d.getTime() + (days * 24 * 60 * 60 * 1000)); d.setTime(d.getTime() + (days * 24 * 60 * 60 * 1000));
var expires = "expires=" + d.toUTCString(); var expires = "expires=" + d.toUTCString();
document.cookie = name + "=" + value + ";" + expires + ";path=/"; var cookieString = name + "=" + value + ";" + expires + ";path=/";
if (sameSite === "Lax" || sameSite === "Strict" || sameSite === "None") {
cookieString += `; SameSite=${sameSite}`;
}
if (secure) {
cookieString += "; Secure";
}
document.cookie = cookieString;
}, },
getCookie: function (name) { getCookie: function (name) {
name = name + "="; name = name + "=";