1.1.2 -> 1.1.3 第12次更新

This commit is contained in:
Space Time 2024-10-20 16:17:24 +08:00
parent c103b860a8
commit 0a9efb4f0b
3 changed files with 15 additions and 21 deletions

View File

@ -217,28 +217,22 @@ public partial class MainWin : Window
foreach ((List<(string cealHostIncludeDomain, string cealHostExcludeDomain)> cealHostDomainPairs, _, _) in cealHostRules)
foreach ((string cealHostIncludeDomain, _) in cealHostDomainPairs)
{
// 配置证书 SAN
if (cealHostIncludeDomain.StartsWith("*."))
{
childCertSanBuilder.AddDnsName("*" + cealHostIncludeDomain.Replace("*", string.Empty));
string cealHostIncludeDomainWithoutWildcard = cealHostIncludeDomain.TrimStart('*').TrimStart('.');
if (cealHostIncludeDomain.StartsWith('#') || cealHostIncludeDomainWithoutWildcard.Contains('*'))
continue;
}
else if (cealHostIncludeDomain.StartsWith('*'))
childCertSanBuilder.AddDnsName("*." + cealHostIncludeDomain.Replace("*", string.Empty));
childCertSanBuilder.AddDnsName(cealHostIncludeDomain.Replace("*", string.Empty));
// 配置 hosts
string cealHostIncludeDomainWithoutWildcard = cealHostIncludeDomain.Replace("*", string.Empty);
if (cealHostIncludeDomainWithoutWildcard.StartsWith('^') || cealHostIncludeDomainWithoutWildcard.EndsWith('^') ||
cealHostIncludeDomainWithoutWildcard.StartsWith('.') || cealHostIncludeDomainWithoutWildcard.EndsWith('.'))
continue;
hostsConfAppendContent += $"127.0.0.1 {cealHostIncludeDomainWithoutWildcard.Split('^', 2)[0]}\n";
if (cealHostIncludeDomain.StartsWith('*'))
hostsConfAppendContent += $"127.0.0.1 www.{cealHostIncludeDomainWithoutWildcard.Split('^', 2)[0]}\n";
{
childCertSanBuilder.AddDnsName($"*.{cealHostIncludeDomainWithoutWildcard}");
hostsConfAppendContent += $"127.0.0.1 www.{cealHostIncludeDomainWithoutWildcard}\n";
if (cealHostIncludeDomain.StartsWith("*."))
continue;
}
childCertSanBuilder.AddDnsName(cealHostIncludeDomainWithoutWildcard);
hostsConfAppendContent += $"127.0.0.1 {cealHostIncludeDomainWithoutWildcard}\n";
}
childCertRequest.CertificateExtensions.Add(childCertSanBuilder.Build());