extension ids constants

desktop/scripts/const/extension-ids.js

@@ -0,0 +1,11 @@
+module.exports.ExtensionIds = {
+    Origins: {
+        KeeWebConnectChrome: 'chrome-extension://pikpfmjfkekaeinceagbebpfkmkdlcjk/',
+        KeeWebConnectEdge: 'chrome-extension://nmggpehkjmeaeocmaijenpejbepckinm/',
+        KeeWebConnectFirefox: 'keeweb-connect@keeweb.info',
+        KeeWebConnectSafari: 'safari-keeweb-connect',
+        KeePassXcBrowserFirefox: 'keepassxc-browser@keepassxc.org',
+        KeePassXcBrowserChrome: 'chrome-extension://oboonakemofpalcgghocfoadofidjkkk/',
+        KeePassXcBrowserEdge: 'chrome-extension://pdffhmdngciaglkoonimfcmckehcpafo/'
+    }
+};

desktop/scripts/ipc-handlers/browser-extension-connector.js

@@ -5,6 +5,7 @@ const net = require('net');
 const { ipcMain, app } = require('electron');
 const { Logger } = require('../logger');
 const { getProcessInfo } = require('../util/process-utils');
+const { ExtensionIds } = require('../const/extension-ids');
 const browserExtensionInstaller = require('../util/browser-extension-installer');
 
 ipcMain.handle('browserExtensionConnectorStart', browserExtensionConnectorStart);
@@ -23,16 +24,19 @@ const BrowserExtensionNames = {
 
 const MaxIncomingDataLength = 10_000;
 const ExtensionOrigins = {
-    'safari-keeweb-connect': BrowserExtensionNames.KWC,
-    'keeweb-connect@keeweb.info': BrowserExtensionNames.KWC,
-    'chrome-extension://aphablpbogbpmocgkpeeadeljldnphon/': BrowserExtensionNames.KWC,
-    'chrome-extension://pikpfmjfkekaeinceagbebpfkmkdlcjk/': BrowserExtensionNames.KWC,
-    'chrome-extension://nmggpehkjmeaeocmaijenpejbepckinm/': BrowserExtensionNames.KWC,
-    'keepassxc-browser@keepassxc.org': BrowserExtensionNames.KPXC,
-    'chrome-extension://oboonakemofpalcgghocfoadofidjkkk/': BrowserExtensionNames.KPXC,
-    'chrome-extension://pdffhmdngciaglkoonimfcmckehcpafo/': BrowserExtensionNames.KPXC
+    [ExtensionIds.Origins.KeeWebConnectSafari]: BrowserExtensionNames.KWC,
+    [ExtensionIds.Origins.KeeWebConnectFirefox]: BrowserExtensionNames.KWC,
+    [ExtensionIds.Origins.KeeWebConnectChrome]: BrowserExtensionNames.KWC,
+    [ExtensionIds.Origins.KeeWebConnectEdge]: BrowserExtensionNames.KWC,
+    [ExtensionIds.Origins.KeePassXcBrowserFirefox]: BrowserExtensionNames.KPXC,
+    [ExtensionIds.Origins.KeePassXcBrowserChrome]: BrowserExtensionNames.KPXC,
+    [ExtensionIds.Origins.KeePassXcBrowserEdge]: BrowserExtensionNames.KPXC
 };
 
+for (const devExtId of process.env.KEEWEB_BROWSER_EXTENSION_IDS_CHROMIUM?.split(',') || []) {
+    ExtensionOrigins[`chrome-extension://${devExtId}/`] = BrowserExtensionNames.KWC;
+}
+
 const AppNames = {
     'msedge': 'Microsoft Edge',
     'chrome': 'Google Chrome'

desktop/scripts/util/browser-extension-installer.js

@@ -3,6 +3,7 @@ const path = require('path');
 const windowsRegistry = require('./windows-registry');
 const { isDev } = require('./app-info');
 const { app } = require('electron');
+const { ExtensionIds } = require('../const/extension-ids');
 
 function getManifestDir(browser) {
     const home = app.getPath('home');
@@ -67,29 +68,34 @@ function getManifestFileName(extension) {
 
 function createManifest(browser, extension) {
     switch (extension) {
-        case 'KWC':
+        case 'KWC': {
+            const devIdsChromium =
+                process.env.KEEWEB_BROWSER_EXTENSION_IDS_CHROMIUM?.split(',')?.map(
+                    (devExtId) => `chrome-extension://${devExtId}/`
+                ) || [];
             return {
                 ...(browser === 'Firefox'
-                    ? { 'allowed_extensions': ['keeweb-connect@keeweb.info'] }
+                    ? { 'allowed_extensions': [ExtensionIds.Origins.KeeWebConnectFirefox] }
                     : {
                           'allowed_origins': [
-                              'chrome-extension://aphablpbogbpmocgkpeeadeljldnphon/',
-                              'chrome-extension://pikpfmjfkekaeinceagbebpfkmkdlcjk/',
-                              'chrome-extension://nmggpehkjmeaeocmaijenpejbepckinm/'
+                              ExtensionIds.Origins.KeeWebConnectChrome,
+                              ExtensionIds.Origins.KeeWebConnectEdge,
+                              ...devIdsChromium
                           ]
                       }),
                 description: 'KeeWeb native messaging host',
                 name: 'net.antelle.keeweb.keeweb_connect',
                 type: 'stdio'
             };
+        }
         case 'KPXC':
             return {
                 ...(browser === 'Firefox'
-                    ? { 'allowed_extensions': ['keepassxc-browser@keepassxc.org'] }
+                    ? { 'allowed_extensions': [ExtensionIds.Origins.KeePassXcBrowserFirefox] }
                     : {
                           'allowed_origins': [
-                              'chrome-extension://pdffhmdngciaglkoonimfcmckehcpafo/',
-                              'chrome-extension://oboonakemofpalcgghocfoadofidjkkk/'
+                              ExtensionIds.Origins.KeePassXcBrowserChrome,
+                              ExtensionIds.Origins.KeePassXcBrowserEdge
                           ]
                       }),
                 description: 'Native messaging host created by KeeWeb',