diff --git a/Program.cs b/Program.cs index 7adb65c..4b22a21 100644 --- a/Program.cs +++ b/Program.cs @@ -26,19 +26,33 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.AddControllers(); // ---- Session for Admin Auth ---- builder.Services.AddDistributedMemoryCache(); -//builder.Services.AddSession(options => -//{ -// options.IdleTimeout = TimeSpan.FromHours(8); -// options.Cookie.HttpOnly = true; -// options.Cookie.IsEssential = true; -// options.Cookie.Name = ".Divers.Admin.Session.v3"; -// options.Cookie.Path = "/admin"; -// options.Cookie.SecurePolicy = CookieSecurePolicy.Always; -// options.Cookie.SameSite = SameSiteMode.Lax; -//}); + +var redisCs = RedisManager.BuildRedisConnectionStringFromEnv() + ?? throw new Exception("REDIS_CONNECTION_STRING required"); + +var redisMux = ConnectionMultiplexer.Connect(redisCs); + +builder.Services.AddSingleton(redisMux); +builder.Services.AddSingleton(); +var dpDb = redisMux.GetDatabase(2); + +builder.Services.AddDataProtection() + .SetApplicationName("Void"); + //.PersistKeysToStackExchangeRedis(() => dpDb, "SystemRevivalServer:DPKeys");//"Void:DataProtectionKeys"); + +builder.Services.AddSession(options => +{ + options.IdleTimeout = TimeSpan.FromHours(8); + options.Cookie.HttpOnly = true; + options.Cookie.IsEssential = true; + options.Cookie.Name = ".Divers.Admin.Session.v4"; + options.Cookie.Path = "/admin"; + options.Cookie.SecurePolicy = CookieSecurePolicy.Always; + options.Cookie.SameSite = SameSiteMode.Lax; +}); builder.Services.AddAntiforgery(o => { - o.Cookie.Name = ".Divers.Admin.AntiForgery.v3"; + o.Cookie.Name = ".Divers.Admin.AntiForgery.v4"; o.Cookie.Path = "/admin"; o.Cookie.SecurePolicy = CookieSecurePolicy.Always; o.Cookie.SameSite = SameSiteMode.Lax; @@ -74,13 +88,7 @@ builder.Services.AddOptions() // Redis + zone leases + WAL //builder.Services.AddSingleton(); -var redisCs = RedisManager.BuildRedisConnectionStringFromEnv() - ?? throw new Exception("REDIS_CONNECTION_STRING required"); -var redisMux = ConnectionMultiplexer.Connect(redisCs); - -builder.Services.AddSingleton(redisMux); -builder.Services.AddSingleton(); builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -106,11 +114,7 @@ builder.Services.AddHttpClient(); // For CDN file hash computation builder.Services.AddHealthChecks() .AddCheck("mysql", tags: new[] { "ready" }); -var dpDb = redisMux.GetDatabase(2); -builder.Services.AddDataProtection() - .SetApplicationName("Void") - .PersistKeysToStackExchangeRedis(() => dpDb, "SystemRevivalServer:DPKeys");//"Void:DataProtectionKeys"); //var app = builder.Build();