Skip to content

Fix/pending model changes warning #1478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Qinyouzeng merged 3 commits into from
Jul 21, 2026
Merged

Fix/pending model changes warning #1478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1972360
细化LDAP连接测试与异常提示
MayueCif Jul 21, 2026
ff99fd3
统一常量命名风格，优化配置及格式化代码
MayueCif Jul 21, 2026
71e3507
merge
MayueCif Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 40 additions & 41 deletions ...ructure/Masa.Auth.EntityFrameworkCore.PostgreSql/Migrations/AuthDbContextModelSnapshot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// <auto-generated />
using System;
using Masa.Auth.Domain.Subjects.Aggregates;
using Masa.Auth.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
Expand Down Expand Up @@ -2547,6 +2546,46 @@ protected override void BuildModel(ModelBuilder modelBuilder)

modelBuilder.Entity("Masa.Auth.Domain.DynamicRoles.Aggregates.DynamicRole", b =>
{
b.OwnsMany("Masa.Auth.Domain.DynamicRoles.Aggregates.DynamicRuleCondition", "Conditions", b1 =>
{
b1.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");

b1.Property<int>("DataType")
.HasColumnType("integer");

b1.Property<Guid>("DynamicRoleId")
.HasColumnType("uuid");

b1.Property<string>("FieldName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)");

b1.Property<int>("LogicalOperator")
.HasColumnType("integer");

b1.Property<int>("OperatorType")
.HasColumnType("integer");

b1.Property<int>("Order")
.HasColumnType("integer");

b1.Property<string>("Value")
.IsRequired()
.HasColumnType("text");

b1.HasKey("Id");

b1.HasIndex("DynamicRoleId");

b1.ToTable("DynamicRuleCondition", "auth");

b1.WithOwner()
.HasForeignKey("DynamicRoleId");
});

b.OwnsMany("Masa.Auth.Domain.DynamicRoles.Aggregates.ControlPolicy", "ControlPolicies", b1 =>
{
b1.Property<Guid>("Id")
Expand Down Expand Up @@ -2652,46 +2691,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b1.Navigation("Resources");
});

b.OwnsMany("Masa.Auth.Domain.DynamicRoles.Aggregates.DynamicRuleCondition", "Conditions", b1 =>
{
b1.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");

b1.Property<int>("DataType")
.HasColumnType("integer");

b1.Property<Guid>("DynamicRoleId")
.HasColumnType("uuid");

b1.Property<string>("FieldName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)");

b1.Property<int>("LogicalOperator")
.HasColumnType("integer");

b1.Property<int>("OperatorType")
.HasColumnType("integer");

b1.Property<int>("Order")
.HasColumnType("integer");

b1.Property<string>("Value")
.IsRequired()
.HasColumnType("text");

b1.HasKey("Id");

b1.HasIndex("DynamicRoleId");

b1.ToTable("DynamicRuleCondition", "auth");

b1.WithOwner()
.HasForeignKey("DynamicRoleId");
});

b.Navigation("Conditions");

b.Navigation("ControlPolicies");
Expand Down
2 changes: 2 additions & 0 deletions src/Infrastructure/Masa.Auth.EntityFrameworkCore/AuthDbContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public AuthDbContext(MasaDbContextOptions<AuthDbContext> options) : base(options
protected override void OnConfiguring(MasaDbContextOptionsBuilder optionsBuilder)
=> optionsBuilder.DbContextOptionsBuilder
//.LogTo(Console.WriteLine, LogLevel.Warning)
.ConfigureWarnings(w => w.Ignore(
Microsoft.EntityFrameworkCore.Diagnostics.RelationalEventId.PendingModelChangesWarning))
.EnableSensitiveDataLogging()
.EnableDetailedErrors();

Expand Down
12 changes: 6 additions & 6 deletions src/Services/Masa.Auth.Service.Admin/Infrastructure/Ldap/LdapAuthenticateHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ public static class LdapAuthenticateHelper
/// <summary>
/// LDAP result code: invalidCredentials (RFC 4511).
/// </summary>
const int LdapInvalidCredentials = 49;
const int LDAP_INVALID_CREDENTIALS = 49;

/// <summary>
/// Connect timeout for LDAP connect-test / save validation (milliseconds).
/// </summary>
const int ConnectionTimeoutMs = 10_000;
const int CONNECTION_TIMEOUT_MS = 10_000;

public static async Task AuthenticateOrThrowAsync(LdapDetailDto ldapDetailDto)
{
Expand All @@ -31,15 +31,15 @@ public static async Task AuthenticateOrThrowAsync(LdapDetailDto ldapDetailDto)
using var connection = new LdapConnection
{
SecureSocketLayer = ldapDetailDto.IsLdaps,
ConnectionTimeout = ConnectionTimeoutMs
ConnectionTimeout = CONNECTION_TIMEOUT_MS
};

// Stage 1: TCP / TLS connect — address、port、LDAP vs LDAPS
try
{
await connection.ConnectAsync(ldapDetailDto.ServerAddress, ldapDetailDto.ServerPort);
}
catch (Exception ex)
catch (Exception)
{
// TCP 已经连通，此时失败发生在 LDAP 明文协议或 TLS 握手阶段。
// 不再把它误报为“地址/端口不可达”。
Expand All @@ -51,7 +51,7 @@ public static async Task AuthenticateOrThrowAsync(LdapDetailDto ldapDetailDto)
{
await connection.BindAsync(ldapDetailDto.RootUserDn, ldapDetailDto.RootUserPassword);
}
catch (LdapException ex) when (ex.ResultCode == LdapInvalidCredentials)
catch (LdapException ex) when (ex.ResultCode == LDAP_INVALID_CREDENTIALS)
{
throw new UserFriendlyException(errorCode: UserFriendlyExceptionCodes.LDAP_CREDENTIALS_INVALID);
}
Expand All @@ -69,7 +69,7 @@ public static async Task AuthenticateOrThrowAsync(LdapDetailDto ldapDetailDto)

static async Task EnsureTcpConnectionAsync(LdapDetailDto ldapDetailDto)
{
using var timeout = new CancellationTokenSource(TimeSpan.FromMilliseconds(ConnectionTimeoutMs));
using var timeout = new CancellationTokenSource(TimeSpan.FromMilliseconds(CONNECTION_TIMEOUT_MS));
using var tcpClient = new TcpClient();

try
Expand Down
Loading