自建登录验证码

.gitignore

@@ -3,6 +3,8 @@
 **/node_modules/
 **/dist/
 .artifacts/
+.codex-build/
+packages/CaptchaKit/artifacts/
 .vs/
 .vscode/
 *.user
@@ -17,4 +19,4 @@ src/Jiaowu.Api/wwwroot/
 !.env.example
 !.env.docker.example
 certs/
-publish/
+publish/

src/Jiaowu.Api/Controllers/AuthController.cs

@@ -4,7 +4,7 @@ using Jiaowu.Api.Domain.Academic;
 using Jiaowu.Api.Domain.Identity;
 using Jiaowu.Api.Infrastructure.Auth;
 using Jiaowu.Api.Infrastructure.Caching;
-using Lazy.Captcha.Core;
+using CaptchaKit.AspNetCore;
 using Jiaowu.Api.Infrastructure.Persistence;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
@@ -21,7 +21,7 @@ public sealed class AuthController(
     UserManager<ApplicationUser> userManager,
     IAuthSessionService authSessionService,
     ITwoFactorLoginTicketService twoFactorTickets,
-    ICaptcha captcha,
+    ICaptchaKitService captcha,
     IAppCache cache) : ControllerBase
 {
     [AllowAnonymous]
@@ -140,13 +140,12 @@ public sealed class AuthController(
     [AllowAnonymous]
     [EnableRateLimiting("public-auth")]
     [HttpPost("login/captcha")]
-    public ActionResult<LazyLoginCaptchaResponse> CreateLoginCaptcha()
+    public async Task<ActionResult<LoginCaptchaResponse>> CreateLoginCaptcha(CancellationToken cancellationToken)
     {
-        var captchaId = Guid.NewGuid().ToString("N");
+        var generated = await captcha.CreateAsync(cancellationToken);
-        var generated = captcha.Generate(captchaId, expirySeconds: 120);
+        return Ok(new LoginCaptchaResponse(
-        return Ok(new LazyLoginCaptchaResponse(
+            generated.Id,
-            captchaId,
+            $"data:{generated.ContentType};base64,{Convert.ToBase64String(generated.ImageBytes)}"));
-            $"data:image/gif;base64,{Convert.ToBase64String(generated.Bytes)}"));
     }
 
     [AllowAnonymous]
@@ -156,7 +155,7 @@ public sealed class AuthController(
         LoginRequest request,
         CancellationToken cancellationToken)
     {
-        if (!captcha.Validate(request.CaptchaId, request.CaptchaCode))
+        if (!await captcha.VerifyAsync(request.CaptchaId, request.CaptchaCode, cancellationToken))
             return Unauthorized(LoginCaptchaProblem());
         var user = await userManager.FindByNameAsync(request.UserName);
         if (user is null || !user.IsEnabled)
@@ -334,7 +333,7 @@ public sealed record LoginRequest(
     [Required, MinLength(3), MaxLength(16)] string CaptchaCode,
     bool IsNativeApp = false);
 
-public sealed record LazyLoginCaptchaResponse(string CaptchaId, string ImageData);
+public sealed record LoginCaptchaResponse(string CaptchaId, string ImageData);
 
 public sealed record TotpLoginRequest(
     [Required, MinLength(20), MaxLength(2048)] string TwoFactorTicket,

src/Jiaowu.Api/Controllers/SsoController.cs

@@ -12,7 +12,7 @@ using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
-using Lazy.Captcha.Core;
+using CaptchaKit.AspNetCore;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 
 namespace Jiaowu.Api.Controllers;
@@ -23,7 +23,7 @@ public sealed class SsoController(
     UserManager<ApplicationUser> userManager,
     IAuthSessionService authSessionService,
     IDistributedCache cache,
-    ICaptcha captcha,
+    ICaptchaKitService captcha,
     IOptions<SsoOptions> options,
     ILogger<SsoController> logger) : ControllerBase
 {
@@ -59,7 +59,7 @@ public sealed class SsoController(
         if (string.IsNullOrWhiteSpace(bindingIntent) &&
             (string.IsNullOrWhiteSpace(captchaId) ||
              string.IsNullOrWhiteSpace(captchaCode) ||
-             !captcha.Validate(captchaId, captchaCode)))
+             !await captcha.VerifyAsync(captchaId, captchaCode, cancellationToken)))
         {
             return Unauthorized(AuthController.LoginCaptchaProblem());
         }