Merge branch 'master' into feature/fit-finish

src/main/messaging.main.ts

@@ -38,7 +38,7 @@ export class MessagingMain {
             case 'minimizeOnCopy':
                 this.storageService.get<boolean>(ElectronConstants.minimizeOnCopyToClipboardKey).then(
                     (shouldMinimize) => {
-                        if (shouldMinimize && this.main.windowMain.win != null) {
+                        if (shouldMinimize && this.main.windowMain.win !== null) {
                             this.main.windowMain.win.minimize();
                         }
                     });
@@ -57,6 +57,16 @@ export class MessagingMain {
                 break;
             case 'removeOpenAtLogin':
                 this.removeOpenAtLogin();
+            case 'setFocus':
+                this.setFocus();
+                break;
+            case 'enableBrowserIntegration':
+                this.main.nativeMessagingMain.generateManifests();
+                this.main.nativeMessagingMain.listen();
+                break;
+            case 'disableBrowserIntegration':
+                this.main.nativeMessagingMain.removeManifests();
+                this.main.nativeMessagingMain.stop();
                 break;
             default:
                 break;
@@ -123,4 +133,9 @@ export class MessagingMain {
     private linuxStartupFile(): string {
         return path.join(app.getPath('home'), '.config', 'autostart', 'bitwarden.desktop');
     }
+
+    private setFocus() {
+        this.main.trayMain.restoreFromTray();
+        this.main.windowMain.win.focusOnWebView();
+    }
 }

src/main/nativeMessaging.main.ts

@@ -0,0 +1,203 @@
+import { promises as fs, existsSync } from 'fs';
+import * as ipc from 'node-ipc';
+import * as path from 'path';
+import * as util from 'util';
+import { homedir } from 'os';
+
+import { LogService } from 'jslib/abstractions/log.service';
+import { ipcMain } from 'electron';
+import { WindowMain } from 'jslib/electron/window.main';
+
+export class NativeMessagingMain {
+    private connected = false;
+
+    constructor(private logService: LogService, private windowMain: WindowMain, private userPath: string, private appPath: string) {}
+
+    listen() {
+        ipc.config.id = 'bitwarden';
+        ipc.config.retry = 1500;
+
+        ipc.serve(() => {
+            ipc.server.on('message', (data: any, socket: any) => {
+                // This is a ugly hack until electron is updated 7.0.0 which supports ipcMain.invoke
+                this.windowMain.win.webContents.send('nativeMessaging', data);
+                ipcMain.once('nativeMessagingReply', (event, msg) => {
+                    if (msg != null) {
+                        this.send(msg, socket);
+                    }
+                });
+            });
+
+            ipc.server.on('connect', () => {
+                this.connected = true;
+            })
+
+            ipc.server.on(
+                'socket.disconnected',
+                (socket: any, destroyedSocketID: any) => {
+                    this.connected = false;
+                    ipc.log(
+                        'client ' + destroyedSocketID + ' has disconnected!'
+                    );
+                }
+            );
+        });
+
+        ipc.server.start();
+    }
+
+    stop() {
+        ipc.server.stop();
+    }
+
+    send(message: object, socket: any) {
+        ipc.server.emit(socket, 'message', message);
+    }
+
+    generateManifests() {
+        const baseJson = {
+            'name': 'com.8bit.bitwarden',
+            'description': 'Bitwarden desktop <-> browser bridge',
+            'path': this.binaryPath(),
+            'type': 'stdio',
+        }
+
+        const firefoxJson = {...baseJson, ...{ 'allowed_extensions': ['{446900e4-71c2-419f-a6a7-df9c091e268b}']}};
+        const chromeJson = {...baseJson, ...{
+            'allowed_origins': [
+                'chrome-extension://nngceckbapebfimnlniiiahkandclblb/',
+                'chrome-extension://jbkfoedolllekgbhcbcoahefnbanhhlh/',
+                'chrome-extension://ccnckbpmaceehanjmeomladnmlffdjgn/'
+            ]
+        }};
+
+        switch (process.platform) {
+            case 'win32':
+                const destination = path.join(this.userPath, 'browsers');
+                this.writeManifest(path.join(destination, 'firefox.json'), firefoxJson);
+                this.writeManifest(path.join(destination, 'chrome.json'), chromeJson);
+
+                this.createWindowsRegistry('HKLM\\SOFTWARE\\Mozilla\\Firefox', 'HKCU\\SOFTWARE\\Mozilla\\NativeMessagingHosts\\com.8bit.bitwarden', path.join(destination, 'firefox.json'))
+                this.createWindowsRegistry('HKCU\\SOFTWARE\\Google\\Chrome', 'HKCU\\SOFTWARE\\Google\\Chrome\\NativeMessagingHosts\\com.8bit.bitwarden', path.join(destination, 'chrome.json'))
+                break;
+            case 'darwin':
+                if (existsSync(`${homedir()}/Library/Application\ Support/Mozilla/`)) {
+                    this.writeManifest(`${homedir()}/Library/Application\ Support/Mozilla/NativeMessagingHosts/com.8bit.bitwarden.json`, firefoxJson)
+                }
+
+                if (existsSync(`${homedir()}/Library/Application\ Support/Google/Chrome`)) {
+                    this.writeManifest(`${homedir()}/Library/Application\ Support/Google/Chrome/NativeMessagingHosts/com.8bit.bitwarden.json`, chromeJson)
+                }
+                break;
+            case 'linux':
+                if (existsSync(`${homedir()}/.mozilla/`)) {
+                    this.writeManifest(`${homedir()}/.mozilla/native-messaging-hosts/com.8bit.bitwarden.json`, firefoxJson)
+                }
+
+                if (existsSync(`${homedir()}/.config/google-chrome/`)) {
+                    this.writeManifest(`${homedir()}/.config/google-chrome/NativeMessagingHosts/com.8bit.bitwarden.json`, chromeJson)
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    removeManifests() {
+        switch (process.platform) {
+            case 'win32':
+                fs.unlink(path.join(this.userPath, 'browsers', 'firefox.json'));
+                fs.unlink(path.join(this.userPath, 'browsers', 'chrome.json'));
+                this.deleteWindowsRegistry('HKCU\\SOFTWARE\\Mozilla\\NativeMessagingHosts\\com.8bit.bitwarden');
+                this.deleteWindowsRegistry('HKCU\\SOFTWARE\\Google\\Chrome\\NativeMessagingHosts\\com.8bit.bitwarden');
+                break;
+            case 'darwin':
+                if (existsSync('~/Library/Application Support/Mozilla/NativeMessagingHosts/com.8bit.bitwarden.json')) {
+                    fs.unlink('~/Library/Application Support/Mozilla/NativeMessagingHosts/com.8bit.bitwarden.json');
+                }
+
+                if (existsSync('~/Library/Application Support/Google/Chrome/NativeMessagingHosts/com.8bit.bitwarden.json')) {
+                    fs.unlink('~/Library/Application Support/Mozilla/NativeMessagingHosts/com.8bit.bitwarden.json');
+                }
+                break;
+            case 'linux':
+                if (existsSync('~/.mozilla/native-messaging-hosts/com.8bit.bitwarden.json')) {
+                    fs.unlink('~/.mozilla/native-messaging-hosts/com.8bit.bitwarden.json');
+                }
+
+                if (existsSync('~/.config/google-chrome/NativeMessagingHosts/com.8bit.bitwarden.json')) {
+                    fs.unlink('~/.config/google-chrome/NativeMessagingHosts/com.8bit.bitwarden.json');
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    private writeManifest(destination: string, manifest: object) {
+        fs.mkdir(path.dirname(destination));
+        fs.writeFile(destination, JSON.stringify(manifest, null, 2)).catch(this.logService.error);
+    }
+
+    private binaryPath() {
+        const dir = path.join(this.appPath, '..');
+        if (process.platform === 'win32') {
+            return path.join(dir, 'native-messaging.bat');
+        } else if (process.platform === 'darwin') {
+            return path.join(dir, '..', 'MacOS', 'Bitwarden');
+        }
+
+        return path.join(dir, '..', 'bitwarden');
+    }
+
+    private async createWindowsRegistry(check: string, location: string, jsonFile: string) {
+        const regedit = require('regedit');
+        regedit.setExternalVBSLocation('resources/regedit/vbs');
+
+        const list = util.promisify(regedit.list);
+        const createKey = util.promisify(regedit.createKey);
+        const putValue = util.promisify(regedit.putValue);
+
+        this.logService.debug(`Adding registry: ${location}`)
+
+        // Check installed
+        try {
+            await list(check)
+        } catch {
+            return;
+        }
+
+        try {
+            await createKey(location);
+
+            // Insert path to manifest
+            const obj: any = {};
+            obj[location] = {
+                'default': {
+                    value: jsonFile,
+                    type: 'REG_DEFAULT',
+                },
+            }
+
+            return putValue(obj);
+        } catch (error) {
+            this.logService.error(error);
+        }
+    }
+
+    private async deleteWindowsRegistry(key: string) {
+        const regedit = require('regedit');
+
+        const list = util.promisify(regedit.list);
+        const deleteKey = util.promisify(regedit.deleteKey);
+
+        this.logService.debug(`Removing registry: ${key}`)
+
+        try {
+            await list(key);
+            await deleteKey(key);
+        } catch {
+            // Do nothing
+        }
+    }
+}