diff --git a/Consts/MainMultilangConst.Designer.cs b/Consts/MainMultilangConst.Designer.cs index edceacc..e45ea05 100644 --- a/Consts/MainMultilangConst.Designer.cs +++ b/Consts/MainMultilangConst.Designer.cs @@ -448,7 +448,7 @@ namespace Sheas_Cealer.Consts { } /// - /// 查找类似 Donot click the button 的本地化字符串。 + /// 查找类似 Do not click the button 的本地化字符串。 /// public static string NoClickButtonIsStoppedToolTip { get { diff --git a/Consts/MainMultilangConst.resx b/Consts/MainMultilangConst.resx index 54efb8a..7b8a72a 100644 --- a/Consts/MainMultilangConst.resx +++ b/Consts/MainMultilangConst.resx @@ -199,7 +199,7 @@ No Clicking - Donot click the button + Do not click the button Fill in a Chromium-based browser path diff --git a/Wins/MainWin.xaml.cs b/Wins/MainWin.xaml.cs index 16db9db..d072b00 100644 --- a/Wins/MainWin.xaml.cs +++ b/Wins/MainWin.xaml.cs @@ -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());