From ea3235957b8fbed615f31edd26c2089a42c3354e Mon Sep 17 00:00:00 2001 From: zefie Date: Mon, 19 Jul 2021 00:04:43 -0400 Subject: [PATCH] fix: could not read service folders/files that had urlescape'd characters in them --- .gitignore | 1 + zefie_wtvp_minisrv/app.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2fda19c5..13961914 100644 --- a/.gitignore +++ b/.gitignore @@ -363,3 +363,4 @@ MigrationBackup/ FodyWeavers.xsd /hacktv_updsrv/ServiceLogPost/1626307222_warning_812bf30600b002bb /hacktv_updsrv/ServiceVault/wtv-music/midi +/zefie_wtvp_minisrv/ServiceVault/wtv-home/6969.html diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js index 3ab1a551..04c7f96c 100644 --- a/zefie_wtvp_minisrv/app.js +++ b/zefie_wtvp_minisrv/app.js @@ -238,7 +238,7 @@ async function processURL(socket, request_headers) { } } } else { - shortURL = request_headers.request_url; + shortURL = unescape(request_headers.request_url); } if (shortURL.indexOf(':/') >= 0 && shortURL.indexOf('://') < 0) { @@ -277,7 +277,7 @@ async function processURL(socket, request_headers) { } async function doHTTPProxy(socket, request_headers) { - if (zshowheaders) console.log("HTTP Proxy: Client Request Headers on socket ID", socket.id, (await processSSID(request_headers)); + if (zshowheaders) console.log("HTTP Proxy: Client Request Headers on socket ID", socket.id, (await processSSID(request_headers))); var request_type = request_headers.request.indexOf('https://') ? 'http' : 'https' switch (request_type) { case "https": @@ -459,7 +459,7 @@ async function sendToClient(socket, headers_obj, data) { // header object to string - if (zshowheaders) console.log(" * Outgoing headers on socket ID", socket.id, (await processSSID(headers_obj)); + if (zshowheaders) console.log(" * Outgoing headers on socket ID", socket.id, (await processSSID(headers_obj))); Object.keys(headers_obj).forEach(function (k) { if (k == "http_response") { headers += headers_obj[k] + "\r\n";