RentAKloud/noVNC
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert broken Add support for URL fragment parameters

Browse Source 
This is a revert of the code changes in commit
f796b05e42cfac7044cca9603e59f258605228f3 as it served no functional
purpose.

Fragments were already respected for setting parameters, via a different
function. Thus it is unclear what that commit tried to fix. It also
complicated things by mixing the document location with the window
location.

The comment changes are useful, though, so those are kept.
This commit is contained in:
Pierre Ossman 2023-04-06 17:11:47 +02:00
parent 747603c0d5
commit 2a21bee245
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/webutil.js
View File

@ -32,7 +32,7 @@ export function initLogging(level) {
export function getQueryVar(name, defVal) { export function getQueryVar(name, defVal) {
"use strict"; "use strict";
const re = new RegExp('.*[?&]' + name + '=([^&#]*)'), const re = new RegExp('.*[?&]' + name + '=([^&#]*)'),
match = ''.concat(document.location.href, window.location.hash).match(re); match = document.location.href.match(re);
if (typeof defVal === 'undefined') { defVal = null; } if (typeof defVal === 'undefined') { defVal = null; }
if (match) { if (match) {

11
vnc_lite.html
View File

@ -107,20 +107,13 @@
// query string. If the variable isn't defined in the URL // query string. If the variable isn't defined in the URL
// it returns the default value instead. // it returns the default value instead.
function readQueryVariable(name, defaultValue) { function readQueryVariable(name, defaultValue) {
// A URL with a query parameter can look like this (But will most probably get logged on the http server): // A URL with a query parameter can look like this:
// https://www.example.com?myqueryparam=myvalue // https://www.example.com?myqueryparam=myvalue
// //
// For privacy (Using a hastag #, the parameters will not be sent to the server)
// the url can be requested in the following way:
// https://www.example.com#myqueryparam=myvalue&password=secreatvalue
//
// Even Mixing public and non public parameters will work:
// https://www.example.com?nonsecretparam=example.com#password=secreatvalue
//
// Note that we use location.href instead of location.search // Note that we use location.href instead of location.search
// because Firefox < 53 has a bug w.r.t location.search // because Firefox < 53 has a bug w.r.t location.search
const re = new RegExp('.*[?&]' + name + '=([^&#]*)'), const re = new RegExp('.*[?&]' + name + '=([^&#]*)'),
match = ''.concat(document.location.href, window.location.hash).match(re); match = document.location.href.match(re);
if (match) { if (match) {
// We have to decode the URL since want the cleartext value // We have to decode the URL since want the cleartext value