bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-13 23:03:23 +00:00
Code Issues Releases Wiki Activity

biometric integrity check in iOS extensions (#1093)

Browse Source
This commit is contained in:
Matt Portune
2020-09-25 21:14:10 -04:00
committed by GitHub
parent 0387d5bdd1
commit 7b358b1bbb
4 changed files with 59 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/iOS.Core/Controllers/LockPasswordViewController.cs
View File

@@ -22,9 +22,11 @@ namespace Bit.iOS.Core.Controllers
private IStorageService _storageService;
private IStorageService _secureStorageService;
private IPlatformUtilsService _platformUtilsService;
private IBiometricService _biometricService;
private Tuple<bool, bool> _pinSet;
private bool _pinLock;
private bool _fingerprintLock;
private bool _biometricLock;
private bool _biometricIntegrityValid = true;
private int _invalidPinAttempts;
public LockPasswordViewController(IntPtr handle)
@@ -49,10 +51,12 @@ namespace Bit.iOS.Core.Controllers
_storageService = ServiceContainer.Resolve<IStorageService>("storageService");
_secureStorageService = ServiceContainer.Resolve<IStorageService>("secureStorageService");
_platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
_biometricService = ServiceContainer.Resolve<IBiometricService>("biometricService");
_pinSet = _vaultTimeoutService.IsPinLockSetAsync().GetAwaiter().GetResult();
_pinLock = (_pinSet.Item1 && _vaultTimeoutService.PinProtectedKey != null) || _pinSet.Item2;
_fingerprintLock = _vaultTimeoutService.IsBiometricLockSetAsync().GetAwaiter().GetResult();
_biometricLock = _vaultTimeoutService.IsBiometricLockSetAsync().GetAwaiter().GetResult() &&
_cryptoService.HasKeyAsync().GetAwaiter().GetResult();
BaseNavItem.Title = _pinLock ? AppResources.VerifyPIN : AppResources.VerifyMasterPassword;
BaseCancelButton.Title = AppResources.Cancel;
@@ -80,12 +84,17 @@ namespace Bit.iOS.Core.Controllers
base.ViewDidLoad();
if (_fingerprintLock)
if (_biometricLock)
{
_biometricIntegrityValid = _biometricService.ValidateIntegrityAsync().GetAwaiter().GetResult();
if (!_biometricIntegrityValid)
{
return;
}
var tasks = Task.Run(async () =>
{
await Task.Delay(500);
NSRunLoop.Main.BeginInvokeOnMainThread(async () => await PromptFingerprintAsync());
NSRunLoop.Main.BeginInvokeOnMainThread(async () => await PromptBiometricAsync());
});
}
}
@@ -93,7 +102,7 @@ namespace Bit.iOS.Core.Controllers
public override void ViewDidAppear(bool animated)
{
base.ViewDidAppear(animated);
if (!_fingerprintLock)
if (!_biometricLock || !_biometricIntegrityValid)
{
MasterPasswordCell.TextField.BecomeFirstResponder();
}
@@ -210,9 +219,9 @@ namespace Bit.iOS.Core.Controllers
Success();
}
public async Task PromptFingerprintAsync()
public async Task PromptBiometricAsync()
{
if (!_fingerprintLock)
if (!_biometricLock || !_biometricIntegrityValid)
{
return;
}
@@ -261,11 +270,22 @@ namespace Bit.iOS.Core.Controllers
{
if (indexPath.Row == 0)
{
var biometricButtonText = _controller._deviceActionService.SupportsFaceBiometric() ?
AppResources.UseFaceIDToUnlock : AppResources.UseFingerprintToUnlock;
var cell = new ExtendedUITableViewCell();
cell.TextLabel.TextColor = ThemeHelpers.PrimaryColor;
cell.TextLabel.Text = biometricButtonText;
if (_controller._biometricIntegrityValid)
{
var biometricButtonText = _controller._deviceActionService.SupportsFaceBiometric() ?
AppResources.UseFaceIDToUnlock : AppResources.UseFingerprintToUnlock;
cell.TextLabel.TextColor = ThemeHelpers.PrimaryColor;
cell.TextLabel.Text = biometricButtonText;
}
else
{
cell.TextLabel.TextColor = ThemeHelpers.DangerColor;
cell.TextLabel.Font = ThemeHelpers.GetDangerFont();
cell.TextLabel.Lines = 0;
cell.TextLabel.LineBreakMode = UILineBreakMode.WordWrap;
cell.TextLabel.Text = AppResources.BiometricInvalidated;
}
return cell;
}
}
@@ -279,7 +299,7 @@ namespace Bit.iOS.Core.Controllers
public override nint NumberOfSections(UITableView tableView)
{
return _controller._fingerprintLock ? 2 : 1;
return _controller._biometricLock ? 2 : 1;
}
public override nint RowsInSection(UITableView tableview, nint section)
@@ -307,7 +327,7 @@ namespace Bit.iOS.Core.Controllers
tableView.EndEditing(true);
if (indexPath.Section == 1 && indexPath.Row == 0)
{
var task = _controller.PromptFingerprintAsync();
var task = _controller.PromptBiometricAsync();
return;
}
var cell = tableView.CellAt(indexPath);