devol
/
Bitwarden-app-android-iphone-ios
mirror of https://github.com/bitwarden/mobile
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

Fixes to uri parsing (#860)

This commit is contained in:
Matt Portune 2020-04-29 11:04:50 -04:00 committed by GitHub
parent 1d48171fd5
commit 69e0906491
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Android/Accessibility/AccessibilityHelpers.cs
View File

@ -147,7 +147,7 @@ namespace Bit.Droid.Accessibility
return uri;
}
public static string ExtractUri(string uri, AccessibilityNodeInfo addressNode, Browser browser)
private static string ExtractUri(string uri, AccessibilityNodeInfo addressNode, Browser browser)
{
if (addressNode?.Text == null)
{
@ -160,21 +160,13 @@ namespace Bit.Droid.Accessibility
uri = browser.GetUriFunction(addressNode.Text)?.Trim();
if (uri != null && uri.Contains("."))
{
if (!uri.Contains("://") && !uri.Contains(" "))
if (Uri.TryCreate(uri, UriKind.Absolute, out var uri2))
{
uri = string.Concat("http://", uri);
return uri;
}
else if (Build.VERSION.SdkInt <= BuildVersionCodes.KitkatWatch)
if (Uri.TryCreate("http://" + uri, UriKind.Absolute, out var uri3))
{
var parts = uri.Split(new string[] { ". " }, StringSplitOptions.None);
if (parts.Length > 1)
{
var urlPart = parts.FirstOrDefault(p => p.StartsWith("http"));
if (urlPart != null)
{
uri = urlPart.Trim();
}
}
return string.Concat("http://", uri);
}
}
return uri;

9
src/Core/Utilities/CoreHelpers.cs
View File

@ -85,15 +85,14 @@ namespace Bit.Core.Utilities
{
return null;
}
var httpUrl = uriString.StartsWith("https://") || uriString.StartsWith("http://");
if (!httpUrl && !uriString.Contains("://") && Regex.IsMatch(uriString, TldEndingRegex))
{
uriString = "http://" + uriString;
}
if (Uri.TryCreate(uriString, UriKind.Absolute, out var uri))
{
return uri;
}
if (Uri.TryCreate("http://" + uriString, UriKind.Absolute, out var uri2))
{
return uri2;
}
return null;
}