Skip to content

Commit 1596ca7

Browse files
committed
feature: add checkbox to enable/disable global http.sslVerify configuration (#877)
1 parent 7a21733 commit 1596ca7

File tree

5 files changed

+21
-1
lines changed

5 files changed

+21
-1
lines changed

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@
475475
<x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">User Email</x:String>
476476
<x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">Global git user email</x:String>
477477
<x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">Install Path</x:String>
478+
<x:String x:Key="Text.Preference.Git.SSLVerify" xml:space="preserve">Enable HTTP SSL Verify</x:String>
478479
<x:String x:Key="Text.Preference.Git.User" xml:space="preserve">User Name</x:String>
479480
<x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">Global git user name</x:String>
480481
<x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git version</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,7 @@
479479
<x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">邮箱</x:String>
480480
<x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">默认GIT用户邮箱</x:String>
481481
<x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">安装路径</x:String>
482+
<x:String x:Key="Text.Preference.Git.SSLVerify" xml:space="preserve">启用HTTP SSL验证</x:String>
482483
<x:String x:Key="Text.Preference.Git.User" xml:space="preserve">用户名</x:String>
483484
<x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">默认GIT用户名</x:String>
484485
<x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git 版本</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,7 @@
478478
<x:String x:Key="Text.Preference.Git.Email" xml:space="preserve">電子郵件</x:String>
479479
<x:String x:Key="Text.Preference.Git.Email.Placeholder" xml:space="preserve">預設 Git 使用者電子郵件</x:String>
480480
<x:String x:Key="Text.Preference.Git.Path" xml:space="preserve">安裝路徑</x:String>
481+
<x:String x:Key="Text.Preference.Git.SSLVerify" xml:space="preserve">啟用 HTTP SSL 驗證</x:String>
481482
<x:String x:Key="Text.Preference.Git.User" xml:space="preserve">使用者名稱</x:String>
482483
<x:String x:Key="Text.Preference.Git.User.Placeholder" xml:space="preserve">預設 Git 使用者名稱</x:String>
483484
<x:String x:Key="Text.Preference.Git.Version" xml:space="preserve">Git 版本</x:String>

src/Views/Preference.axaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Git}"/>
256256
</TabItem.Header>
257257

258-
<Grid Margin="8" RowDefinitions="32,32,32,32,32" ColumnDefinitions="Auto,*">
258+
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="Auto,*">
259259
<TextBlock Grid.Row="0" Grid.Column="0"
260260
Text="{DynamicResource Text.Preference.Git.Path}"
261261
HorizontalAlignment="Right"
@@ -326,6 +326,11 @@
326326
</DataTemplate>
327327
</ComboBox.ItemTemplate>
328328
</ComboBox>
329+
330+
<CheckBox Grid.Row="5" Grid.Column="1"
331+
Height="32"
332+
Content="{DynamicResource Text.Preference.Git.SSLVerify}"
333+
IsChecked="{Binding #ThisControl.EnableHTTPSSLVerify, Mode=TwoWay}"/>
329334
</Grid>
330335
</TabItem>
331336

src/Views/Preference.axaml.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ public string GPGUserKey
7373
set;
7474
}
7575

76+
public bool EnableHTTPSSLVerify
77+
{
78+
get;
79+
set;
80+
} = false;
81+
7682
public static readonly StyledProperty<Models.OpenAIService> SelectedOpenAIServiceProperty =
7783
AvaloniaProperty.Register<Preference, Models.OpenAIService>(nameof(SelectedOpenAIService));
7884

@@ -112,6 +118,11 @@ public Preference()
112118
else if (config.TryGetValue($"gpg.{GPGFormat.Value}.program", out var gpgProgram))
113119
GPGExecutableFile = gpgProgram;
114120

121+
if (config.TryGetValue("http.sslverify", out var sslVerify))
122+
EnableHTTPSSLVerify = sslVerify == "true";
123+
else
124+
EnableHTTPSSLVerify = true;
125+
115126
ver = new Commands.Version().Query();
116127
}
117128

@@ -142,6 +153,7 @@ protected override void OnClosing(WindowClosingEventArgs e)
142153
SetIfChanged(config, "core.autocrlf", CRLFMode != null ? CRLFMode.Value : null, null);
143154
SetIfChanged(config, "commit.gpgsign", EnableGPGCommitSigning ? "true" : "false", "false");
144155
SetIfChanged(config, "tag.gpgsign", EnableGPGTagSigning ? "true" : "false", "false");
156+
SetIfChanged(config, "http.sslverify", EnableHTTPSSLVerify ? "" : "false", "");
145157
SetIfChanged(config, "gpg.format", GPGFormat.Value, "openpgp");
146158

147159
if (!GPGFormat.Value.Equals("ssh", StringComparison.Ordinal))

0 commit comments

Comments
 (0)