feat(auth): support RS256 + OIDC discovery (JWKS auto-fetch)
Build Docker Image / build (push) Has been cancelled
Build Docker Image / build (push) Has been cancelled
Add Jwt__Algorithm config to choose between HS256 (shared symmetric key, existing behavior, default) and RS256 (Authority-based OIDC discovery, public-key auto-fetch with periodic refresh). RS256 mode makes the server compatible with any standard OAuth 2.1 / OIDC provider (Logto, ZITADEL, Keycloak, Auth0) without requiring a shared secret. HS256 mode remains the default for minimal self-built AS setups.
This commit is contained in:
+41
-10
@@ -8,13 +8,19 @@ namespace ObsidianMcp.Auth;
|
||||
public static class JwtBearerSetup
|
||||
{
|
||||
/// <summary>
|
||||
/// 配置 HS256 JWT Bearer 认证。
|
||||
/// 支持 Current + Previous 双密钥,方便密钥轮换过渡期。
|
||||
/// 配置 JWT Bearer 认证。根据 JwtOptions.Algorithm 选择:
|
||||
/// <list type="bullet">
|
||||
/// <item><c>HS256</c>:与 AS 共享对称密钥(Current + Previous 双密钥用于轮换)。</item>
|
||||
/// <item><c>RS256</c>:委托 ASP.NET Core 通过 OIDC discovery 拉 JWKS,
|
||||
/// 自动刷新公钥(默认 24h),AS 端密钥轮换无需重启本服务。</item>
|
||||
/// </list>
|
||||
/// </summary>
|
||||
public static IServiceCollection AddObsidianJwtBearer(
|
||||
this IServiceCollection services,
|
||||
JwtOptions opts)
|
||||
{
|
||||
var algorithm = (opts.Algorithm ?? "HS256").Trim().ToUpperInvariant();
|
||||
|
||||
services
|
||||
.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
|
||||
.AddJwtBearer(options =>
|
||||
@@ -23,7 +29,7 @@ public static class JwtBearerSetup
|
||||
// ClaimTypes.NameIdentifier 之类的长 URI,下游 FindFirst("sub") 取不到。
|
||||
options.MapInboundClaims = false;
|
||||
|
||||
options.TokenValidationParameters = new TokenValidationParameters
|
||||
var tvp = new TokenValidationParameters
|
||||
{
|
||||
ValidateIssuer = true,
|
||||
ValidIssuer = opts.Issuer,
|
||||
@@ -32,25 +38,46 @@ public static class JwtBearerSetup
|
||||
ValidAudience = opts.Audience,
|
||||
|
||||
ValidateIssuerSigningKey = true,
|
||||
// Current 必须有值;Previous 可选(密钥轮换过渡期)。
|
||||
// ToList 物化一次,避免每次验签都重建 SymmetricSecurityKey。
|
||||
IssuerSigningKeys = BuildSigningKeys(opts).ToList(),
|
||||
|
||||
ValidateLifetime = true,
|
||||
ClockSkew = TimeSpan.FromMinutes(2),
|
||||
|
||||
// scope claim 的 claim type 直接保持原样,User.FindAll("scope") 能取到。
|
||||
NameClaimType = "sub",
|
||||
};
|
||||
|
||||
if (algorithm == "RS256")
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(opts.Issuer))
|
||||
throw new InvalidOperationException(
|
||||
"Jwt:Issuer 未配置,RS256 模式无法启动。");
|
||||
|
||||
// Authority = Issuer 时,JwtBearer 会自动从
|
||||
// <Issuer>/.well-known/openid-configuration 拉 OIDC 元数据,
|
||||
// 再从其中的 jwks_uri 拉公钥并周期性刷新。IssuerSigningKeys
|
||||
// 由 ConfigurationManager 在验签时动态注入,无需在此设置。
|
||||
options.Authority = opts.Issuer;
|
||||
options.RequireHttpsMetadata = !IsLocalhostUrl(opts.Issuer);
|
||||
}
|
||||
else if (algorithm == "HS256")
|
||||
{
|
||||
tvp.IssuerSigningKeys = BuildHs256Keys(opts).ToList();
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
$"Jwt:Algorithm '{opts.Algorithm}' 不支持。可选值:HS256, RS256");
|
||||
}
|
||||
|
||||
options.TokenValidationParameters = tvp;
|
||||
});
|
||||
|
||||
return services;
|
||||
}
|
||||
|
||||
private static IEnumerable<SecurityKey> BuildSigningKeys(JwtOptions opts)
|
||||
private static IEnumerable<SecurityKey> BuildHs256Keys(JwtOptions opts)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(opts.SigningKey.Current))
|
||||
throw new InvalidOperationException("Jwt:SigningKey:Current 未配置,服务无法启动。");
|
||||
throw new InvalidOperationException(
|
||||
"Jwt:SigningKey:Current 未配置,HS256 模式无法启动。");
|
||||
|
||||
yield return new SymmetricSecurityKey(
|
||||
Encoding.UTF8.GetBytes(opts.SigningKey.Current));
|
||||
@@ -59,4 +86,8 @@ public static class JwtBearerSetup
|
||||
yield return new SymmetricSecurityKey(
|
||||
Encoding.UTF8.GetBytes(opts.SigningKey.Previous));
|
||||
}
|
||||
|
||||
private static bool IsLocalhostUrl(string url) =>
|
||||
url.StartsWith("http://localhost", StringComparison.OrdinalIgnoreCase) ||
|
||||
url.StartsWith("http://127.0.0.1", StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user