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

added try-catch around ext module calls (#143)

Browse Source
This commit is contained in:
Chad Scharf
2020-08-06 12:27:49 -04:00
committed by GitHub
parent 1513b25a35
commit 7c0c06705e
1 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/electron/biometric.windows.main.ts
View File

@@ -62,12 +62,17 @@ export default class BiometricWindowsMain implements BiometricMain {
const module = this.getWindowsSecurityCredentialsUiModule(); const module = this.getWindowsSecurityCredentialsUiModule();
if (module != null) { if (module != null) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try {
module.UserConsentVerifier.checkAvailabilityAsync((error: Error, result: any) => { module.UserConsentVerifier.checkAvailabilityAsync((error: Error, result: any) => {
if (error) { if (error) {
return resolve(null); return resolve(null);
} }
return resolve(result); return resolve(result);
}); });
} catch {
this.isError = true;
return resolve(null);
}
}); });
} }
return Promise.resolve(null); return Promise.resolve(null);
@@ -77,18 +82,24 @@ export default class BiometricWindowsMain implements BiometricMain {
const module = this.getWindowsSecurityCredentialsUiModule(); const module = this.getWindowsSecurityCredentialsUiModule();
if (module != null) { if (module != null) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try {
module.UserConsentVerifier.requestVerificationAsync(message, (error: Error, result: any) => { module.UserConsentVerifier.requestVerificationAsync(message, (error: Error, result: any) => {
if (error) { if (error) {
return resolve(null); return resolve(null);
} }
return resolve(result); return resolve(result);
}); });
} catch (error) {
this.isError = true;
return reject(error);
}
}); });
} }
return Promise.resolve(null); return Promise.resolve(null);
} }
getAllowedAvailabilities(): any[] { getAllowedAvailabilities(): any[] {
try {
const module = this.getWindowsSecurityCredentialsUiModule(); const module = this.getWindowsSecurityCredentialsUiModule();
if (module != null) { if (module != null) {
return [ return [
@@ -96,6 +107,7 @@ export default class BiometricWindowsMain implements BiometricMain {
module.UserConsentVerifierAvailability.deviceBusy, module.UserConsentVerifierAvailability.deviceBusy,
]; ];
} }
} catch { /*Ignore error*/ }
return []; return [];
} }
} }