Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-05-18 15:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make 2FA redirect highest priority

Browse source
This commit is contained in:
Slendy 2023-01-02 00:58:57 -06:00
parent fb90371ad1
commit 461de3a299
No known key found for this signature in database
GPG key ID: 7288D68361B91428
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ProjectLighthouse.Servers.Website/Middlewares/UserRequiredRedirectMiddleware.cs
View file

@ -11,7 +11,7 @@ public class UserRequiredRedirectMiddleware : MiddlewareDBContext
public UserRequiredRedirectMiddleware(RequestDelegate next) : base(next) public UserRequiredRedirectMiddleware(RequestDelegate next) : base(next)
{ } { }
public override async Task InvokeAsync(HttpContext ctx, Database database) public override async Task InvokeAsync(HttpContext ctx, Database.Database database)
{ {
WebToken? token = database.WebTokenFromRequest(ctx.Request); WebToken? token = database.WebTokenFromRequest(ctx.Request);
if (token == null || pathContains(ctx, "/logout")) if (token == null || pathContains(ctx, "/logout"))
@ -34,6 +34,18 @@ public class UserRequiredRedirectMiddleware : MiddlewareDBContext
return; return;
} }
if (!token.Verified && ServerConfiguration.Instance.TwoFactorConfiguration.TwoFactorEnabled)
{
if (!pathContains(ctx, "/2fa"))
{
ctx.Response.Redirect("/2fa");
return;
}
await this.next(ctx);
return;
}
if (user.PasswordResetRequired) if (user.PasswordResetRequired)
{ {
if (!pathContains(ctx, "/passwordResetRequired", "/passwordReset")) if (!pathContains(ctx, "/passwordResetRequired", "/passwordReset"))
@ -77,17 +89,6 @@ public class UserRequiredRedirectMiddleware : MiddlewareDBContext
return; return;
} }
if (!token.Verified && ServerConfiguration.Instance.TwoFactorConfiguration.TwoFactorEnabled)
{
if (!pathContains(ctx, "/2fa"))
{
ctx.Response.Redirect("/2fa");
return;
}
await this.next(ctx);
return;
}
await this.next(ctx); await this.next(ctx);
} }