diff --git a/jslib b/jslib index c3f67dbe26..4b7962dc8f 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit c3f67dbe26d7d5b30645a2857fd9f316fce7b6bc +Subproject commit 4b7962dc8fba73003be1ae651013f5f817496551 diff --git a/package.json b/package.json index d149bc727c..22fb8891f5 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "dist": "npm run build:prod && gulp postdist", "dist:selfhost": "npm run build:selfhost:prod && gulp postdist", "deploy": "npm run dist && gh-pages -d build", + "deploy:dev": "npm run dist && gh-pages -d build -r git@github.com:kspearrin/bitwarden-web-dev.git", "lint": "tslint src/**/*.ts || true", "lint:fix": "tslint src/**/*.ts --fix" }, diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts index b0142550d8..c7455bd119 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts @@ -127,7 +127,7 @@ containerService.attachToWindow(window); export function initFactory(): Function { return async () => { await (storageService as HtmlStorageService).init(); - const isDev = platformUtilsService.isDev(); + const isDev = true; if (!isDev && platformUtilsService.isSelfHost()) { environmentService.baseUrl = window.location.origin; } else { diff --git a/src/app/settings/two-factor-u2f.component.html b/src/app/settings/two-factor-u2f.component.html index d3552b4a8c..0ca7f04bf1 100644 --- a/src/app/settings/two-factor-u2f.component.html +++ b/src/app/settings/two-factor-u2f.component.html @@ -1,5 +1,5 @@
-
+

@@ -23,43 +23,66 @@
  • {{'twoFactorU2fSupportWeb' | i18n}}
    • - - -

    {{'twoFactorU2fAdd' | i18n}}:

    -
      -
    1. {{'twoFactorU2fPlugIn' | i18n}}
      2. -
    2. {{'twoFactorU2fTouchButton' | i18n}}
      3. -
    -
    -
    - -

    - -

    - {{'twoFactorU2fWaiting' | i18n}}... -     - -

    - -

    - {{'twoFactorU2fClickEnable' | i18n}} -     - -

    - -

    - {{'twoFactorU2fProblemReading' | i18n}} + + +
    +

    {{'twoFactorU2fAdd' | i18n}}:

    +
      +
    1. {{'twoFactorU2fGiveName' | i18n}}
      2. +
    2. {{'twoFactorU2fPlugInReadKey' | i18n}}
      3. +
    3. {{'twoFactorU2fTouchButton' | i18n}}
      4. +
    4. {{'twoFactorU2fSaveForm' | i18n}}
      5. +
    +
    +
    + +
    +
    + + + + + + + + {{'twoFactorU2fWaiting' | i18n}}... + + + + {{'twoFactorU2fClickSave' | i18n}} + + + + {{'twoFactorU2fProblemReadingTryAgain' | i18n}} +
    - +
    diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts index 12c0bd34d8..5560c4766c 100644 --- a/src/app/settings/two-factor-u2f.component.ts +++ b/src/app/settings/two-factor-u2f.component.ts @@ -1,5 +1,6 @@ import { Component, + NgZone, OnDestroy, OnInit, } from '@angular/core'; @@ -12,6 +13,9 @@ import { I18nService } from 'jslib/abstractions/i18n.service'; import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; + +import { PasswordVerificationRequest } from 'jslib/models/request/passwordVerificationRequest'; +import { UpdateTwoFactorU2fDeleteRequest } from 'jslib/models/request/updateTwoFactorU2fDeleteRequest'; import { UpdateTwoFactorU2fRequest } from 'jslib/models/request/updateTwoFactorU2fRequest'; import { ChallengeResponse, @@ -26,18 +30,21 @@ import { TwoFactorBaseComponent } from './two-factor-base.component'; }) export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnInit, OnDestroy { type = TwoFactorProviderType.U2f; - u2fChallenge: ChallengeResponse; + name: string; + keys: any[]; + keyIdAvailable: number = null; + keysConfiguredCount = 0; u2fError: boolean; u2fListening: boolean; u2fResponse: string; + challengePromise: Promise; formPromise: Promise; - private closed = false; private u2fScript: HTMLScriptElement; constructor(apiService: ApiService, i18nService: I18nService, analytics: Angulartics2, toasterService: ToasterService, - platformUtilsService: PlatformUtilsService) { + platformUtilsService: PlatformUtilsService, private ngZone: NgZone) { super(apiService, i18nService, analytics, toasterService, platformUtilsService); this.u2fScript = window.document.createElement('script'); this.u2fScript.src = 'scripts/u2f.js'; @@ -49,28 +56,24 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI } ngOnDestroy() { - this.closed = true; window.document.body.removeChild(this.u2fScript); } auth(authResponse: any) { super.auth(authResponse); this.processResponse(authResponse.response); - this.readDevice(); } submit() { - if (this.enabled) { - return super.disable(this.formPromise); - } else { - return this.enable(); + if (this.u2fResponse == null || this.keyIdAvailable == null) { + // Should never happen. + return Promise.reject(); } - } - - protected enable() { const request = new UpdateTwoFactorU2fRequest(); request.masterPasswordHash = this.masterPasswordHash; request.deviceResponse = this.u2fResponse; + request.id = this.keyIdAvailable; + request.name = this.name; return super.enable(async () => { this.formPromise = this.apiService.putTwoFactorU2f(request); @@ -79,38 +82,97 @@ export class TwoFactorU2fComponent extends TwoFactorBaseComponent implements OnI }); } - private readDevice() { - if (this.closed || this.enabled) { + disable() { + return super.disable(this.formPromise); + } + + async remove(key: any) { + if (this.keysConfiguredCount <= 1 || key.removePromise != null) { return; } + const name = key.name != null ? key.name : this.i18nService.t('u2fkeyX', key.id); + const confirmed = await this.platformUtilsService.showDialog( + this.i18nService.t('removeU2fConfirmation'), name, + this.i18nService.t('yes'), this.i18nService.t('no'), 'warning'); + if (!confirmed) { + return; + } + const request = new UpdateTwoFactorU2fDeleteRequest(); + request.id = key.id; + request.masterPasswordHash = this.masterPasswordHash; + try { + key.removePromise = this.apiService.deleteTwoFactorU2f(request); + const response = await key.removePromise; + key.removePromise = null; + await this.processResponse(response); + } catch { } + } + async readKey() { + if (this.keyIdAvailable == null) { + return; + } + const request = new PasswordVerificationRequest(); + request.masterPasswordHash = this.masterPasswordHash; + try { + this.challengePromise = this.apiService.getTwoFactorU2fChallenge(request); + const challenge = await this.challengePromise; + this.readDevice(challenge); + } catch { } + } + + private readDevice(u2fChallenge: ChallengeResponse) { // tslint:disable-next-line console.log('listening for key...'); + this.resetU2f(true); + (window as any).u2f.register(u2fChallenge.appId, [{ + version: u2fChallenge.version, + challenge: u2fChallenge.challenge, + }], [], (data: any) => { + this.ngZone.run(() => { + this.u2fListening = false; + if (data.errorCode) { + this.u2fError = true; + // tslint:disable-next-line + console.log('error: ' + data.errorCode); + return; + } + this.u2fResponse = JSON.stringify(data); + }); + }, 15); + } + private resetU2f(listening = false) { this.u2fResponse = null; this.u2fError = false; - this.u2fListening = true; - - (window as any).u2f.register(this.u2fChallenge.appId, [{ - version: this.u2fChallenge.version, - challenge: this.u2fChallenge.challenge, - }], [], (data: any) => { - this.u2fListening = false; - if (data.errorCode === 5) { - this.readDevice(); - return; - } else if (data.errorCode) { - this.u2fError = true; - // tslint:disable-next-line - console.log('error: ' + data.errorCode); - return; - } - this.u2fResponse = JSON.stringify(data); - }, 10); + this.u2fListening = listening; } private processResponse(response: TwoFactorU2fResponse) { - this.u2fChallenge = response.challenge; + this.resetU2f(); + this.keys = []; + this.keyIdAvailable = null; + this.name = null; + this.keysConfiguredCount = 0; + for (let i = 1; i <= 5; i++) { + if (response.keys != null) { + const key = response.keys.filter((k) => k.id === i); + if (key.length > 0) { + this.keysConfiguredCount++; + this.keys.push({ + id: i, name: key[0].name, + configured: true, + compromised: key[0].compromised, + removePromise: null, + }); + continue; + } + } + this.keys.push({ id: i, name: null, configured: false, compromised: false, removePromise: null }); + if (this.keyIdAvailable == null) { + this.keyIdAvailable = i; + } + } this.enabled = response.enabled; } } diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index ef89997c44..b0a47978f0 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -1145,7 +1145,7 @@ "message": "Add a new YubiKey to your account" }, "twoFactorYubikeyPlugIn": { - "message": "Plug the YubiKey (NEO or 4 series) into your computer's USB port." + "message": "Plug the YubiKey into your computer's USB port." }, "twoFactorYubikeySelectKey": { "message": "Select the first empty YubiKey input field below." @@ -1174,6 +1174,15 @@ } } }, + "u2fkeyX": { + "message": "U2F Key $INDEX$", + "placeholders": { + "index": { + "content": "$1", + "example": "2" + } + } + }, "nfcSupport": { "message": "NFC Support" }, @@ -1216,12 +1225,27 @@ "twoFactorU2fAdd": { "message": "Add a FIDO U2F security key to your account" }, - "twoFactorU2fPlugIn": { - "message": "Plug the security key into your computer's USB port." + "removeU2fConfirmation": { + "message": "Are you sure you want to remove this security key?" + }, + "readKey": { + "message": "Read Key" + }, + "keyCompromised": { + "message": "Key is compromised." + }, + "twoFactorU2fGiveName": { + "message": "Give the security key a friendly name to identify it." + }, + "twoFactorU2fPlugInReadKey": { + "message": "Plug the security key into your computer's USB port and click the \"Read Key\" button." }, "twoFactorU2fTouchButton": { "message": "If the security key has a button, touch it." }, + "twoFactorU2fSaveForm": { + "message": "Save the form." + }, "twoFactorU2fWarning": { "message": "Due to platform limitations, FIDO U2F cannot be used on all Bitwarden applications. You should enable another two-step login provider so that you can access your account when FIDO U2F cannot be used. Supported platforms:" }, @@ -1231,11 +1255,11 @@ "twoFactorU2fWaiting": { "message": "Waiting for you to touch the button on your security key" }, - "twoFactorU2fClickEnable": { - "message": "Click the \"Enable\" button below to enable this security key for two-step login." + "twoFactorU2fClickSave": { + "message": "Click the \"Save\" button below to enable this security key for two-step login." }, - "twoFactorU2fProblemReading": { - "message": "There was a problem reading the security key." + "twoFactorU2fProblemReadingTryAgain": { + "message": "There was a problem reading the security key. Try again." }, "twoFactorRecoveryYourCode": { "message": "Your Bitwarden two-step login recovery code"