mirror of
https://github.com/bitwarden/browser.git
synced 2024-09-06 00:48:08 +02:00
Merge pull request #138 from bitwarden/fix/desktop/495-try-catch-require-nodert
try catch nodeRT module via require
This commit is contained in:
commit
101c5688c4
@ -1,4 +1,5 @@
|
||||
export abstract class BiometricMain {
|
||||
isError: boolean;
|
||||
init: () => Promise<void>;
|
||||
supportsBiometric: () => Promise<boolean>;
|
||||
requestCreate: () => Promise<boolean>;
|
||||
|
@ -6,6 +6,8 @@ import { ConstantsService } from '../services';
|
||||
import { ElectronConstants } from './electronConstants';
|
||||
|
||||
export default class BiometricDarwinMain implements BiometricMain {
|
||||
isError: boolean = false;
|
||||
|
||||
constructor(private storageService: StorageService, private i18nservice: I18nService) {}
|
||||
|
||||
async init() {
|
||||
|
@ -1,10 +1,3 @@
|
||||
import * as util from 'util';
|
||||
|
||||
import {
|
||||
UserConsentVerificationResult,
|
||||
UserConsentVerifier,
|
||||
UserConsentVerifierAvailability,
|
||||
} from '@nodert-win10-rs4/windows.security.credentials.ui';
|
||||
import { I18nService, StorageService } from '../abstractions';
|
||||
|
||||
import { ipcMain } from 'electron';
|
||||
@ -12,19 +5,23 @@ import { BiometricMain } from '../abstractions/biometric.main';
|
||||
import { ConstantsService } from '../services';
|
||||
import { ElectronConstants } from './electronConstants';
|
||||
|
||||
const requestVerification: any = util.promisify(UserConsentVerifier.requestVerificationAsync);
|
||||
const checkAvailability: any = util.promisify(UserConsentVerifier.checkAvailabilityAsync);
|
||||
|
||||
const AllowedAvailabilities = [
|
||||
UserConsentVerifierAvailability.available,
|
||||
UserConsentVerifierAvailability.deviceBusy,
|
||||
];
|
||||
|
||||
export default class BiometricWindowsMain implements BiometricMain {
|
||||
isError: boolean = false;
|
||||
|
||||
private windowsSecurityCredentialsUiModule: any;
|
||||
|
||||
constructor(private storageService: StorageService, private i18nservice: I18nService) { }
|
||||
|
||||
async init() {
|
||||
this.storageService.save(ElectronConstants.enableBiometric, await this.supportsBiometric());
|
||||
this.windowsSecurityCredentialsUiModule = this.getWindowsSecurityCredentialsUiModule();
|
||||
let supportsBiometric = false;
|
||||
try {
|
||||
supportsBiometric = await this.supportsBiometric();
|
||||
} catch {
|
||||
// store error state so we can let the user know on the settings page
|
||||
this.isError = true;
|
||||
}
|
||||
this.storageService.save(ElectronConstants.enableBiometric, supportsBiometric);
|
||||
this.storageService.save(ConstantsService.biometricText, 'unlockWithWindowsHello');
|
||||
|
||||
ipcMain.on('biometric', async (event: any, message: any) => {
|
||||
@ -33,14 +30,72 @@ export default class BiometricWindowsMain implements BiometricMain {
|
||||
}
|
||||
|
||||
async supportsBiometric(): Promise<boolean> {
|
||||
const availability = await checkAvailability();
|
||||
const availability = await this.checkAvailabilityAsync();
|
||||
|
||||
return AllowedAvailabilities.includes(availability);
|
||||
return this.getAllowedAvailabilities().includes(availability);
|
||||
}
|
||||
|
||||
async requestCreate(): Promise<boolean> {
|
||||
const verification = await requestVerification(this.i18nservice.t('windowsHelloConsentMessage'));
|
||||
const module = this.getWindowsSecurityCredentialsUiModule();
|
||||
if (module == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return verification === UserConsentVerificationResult.verified;
|
||||
const verification = await this.requestVerificationAsync(this.i18nservice.t('windowsHelloConsentMessage'));
|
||||
|
||||
return verification === module.UserConsentVerificationResult.verified;
|
||||
}
|
||||
|
||||
getWindowsSecurityCredentialsUiModule(): any {
|
||||
try {
|
||||
if (this.windowsSecurityCredentialsUiModule == null) {
|
||||
this.windowsSecurityCredentialsUiModule = require('@nodert-win10-rs4/windows.security.credentials.ui');
|
||||
}
|
||||
return this.windowsSecurityCredentialsUiModule;
|
||||
} catch {
|
||||
this.isError = true;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
async checkAvailabilityAsync(): Promise<any> {
|
||||
const module = this.getWindowsSecurityCredentialsUiModule();
|
||||
if (module != null) {
|
||||
return new Promise((resolve, reject) => {
|
||||
module.UserConsentVerifier.checkAvailabilityAsync((error: Error, result: any) => {
|
||||
if (error) {
|
||||
return resolve(null);
|
||||
}
|
||||
return resolve(result);
|
||||
});
|
||||
});
|
||||
}
|
||||
return Promise.resolve(null);
|
||||
}
|
||||
|
||||
async requestVerificationAsync(message: string): Promise<any> {
|
||||
const module = this.getWindowsSecurityCredentialsUiModule();
|
||||
if (module != null) {
|
||||
return new Promise((resolve, reject) => {
|
||||
module.UserConsentVerifier.requestVerificationAsync(message, (error: Error, result: any) => {
|
||||
if (error) {
|
||||
return resolve(null);
|
||||
}
|
||||
return resolve(result);
|
||||
});
|
||||
});
|
||||
}
|
||||
return Promise.resolve(null);
|
||||
}
|
||||
|
||||
getAllowedAvailabilities(): any[] {
|
||||
const module = this.getWindowsSecurityCredentialsUiModule();
|
||||
if (module != null) {
|
||||
return [
|
||||
module.UserConsentVerifierAvailability.available,
|
||||
module.UserConsentVerifierAvailability.deviceBusy,
|
||||
];
|
||||
}
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
101
src/globals.d.ts
vendored
101
src/globals.d.ts
vendored
@ -1,104 +1,3 @@
|
||||
declare function escape(s: string): string;
|
||||
declare function unescape(s: string): string;
|
||||
declare module 'duo_web_sdk';
|
||||
|
||||
/* tslint:disable */
|
||||
declare module '@nodert-win10-rs4/windows.security.credentials.ui' {
|
||||
export enum AuthenticationProtocol {
|
||||
basic,
|
||||
digest,
|
||||
ntlm,
|
||||
kerberos,
|
||||
negotiate,
|
||||
credSsp,
|
||||
custom,
|
||||
}
|
||||
|
||||
export enum CredentialSaveOption {
|
||||
unselected,
|
||||
selected,
|
||||
hidden,
|
||||
}
|
||||
|
||||
export enum UserConsentVerifierAvailability {
|
||||
available,
|
||||
deviceNotPresent,
|
||||
notConfiguredForUser,
|
||||
disabledByPolicy,
|
||||
deviceBusy,
|
||||
}
|
||||
|
||||
export enum UserConsentVerificationResult {
|
||||
verified,
|
||||
deviceNotPresent,
|
||||
notConfiguredForUser,
|
||||
disabledByPolicy,
|
||||
deviceBusy,
|
||||
retriesExhausted,
|
||||
canceled,
|
||||
}
|
||||
|
||||
export class CredentialPickerOptions {
|
||||
targetName: String;
|
||||
previousCredential: Object;
|
||||
message: String;
|
||||
errorCode: Number;
|
||||
customAuthenticationProtocol: String;
|
||||
credentialSaveOption: CredentialSaveOption;
|
||||
caption: String;
|
||||
callerSavesCredential: Boolean;
|
||||
authenticationProtocol: AuthenticationProtocol;
|
||||
alwaysDisplayDialog: Boolean;
|
||||
constructor();
|
||||
}
|
||||
|
||||
export class CredentialPickerResults {
|
||||
credential: Object;
|
||||
credentialDomainName: String;
|
||||
credentialPassword: String;
|
||||
credentialSaveOption: CredentialSaveOption;
|
||||
credentialSaved: Boolean;
|
||||
credentialUserName: String;
|
||||
errorCode: Number;
|
||||
constructor();
|
||||
}
|
||||
|
||||
export class CredentialPicker {
|
||||
constructor();
|
||||
|
||||
static pickAsync(
|
||||
options: CredentialPickerOptions,
|
||||
callback: (error: Error, result: CredentialPickerResults) => void
|
||||
): void;
|
||||
static pickAsync(
|
||||
targetName: String,
|
||||
message: String,
|
||||
callback: (error: Error, result: CredentialPickerResults) => void
|
||||
): void;
|
||||
static pickAsync(
|
||||
targetName: String,
|
||||
message: String,
|
||||
caption: String,
|
||||
callback: (error: Error, result: CredentialPickerResults) => void
|
||||
): void;
|
||||
}
|
||||
|
||||
export class UserConsentVerifier {
|
||||
constructor();
|
||||
|
||||
static checkAvailabilityAsync(
|
||||
callback: (
|
||||
error: Error,
|
||||
result: UserConsentVerifierAvailability
|
||||
) => void
|
||||
): void;
|
||||
|
||||
static requestVerificationAsync(
|
||||
message: String,
|
||||
callback: (
|
||||
error: Error,
|
||||
result: UserConsentVerificationResult
|
||||
) => void
|
||||
): void;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user