From e8dbe5fb49b42b3debfed4037c605927482ce9f5 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Thu, 24 Apr 2025 15:39:06 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E5=A2=9E=E5=8A=A0APIKey=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.NET.Core/Admin.NET.Core.csproj | 8 +-- .../ApiKeyAuth/ApiKeyAuthenticationHandler.cs | 61 +++++++++++++++++++ .../ApiKeyAuth/ApiKeyAuthenticationOptions.cs | 16 +++++ Web/src/api-services/models/db-type.ts | 1 + 4 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 Admin.NET/Admin.NET.Core/ApiKeyAuth/ApiKeyAuthenticationHandler.cs create mode 100644 Admin.NET/Admin.NET.Core/ApiKeyAuth/ApiKeyAuthenticationOptions.cs diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index b428a9d0..be20232b 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -28,9 +28,9 @@ - - - + + + @@ -56,7 +56,7 @@ - + diff --git a/Admin.NET/Admin.NET.Core/ApiKeyAuth/ApiKeyAuthenticationHandler.cs b/Admin.NET/Admin.NET.Core/ApiKeyAuth/ApiKeyAuthenticationHandler.cs new file mode 100644 index 00000000..03b9c496 --- /dev/null +++ b/Admin.NET/Admin.NET.Core/ApiKeyAuth/ApiKeyAuthenticationHandler.cs @@ -0,0 +1,61 @@ +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// +// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 +// +// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + +using Microsoft.AspNetCore.Authentication; +using System.Security.Claims; +using System.Text.Encodings.Web; + +namespace Admin.NET.Core.ApiKeyAuth; + +/// +/// ApiKey 身份验证处理 +/// +public class ApiKeyAuthenticationHandler : AuthenticationHandler +{ + public const string AuthenticationScheme = "ApiKey"; + + public ApiKeyAuthenticationHandler(IOptionsMonitor options, + ILoggerFactory logger, + UrlEncoder encoder) + : base(options, logger, encoder) + { + } + + protected override async Task HandleAuthenticateAsync() + { + var apiKey = Request.Headers["X-API-KEY"].FirstOrDefault(); + if (string.IsNullOrWhiteSpace(apiKey)) + return await AuthenticateResultFailAsync("API-KEY 不能为空"); + + var repAcs = App.GetRequiredService>(); + var acsInfo = await repAcs.AsQueryable().Includes(u => u.BindUser).Includes(u => u.BindUser, p => p.SysOrg).FirstAsync(c => c.AccessSecret == apiKey); + if (acsInfo == null) + return await AuthenticateResultFailAsync("API-KEY 无效"); + + var identity = new ClaimsIdentity(AuthenticationScheme); + identity.AddClaims( + [ + new Claim(ClaimConst.UserId, acsInfo.BindUserId + ""), + new Claim(ClaimConst.TenantId, acsInfo.BindTenantId + ""), + new Claim(ClaimConst.Account, acsInfo.BindUser.Account + ""), + new Claim(ClaimConst.RealName, acsInfo.BindUser.RealName), + new Claim(ClaimConst.AccountType, ((int)acsInfo.BindUser.AccountType).ToString()), + new Claim(ClaimConst.OrgId, acsInfo.BindUser.OrgId + ""), + new Claim(ClaimConst.OrgName, acsInfo.BindUser.SysOrg?.Name + ""), + new Claim(ClaimConst.OrgType, acsInfo.BindUser.SysOrg?.Type + ""), + new Claim(ClaimConst.TokenVersion,"1") + ]); + var user = new ClaimsPrincipal(identity); + return AuthenticateResult.Success(new AuthenticationTicket(user, AuthenticationScheme)); + } + + private Task AuthenticateResultFailAsync(string message) + { + // 写入身份验证失败消息 + Context.Items[SignatureAuthenticationDefaults.AuthenticateFailMsgKey] = message; + return Task.FromResult(AuthenticateResult.Fail(message)); + } +} \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/ApiKeyAuth/ApiKeyAuthenticationOptions.cs b/Admin.NET/Admin.NET.Core/ApiKeyAuth/ApiKeyAuthenticationOptions.cs new file mode 100644 index 00000000..e3c76f5e --- /dev/null +++ b/Admin.NET/Admin.NET.Core/ApiKeyAuth/ApiKeyAuthenticationOptions.cs @@ -0,0 +1,16 @@ +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// +// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 +// +// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + +using Microsoft.AspNetCore.Authentication; + +namespace Admin.NET.Core.ApiKeyAuth; + +/// +/// ApiKey 身份验证选项 +/// +public class ApiKeyAuthenticationOptions : AuthenticationSchemeOptions +{ +} \ No newline at end of file diff --git a/Web/src/api-services/models/db-type.ts b/Web/src/api-services/models/db-type.ts index 94d2fbe4..fb6dfa9e 100644 --- a/Web/src/api-services/models/db-type.ts +++ b/Web/src/api-services/models/db-type.ts @@ -49,6 +49,7 @@ export enum DbType { NUMBER_28 = 28, NUMBER_29 = 29, NUMBER_30 = 30, + NUMBER_31 = 31, NUMBER_900 = 900 }