GithubStar/SteamTools
1
0
Fork 0
mirror of https://github.com/BeyondDimension/SteamTools.git synced 2026-10-28 23:19:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix TrustRootCertificate

Browse Source
This commit is contained in:
Aigio Liu
2022-06-22 21:50:01 +08:00
parent 262797b500
commit 78feece7bf
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ST.Client.ReverseProxy/Services/ICertificateManager.cs
+2 -2
View File
@@ -76,9 +76,9 @@ public interface ICertificateManager
string? GetCerFilePathGeneratedWhenNoFileExists();
/// <summary>
/// 信任根证书
/// 由平台实现的信任根证书引导，有 Root 权限将尝试执行信任，否则则 UI 引导，跳转网页或弹窗
/// </summary>
void TrustRootCertificate();
void PlatformTrustRootCertificateGuide();
/// <summary>
/// 安装根证书，如果没有证书将生成一个新的
src/ST.Client.ReverseProxy/Services/Implementation/CertificateManagerImpl.cs
+19 -3
View File
@@ -86,13 +86,29 @@ abstract partial class CertificateManagerImpl
}
}
/// <inheritdoc cref="ICertificateManager.TrustRootCertificate"/>
public void TrustRootCertificate()
void TrustRootCertificate()
{
try
{
SharedTrustRootCertificate();
}
#if DEBUG
catch (Exception e)
{
e.LogAndShowT(TAG, msg: "TrustRootCertificate Error");
}
#else
catch { }
#endif
PlatformTrustRootCertificateGuide();
}
/// <inheritdoc cref="ICertificateManager.PlatformTrustRootCertificateGuide"/>
public void PlatformTrustRootCertificateGuide()
{
try
{
if (OperatingSystem2.IsMacOS())
{
TrustRootCertificateMacOS();
@@ -105,7 +121,7 @@ abstract partial class CertificateManagerImpl
#if DEBUG
catch (Exception e)
{
e.LogAndShowT(TAG, msg: "TrustRootCertificate Error");
e.LogAndShowT(TAG, msg: "PlatformTrustRootCertificateGuide Error");
}
#else
catch { }
src/ST.Client/UI/ViewModels/Pages/CommunityProxyPageViewModel.cs
+2 -1
View File
@@ -127,7 +127,8 @@ namespace System.Application.UI.ViewModels
public void TrustCer_OnClick()
{
reverseProxyService.CertificateManager.TrustRootCertificate();
reverseProxyService.CertificateManager.GetCerFilePathGeneratedWhenNoFileExists();
reverseProxyService.CertificateManager.PlatformTrustRootCertificateGuide();
}
public override void Activation()