prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix potential uri format issue causing program crash

Browse source
This commit is contained in:
弘韬 张 2021-02-22 11:46:31 +08:00 committed by Jeremy Wu
parent cc48ed54a3
commit ff5fd5738c
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Flow.Launcher.Infrastructure/Http/Http.cs
View file

@ -50,25 +50,35 @@ namespace Flow.Launcher.Infrastructure.Http
/// </summary> /// </summary>
public static void UpdateProxy(ProxyProperty property) public static void UpdateProxy(ProxyProperty property)
{ {
(WebProxy.Address, WebProxy.Credentials) = property switch if (string.IsNullOrEmpty(Proxy.Server))
return;
try
{ {
ProxyProperty.Enabled => Proxy.Enabled switch (WebProxy.Address, WebProxy.Credentials) = property switch
{ {
true => Proxy.UserName switch ProxyProperty.Enabled => Proxy.Enabled switch
{ {
var userName when !string.IsNullOrEmpty(userName) => true when !string.IsNullOrEmpty(Proxy.Server) => Proxy.UserName switch
(new Uri($"http://{Proxy.Server}:{Proxy.Port}"), null), {
_ => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), var userName when string.IsNullOrEmpty(userName) =>
new NetworkCredential(Proxy.UserName, Proxy.Password)) (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), null),
_ => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"),
new NetworkCredential(Proxy.UserName, Proxy.Password))
},
_ => (null, null)
}, },
false => (null, null) ProxyProperty.Server => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), WebProxy.Credentials),
}, ProxyProperty.Port => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), WebProxy.Credentials),
ProxyProperty.Server => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), WebProxy.Credentials), ProxyProperty.UserName => (WebProxy.Address, new NetworkCredential(Proxy.UserName, Proxy.Password)),
ProxyProperty.Port => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), WebProxy.Credentials), ProxyProperty.Password => (WebProxy.Address, new NetworkCredential(Proxy.UserName, Proxy.Password)),
ProxyProperty.UserName => (WebProxy.Address, new NetworkCredential(Proxy.UserName, Proxy.Password)), _ => throw new ArgumentOutOfRangeException()
ProxyProperty.Password => (WebProxy.Address, new NetworkCredential(Proxy.UserName, Proxy.Password)), };
_ => throw new ArgumentOutOfRangeException() }
}; catch(UriFormatException e)
{
Log.Exception("Http", "Unable to parse Uri", e);
}
} }
public static async Task DownloadAsync([NotNull] string url, [NotNull] string filePath, CancellationToken token = default) public static async Task DownloadAsync([NotNull] string url, [NotNull] string filePath, CancellationToken token = default)