diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/get.js b/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/get.js index 8a9c38ff..13f6dff5 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/get.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/get.js @@ -3,7 +3,7 @@ if (request_headers.post_data) { if (socket.ssid) { if (ssid_sessions[socket.ssid]) { - data = ssid_sessions[socket.ssid].getCookieString(unescape(request_headers.query.domain), unescape(request_headers.query.path)); + data = ssid_sessions[socket.ssid].getCookieString(request_headers.query.domain, request_headers.query.path); headers = "200 OK\n"; headers += "Content-Type: text/plain"; } diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js index 54bb7627..642803cf 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js @@ -11,7 +11,7 @@ var default_build_to_send = minisrv_config.services[service_name].bf0app_default var request_path = ""; var bf0app_update = true; -if (request_headers.query.path) request_path = unescape(request_headers.query.path); +if (request_headers.query.path) request_path = request_headers.query.path; else request_path = default_build_to_send; if (ssid_sessions[socket.ssid].get("wtv-client-rom-type") == "bf0app" && ssid_sessions[socket.ssid].get("wtv-client-bootrom-version") == "105") { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js index add6f7b4..33f19f0e 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js @@ -2,7 +2,7 @@ const WTVFlashrom = require("./WTVFlashrom.js"); request_is_async = true; var bf0app_update = false; -var request_path = unescape(request_headers.query.path); +var request_path = request_headers.query.path; var romtype = ssid_sessions[socket.ssid].get("wtv-client-rom-type"); var bootver = ssid_sessions[socket.ssid].get("wtv-client-bootrom-version") diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js index bfd64ffe..25a2368b 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js @@ -9,7 +9,7 @@ if (!request_headers.query.path) { data = errpage[1]; } else { var wtvflashrom = new WTVFlashrom(service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, minisrv_config.services[service_name].debug); - var request_path = unescape(request_headers.query.path); + var request_path = request_headers.query.path; // read flashrom header info into array using WTVFlashrom class wtvflashrom.getFlashromMeta(request_path, function (data) { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js index 928d732f..03c990e9 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js @@ -11,7 +11,7 @@ var default_build_to_send = minisrv_config.services[service_name].bf0app_default var request_path = ""; var bf0app_update = true; -if (request_headers.query.path) request_path = unescape(request_headers.query.path); +if (request_headers.query.path) request_path = request_headers.query.path; else request_path = default_build_to_send; if (ssid_sessions[socket.ssid].get("wtv-client-rom-type") == "bf0app" && ssid_sessions[socket.ssid].get("wtv-client-bootrom-version") == "105") { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js index a7a23a4e..214d201b 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js @@ -4,7 +4,7 @@ wtv-expire-all: wtv-home:/splash wtv-expire-all: wtv-flashrom: Content-type: text/html` -if (request_headers.query.url) headers += "\nwtv-visit: " + unescape(request_headers.query.url); +if (request_headers.query.url) headers += "\nwtv-visit: " + request_headers.query.url; if (ssid_sessions[socket.ssid].get('box-does-psuedo-encryption')) { var cryptstatus = "Psuedo-encrypted"; @@ -56,7 +56,7 @@ if (ssid_sessions[socket.ssid].hasCap("client-can-do-javascript")) { data += `
  • diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-log/log.js b/zefie_wtvp_minisrv/ServiceVault/wtv-log/log.js index 288c81a6..47fa7299 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-log/log.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-log/log.js @@ -15,7 +15,7 @@ Content-length: 0`; var logdata_outstring = ''; Object.keys(request_headers.query).forEach(function (k) { - logdata_outstring += k + "=" + unescape(request_headers.query[k].toString()) + "\r\n"; + logdata_outstring += k + "=" + request_headers.query[k].toString() + "\r\n"; }); logdata_outstring += "\r\n"; var logdata_outstring_hex = Buffer.from(logdata_outstring, 'utf8').toString('hex'); @@ -36,7 +36,7 @@ Content-length: 0`; var logdata_outstring = ''; Object.keys(request_headers.query).forEach(function (k) { - logdata_outstring += k + "=" + unescape(request_headers.query[k].toString()) + "\r\n"; + logdata_outstring += k + "=" + request_headers.query[k].toString() + "\r\n"; }); var logdata_outstring_hex = Buffer.from(logdata_outstring, 'utf8').toString('hex'); if (minisrv_config.services[service_name].write_logs_to_disk) { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateAccountInfo.js b/zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateAccountInfo.js index 40a92ecb..82009301 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateAccountInfo.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateAccountInfo.js @@ -10,9 +10,9 @@ if (!request_headers.query.registering) { if (!request_headers.query.registering) errpage = doErrorPage(400); else if (!request_headers.query.subscriber_name) errpage = doErrorPage(400, "Please enter your name. This can be your real name, or your well-known online alias."); else if (!request_headers.query.subscriber_username) errpage = doErrorPage(400, "Please enter a username."); - else if (unescape(request_headers.query.subscriber_username).length < 5) errpage = doErrorPage(400, "Please choose a username with 5 or more characters."); - else if (unescape(request_headers.query.subscriber_username).length > 16) errpage = doErrorPage(400, "Please choose a username with 16 or less characters."); - else if (!WTVRegister.checkUsernameSanity(unescape(request_headers.query.subscriber_username))) errpage = doErrorPage(400, "The username you have chosen contains invalid characters. Please choose a username with only letters, numbers, _ or -. Also, please be sure your username begins with a letter."); + else if (request_headers.query.subscriber_username.length < 5) errpage = doErrorPage(400, "Please choose a username with 5 or more characters."); + else if (request_headers.query.subscriber_username.length > 16) errpage = doErrorPage(400, "Please choose a username with 16 or less characters."); + else if (!WTVRegister.checkUsernameSanity(request_headers.query.subscriber_username)) errpage = doErrorPage(400, "The username you have chosen contains invalid characters. Please choose a username with only letters, numbers, _ or -. Also, please be sure your username begins with a letter."); else if (!WTVRegister.checkUsernameAvailable(request_headers.query.subscriber_username, ssid_sessions)) errpage = doErrorPage(400, "The username you have selected is already in use. Please select another username."); else if (!request_headers.query.subscriber_contact) errpage = doErrorPage(400, "Please enter your contact information."); else if (request_headers.query.subscriber_contact_method == "") errpage = doErrorPage(400, "Please select the type of contact information you provided."); @@ -64,10 +64,10 @@ Review account info
    - - - - + + + + Here is your account information. If you need to
    correct an item, press Back. @@ -76,24 +76,24 @@ correct an item, press Back.   NAME
    - ${unescape(request_headers.query.subscriber_name)} + ${request_headers.query.subscriber_name}

      CONTACT
    - ${unescape(request_headers.query.subscriber_contact)} + ${request_headers.query.subscriber_contact}
      USERNAME
    -${unescape(request_headers.query.subscriber_name)} +${request_headers.query.subscriber_name}

      CONTACT TYPE
    -${unescape(request_headers.query.subscriber_contact_method)} +${request_headers.query.subscriber_contact_method}

     

      diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateReviewAccountInfo.js b/zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateReviewAccountInfo.js index 8d7e4d9d..32315cbf 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateReviewAccountInfo.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateReviewAccountInfo.js @@ -11,10 +11,10 @@ if (!request_headers.query.registering || headers = errpage[0]; data = errpage[1]; } else { - ssid_sessions[socket.ssid].setSessionData("subscriber_name", unescape(request_headers.query.subscriber_name)); - ssid_sessions[socket.ssid].setSessionData("subscriber_username", unescape(request_headers.query.subscriber_username)); - ssid_sessions[socket.ssid].setSessionData("subscriber_contact", unescape(request_headers.query.subscriber_contact)); - ssid_sessions[socket.ssid].setSessionData("subscriber_contact_method", unescape(request_headers.query.subscriber_contact_method)); + ssid_sessions[socket.ssid].setSessionData("subscriber_name", request_headers.query.subscriber_name); + ssid_sessions[socket.ssid].setSessionData("subscriber_username", request_headers.query.subscriber_username); + ssid_sessions[socket.ssid].setSessionData("subscriber_contact", request_headers.query.subscriber_contact); + ssid_sessions[socket.ssid].setSessionData("subscriber_contact_method", request_headers.query.subscriber_contact_method); ssid_sessions[socket.ssid].setSessionData("subscriber_userid", '1' + Math.floor(Math.random() * 1000000000000000000)); ssid_sessions[socket.ssid].setSessionData("registered", true); if (!ssid_sessions[socket.ssid].storeSessionData()) { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/access.js b/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/access.js index 3281696d..28423f37 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/access.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/access.js @@ -1,6 +1,6 @@ // Allow URL access outside our trusted minisrv -if (request_headers.query.url) var url = unescape(request_headers.query.url); +if (request_headers.query.url) var url = request_headers.query.url; else var url = "client:showalert?message=Please%20provide%20a%20%3Furl%3D%20with%20the%20url%20you%20would%20like%20to%20access.&buttonlabel1=Okay&buttonacction1=client:donothing" headers = `200 OK diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/blastbacklist.js b/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/blastbacklist.js index 8fff8d16..6e352b5c 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/blastbacklist.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/blastbacklist.js @@ -6,7 +6,7 @@ Content-type: text/html` var visit_url = null; if (request_headers.Referer) visit_url = request_headers.Referer; -else if (request_headers.query.return_to) visit_url = unescape(request_headers.query.return_to); +else if (request_headers.query.return_to) visit_url = request_headers.query.return_to; else visit_url = "client:goback"; data = ` diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js index 0bc18bff..be15b904 100644 --- a/zefie_wtvp_minisrv/app.js +++ b/zefie_wtvp_minisrv/app.js @@ -318,7 +318,7 @@ async function processURL(socket, request_headers) { for (let i = 0; i < qraw.length; i++) { var k = qraw[i].split("=")[0]; if (k) { - request_headers.query[k] = qraw[i].split("=")[1]; + request_headers.query[k] = unescape(qraw[i].split("=")[1].replace('+',"%20")); } } } @@ -335,7 +335,7 @@ async function processURL(socket, request_headers) { for (let i = 0; i < qraw.length; i++) { var k = qraw[i].split("=")[0]; if (k) { - request_headers.query[k] = qraw[i].split("=")[1]; + request_headers.query[k] = unescape(qraw[i].split("=")[1].replace('+', "%20")); } } } @@ -343,7 +343,7 @@ async function processURL(socket, request_headers) { var qraw = request_headers.post_data.toString(CryptoJS.enc.Utf8); var k = qraw[i].split("=")[0]; if (k) { - request_headers.query[k] = qraw[i].split("=")[1]; + request_headers.query[k] = unescape(qraw[i].split("=")[1].replace('+', "%20")); } } }