zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test again

Browse Source
This commit is contained in:
zefie
2022-12-02 21:23:32 -05:00
parent ffbc1c6ef6
commit 2d621cc4a1
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zefie_wtvp_minisrv/app.js
View File

@@ -618,13 +618,13 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
} }
async function processURL(socket, request_headers, pc_services = false) { async function processURL(socket, request_headers, pc_services = false) {
var shortURL, headers, data, original_service_name = ""; var shortURL, headers, data, service_name, original_service_name = "";
var enable_multi_query = false; var enable_multi_query = false;
var service_name = verifyServicePort(request_headers.service_name, socket); // get the actual ServiceVault path
request_headers.query = {}; request_headers.query = {};
if (request_headers.request_url) { if (request_headers.request_url) {
if (pc_services) { if (pc_services) {
original_service_name = request_headers.service_name; // store PC Services service name original_service_name = request_headers.service_name; // store PC Services service name
service_name = verifyServicePort(request_headers.service_name, socket); // get the actual ServiceVault path
delete request_headers.service_name; delete request_headers.service_name;
} }
if (request_headers.request_url.indexOf('?') >= 0) { if (request_headers.request_url.indexOf('?') >= 0) {
@@ -779,8 +779,12 @@ minisrv-no-mail-count: true`;
if (original_service_name == service_name) console.log(" * " + ((ssl) ? "SSL " : "") + "PC request on service " + service_name + " for " + request_headers.request_url, 'on', socket.id); if (original_service_name == service_name) console.log(" * " + ((ssl) ? "SSL " : "") + "PC request on service " + service_name + " for " + request_headers.request_url, 'on', socket.id);
else console.log(" * " + ((ssl) ? "SSL " : "") + "PC request on service " + original_service_name + " (Service Vault " + service_name + ") for " + request_headers.request_url, 'on', socket.id); else console.log(" * " + ((ssl) ? "SSL " : "") + "PC request on service " + original_service_name + " (Service Vault " + service_name + ") for " + request_headers.request_url, 'on', socket.id);
} }
var service_name = verifyServicePort(shortURL.split(':/')[0], socket);
if ((shortURL.indexOf(':/') >= 0) && (shortURL.indexOf('://') == -1 || (shortURL.indexOf('://') && minisrv_config.services[service_name].allow_double_slash))) { var allow_double_slash = false;
if (minisrv_config.services[service_name]) {
if (minisrv_config.services[service_name].allow_double_slash) allow_double_slash = true;
}
if ((shortURL.indexOf(':/') >= 0) && (shortURL.indexOf('://') == -1 || (shortURL.indexOf('://') && allow_double_slash))) {
var ssid = socket.ssid; var ssid = socket.ssid;
if (ssid == null) { if (ssid == null) {
// prevent possible injection attacks via malformed SSID and filesystem SessionStore // prevent possible injection attacks via malformed SSID and filesystem SessionStore
@@ -795,8 +799,7 @@ minisrv-no-mail-count: true`;
} else { } else {
console.log(" * " + reqverb + " for " + request_headers.request_url, 'on', socket.id); console.log(" * " + reqverb + " for " + request_headers.request_url, 'on', socket.id);
} }
var service_name = verifyServicePort(shortURL.split(':/')[0], socket);
if (!service_name) { if (!service_name) {
// detect if client is trying to load wtv-star due to client-perceived error // detect if client is trying to load wtv-star due to client-perceived error
if (getSocketDestinationPort(socket) == getPortByService("wtv-star")) { if (getSocketDestinationPort(socket) == getPortByService("wtv-star")) {