5 files changed, 56 insertions, 3 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.jsx b/src/components/settings/settings/EditSettingsForm.jsx
index e6cba922b..d0da4ed14 100644
--- a/src/components/settings/settings/EditSettingsForm.jsx
+++ b/src/components/settings/settings/EditSettingsForm.jsx
@@ -798,6 +798,14 @@ class EditSettingsForm extends Component {
 
                 <Hr />
 
+                <Select field={form.$('webRTCIPHandlingPolicy')} />
+
+                <p className="settings__help">
+                  {intl.formatMessage(messages.appRestartRequired)}
+                </p>
+
+                <Hr />
+
                 <Select field={form.$('searchEngine')} />
 
                 <p className="settings__help">
diff --git a/src/config.ts b/src/config.ts
index c8cb09d84..1261d900f 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -38,6 +38,21 @@ export const CDN_URL = 'https://cdn.franzinfra.com';
 
 export const KEEP_WS_LOADED_USID = '0a0aa000-0a0a-49a0-a000-a0a0a0a0a0a0';
 
+const defaultWebRTCIPHandlingPolicy = 'default';
+const publicWebRTCIPHandlingPolicy = 'default_public_interface_only';
+const publicPrivateWebRTCIPHandlingPolicy =
+  'default_public_and_private_interfaces';
+const disableWebRTCIPHandlingPolicy = 'disable_non_proxied_udp';
+
+export const WEBRTC_IP_HANDLING_POLICY = {
+  [defaultWebRTCIPHandlingPolicy]: 'Expose user public and local IPs',
+  [publicWebRTCIPHandlingPolicy]:
+    'Expose user public IP, but not expose user local IP',
+  [publicPrivateWebRTCIPHandlingPolicy]:
+    'Expose user public and local IPs (only use default route used by http)',
+  [disableWebRTCIPHandlingPolicy]: 'Do not expose public or local IPs',
+};
+
 // TODO: Need to convert many of these to i18n
 export const HIBERNATION_STRATEGIES = {
   10: 'Extremely Fast Hibernation (10sec)',
@@ -397,6 +412,7 @@ export const DEFAULT_APP_SETTINGS = {
   sidebarServicesLocation: SIDEBAR_SERVICES_LOCATION_TOPLEFT,
   iconSize: iconSizeBias,
   navigationBarBehaviour: 'custom',
+  webRTCIPHandlingPolicy: disableWebRTCIPHandlingPolicy,
   searchEngine: SEARCH_ENGINE_STARTPAGE,
   translatorLanguage: 'en',
   translatorEngine: TRANSLATOR_ENGINE_LIBRETRANSLATE,
diff --git a/src/containers/settings/EditSettingsScreen.tsx b/src/containers/settings/EditSettingsScreen.tsx
index a4d7ba0eb..162d422ce 100644
--- a/src/containers/settings/EditSettingsScreen.tsx
+++ b/src/containers/settings/EditSettingsScreen.tsx
@@ -26,6 +26,7 @@ import {
   WAKE_UP_HIBERNATION_STRATEGIES,
   SPLIT_COLUMNS_MIN,
   SPLIT_COLUMNS_MAX,
+  WEBRTC_IP_HANDLING_POLICY,
 } from '../../config';
 import { isMac } from '../../environment';
 
@@ -103,6 +104,10 @@ const messages = defineMessages({
     id: 'settings.app.form.navigationBarBehaviour',
     defaultMessage: 'Navigation bar behaviour',
   },
+  webRTCIPHandlingPolicy: {
+    id: 'settings.app.form.webRTCIPHandlingPolicy',
+    defaultMessage: 'WebRTC IP Handling Policy',
+  },
   searchEngine: {
     id: 'settings.app.form.searchEngine',
     defaultMessage: 'Search engine',
@@ -357,6 +362,7 @@ class EditSettingsScreen extends Component<EditSettingsScreenProps> {
         clipboardNotifications: Boolean(settingsData.clipboardNotifications),
         notifyTaskBarOnMessage: Boolean(settingsData.notifyTaskBarOnMessage),
         navigationBarBehaviour: settingsData.navigationBarBehaviour,
+        webRTCIPHandlingPolicy: settingsData.webRTCIPHandlingPolicy,
         searchEngine: settingsData.searchEngine,
         translatorEngine: settingsData.translatorEngine,
         translatorLanguage: settingsData.translatorLanguage,
@@ -465,6 +471,11 @@ class EditSettingsScreen extends Component<EditSettingsScreenProps> {
       sort: false,
     });
 
+    const webRTCIPHandlingPolicies = getSelectOptions({
+      locales: WEBRTC_IP_HANDLING_POLICY,
+      sort: false,
+    });
+
     const searchEngines = getSelectOptions({
       locales: SEARCH_ENGINE_NAMES,
       sort: false,
@@ -597,6 +608,12 @@ class EditSettingsScreen extends Component<EditSettingsScreenProps> {
           default: DEFAULT_APP_SETTINGS.navigationBarBehaviour,
           options: navigationBarBehaviours,
         },
+        webRTCIPHandlingPolicy: {
+          label: intl.formatMessage(messages.webRTCIPHandlingPolicy),
+          value: settings.all.app.webRTCIPHandlingPolicy,
+          default: DEFAULT_APP_SETTINGS.webRTCIPHandlingPolicy,
+          options: webRTCIPHandlingPolicies,
+        },
         searchEngine: {
           label: intl.formatMessage(messages.searchEngine),
           value: settings.all.app.searchEngine,
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 4dc8bad82..80ad855c3 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -266,6 +266,7 @@
   "settings.app.form.wakeUpHibernationSplay": "Splay hibernate/wake cycles to reduce load",
   "settings.app.form.wakeUpHibernationStrategy": "Hibernation strategy after automatic wake up",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
+  "settings.app.form.webRTCIPHandlingPolicy": "WebRTC IP Handling Policy",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
   "settings.app.headlineGeneral": "General",
diff --git a/src/index.ts b/src/index.ts
index 7c80ca955..97c77d185 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -90,8 +90,8 @@ if (isWindows) {
 const settings = new Settings('app', DEFAULT_APP_SETTINGS);
 const proxySettings = new Settings('proxy');
 
-const retrieveSettingValue = (key: string, defaultValue: boolean) =>
-  ifUndefined<boolean>(settings.get(key), defaultValue);
+const retrieveSettingValue = (key: string, defaultValue: boolean | string) =>
+  ifUndefined<boolean | string>(settings.get(key), defaultValue);
 
 const liftSingleInstanceLock = retrieveSettingValue(
   'liftSingleInstanceLock',
@@ -164,6 +164,15 @@ if (!retrieveSettingValue('enableGPUAcceleration', false)) {
   app.disableHardwareAcceleration();
 }
 
+const webRTCIPHandlingPolicy = retrieveSettingValue(
+  'webRTCIPHandlingPolicy',
+  DEFAULT_APP_SETTINGS.webRTCIPHandlingPolicy,
+) as
+  | 'disable_non_proxied_udp'
+  | 'default'
+  | 'default_public_interface_only'
+  | 'default_public_and_private_interfaces';
+
 const createWindow = () => {
   // Remember window size
   const mainWindowState = windowStateKeeper({
@@ -202,7 +211,7 @@ const createWindow = () => {
       spellcheck: retrieveSettingValue(
         'enableSpellchecking',
         DEFAULT_APP_SETTINGS.enableSpellchecking,
-      ),
+      ) as boolean | undefined,
       nodeIntegration: true,
       contextIsolation: false,
       webviewTag: true,
@@ -210,6 +219,7 @@ const createWindow = () => {
   });
 
   enableWebContents(mainWindow.webContents);
+  mainWindow.webContents.setWebRTCIPHandlingPolicy(webRTCIPHandlingPolicy);
 
   app.on('browser-window-created', (_, window) => {
     enableWebContents(window.webContents);
@@ -532,6 +542,7 @@ ipcMain.on('open-browser-window', (_e, { url, serviceId }) => {
     },
   });
   enableWebContents(child.webContents);
+  child.webContents.setWebRTCIPHandlingPolicy(webRTCIPHandlingPolicy);
   child.show();
   child.loadURL(url);
   debug('Received open-browser-window', url);