Merge branch 'master' into feature/sso

2020-08-25 10:23:54 -05:00 · 2020-08-25 10:23:54 -05:00 · 12e17c9d39
parent 033d02d3ec b7c2c76230
commit 12e17c9d39
12 changed files with 238 additions and 81 deletions
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@ -1299,5 +1299,14 @@
  },
  "vaultTimeoutLogOutConfirmationTitle": {
    "message": "Timeout Action Confirmation"
+  },
+  "autoFillAndSave": {
+    "message": "Auto-fill and Save"
+  },
+  "autoFillSuccessAndSavedUri": {
+    "message": "Auto-filled Item and Saved URI"
+  },
+  "autoFillSuccess": {
+    "message": "Auto-filled Item"
  }
-}
+}
--- a/src/background/main.background.ts
+++ b/src/background/main.background.ts
@ -219,8 +219,8 @@ export default class MainBackground {
        // Background
        this.runtimeBackground = new RuntimeBackground(this, this.autofillService, this.cipherService,
            this.platformUtilsService as BrowserPlatformUtilsService, this.storageService, this.i18nService,
-            this.analytics, this.notificationsService, this.systemService, this.vaultTimeoutService, this.syncService,
-            this.authService, this.stateService, this.environmentService, this.popupUtilsService);
+            this.analytics, this.notificationsService, this.systemService, this.vaultTimeoutService,
+            this.environmentService);
        this.commandsBackground = new CommandsBackground(this, this.passwordGenerationService,
            this.platformUtilsService, this.analytics, this.vaultTimeoutService);

--- a/src/background/runtime.background.ts
+++ b/src/background/runtime.background.ts
@ -38,8 +38,7 @@ export default class RuntimeBackground {
        private storageService: StorageService, private i18nService: I18nService,
        private analytics: Analytics, private notificationsService: NotificationsService,
        private systemService: SystemService, private vaultTimeoutService: VaultTimeoutService,
-        private syncService: SyncService, private authService: AuthService, private stateService: StateService,
-        private environmentService: EnvironmentService, private popupUtilsService : PopupUtilsService) {
+        private environmentService: EnvironmentService) {
        this.isSafari = this.platformUtilsService.isSafari();
        this.runtime = this.isSafari ? {} : chrome.runtime;

@ -165,25 +164,21 @@ export default class RuntimeBackground {
                }
                break;
            case 'authResult':
-                    var vaultUrl = this.environmentService.webVaultUrl;
-                    if(!vaultUrl) {
-                        vaultUrl = 'https://vault.bitwarden.com';
-                    }
+                let vaultUrl = this.environmentService.webVaultUrl;
+                if (vaultUrl == null) {
+                    vaultUrl = 'https://vault.bitwarden.com';
+                }

-                    if(!msg.referrer) {
-                        return;
-                    }
-        
-                    if(!vaultUrl.includes(msg.referrer)) {
-                        return;
-                    }
-    
-                    try {
-                        chrome.tabs.create({
-                            url: 'popup/index.html?uilocation=popout#/sso?code=' + msg.code + '&state=' + msg.state
-                        });
-                    }
-                    catch { }
+                if (msg.referrer == null || Utils.getHostname(vaultUrl) !== msg.referrer) {
+                    return;
+                }
+
+                try {
+                    chrome.tabs.create({
+                        url: 'popup/index.html?uilocation=popout#/sso?code=' + msg.code + '&state=' + msg.state
+                    });
+                }
+                catch { }
                break;
            default:
                break;
--- a/src/background/tabs.background.ts
+++ b/src/background/tabs.background.ts
@ -14,6 +14,8 @@ export default class TabsBackground {

        this.tabs.onActivated.addListener(async (activeInfo: any) => {
            await this.main.refreshBadgeAndMenu();
+            this.main.messagingService.send('tabActivated');
+            this.main.messagingService.send('tabChanged');
        });

        this.tabs.onReplaced.addListener(async (addedTabId: any, removedTabId: any) => {
@ -23,6 +25,8 @@ export default class TabsBackground {
            this.main.onReplacedRan = true;
            await this.main.checkNotificationQueue();
            await this.main.refreshBadgeAndMenu();
+            this.main.messagingService.send('tabReplaced');
+            this.main.messagingService.send('tabChanged');
        });

        this.tabs.onUpdated.addListener(async (tabId: any, changeInfo: any, tab: any) => {
@ -32,6 +36,8 @@ export default class TabsBackground {
            this.main.onUpdatedRan = true;
            await this.main.checkNotificationQueue();
            await this.main.refreshBadgeAndMenu();
+            this.main.messagingService.send('tabUpdated');
+            this.main.messagingService.send('tabChanged');
        });
    }
 }
--- a/src/background/windows.background.ts
+++ b/src/background/windows.background.ts
@ -18,6 +18,8 @@ export default class WindowsBackground {
            }

            await this.main.refreshBadgeAndMenu();
+            this.main.messagingService.send('windowFocused');
+            this.main.messagingService.send('windowChanged');
        });
    }
 }
--- a/src/browser/browserApi.ts
+++ b/src/browser/browserApi.ts
@ -215,11 +215,9 @@ export class BrowserApi {
    }

    static reloadOpenWindows() {
-        if(!BrowserApi.isSafariApi)
-        {
-            var sidebarName : string = 'sidebar';
-            var sidebarWindows = chrome.extension.getViews({ type: sidebarName });
-            if(sidebarWindows && sidebarWindows.length > 0) {
+        if (!BrowserApi.isSafariApi) {
+            const sidebarWindows = chrome.extension.getViews({ type: 'sidebar' });
+            if (sidebarWindows && sidebarWindows.length > 0) {
                sidebarWindows[0].location.reload();
            }
        }
--- a/src/content/sso.ts
+++ b/src/content/sso.ts
@ -7,7 +7,7 @@ window.addEventListener('message', (event) => {
            command: event.data.command,
            code: event.data.code,
            state: event.data.state,
-            referrer: event.source.location.hostname
+            referrer: event.source.location.hostname,
        });
    }
-}, false)
+}, false)
--- a/src/popup/accounts/home.component.ts
+++ b/src/popup/accounts/home.component.ts
@ -13,43 +13,40 @@ import { Utils } from 'jslib/misc/utils';
    selector: 'app-home',
    templateUrl: 'home.component.html',
 })
-export class HomeComponent { 
-    constructor(
-        protected platformUtilsService: PlatformUtilsService, 
-        private passwordGenerationService : PasswordGenerationService,
-        private cryptoFunctionService: CryptoFunctionService, 
-        private environmentService: EnvironmentService,
-        private storageService : StorageService) { }
+export class HomeComponent {
+    constructor(protected platformUtilsService: PlatformUtilsService,
+        private passwordGenerationService: PasswordGenerationService, private storageService: StorageService,
+        private cryptoFunctionService: CryptoFunctionService, private environmentService: EnvironmentService) { }

-        async launchSsoBrowser() {
-            // Generate necessary sso params
-            const passwordOptions: any = {
-                type: 'password',
-                length: 64,
-                uppercase: true,
-                lowercase: true,
-                numbers: true,
-                special: false,
-            };
+    async launchSsoBrowser() {
+        // Generate necessary sso params
+        const passwordOptions: any = {
+            type: 'password',
+            length: 64,
+            uppercase: true,
+            lowercase: true,
+            numbers: true,
+            special: false,
+        };

-            const state = (await this.passwordGenerationService.generatePassword(passwordOptions)) + ':clientId=browser';
-            let codeVerifier = await this.passwordGenerationService.generatePassword(passwordOptions);
-            const codeVerifierHash = await this.cryptoFunctionService.hash(codeVerifier, 'sha256');
-            const codeChallenge = Utils.fromBufferToUrlB64(codeVerifierHash);
-    
-            await this.storageService.save(ConstantsService.ssoCodeVerifierKey, codeVerifier);
-            await this.storageService.save(ConstantsService.ssoStateKey, state);
+        const state = (await this.passwordGenerationService.generatePassword(passwordOptions)) + ':clientId=browser';
+        const codeVerifier = await this.passwordGenerationService.generatePassword(passwordOptions);
+        const codeVerifierHash = await this.cryptoFunctionService.hash(codeVerifier, 'sha256');
+        const codeChallenge = Utils.fromBufferToUrlB64(codeVerifierHash);

-            let url = this.environmentService.getWebVaultUrl();
-            if (url == null) {
-                url = 'https://vault.bitwarden.com';
-            }
+        await this.storageService.save(ConstantsService.ssoCodeVerifierKey, codeVerifier);
+        await this.storageService.save(ConstantsService.ssoStateKey, state);

-            const redirectUri = url + '/sso-connector.html';
-    
-            // Launch browser
-            this.platformUtilsService.launchUri(url + '/#/sso?clientId=browser' +
-                '&redirectUri=' + encodeURIComponent(redirectUri) +
-                '&state=' + state + '&codeChallenge=' + codeChallenge);
-        }   
+        let url = this.environmentService.getWebVaultUrl();
+        if (url == null) {
+            url = 'https://vault.bitwarden.com';
+        }
+
+        const redirectUri = url + '/sso-connector.html';
+
+        // Launch browser
+        this.platformUtilsService.launchUri(url + '/#/sso?clientId=browser' +
+            '&redirectUri=' + encodeURIComponent(redirectUri) +
+            '&state=' + state + '&codeChallenge=' + codeChallenge);
+    }
 }
--- a/src/popup/accounts/login.component.ts
+++ b/src/popup/accounts/login.component.ts
@ -22,8 +22,8 @@ export class LoginComponent extends BaseLoginComponent {
        protected platformUtilsService: PlatformUtilsService, protected i18nService: I18nService,
        protected stateService: StateService, protected environmentService: EnvironmentService,
        protected passwordGenerationService: PasswordGenerationService,
-        protected cryptoFunctionService: CryptoFunctionService, 
-        storageService: StorageService, syncService : SyncService) {
+        protected cryptoFunctionService: CryptoFunctionService, storageService: StorageService,
+        syncService: SyncService) {
        super(authService, router, platformUtilsService, i18nService, stateService, environmentService, passwordGenerationService, cryptoFunctionService, storageService);
        super.onSuccessfulLogin = () => {
            return syncService.fullSync(true);
--- a/src/popup/accounts/sso.component.ts
+++ b/src/popup/accounts/sso.component.ts
@ -29,23 +29,23 @@ export class SsoComponent extends BaseSsoComponent {
        storageService: StorageService, stateService: StateService,
        platformUtilsService: PlatformUtilsService, apiService: ApiService,
        cryptoFunctionService: CryptoFunctionService, passwordGenerationService: PasswordGenerationService,
-        syncService: SyncService, private environmentService: EnvironmentService  ) {
+        syncService: SyncService, private environmentService: EnvironmentService) {
        super(authService, router, i18nService, route, storageService, stateService, platformUtilsService,
            apiService, cryptoFunctionService, passwordGenerationService);
-            
+
        let url = this.environmentService.getWebVaultUrl();
        if (url == null) {
            url = 'https://vault.bitwarden.com';
        }
-            
+
        this.redirectUri = url + '/sso-connector.html';
        this.clientId = 'browser';
-        
+
        super.onSuccessfulLogin = () => {
-                BrowserApi.reloadOpenWindows();
-                const thisWindow = window.open('', '_self');
-                thisWindow.close();
-                return syncService.fullSync(true);
+            BrowserApi.reloadOpenWindows();
+            const thisWindow = window.open('', '_self');
+            thisWindow.close();
+            return syncService.fullSync(true);
        };
    }
 }
--- a/src/popup/vault/view.component.html
+++ b/src/popup/vault/view.component.html
@ -17,7 +17,7 @@
        <div class="box-content">
            <div class="box-content-row">
                <span class="row-label">{{'name' | i18n}}</span>
-                <input type="text" [value]="cipher.name" readonly aria-readonly="true"/>
+                <input type="text" [value]="cipher.name" readonly aria-readonly="true" />
            </div>
            <!-- Login -->
            <div *ngIf="cipher.login">
@ -60,8 +60,7 @@
                                [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                        </a>
                        <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyPassword' | i18n}}"
-                            (click)="copy(cipher.login.password, 'password', 'Password')"
-                            *ngIf="cipher.viewPassword">
+                            (click)="copy(cipher.login.password, 'password', 'Password')" *ngIf="cipher.viewPassword">
                            <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
                        </a>
                    </div>
@ -238,7 +237,8 @@
                </div>
                <div class="action-buttons">
                    <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
-                        *ngIf="field.type === fieldType.Hidden && cipher.viewPassword" (click)="toggleFieldValue(field)">
+                        *ngIf="field.type === fieldType.Hidden && cipher.viewPassword"
+                        (click)="toggleFieldValue(field)">
                        <i class="fa fa-lg" aria-hidden="true"
                            [ngClass]="{'fa-eye': !field.showValue, 'fa-eye-slash': field.showValue}"></i>
                    </a>
@ -268,7 +268,25 @@
    </div>
    <div class="box list">
        <div class="box-content single-line">
-            <a class="box-content-row" href="#" appStopClick appBlurClick (click)="clone()" 
+            <a class="box-content-row" href="#" appStopClick appBlurClick (click)="fillCipher()"
+                *ngIf="!cipher.isDeleted && !inPopout">
+                <div class="row-main text-primary">
+                    <div class="icon text-primary" aria-hidden="true">
+                        <i class="fa fa-pencil-square-o fa-lg fa-fw"></i>
+                    </div>
+                    <span>{{'autoFill' | i18n}}</span>
+                </div>
+            </a>
+            <a class="box-content-row" href="#" appStopClick appBlurClick (click)="fillCipherAndSave()"
+                *ngIf="!cipher.isDeleted && !inPopout">
+                <div class="row-main text-primary">
+                    <div class="icon text-primary" aria-hidden="true">
+                        <i class="fa fa-bookmark fa-lg fa-fw"></i>
+                    </div>
+                    <span>{{'autoFillAndSave' | i18n}}</span>
+                </div>
+            </a>
+            <a class="box-content-row" href="#" appStopClick appBlurClick (click)="clone()"
                *ngIf="!cipher.organizationId && !cipher.isDeleted">
                <div class="row-main text-primary">
                    <div class="icon text-primary" aria-hidden="true">
--- a/src/popup/vault/view.component.ts
+++ b/src/popup/vault/view.component.ts
@ -14,14 +14,22 @@ import { CipherService } from 'jslib/abstractions/cipher.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
 import { EventService } from 'jslib/abstractions/event.service';
 import { I18nService } from 'jslib/abstractions/i18n.service';
+import { MessagingService } from 'jslib/abstractions/messaging.service';
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { TokenService } from 'jslib/abstractions/token.service';
 import { TotpService } from 'jslib/abstractions/totp.service';
 import { UserService } from 'jslib/abstractions/user.service';
+import { Cipher } from 'jslib/models/domain';
+import { LoginUriView } from 'jslib/models/view';

 import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';

 import { ViewComponent as BaseViewComponent } from 'jslib/angular/components/view.component';
+import { BrowserApi } from '../../browser/browserApi';
+import { AutofillService } from '../../services/abstractions/autofill.service';
+import { PopupUtilsService } from '../services/popup-utils.service';
+
+const BroadcasterSubscriptionId = 'ChildViewComponent';

@Component({
    selector: 'app-vault-view',
@ -29,6 +37,10 @@ import { ViewComponent as BaseViewComponent } from 'jslib/angular/components/vie
 })
 export class ViewComponent extends BaseViewComponent {
    showAttachments = true;
+    pageDetails: any[] = [];
+    tab: any;
+    loadPageDetailsTimeout: number;
+    inPopout = false;

    constructor(cipherService: CipherService, totpService: TotpService,
        tokenService: TokenService, i18nService: I18nService,
@ -37,13 +49,15 @@ export class ViewComponent extends BaseViewComponent {
        private router: Router, private location: Location,
        broadcasterService: BroadcasterService, ngZone: NgZone,
        changeDetectorRef: ChangeDetectorRef, userService: UserService,
-        eventService: EventService) {
+        eventService: EventService, private autofillService: AutofillService,
+        private messagingService: MessagingService, private popupUtilsService: PopupUtilsService) {
        super(cipherService, totpService, tokenService, i18nService, cryptoService, platformUtilsService,
            auditService, window, broadcasterService, ngZone, changeDetectorRef, userService, eventService);
    }

    ngOnInit() {
        this.showAttachments = !this.platformUtilsService.isEdge();
+        this.inPopout = this.popupUtilsService.inPopout(window);
        const queryParamsSub = this.route.queryParams.subscribe(async (params) => {
            if (params.cipherId) {
                this.cipherId = params.cipherId;
@ -56,7 +70,43 @@ export class ViewComponent extends BaseViewComponent {
                queryParamsSub.unsubscribe();
            }
        });
+
        super.ngOnInit();
+
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
+            this.ngZone.run(async () => {
+                switch (message.command) {
+                    case 'collectPageDetailsResponse':
+                        if (message.sender === BroadcasterSubscriptionId) {
+                            this.pageDetails.push({
+                                frameId: message.webExtSender.frameId,
+                                tab: message.tab,
+                                details: message.details,
+                            });
+                        }
+                        break;
+                    case 'tabChanged':
+                    case 'windowChanged':
+                        if (this.loadPageDetailsTimeout != null) {
+                            window.clearTimeout(this.loadPageDetailsTimeout);
+                        }
+                        this.loadPageDetailsTimeout = window.setTimeout(() => this.loadPageDetails(), 500);
+                        break;
+                    default:
+                        break;
+                }
+            });
+        });
+    }
+
+    ngOnDestroy() {
+        super.ngOnDestroy();
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
+    async load() {
+        await super.load();
+        await this.loadPageDetails();
    }

    edit() {
@ -80,6 +130,49 @@ export class ViewComponent extends BaseViewComponent {
        });
    }

+    async fillCipher() {
+        const didAutofill = await this.doAutofill();
+        if (didAutofill) {
+            this.platformUtilsService.showToast('success', null,
+                this.i18nService.t('autoFillSuccess'));
+        }
+    }
+
+    async fillCipherAndSave() {
+        const didAutofill = await this.doAutofill();
+
+        if (didAutofill) {
+            if (this.tab == null) {
+                throw new Error('No tab found.');
+            }
+
+            if (this.cipher.login.uris == null) {
+                this.cipher.login.uris = [];
+            } else {
+                if (this.cipher.login.uris.some((uri) => uri.uri === this.tab.url)) {
+                    this.platformUtilsService.showToast('success', null,
+                        this.i18nService.t('autoFillSuccessAndSavedUri'));
+                    return;
+                }
+            }
+
+            const loginUri = new LoginUriView();
+            loginUri.uri = this.tab.url;
+            this.cipher.login.uris.push(loginUri);
+
+            try {
+                const cipher: Cipher = await this.cipherService.encrypt(this.cipher);
+                await this.cipherService.saveWithServer(cipher);
+                this.platformUtilsService.showToast('success', null,
+                    this.i18nService.t('autoFillSuccessAndSavedUri'));
+                this.messagingService.send('editedCipher');
+            } catch {
+                this.platformUtilsService.showToast('error', null,
+                    this.i18nService.t('unexpectedError'));
+            }
+        }
+    }
+
    async restore() {
        if (!this.cipher.isDeleted) {
            return false;
@ -102,4 +195,43 @@ export class ViewComponent extends BaseViewComponent {
    close() {
        this.location.back();
    }
+
+    private async loadPageDetails() {
+        this.pageDetails = [];
+        this.tab = await BrowserApi.getTabFromCurrentWindow();
+        if (this.tab == null) {
+            return;
+        }
+        BrowserApi.tabSendMessage(this.tab, {
+            command: 'collectPageDetails',
+            tab: this.tab,
+            sender: BroadcasterSubscriptionId,
+        });
+    }
+
+    private async doAutofill() {
+        if (this.pageDetails == null || this.pageDetails.length === 0) {
+            this.platformUtilsService.showToast('error', null,
+                this.i18nService.t('autofillError'));
+            return false;
+        }
+
+        try {
+            this.totpCode = await this.autofillService.doAutoFill({
+                cipher: this.cipher,
+                pageDetails: this.pageDetails,
+                doc: window.document,
+            });
+            if (this.totpCode != null) {
+                this.platformUtilsService.copyToClipboard(this.totpCode, { window: window });
+            }
+        } catch {
+            this.platformUtilsService.showToast('error', null,
+                this.i18nService.t('autofillError'));
+            this.changeDetectorRef.detectChanges();
+            return false;
+        }
+
+        return true;
+    }
 }