bring back upstream changes that got lost with the revert of the 2022…

….9.1 merge

app/features/conference/components/Conference.js

@@ -10,6 +10,7 @@ import { push } from 'react-router-redux';
 import i18n from '../../../i18n';
 import config from '../../config';
 import { getSetting } from '../../settings';
+import { parseURLParams } from '../../utils/parseURLParams';
 
 import { conferenceEnded, conferenceJoined } from '../actions';
 import JitsiMeetExternalAPI from '../external_api';
@@ -178,14 +179,7 @@ class Conference extends Component<Props, State> {
         const roomName = url.pathname.split('/').pop();
         const host = this._conference.serverURL.replace(/https?:\/\//, '');
         const searchParameters = Object.fromEntries(url.searchParams);
-        const hashParameters = url.hash.substring(1).split('&')
-            .reduce((res, item) => {
-                const parts = item.split('=');
-
-                res[parts[0]] = parts[1];
-
-                return res;
-            }, {});
+        const hashParameters = parseURLParams(url);
 
         const locale = { lng: i18n.language };
         const urlParameters = {

app/features/utils/parseURLParams.js

@@ -0,0 +1,83 @@
+import Bourne from '@hapi/bourne';
+
+/**
+ * Prints the error and reports it to the global error handler.
+ *
+ * @param {Error} e - The error object.
+ * @param {string} msg - A custom message to print in addition to the error.
+ * @returns {void}
+ */
+export function reportError(e, msg = '') {
+    console.error(msg, e);
+    window.onerror && window.onerror(msg, undefined, undefined, undefined, e);
+}
+
+
+/**
+ * A list if keys to ignore when parsing.
+ *
+ * @type {string[]}
+ */
+const blacklist = [ '__proto__', 'constructor', 'prototype' ];
+
+/**
+ * Parses the query/search or fragment/hash parameters out of a specific URL and
+ * returns them as a JS object.
+ *
+ * @param {URL} url - The URL to parse.
+ * @param {boolean} dontParse - If falsy, some transformations (for parsing the
+ * value as JSON) will be executed.
+ * @param {string} source - If {@code 'search'}, the parameters will parsed out
+ * of {@code url.search}; otherwise, out of {@code url.hash}.
+ * @returns {Object}
+ */
+export function parseURLParams(
+        url,
+        dontParse = false,
+        source = 'hash') {
+    if (typeof url === 'string') {
+        // eslint-disable-next-line no-param-reassign
+        url = new URL(url);
+    }
+    const paramStr = source === 'search' ? url.search : url.hash;
+    const params = {};
+    const paramParts = (paramStr && paramStr.substring(1).split('&')) || [];
+
+    // Detect and ignore hash params for hash routers.
+    if (source === 'hash' && paramParts.length === 1) {
+        const firstParam = paramParts[0];
+
+        if (firstParam.startsWith('/') && firstParam.split('&').length === 1) {
+            return params;
+        }
+    }
+
+    paramParts.forEach(part => {
+        const param = part.split('=');
+        const key = param[0];
+
+        if (!key || key.split('.').some(k => blacklist.includes(k))) {
+            return;
+        }
+
+        let value;
+
+        try {
+            value = param[1];
+
+            if (!dontParse) {
+                const decoded = decodeURIComponent(value).replace(/\\&/, '&');
+
+                value = decoded === 'undefined' ? undefined : Bourne.parse(decoded);
+            }
+        } catch (e) {
+            reportError(
+                e, `Failed to parse URL parameter value: ${String(value)}`);
+
+            return;
+        }
+        params[key] = value;
+    });
+
+    return params;
+}

app/preload/preload.js

@@ -31,7 +31,7 @@ function setupRenderer(api, options = {}) {
 
     // Allow window to be on top if enabled in settings
     if (options.enableAlwaysOnTopWindow) {
-        setupAlwaysOnTopRender(api);
+        setupAlwaysOnTopRender(api, null, { showOnPrejoin: true });
     }
 
     // Disable WiFiStats on mac due to jitsi-meet-electron#585

main.js

@@ -207,10 +207,21 @@ function createJitsiMeetWindow() {
             enableBlinkFeatures: 'WebAssemblyCSP',
             contextIsolation: false,
             nodeIntegration: false,
-            preload: path.resolve(basePath, './build/preload.js')
+            preload: path.resolve(basePath, './build/preload.js'),
+            sandbox: false
         }
     };
 
+    const windowOpenHandler = ({ url, frameName }) => {
+        const target = getPopupTarget(url, frameName);
+
+        if (!target || target === 'browser') {
+            openExternalLink(url);
+        }
+
+        return { action: 'deny' };
+    };
+
     mainWindow = new BrowserWindow(options);
     windowState.manage(mainWindow);
     mainWindow.loadURL(indexURL);
@@ -244,14 +255,6 @@ function createJitsiMeetWindow() {
         new RemoteControlMain(mainWindow); // eslint-disable-line no-new
     }
 
-    mainWindow.webContents.on('new-window', (event, url, frameName) => {
-        const target = getPopupTarget(url, frameName);
-
-        if (!target || target === 'browser') {
-            event.preventDefault();
-            openExternalLink(url);
-        }
-    });
     mainWindow.on('closed', () => {
         mainWindow = null;
     });

package.json

@@ -149,6 +149,7 @@
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-flow": "^7.16.7",
     "@babel/preset-react": "^7.16.7",
+    "@hapi/bourne": "^3.0.0",
     "@jitsi/js-utils": "2.0.0",
     "@svgr/webpack": "^6.2.1",
     "babel-eslint": "10.0.3",