notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

refact & cookies

Browse source
This commit is contained in:
Paul Schneider 2026-02-17 19:24:30 +00:00
commit 5cf4bd48e8
9 changed files with 48 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Abstract/Constants.cs
View file

@ -23,6 +23,8 @@ namespace Yavsc
public const string LoginPath = "/signin";
public const string LogoutPath = "/signout";
public const string AccessDeniedPath = "/Account/AccessDenied";
public const string UserFilesPath = "/files";
public const string AvatarsPath = "/avatars";
public const string GitPath = "/sources";
@ -38,6 +40,7 @@ namespace Yavsc
public const string DefaultAvatar = "/images/Users/icon_user.png";
public const string AnonAvatar = "/images/Users/icon_anon_user.png";
public const string YavscConnectionStringEnvName = "YAVSC_CONNECTION_STRING";
public const string YavscConnectionStringName = "YavscConnection";
// at the end, let 4*4 bytes in peace
public const int WebSocketsMaxBufLen = 4096;

6
src/Org/Controllers/Accounting/AccountController.cs
View file

@ -29,6 +29,7 @@ using System.Text.Unicode;
using System.Text;
using Yavsc.Server.Helpers;
using System.Reflection;
using Microsoft.AspNetCore.Authentication.Cookies;
namespace Yavsc.Controllers
{
@ -485,7 +486,8 @@ namespace Yavsc.Controllers
if (result.Succeeded)
{
return Redirect(model.ReturnUrl ?? "/");
// Redirect to returnUrl (ensure it's local to prevent open redirects)
return LocalRedirect(model.ReturnUrl);
}
if (result.RequiresTwoFactor)
@ -503,8 +505,6 @@ namespace Yavsc.Controllers
return this.ViewOk(model);
}
}
// If we got this far, something failed, redisplay form
ModelState.AddModelError(string.Empty, "Unexpected behavior: something failed ... you could try again, or contact me ...");
}

53
src/Org/Extensions/HostingExtensions.cs
View file

@ -41,6 +41,7 @@ using System.IdentityModel.Tokens.Jwt;
using IdentityServer8.EntityFramework.Stores;
using IdentityServer8.EntityFramework.Services;
using IdentityServer8.EntityFramework.Interfaces;
using Microsoft.AspNetCore.Authentication.Cookies;
namespace Yavsc.Extensions;
@ -135,16 +136,15 @@ public static class HostingExtensions
IServiceCollection services = builder.Services;
services.AddDbContext<ApplicationDbContext>(options =>
{
options.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection"),
options => options.MigrationsAssembly("Yavsc")
);
}
);
options.UseNpgsql(builder.Configuration.GetConnectionString(Constants.YavscConnectionStringName ),
options => options.MigrationsAssembly(typeof(Program).Assembly));
});
return services.AddIdentity<ApplicationUser, IdentityRole>(
options =>
{
options.SignIn.RequireConfirmedAccount = true;
options.SignIn.RequireConfirmedAccount = builder.Environment.IsEnvironment(
builder.Environment.EnvironmentName);
options.ClaimsIdentity.UserNameClaimType = JwtClaimTypes.PreferredUserName;
options.ClaimsIdentity.RoleClaimType = Constants.RoleClaimType;
}
@ -204,7 +204,7 @@ public static class HostingExtensions
// OAuth2AppSettings
var googleAuthSettings = builder.Configuration.GetSection("Authentication:Google");
//LoadGoogleConfig(builder.Configuration);
LoadGoogleConfig(builder.Configuration);
var services = builder.Services;
@ -245,7 +245,7 @@ public static class HostingExtensions
private static IIdentityServerBuilder AddIdentityServer(WebApplicationBuilder builder)
{
var migrationsAssembly = typeof(Startup).GetTypeInfo().Assembly.GetName().Name;
var connectionString = builder.Configuration.GetConnectionString("DefaultConnection");
var connectionString = builder.Configuration.GetConnectionString(Constants.YavscConnectionStringName);
var identityServerBuilder = builder.Services.AddIdentityServer(options =>
{
@ -276,6 +276,20 @@ public static class HostingExtensions
sql => sql.MigrationsAssembly(migrationsAssembly));
});
builder.Services.AddAuthentication(
CookieAuthenticationDefaults.AuthenticationScheme)
.AddCookie(options =>
{
options.LoginPath = Constants.LoginPath; // Redirect here if unauthenticated
options.AccessDeniedPath = Constants.AccessDeniedPath;
options.Cookie.SecurePolicy = builder.Environment.IsDevelopment()
? CookieSecurePolicy.None
: CookieSecurePolicy.Always; // Use HTTPS in production
options.Cookie.SameSite = Microsoft.AspNetCore.Http.SameSiteMode.Lax; // Allows cross-site top-level navigation
options.ExpireTimeSpan = TimeSpan.FromMinutes(30); // Cookie expires in 30 mins
options.SlidingExpiration = true; // Renew cookie if user is active
});
builder.Services.Configure<IdentityOptions>(options =>
{
options.ClaimsIdentity.UserIdClaimType = JwtClaimTypes.Subject;
@ -290,7 +304,6 @@ public static class HostingExtensions
else
{
var path = builder.Configuration["SigningCert:Path"];
var pass = builder.Configuration["SigningCert:Password"];
if (path == null)
throw new InvalidConfigurationException("No signing cert path");
FileInfo certFileInfo = new FileInfo(path);
@ -312,16 +325,16 @@ public static class HostingExtensions
{
CultureInfo[] supportedCultures = new[]
{
new CultureInfo("en"),
new CultureInfo("fr"),
new CultureInfo("pt")
new CultureInfo("en"),
new CultureInfo("fr"),
new CultureInfo("pt")
};
CultureInfo[] supportedUICultures = new[]
{
new CultureInfo("fr"),
new CultureInfo("en"),
new CultureInfo("pt")
new CultureInfo("fr"),
new CultureInfo("en"),
new CultureInfo("pt")
};
// You must explicitly state which cultures your application supports.
@ -332,11 +345,11 @@ public static class HostingExtensions
options.SupportedUICultures = supportedUICultures;
options.RequestCultureProviders = new List<IRequestCultureProvider>
{
new QueryStringRequestCultureProvider { Options = options },
new CookieRequestCultureProvider { Options = options, CookieName="ASPNET_CULTURE" },
new AcceptLanguageHeaderRequestCultureProvider { Options = options }
};
{
new QueryStringRequestCultureProvider { Options = options },
new CookieRequestCultureProvider { Options = options, CookieName="ASPNET_CULTURE" },
new AcceptLanguageHeaderRequestCultureProvider { Options = options }
};
});
}

2
src/Org/Org.csproj
View file

@ -50,4 +50,4 @@
<ProjectReference Include="../Server/Server.csproj" />
<ProjectReference Include="../Abstract/Abstract.csproj" />
</ItemGroup>
</Project>
</Project>

2
src/Org/appsettings.json
View file

@ -9,7 +9,7 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnection": "Server=[YOURSERVERNAME];Port=5432;Database=[YOURDBNAME];Username=[YOURDBUSERNAME];Password=[YOURDBPASSW];"
"YavscConnection": "Server=[YOURSERVERNAME];Port=5432;Database=[YOURDBNAME];Username=[YOURDBUSERNAME];Password=[YOURDBPASSW];"
},
"Site": {
"Title": "Yavsc",

7
src/Server/Models/ApplicationDbContext.cs
View file

@ -86,13 +86,6 @@ namespace Yavsc.Models
builder.Entity<Activity>().Property(a => a.ParentCode).IsRequired(false);
// builder.Entity<IdentityUserLogin<String>>().HasKey(i=> new { i.LoginProvider, i.UserId, i.ProviderKey });
}
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
string? envCxStr = Environment.GetEnvironmentVariable(Constants.YavscConnectionStringEnvName);
if (envCxStr != null)
optionsBuilder.UseNpgsql(envCxStr);
base.OnConfiguring(optionsBuilder);
}
/// <summary>
/// Activities referenced on this site