mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 02:18:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

[KnownUsernameField] Engine update (make the system more flexible) (#1011)

Browse source 
* [KnownUsernameField] Engine update (make the system more flexible)

* [KnownUsernameField] Engine update (make the system more flexible)

* Use of tuples array instead of multidimensional array (string[,])

* Use of tuples array instead of multidimensional array (string[,])

* [FIX] IndexOf -> Contains
This commit is contained in:
Contribucious 2020-08-06 18:38:25 +02:00 committed by GitHub
parent 3b4ef4d238
commit 22570e08aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/Android/Accessibility/AccessibilityHelpers.cs
View file

@ -133,12 +133,12 @@ namespace Bit.Droid.Accessibility
// Be sure to keep these entries sorted alphabetically // Be sure to keep these entries sorted alphabetically
public static Dictionary<string, KnownUsernameField> KnownUsernameFields => new List<KnownUsernameField> public static Dictionary<string, KnownUsernameField> KnownUsernameFields => new List<KnownUsernameField>
{ {
new KnownUsernameField("accounts.google.com", "ServiceLogin", "Email"), new KnownUsernameField("accounts.google.com", new (string, string)[] { ("ServiceLogin", "Email") }),
new KnownUsernameField("amazon.com", "signin", "ap_email_login"), new KnownUsernameField("amazon.com", new (string, string)[] { ("signin", "ap_email_login") }),
new KnownUsernameField("github.com", "", "user[login]-footer"), new KnownUsernameField("github.com", new (string, string)[] { ("", "user[login]-footer") }),
new KnownUsernameField("paypal.com", "signin", "email"), new KnownUsernameField("paypal.com", new (string, string)[] { ("signin", "email") }),
new KnownUsernameField("signin.aws.amazon.com", "signin", "resolving_input"), new KnownUsernameField("signin.aws.amazon.com", new (string, string)[] { ("signin", "resolving_input") }),
new KnownUsernameField("signin.ebay.com", "eBayISAPI.dll", "userid"), new KnownUsernameField("signin.ebay.com", new (string, string)[] { ("eBayISAPI.dll", "userid") }),
}.ToDictionary(n => n.UriAuthority); }.ToDictionary(n => n.UriAuthority);
public static void PrintTestData(AccessibilityNodeInfo root, AccessibilityEvent e) public static void PrintTestData(AccessibilityNodeInfo root, AccessibilityEvent e)
@ -314,7 +314,7 @@ namespace Bit.Droid.Accessibility
if (Uri.TryCreate(uriString, UriKind.Absolute, out var uri)) if (Uri.TryCreate(uriString, UriKind.Absolute, out var uri))
{ {
uriAuthority = uri.Authority; uriAuthority = uri.Authority;
uriKey = uriAuthority.StartsWith("www.") ? uriAuthority.Substring(4) : uriAuthority; uriKey = uriAuthority.StartsWith("www.", StringComparison.Ordinal) ? uriAuthority.Substring(4) : uriAuthority;
uriLocalPath = uri.LocalPath; uriLocalPath = uri.LocalPath;
} }
@ -330,15 +330,64 @@ namespace Bit.Droid.Accessibility
if (KnownUsernameFields.ContainsKey(uriKey)) if (KnownUsernameFields.ContainsKey(uriKey))
{ {
var usernameField = KnownUsernameFields[uriKey]; var usernameField = KnownUsernameFields[uriKey];
if (uriLocalPath.EndsWith(usernameField.UriPathEnd)) (string UriPathWanted, string UsernameViewId)[] accessOptions = usernameField.AccessOptions;
for (int i = 0; i < accessOptions.Length; i++)
{ {
foreach (var editText in allEditTexts) string curUriPathWanted = accessOptions[i].UriPathWanted;
string curUsernameViewId = accessOptions[i].UsernameViewId;
bool uriLocalPathMatches = false;
// Case-sensitive comparison
if (curUriPathWanted.StartsWith("startswith:", StringComparison.Ordinal))
{ {
foreach (var usernameViewId in usernameField.UsernameViewId.Split(",")) curUriPathWanted = curUriPathWanted.Substring(11);
uriLocalPathMatches = uriLocalPath.StartsWith(curUriPathWanted, StringComparison.Ordinal);
}
else if (curUriPathWanted.StartsWith("contains:", StringComparison.Ordinal))
{
curUriPathWanted = curUriPathWanted.Substring(9);
uriLocalPathMatches = uriLocalPath.Contains(curUriPathWanted, StringComparison.Ordinal);
}
else if (curUriPathWanted.StartsWith("endswith:", StringComparison.Ordinal))
{
curUriPathWanted = curUriPathWanted.Substring(9);
uriLocalPathMatches = uriLocalPath.EndsWith(curUriPathWanted, StringComparison.Ordinal);
}
// Case-insensitive comparison
else if (curUriPathWanted.StartsWith("istartswith:", StringComparison.Ordinal))
{
curUriPathWanted = curUriPathWanted.Substring(12);
uriLocalPathMatches = uriLocalPath.StartsWith(curUriPathWanted, StringComparison.OrdinalIgnoreCase);
}
else if (curUriPathWanted.StartsWith("icontains:", StringComparison.Ordinal))
{
curUriPathWanted = curUriPathWanted.Substring(10);
uriLocalPathMatches = uriLocalPath.Contains(curUriPathWanted, StringComparison.OrdinalIgnoreCase);
}
else if (curUriPathWanted.StartsWith("iendswith:", StringComparison.Ordinal))
{
curUriPathWanted = curUriPathWanted.Substring(10);
uriLocalPathMatches = uriLocalPath.EndsWith(curUriPathWanted, StringComparison.OrdinalIgnoreCase);
}
// Default type of comparison
else
{
uriLocalPathMatches = uriLocalPath.EndsWith(curUriPathWanted, StringComparison.Ordinal);
}
if (uriLocalPathMatches)
{
foreach (var editText in allEditTexts)
{ {
if (usernameViewId == editText.ViewIdResourceName) foreach (var usernameViewId in curUsernameViewId.Split(","))
{ {
return editText; if (usernameViewId == editText.ViewIdResourceName)
{
return editText;
}
} }
} }
} }

8
src/Android/Accessibility/KnownUsernameField.cs
View file

@ -2,15 +2,13 @@
{ {
public class KnownUsernameField public class KnownUsernameField
{ {
public KnownUsernameField(string uriAuthority, string uriPathEnd, string usernameViewId) public KnownUsernameField(string uriAuthority, (string UriPathWanted, string UsernameViewId)[] accessOptions)
{ {
UriAuthority = uriAuthority; UriAuthority = uriAuthority;
UriPathEnd = uriPathEnd; AccessOptions = accessOptions;
UsernameViewId = usernameViewId;
} }
public string UriAuthority { get; set; } public string UriAuthority { get; set; }
public string UriPathEnd { get; set; } public (string UriPathWanted, string UsernameViewId)[] AccessOptions { get; set; }
public string UsernameViewId { get; set; }
} }
} }