mirrors/Sheas-Cealer
1
0
Fork 0
mirror of https://github.com/SpaceTimee/Sheas-Cealer.git synced 2025-07-14 05:12:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.1.1 -> 1.1.2 第46次更新

Browse Source
This commit is contained in:
Space Time 2024-10-07 00:59:04 +08:00
parent 5842ca0098
commit b0c7e551c1
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Wins/MainWin.xaml.cs
View File

@ -141,7 +141,7 @@ public partial class MainWin : Window
HoldButtonTimer.Tick += StartButtonHoldTimer_Tick; HoldButtonTimer.Tick += StartButtonHoldTimer_Tick;
HoldButtonTimer.Start(); HoldButtonTimer.Start();
} }
private void StartButtonHoldTimer_Tick(object? sender, EventArgs e) private async void StartButtonHoldTimer_Tick(object? sender, EventArgs e)
{ {
HoldButtonTimer?.Stop(); HoldButtonTimer?.Stop();
@ -161,7 +161,10 @@ public partial class MainWin : Window
browserProcess.WaitForExit(); browserProcess.WaitForExit();
} }
new CommandProc(sender == null).ShellRun(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, ($"{CealArgs} {MainPres!.ExtraArgs}").Trim()); await Task.Run(() =>
{
new CommandProc(sender == null).ShellRun(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, ($"{CealArgs} {MainPres!.ExtraArgs}").Trim());
});
} }
private void NginxButton_Click(object sender, RoutedEventArgs e) private void NginxButton_Click(object sender, RoutedEventArgs e)
{ {
@ -192,9 +195,7 @@ public partial class MainWin : Window
RSA certKey = RSA.Create(2048); RSA certKey = RSA.Create(2048);
CertificateRequest rootCertRequest = new("CN=Cealing Cert Root", certKey, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); CertificateRequest rootCertRequest = new("CN=Cealing Cert Root", certKey, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
rootCertRequest.CertificateExtensions.Add(new X509BasicConstraintsExtension(true, false, 0, false)); rootCertRequest.CertificateExtensions.Add(new X509BasicConstraintsExtension(true, false, 0, false));
X509Certificate2 rootCert = rootCertRequest.CreateSelfSigned(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow.AddYears(100)); X509Certificate2 rootCert = rootCertRequest.CreateSelfSigned(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow.AddYears(100));
using X509Store certStore = new(StoreName.Root, StoreLocation.CurrentUser, OpenFlags.ReadWrite); using X509Store certStore = new(StoreName.Root, StoreLocation.CurrentUser, OpenFlags.ReadWrite);
@ -204,10 +205,13 @@ public partial class MainWin : Window
CertificateRequest childCertRequest = new("CN=Cealing Cert Child", certKey, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); CertificateRequest childCertRequest = new("CN=Cealing Cert Child", certKey, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
SubjectAlternativeNameBuilder childCertSanBuilder = new(); SubjectAlternativeNameBuilder childCertSanBuilder = new();
string hostsConfAppendContent = MainConst.HostsConfStartMarker;
foreach (List<(List<(string hostIncludeDomain, string hostExcludeDomain)> hostDomainPairs, string hostSni, string hostIp)> hostRules in HostRulesDict.Values) foreach (List<(List<(string hostIncludeDomain, string hostExcludeDomain)> hostDomainPairs, string hostSni, string hostIp)> hostRules in HostRulesDict.Values)
foreach ((List<(string hostIncludeDomain, string hostExcludeDomain)> hostDomainPairs, _, _) in hostRules) foreach ((List<(string hostIncludeDomain, string hostExcludeDomain)> hostDomainPairs, _, _) in hostRules)
foreach ((string hostIncludeDomain, _) in hostDomainPairs) foreach ((string hostIncludeDomain, _) in hostDomainPairs)
{ {
// 配置证书 SAN
if (hostIncludeDomain.StartsWith("*.")) if (hostIncludeDomain.StartsWith("*."))
{ {
childCertSanBuilder.AddDnsName("*" + hostIncludeDomain.Replace("*", string.Empty)); childCertSanBuilder.AddDnsName("*" + hostIncludeDomain.Replace("*", string.Empty));
@ -217,36 +221,28 @@ public partial class MainWin : Window
childCertSanBuilder.AddDnsName("*." + hostIncludeDomain.Replace("*", string.Empty)); childCertSanBuilder.AddDnsName("*." + hostIncludeDomain.Replace("*", string.Empty));
childCertSanBuilder.AddDnsName(hostIncludeDomain.Replace("*", string.Empty)); childCertSanBuilder.AddDnsName(hostIncludeDomain.Replace("*", string.Empty));
}
childCertRequest.CertificateExtensions.Add(childCertSanBuilder.Build()); // 配置 hosts
X509Certificate2 childCert = childCertRequest.Create(rootCert, rootCert.NotBefore, rootCert.NotAfter, Guid.NewGuid().ToByteArray());
File.WriteAllText(MainConst.NginxCertPath, childCert.ExportCertificatePem());
File.WriteAllText(MainConst.NginxKeyPath, certKey.ExportPkcs8PrivateKeyPem());
string hostsAppendContent = MainConst.HostsConfStartMarker;
foreach (List<(List<(string hostIncludeDomain, string hostExcludeDomain)> hostDomainPairs, string hostSni, string hostIp)> hostRules in HostRulesDict.Values)
foreach ((List<(string hostIncludeDomain, string hostExcludeDomain)> hostDomainPairs, string hostSni, string hostIp) in hostRules)
foreach ((string hostIncludeDomain, string hostExcludeDomain) in hostDomainPairs)
{
string hostIncludeDomainWithoutWildcard = hostIncludeDomain.Replace("*", string.Empty); string hostIncludeDomainWithoutWildcard = hostIncludeDomain.Replace("*", string.Empty);
if (hostIncludeDomainWithoutWildcard.StartsWith('^') || hostIncludeDomainWithoutWildcard.EndsWith('^') || if (hostIncludeDomainWithoutWildcard.StartsWith('^') || hostIncludeDomainWithoutWildcard.EndsWith('^') ||
hostIncludeDomainWithoutWildcard.StartsWith('.') || hostIncludeDomainWithoutWildcard.EndsWith('.')) hostIncludeDomainWithoutWildcard.StartsWith('.') || hostIncludeDomainWithoutWildcard.EndsWith('.'))
continue; continue;
hostsAppendContent += $"127.0.0.1 {hostIncludeDomainWithoutWildcard.Split('^', 2)[0]}\n"; hostsConfAppendContent += $"127.0.0.1 {hostIncludeDomainWithoutWildcard.Split('^', 2)[0]}\n";
if (hostIncludeDomain.StartsWith('*')) if (hostIncludeDomain.StartsWith('*'))
hostsAppendContent += $"127.0.0.1 www.{hostIncludeDomainWithoutWildcard.Split('^', 2)[0]}\n"; hostsConfAppendContent += $"127.0.0.1 www.{hostIncludeDomainWithoutWildcard.Split('^', 2)[0]}\n";
} }
hostsAppendContent += MainConst.HostsConfEndMarker; childCertRequest.CertificateExtensions.Add(childCertSanBuilder.Build());
X509Certificate2 childCert = childCertRequest.Create(rootCert, rootCert.NotBefore, rootCert.NotAfter, Guid.NewGuid().ToByteArray());
File.AppendAllText(MainConst.HostsConfPath, hostsAppendContent); File.WriteAllText(MainConst.NginxCertPath, childCert.ExportCertificatePem());
File.WriteAllText(MainConst.NginxKeyPath, certKey.ExportPkcs8PrivateKeyPem());
hostsConfAppendContent += MainConst.HostsConfEndMarker;
File.AppendAllText(MainConst.HostsConfPath, hostsConfAppendContent);
MainPres.IsNginxIniting = true; MainPres.IsNginxIniting = true;
NginxConfWatcher.EnableRaisingEvents = false; NginxConfWatcher.EnableRaisingEvents = false;