From 1596ca71a5617e17193560c8cfe87e185bd4803c Mon Sep 17 00:00:00 2001 From: leo Date: Tue, 7 Jan 2025 19:51:27 +0800 Subject: [PATCH] feature: add checkbox to enable/disable global `http.sslVerify` configuration (#877) --- src/Resources/Locales/en_US.axaml | 1 + src/Resources/Locales/zh_CN.axaml | 1 + src/Resources/Locales/zh_TW.axaml | 1 + src/Views/Preference.axaml | 7 ++++++- src/Views/Preference.axaml.cs | 12 ++++++++++++ 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml index f907b15b..0a81617a 100644 --- a/src/Resources/Locales/en_US.axaml +++ b/src/Resources/Locales/en_US.axaml @@ -475,6 +475,7 @@ User Email Global git user email Install Path + Enable HTTP SSL Verify User Name Global git user name Git version diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml index 0a5cd880..cc765738 100644 --- a/src/Resources/Locales/zh_CN.axaml +++ b/src/Resources/Locales/zh_CN.axaml @@ -479,6 +479,7 @@ 邮箱 默认GIT用户邮箱 安装路径 + 启用HTTP SSL验证 用户名 默认GIT用户名 Git 版本 diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml index d49cbce7..758ec3be 100644 --- a/src/Resources/Locales/zh_TW.axaml +++ b/src/Resources/Locales/zh_TW.axaml @@ -478,6 +478,7 @@ 電子郵件 預設 Git 使用者電子郵件 安裝路徑 + 啟用 HTTP SSL 驗證 使用者名稱 預設 Git 使用者名稱 Git 版本 diff --git a/src/Views/Preference.axaml b/src/Views/Preference.axaml index d87d1907..c16becff 100644 --- a/src/Views/Preference.axaml +++ b/src/Views/Preference.axaml @@ -255,7 +255,7 @@ - + + + diff --git a/src/Views/Preference.axaml.cs b/src/Views/Preference.axaml.cs index e54d4c25..d85a29e2 100644 --- a/src/Views/Preference.axaml.cs +++ b/src/Views/Preference.axaml.cs @@ -73,6 +73,12 @@ namespace SourceGit.Views set; } + public bool EnableHTTPSSLVerify + { + get; + set; + } = false; + public static readonly StyledProperty SelectedOpenAIServiceProperty = AvaloniaProperty.Register(nameof(SelectedOpenAIService)); @@ -112,6 +118,11 @@ namespace SourceGit.Views else if (config.TryGetValue($"gpg.{GPGFormat.Value}.program", out var gpgProgram)) GPGExecutableFile = gpgProgram; + if (config.TryGetValue("http.sslverify", out var sslVerify)) + EnableHTTPSSLVerify = sslVerify == "true"; + else + EnableHTTPSSLVerify = true; + ver = new Commands.Version().Query(); } @@ -142,6 +153,7 @@ namespace SourceGit.Views SetIfChanged(config, "core.autocrlf", CRLFMode != null ? CRLFMode.Value : null, null); SetIfChanged(config, "commit.gpgsign", EnableGPGCommitSigning ? "true" : "false", "false"); SetIfChanged(config, "tag.gpgsign", EnableGPGTagSigning ? "true" : "false", "false"); + SetIfChanged(config, "http.sslverify", EnableHTTPSSLVerify ? "" : "false", ""); SetIfChanged(config, "gpg.format", GPGFormat.Value, "openpgp"); if (!GPGFormat.Value.Equals("ssh", StringComparison.Ordinal))