nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-08 05:02:21 -05:00
Code

icon service fixes

Browse Source
This commit is contained in:
Kyle Spearrin 2018-06-25 09:28:54 -04:00
parent 5c17f910fe
commit 9561b167f7
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Icons/Services/IconFetchingService.cs
View File

@ -139,9 +139,10 @@ namespace Bit.Icons.Services
foreach(var icon in icons) foreach(var icon in icons)
{ {
Uri iconUri = null; Uri iconUri = null;
if(icon.Path.StartsWith("//")) if(icon.Path.StartsWith("//") && Uri.TryCreate($"{GetScheme(uri)}://{icon.Path.Substring(2)}",
UriKind.Absolute, out var slashUri))
{ {
iconUri = new Uri($"{GetScheme(uri)}://{icon.Path.Substring(2)}"); iconUri = slashUri;
} }
else if(Uri.TryCreate(icon.Path, UriKind.Relative, out var relUri)) else if(Uri.TryCreate(icon.Path, UriKind.Relative, out var relUri))
{ {
@ -281,9 +282,20 @@ namespace Bit.Icons.Services
Uri location = null; Uri location = null;
if(response.Headers.Location.IsAbsoluteUri) if(response.Headers.Location.IsAbsoluteUri)
{
if(response.Headers.Location.Scheme != "http" && response.Headers.Location.Scheme != "https")
{
if(Uri.TryCreate($"https://{response.Headers.Location.OriginalString}",
UriKind.Absolute, out var newUri))
{
location = newUri;
}
}
else
{ {
location = response.Headers.Location; location = response.Headers.Location;
} }
}
else else
{ {
var requestUri = response.RequestMessage.RequestUri; var requestUri = response.RequestMessage.RequestUri;