Merge branch 'master' into HEAD
This commit is contained in:
@@ -644,11 +644,12 @@ 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, service_name, original_service_name = "";
|
var shortURL, headers, data, service_name, original_service_name = "";
|
||||||
var enable_multi_query = false;
|
var allow_double_slash, enable_multi_query, use_external_proxy = false;
|
||||||
request_headers.query = {};
|
request_headers.query = {};
|
||||||
if (request_headers.request_url) {
|
if (request_headers.request_url) {
|
||||||
|
service_name = request_headers.service_name;
|
||||||
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 service name
|
||||||
service_name = verifyServicePort(request_headers.service_name, socket); // get the actual ServiceVault path
|
service_name = verifyServicePort(request_headers.service_name, socket); // get the actual ServiceVault path
|
||||||
delete request_headers.service_name;
|
delete request_headers.service_name;
|
||||||
}
|
}
|
||||||
@@ -657,7 +658,6 @@ async function processURL(socket, request_headers, pc_services = false) {
|
|||||||
|
|
||||||
if (request_headers.request_url.indexOf('?') >= 0) {
|
if (request_headers.request_url.indexOf('?') >= 0) {
|
||||||
shortURL = request_headers.request_url.split('?')[0];
|
shortURL = request_headers.request_url.split('?')[0];
|
||||||
if (minisrv_config.services[service_name]) enable_multi_query = minisrv_config.services[service_name].enable_multi_query || false;
|
|
||||||
var qraw = request_headers.request_url.split('?')[1];
|
var qraw = request_headers.request_url.split('?')[1];
|
||||||
if (qraw.length > 0) {
|
if (qraw.length > 0) {
|
||||||
qraw = qraw.split("&");
|
qraw = qraw.split("&");
|
||||||
@@ -779,7 +779,7 @@ async function processURL(socket, request_headers, pc_services = false) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ssid_sessions[socket.ssid].get("wtv-my-disk-sucks-sucks-sucks")) {
|
if (ssid_sessions[socket.ssid].get("wtv-my-disk-sucks-sucks-sucks") && !ssid_sessions[socket.ssid].get("bad_disk_shown")) {
|
||||||
if (!ssid_sessions[socket.ssid].baddisk) {
|
if (!ssid_sessions[socket.ssid].baddisk) {
|
||||||
// psuedo lockdown, will unlock on the disk warning page, but prevents minisrv access until they read the error
|
// psuedo lockdown, will unlock on the disk warning page, but prevents minisrv access until they read the error
|
||||||
ssid_sessions[socket.ssid].lockdown = true;
|
ssid_sessions[socket.ssid].lockdown = true;
|
||||||
@@ -806,10 +806,13 @@ minisrv-no-mail-count: true`;
|
|||||||
} else {
|
} else {
|
||||||
var service_name = verifyServicePort(shortURL.split(':/')[0], socket);
|
var service_name = verifyServicePort(shortURL.split(':/')[0], socket);
|
||||||
}
|
}
|
||||||
var allow_double_slash = false;
|
|
||||||
if (minisrv_config.services[service_name]) {
|
if (minisrv_config.services[service_name]) {
|
||||||
if (minisrv_config.services[service_name].allow_double_slash) allow_double_slash = true;
|
allow_double_slash = minisrv_config.services[service_name].allow_double_slash || false;
|
||||||
|
enable_multi_query = minisrv_config.services[service_name].enable_multi_query || false;
|
||||||
|
use_external_proxy = minisrv_config.services[service_name].use_external_proxy || false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ((shortURL.indexOf(':/') >= 0) && (shortURL.indexOf('://') == -1 || (shortURL.indexOf('://') && allow_double_slash))) {
|
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) {
|
||||||
@@ -850,7 +853,7 @@ minisrv-no-mail-count: true`;
|
|||||||
if (minisrv_config.config.debug_flags.show_headers) console.log(" * Incoming headers on socket ID", socket.id, (await wtvshared.decodePostData(wtvshared.filterRequestLog(wtvshared.filterSSID(request_headers)))));
|
if (minisrv_config.config.debug_flags.show_headers) console.log(" * Incoming headers on socket ID", socket.id, (await wtvshared.decodePostData(wtvshared.filterRequestLog(wtvshared.filterSSID(request_headers)))));
|
||||||
socket_sessions[socket.id].request_headers = request_headers;
|
socket_sessions[socket.id].request_headers = request_headers;
|
||||||
processPath(socket, urlToPath, request_headers, service_name, shared_romcache, pc_services);
|
processPath(socket, urlToPath, request_headers, service_name, shared_romcache, pc_services);
|
||||||
} else if ((shortURL.indexOf('http://') >= 0 || shortURL.indexOf('https://') >= 0) && !pc_services) {
|
} else if (shortURL.indexOf('http://') >= 0 || shortURL.indexOf('https://') >= 0 || (use_external_proxy == true && shortURL.indexOf(service_name + "://") >= 0) && !pc_services) {
|
||||||
doHTTPProxy(socket, request_headers);
|
doHTTPProxy(socket, request_headers);
|
||||||
} else if (shortURL.indexOf('file://') >= 0) {
|
} else if (shortURL.indexOf('file://') >= 0) {
|
||||||
shortURL = shortURL.replace("file://",'').replace("romcache", "ROMCache");
|
shortURL = shortURL.replace("file://",'').replace("romcache", "ROMCache");
|
||||||
@@ -869,6 +872,7 @@ minisrv-no-mail-count: true`;
|
|||||||
debug('request_headers', request_headers);
|
debug('request_headers', request_headers);
|
||||||
if (request_headers.request.indexOf("HTTP/1.0") > 0) {
|
if (request_headers.request.indexOf("HTTP/1.0") > 0) {
|
||||||
// webtv in HTTP/1.0 mode, try to kick it back to WTVP
|
// webtv in HTTP/1.0 mode, try to kick it back to WTVP
|
||||||
|
if (minisrv_config.config.debug_flags.show_headers) console.log(" * Incoming invalid headers on socket ID", socket.id, (await wtvshared.decodePostData(wtvshared.filterRequestLog(wtvshared.filterSSID(request_headers)))));
|
||||||
var errpage = wtvshared.doErrorPage(500, null, null, false, true);
|
var errpage = wtvshared.doErrorPage(500, null, null, false, true);
|
||||||
headers = errpage[0];
|
headers = errpage[0];
|
||||||
data = ''
|
data = ''
|
||||||
@@ -876,6 +880,7 @@ minisrv-no-mail-count: true`;
|
|||||||
sendToClient(socket, headers, data);
|
sendToClient(socket, headers, data);
|
||||||
} else {
|
} else {
|
||||||
// error reading headers (no request_url provided)
|
// error reading headers (no request_url provided)
|
||||||
|
if (minisrv_config.config.debug_flags.show_headers) console.log(" * Incoming invalid headers on socket ID", socket.id, (await wtvshared.decodePostData(wtvshared.filterRequestLog(wtvshared.filterSSID(request_headers)))));
|
||||||
var errpage = wtvshared.doErrorPage(400, null, null, false, true);
|
var errpage = wtvshared.doErrorPage(400, null, null, false, true);
|
||||||
headers = errpage[0];
|
headers = errpage[0];
|
||||||
data = ''
|
data = ''
|
||||||
@@ -886,14 +891,96 @@ minisrv-no-mail-count: true`;
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Array.prototype.replace = function(sub, newSub) {
|
||||||
|
splits = this.split(sub, 2);
|
||||||
|
return Array.concat(splits[0], newSub, splits[1])
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleProxy(socket, request_type, request_headers, res, data) {
|
||||||
|
console.log(` * Proxy Request ${request_type.toUpperCase()} ${res.statusCode} for ${request_headers.request}`)
|
||||||
|
// an http response error is not a request error, and will come here under the 'end' event rather than an 'error' event.
|
||||||
|
switch (res.statusCode) {
|
||||||
|
case 404:
|
||||||
|
res.headers.Response = res.statusCode + " The publisher can’t find the page requested.";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 401:
|
||||||
|
case 403:
|
||||||
|
res.headers.Response = res.statusCode + " The publisher of that page has not authorized you to use it.";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 500:
|
||||||
|
res.headers.Response = res.statusCode + " The publisher of that page can’t be reached.";
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
res.headers.Response = res.statusCode + " " + res.statusMessage;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (res.headers['Content-yype']) {
|
||||||
|
res.headers['Content-Type'] = res.headers['Content-Type'];
|
||||||
|
delete (res.headers['Content-type'])
|
||||||
|
}
|
||||||
|
|
||||||
|
if (res.headers['content-type']) {
|
||||||
|
res.headers['Content-Type'] = res.headers['content-type'];
|
||||||
|
delete (res.headers['content-type'])
|
||||||
|
}
|
||||||
|
|
||||||
|
if (res.headers['Content-Type'].substr(0, 4) == "text" && request_type != "http" && request_type != "https") {
|
||||||
|
var data_t = data.toString().replaceAll("http://", request_type + "://").replaceAll("https://", request_type + "://");
|
||||||
|
data = [Buffer.from(data_t)]
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// header pass-through whitelist, case insensitive comparsion to server, however, you should
|
||||||
|
// specify the header case as you intend for the client
|
||||||
|
var headers = stripHeaders(res.headers, [
|
||||||
|
'Connection',
|
||||||
|
'Server',
|
||||||
|
'Date',
|
||||||
|
'Content-Type',
|
||||||
|
'Cookie',
|
||||||
|
'Location',
|
||||||
|
'Accept-Ranges',
|
||||||
|
'Last-Modified'
|
||||||
|
]);
|
||||||
|
headers["wtv-http-proxy"] = true;
|
||||||
|
headers["wtv-trusted"] = false;
|
||||||
|
|
||||||
|
// if Connection: close header, set our internal variable to close the socket
|
||||||
|
if (headers['Connection']) {
|
||||||
|
if (headers['Connection'].toLowerCase().indexOf('close') !== -1) {
|
||||||
|
headers["wtv-connection-close"] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// if a wtv-explaination is defined for an error code (except 200), define the header here to
|
||||||
|
// show the 'Explain' button on the client error ShowAlert
|
||||||
|
if (minisrv_config.services['http']['wtv-explanation']) {
|
||||||
|
if (minisrv_config.services['http']['wtv-explanation'][res.statusCode]) {
|
||||||
|
headers['wtv-explanation-url'] = minisrv_config.services['http']['wtv-explanation'][res.statusCode];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var data_hex = Buffer.concat(data).toString('hex');
|
||||||
|
if (data_hex.substring(0, 8) == "0d0a0d0a") data_hex = data_hex.substring(8);
|
||||||
|
if (data_hex.substring(0, 4) == "0a0a") data_hex = data_hex.substring(4);
|
||||||
|
sendToClient(socket, headers, Buffer.from(data_hex, 'hex'));
|
||||||
|
}
|
||||||
|
|
||||||
async function doHTTPProxy(socket, request_headers) {
|
async function doHTTPProxy(socket, request_headers) {
|
||||||
var request_type = (request_headers.request_url.substring(0, 5) == "https") ? "https" : "http";
|
// detect protocol name
|
||||||
|
var idx = request_headers.request_url.indexOf('/') - 1;
|
||||||
|
|
||||||
|
var request_type = request_headers.request_url.substring(0, idx);
|
||||||
if (minisrv_config.config.debug_flags.show_headers) console.log(request_type.toUpperCase() + " Proxy: Client Request Headers on socket ID", socket.id, (await wtvshared.decodePostData(wtvshared.filterRequestLog(wtvshared.filterSSID(request_headers)))));
|
if (minisrv_config.config.debug_flags.show_headers) console.log(request_type.toUpperCase() + " Proxy: Client Request Headers on socket ID", socket.id, (await wtvshared.decodePostData(wtvshared.filterRequestLog(wtvshared.filterSSID(request_headers)))));
|
||||||
switch (request_type) {
|
switch (request_type) {
|
||||||
case "https":
|
case "https":
|
||||||
var proxy_agent = https;
|
var proxy_agent = https;
|
||||||
break;
|
break;
|
||||||
case "http":
|
case "http":
|
||||||
|
case "proto":
|
||||||
var proxy_agent = http;
|
var proxy_agent = http;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -911,7 +998,6 @@ async function doHTTPProxy(socket, request_headers) {
|
|||||||
}
|
}
|
||||||
for (var i = 0; i < 3; i++) request_url_split.shift();
|
for (var i = 0; i < 3; i++) request_url_split.shift();
|
||||||
request_data.path = "/" + request_url_split.join('/');
|
request_data.path = "/" + request_url_split.join('/');
|
||||||
|
|
||||||
if (request_data.method && request_data.host && request_data.path) {
|
if (request_data.method && request_data.host && request_data.path) {
|
||||||
|
|
||||||
var options = {
|
var options = {
|
||||||
@@ -949,91 +1035,61 @@ async function doHTTPProxy(socket, request_headers) {
|
|||||||
options.port = minisrv_config.services[request_type].external_proxy_port;
|
options.port = minisrv_config.services[request_type].external_proxy_port;
|
||||||
options.path = request_headers.request.split(' ')[1];
|
options.path = request_headers.request.split(' ')[1];
|
||||||
options.headers.Host = request_data.host + ":" + request_data.port;
|
options.headers.Host = request_data.host + ":" + request_data.port;
|
||||||
|
options.headers.Connection = 'close';
|
||||||
|
options.insecureHTTPParser = true;
|
||||||
|
if (minisrv_config.services[request_type].replace_protocol) {
|
||||||
|
options.path = options.path.replace(request_type, minisrv_config.services[request_type].replace_protocol);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (minisrv_config.services[request_type].external_proxy_is_http1) {
|
||||||
|
options.insecureHTTPParser = true;
|
||||||
|
options.headers.Connection = 'close'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const req = proxy_agent.request(options, function (res) {
|
const req = proxy_agent.request(options, function (res) {
|
||||||
var data = [];
|
var data = [];
|
||||||
|
var data_handled = false;
|
||||||
|
|
||||||
res.on('data', d => {
|
res.on('data', d => {
|
||||||
data.push(d);
|
data.push(d);
|
||||||
})
|
})
|
||||||
|
|
||||||
res.on('error', function (err) {
|
res.on('error', function (err) {
|
||||||
|
// hack for Protoweb ECONNRESET
|
||||||
|
if (minisrv_config.services[request_type].external_proxy_is_http1 && data.length > 0 && !data_handled) {
|
||||||
|
handleProxy(socket, request_type, request_headers, res, data);
|
||||||
|
data_handled = true
|
||||||
|
} else {
|
||||||
console.log(" * Unhandled Proxy Request Error:", err);
|
console.log(" * Unhandled Proxy Request Error:", err);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
res.on('end', function () {
|
res.on('end', function () {
|
||||||
var data_hex = Buffer.concat(data).toString('hex');
|
// Hack for when old http proxies behave correctly
|
||||||
|
if (!minisrv_config.services[request_type].external_proxy_is_http1 || data.length > 0 && !data_handled) {
|
||||||
console.log(` * Proxy Request ${request_type.toUpperCase()} ${res.statusCode} for ${request_headers.request}`)
|
handleProxy(socket, request_type, request_headers, res, data);
|
||||||
// an http response error is not a request error, and will come here under the 'end' event rather than an 'error' event.
|
data_handled = true;
|
||||||
switch (res.statusCode) {
|
|
||||||
case 404:
|
|
||||||
res.headers.Response = res.statusCode + " The publisher can’t find the page requested.";
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 401:
|
|
||||||
case 403:
|
|
||||||
res.headers.Response = res.statusCode + " The publisher of that page has not authorized you to use it.";
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 500:
|
|
||||||
res.headers.Response = res.statusCode + " The publisher of that page can’t be reached.";
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
res.headers.Response = res.statusCode + " " + res.statusMessage;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// header pass-through whitelist, case insensitive comparsion to server, however, you should
|
|
||||||
// specify the header case as you intend for the client
|
|
||||||
var headers = stripHeaders(res.headers, [
|
|
||||||
'Connection',
|
|
||||||
'Server',
|
|
||||||
'Date',
|
|
||||||
'Content-Type',
|
|
||||||
'Cookie',
|
|
||||||
'Location',
|
|
||||||
'Accept-Ranges',
|
|
||||||
'Last-Modified'
|
|
||||||
]);
|
|
||||||
headers["wtv-http-proxy"] = true;
|
|
||||||
headers["wtv-trusted"] = false;
|
|
||||||
|
|
||||||
// if Connection: close header, set our internal variable to close the socket
|
|
||||||
if (headers['Connection']) {
|
|
||||||
if (headers['Connection'].toLowerCase().indexOf('close') !== -1) {
|
|
||||||
headers["wtv-connection-close"] = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// if a wtv-explaination is defined for an error code (except 200), define the header here to
|
|
||||||
// show the 'Explain' button on the client error ShowAlert
|
|
||||||
if (minisrv_config.services['http']['wtv-explanation']) {
|
|
||||||
if (minisrv_config.services['http']['wtv-explanation'][res.statusCode]) {
|
|
||||||
headers['wtv-explanation-url'] = minisrv_config.services['http']['wtv-explanation'][res.statusCode];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (data_hex.substring(0, 8) == "0d0a0d0a") data_hex = data_hex.substring(8);
|
|
||||||
if (data_hex.substring(0, 4) == "0a0a") data_hex = data_hex.substring(4);
|
|
||||||
sendToClient(socket, headers, Buffer.from(data_hex, 'hex'));
|
|
||||||
});
|
});
|
||||||
}).on('error', function (err) {
|
}).on('error', function (err) {
|
||||||
// severe errors, such as unable to connect.
|
// severe errors, such as unable to connect.
|
||||||
var errpage, headers, data = null;
|
var errpage, headers, data = null;
|
||||||
if (err.code == "ENOTFOUND" || err.message.indexOf("HostUnreachable") > 0) {
|
if (err.code == "ENOTFOUND" || err.message.indexOf("HostUnreachable") > 0) {
|
||||||
errpage = wtvshared.doErrorPage(400, `The publisher <b>${request_data.host}</b> is unknown.`);
|
errpage = wtvshared.doErrorPage(400, `The publisher <b>${request_data.host}</b> is unknown.`);
|
||||||
}
|
} else {
|
||||||
else {
|
if (minisrv_config.services[request_type].external_proxy_is_http1 && !data_handled) {
|
||||||
|
handleProxy(socket, request_type, request_headers, res, data);
|
||||||
|
data_handled = true;
|
||||||
|
} else {
|
||||||
console.log(" * Unhandled Proxy Request Error:", err);
|
console.log(" * Unhandled Proxy Request Error:", err);
|
||||||
errpage = wtvshared.doErrorPage(400);
|
errpage = wtvshared.doErrorPage(400);
|
||||||
}
|
|
||||||
headers = errpage[0];
|
headers = errpage[0];
|
||||||
data = errpage[1];
|
data = errpage[1];
|
||||||
sendToClient(socket, headers, data);
|
sendToClient(socket, headers, data);
|
||||||
});;
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
if (request_headers.post_data) {
|
if (request_headers.post_data) {
|
||||||
req.write(Buffer.from(request_headers.post_data.toString(CryptoJS.enc.Hex), 'hex'), function () {
|
req.write(Buffer.from(request_headers.post_data.toString(CryptoJS.enc.Hex), 'hex'), function () {
|
||||||
req.end();
|
req.end();
|
||||||
@@ -1473,12 +1529,13 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq
|
|||||||
if (headers["wtv-client-serial-number"] != null && socket.ssid == null) {
|
if (headers["wtv-client-serial-number"] != null && socket.ssid == null) {
|
||||||
socket.ssid = wtvshared.makeSafeSSID(headers["wtv-client-serial-number"]);
|
socket.ssid = wtvshared.makeSafeSSID(headers["wtv-client-serial-number"]);
|
||||||
if (minisrv_config.config.require_valid_ssid) {
|
if (minisrv_config.config.require_valid_ssid) {
|
||||||
if (!wtvshared.checkSSID(headers["wtv-client-serial-number"])) {
|
if (!wtvshared.checkSSID(socket.ssid)) {
|
||||||
if (socket.ssid.substring(0, 5) != "1SEGA" && socket.ssid.substring(0, 8) != "MSTVSIMU") {
|
if (socket.ssid.substring(0, 5) != "1SEGA" && socket.ssid.substring(0, 8) != "MSTVSIMU") {
|
||||||
// reject invalid SSIDs, but let Dreamcast and MSTV Sim through for now until we figure out their checksumming method.
|
// reject invalid SSIDs, but let Dreamcast and MSTV Sim through for now until we figure out their checksumming method.
|
||||||
var errpage = wtvshared.doErrorPage(400, "minisrv ran into a technical problem. Reason: Your SSID is not valid.");
|
var errpage = wtvshared.doErrorPage(400, "minisrv ran into a technical problem. Reason: Your SSID is not valid.");
|
||||||
headers = errpage[0];
|
headers = errpage[0];
|
||||||
data = errpage[1];
|
data = errpage[1];
|
||||||
|
socket.close_me = true;
|
||||||
sendToClient(socket, headers, data);
|
sendToClient(socket, headers, data);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1573,7 +1630,7 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq
|
|||||||
}
|
}
|
||||||
if (socket_sessions[socket.id].secure != true) {
|
if (socket_sessions[socket.id].secure != true) {
|
||||||
// first time so reroll sessions
|
// first time so reroll sessions
|
||||||
if (minisrv_config.config.debug_flags.debug) console.log(" # [ SECURE ON BLOCK (" + socket.id + ") ]");
|
//if (minisrv_config.config.debug_flags.debug) console.log(" # [ SECURE ON BLOCK (" + socket.id + ") ]");
|
||||||
socket_sessions[socket.id].secure = true;
|
socket_sessions[socket.id].secure = true;
|
||||||
}
|
}
|
||||||
if (!headers.request_url) {
|
if (!headers.request_url) {
|
||||||
@@ -1823,17 +1880,27 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
cleanupSocket(socket);
|
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
cleanupSocket(socket);
|
var errpage = wtvshared.doErrorPage(400);
|
||||||
|
headers = errpage[0];
|
||||||
|
data = errpage[1];
|
||||||
|
socket.close_me = true;
|
||||||
|
sendToClient(socket, headers, data);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
cleanupSocket(socket);
|
var errpage = wtvshared.doErrorPage(400);
|
||||||
|
headers = errpage[0];
|
||||||
|
data = errpage[1];
|
||||||
|
socket.close_me = true;
|
||||||
|
sendToClient(socket, headers, data);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
cleanupSocket(socket);
|
var errpage = wtvshared.doErrorPage(400);
|
||||||
|
headers = errpage[0];
|
||||||
|
data = errpage[1];
|
||||||
|
socket.close_me = true;
|
||||||
|
sendToClient(socket, headers, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -69,7 +69,7 @@ minisrv-no-mail-count: true
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (session_data.baddisk === true) {
|
if (session_data.baddisk === true && !ssid_sessions[socket.ssid].get("bad_disk_shown")) {
|
||||||
gourl = "wtv-head-waiter:/bad-disk?"
|
gourl = "wtv-head-waiter:/bad-disk?"
|
||||||
}
|
}
|
||||||
else if (session_data.getNumberOfUserAccounts() > 1 && user_id === 0 && (!session_data.isUserLoggedIn() || request_headers.query.initial_login || request_headers.query.relogin) ) {
|
else if (session_data.getNumberOfUserAccounts() > 1 && user_id === 0 && (!session_data.isUserLoggedIn() || request_headers.query.initial_login || request_headers.query.relogin) ) {
|
||||||
|
|||||||
@@ -2,8 +2,7 @@ var minisrv_service_file = true;
|
|||||||
|
|
||||||
// remove restrictions once this page is shown, since the user will be 'trapped' anyway
|
// remove restrictions once this page is shown, since the user will be 'trapped' anyway
|
||||||
session_data.disableLockdown();
|
session_data.disableLockdown();
|
||||||
session_data.delete("wtv-my-disk-sucks-sucks-sucks");
|
ssid_sessions[socket.ssid].set("bad_disk_shown", true)
|
||||||
session_data.baddisk = false;
|
|
||||||
|
|
||||||
headers = `200 OK
|
headers = `200 OK
|
||||||
Content-type: text/html`;
|
Content-type: text/html`;
|
||||||
@@ -77,15 +76,17 @@ switch (wtvshared.getManufacturer(session_data.ssid, true)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
data += `
|
data += `
|
||||||
<tr><td colspan=2>
|
<tr>
|
||||||
<td colspan=99 abswidth=436 absheight=2 bgcolor=2B2B2B> <img src="wtv-flashrom:/${service_name}:/ROMCache/Spacer.gif" width=1 height=1> <tr><td absheight=1>
|
<td colspan=99 abswidth=436 absheight=2 bgcolor=2B2B2B> <img src="${service_name}:/ROMCache/Spacer.gif" width=1 height=1> <tr><td absheight=1>
|
||||||
<tr><td colspan=2>
|
<tr>
|
||||||
<td colspan=99 abswidth=436 absheight=2 bgcolor=0D0D0D> <img src="wtv-flashrom:/${service_name}:/ROMCache/Spacer.gif" width=1 height=1> <tr><td height=7>
|
<td colspan=99 abswidth=436 absheight=2 bgcolor=0D0D0D> <img src="${service_name}:/ROMCache/Spacer.gif" width=1 height=1> <tr><td height=7>
|
||||||
<tr>
|
<tr>
|
||||||
<td width=104 valign=middle align=center> <td width=20 valign=middle align=center> <td colspan=9 width=416 valign=top align=left> <table cellspacing=0 cellpadding=0>
|
<td width=104 valign=middle align=center> <td width=20 valign=middle align=center> <td colspan=9 width=416 valign=top align=left> <table cellspacing=0 cellpadding=0>
|
||||||
<tr>
|
<tr>
|
||||||
<td width=306 valign=top align=right><td width=20> <td width=112 valign=top align=right>
|
<td width=208 valign=top align=right><td width=20> <td width=250 valign=top align=right>
|
||||||
<form action="client:poweroff"> <FONT COLOR="#E7CE4A" SIZE=-1><input type="Submit" value="Power Off" BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" usestyle selected></font>
|
<form action="wtv-head-waiter:/ValidateLogin?initial_login=true">
|
||||||
|
<FONT COLOR="#E7CE4A" SIZE=-1><input type="Submit" value="Continue" BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" usestyle selected>
|
||||||
|
<input type="Submit" value="Power Off" BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" usestyle onclick="location.href='client:poweroff'"></font>
|
||||||
<input type="Hidden" name="version" value=""> </form>
|
<input type="Hidden" name="version" value=""> </form>
|
||||||
</table>
|
</table>
|
||||||
</BODY>
|
</BODY>
|
||||||
|
|||||||
@@ -225,6 +225,7 @@ data += `
|
|||||||
<td absheight="6">
|
<td absheight="6">
|
||||||
<tr>
|
<tr>
|
||||||
<td valign="top" colspan=4 absheight=80 >
|
<td valign="top" colspan=4 absheight=80 >
|
||||||
|
• Added Protoweb Support (<a href="proto://www.webtv.net/">Try it!</a>)<br>
|
||||||
• Added a <a href="wtv-tricks:/charmap">WebTV Character Map</a><br>
|
• Added a <a href="wtv-tricks:/charmap">WebTV Character Map</a><br>
|
||||||
• Redesigned homepage based on MattMan69's HackTV<br>
|
• Redesigned homepage based on MattMan69's HackTV<br>
|
||||||
• Added a new minisrv logo<br>
|
• Added a new minisrv logo<br>
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
var minisrv_service_file = true;
|
var minisrv_service_file = true;
|
||||||
|
session_data.mailstore.setMailIntroSeen(true)
|
||||||
headers = `200 OK
|
headers = `200 OK
|
||||||
Content-type: text/html`;
|
Content-type: text/html`;
|
||||||
|
|
||||||
data = `
|
data = `
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
|
<display skipback>
|
||||||
<title>
|
<title>
|
||||||
Welcome to Mail
|
Welcome to Mail
|
||||||
</title>
|
</title>
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ async function WebTVListGroup(group) {
|
|||||||
page_end = response.group.high;
|
page_end = response.group.high;
|
||||||
limit_per_page = (page_end - (limit_per_page / (page + 1))) + limit_per_page;
|
limit_per_page = (page_end - (limit_per_page / (page + 1))) + limit_per_page;
|
||||||
}
|
}
|
||||||
|
|
||||||
wtvnews.listGroup(group, page, limit_per_page).then((response) => {
|
wtvnews.listGroup(group, page, limit_per_page).then((response) => {
|
||||||
if (response.code == 211) {
|
if (response.code == 211) {
|
||||||
NGCount = response.group.number;
|
NGCount = response.group.number;
|
||||||
@@ -143,7 +142,7 @@ cellspacing=0 cellpadding=0>
|
|||||||
<tr>
|
<tr>
|
||||||
<td abswidth=6 >
|
<td abswidth=6 >
|
||||||
<td abswidth=93 absheight=26 >
|
<td abswidth=93 absheight=26 >
|
||||||
<table href="wtv-guide:/help?topic=Discuss&subtopic=Index&appName=Discuss"
|
<table href="wtv-guide:/help?topic=Glossary&subtopic=D&page=discuss"
|
||||||
cellspacing=0 cellpadding=0>
|
cellspacing=0 cellpadding=0>
|
||||||
<tr>
|
<tr>
|
||||||
<td abswidth=5>
|
<td abswidth=5>
|
||||||
|
|||||||
@@ -142,9 +142,9 @@ class WTVFlashrom {
|
|||||||
if (!self.fs.existsSync(flashrom_file_path)) flashrom_file_path = null;
|
if (!self.fs.existsSync(flashrom_file_path)) flashrom_file_path = null;
|
||||||
});
|
});
|
||||||
if (this.use_zefie_server && !flashrom_file_path) {
|
if (this.use_zefie_server && !flashrom_file_path) {
|
||||||
// get flashrom files from roms.minisrv.dev
|
// get flashrom files from flashrom.webtv.onl
|
||||||
var options = {
|
var options = {
|
||||||
host: "roms.minisrv.dev",
|
host: "flashrom.webtv.onl",
|
||||||
path: "/" + request_path,
|
path: "/" + request_path,
|
||||||
timeout: 5000,
|
timeout: 5000,
|
||||||
method: 'GET'
|
method: 'GET'
|
||||||
|
|||||||
@@ -355,7 +355,8 @@ class WTVNews {
|
|||||||
var messages = [];
|
var messages = [];
|
||||||
var promises = [];
|
var promises = [];
|
||||||
for (var article in NGArticles) {
|
for (var article in NGArticles) {
|
||||||
if (article == "getCaseInsensitiveKey") continue;
|
if (article == "getCaseInsensitiveKey" || isNaN(article)) continue;
|
||||||
|
console.log(article);
|
||||||
promises.push(new Promise((resolve, reject) => {
|
promises.push(new Promise((resolve, reject) => {
|
||||||
this.getHeader(NGArticles[article]).then((data) => {
|
this.getHeader(NGArticles[article]).then((data) => {
|
||||||
if (data.article) messages.push(data.article)
|
if (data.article) messages.push(data.article)
|
||||||
|
|||||||
@@ -781,12 +781,16 @@ class WTVShared {
|
|||||||
}
|
}
|
||||||
|
|
||||||
censorSSID(ssid) {
|
censorSSID(ssid) {
|
||||||
|
if (ssid) {
|
||||||
if (ssid.slice(0, 8) === "MSTVSIMU") {
|
if (ssid.slice(0, 8) === "MSTVSIMU") {
|
||||||
return ssid.slice(0, 10) + ('*').repeat(10) + ssid.slice(20);
|
return ssid.slice(0, 10) + ('*').repeat(10) + ssid.slice(20);
|
||||||
} else if (ssid.slice(0, 5) === "1SEGA") {
|
} else if (ssid.slice(0, 5) === "1SEGA") {
|
||||||
return ssid.slice(0, 6) + ('*').repeat(6) + ssid.slice(12);
|
return ssid.slice(0, 6) + ('*').repeat(6) + ssid.slice(12);
|
||||||
}
|
}
|
||||||
return ssid.slice(0, 6) + ('*').repeat(9);
|
return ssid.slice(0, 6) + ('*').repeat(9);
|
||||||
|
} else {
|
||||||
|
return "????????????????";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -816,11 +820,13 @@ class WTVShared {
|
|||||||
const passwordRegex = /(^pass$|passw(or)?d)/i;
|
const passwordRegex = /(^pass$|passw(or)?d)/i;
|
||||||
let newobj = this.cloneObj(obj); // Clone the object once at the beginning
|
let newobj = this.cloneObj(obj); // Clone the object once at the beginning
|
||||||
|
|
||||||
|
if (newobj.query) {
|
||||||
Object.keys(newobj.query).forEach((k) => {
|
Object.keys(newobj.query).forEach((k) => {
|
||||||
if (passwordRegex.test(k)) {
|
if (passwordRegex.test(k)) {
|
||||||
newobj.query[k] = '*'.repeat(newobj.query[k].length);
|
newobj.query[k] = '*'.repeat(newobj.query[k].length);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return newobj;
|
return newobj;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -112,7 +112,8 @@
|
|||||||
"wtv-head-waiter": {
|
"wtv-head-waiter": {
|
||||||
// wtv-head-waiter handles logins
|
// wtv-head-waiter handles logins
|
||||||
"port": 1601,
|
"port": 1601,
|
||||||
"connections": 1
|
"connections": 1,
|
||||||
|
"privileged": true
|
||||||
},
|
},
|
||||||
"wtv-tricks": {
|
"wtv-tricks": {
|
||||||
// wtv-tricks
|
// wtv-tricks
|
||||||
@@ -311,13 +312,25 @@
|
|||||||
"external_proxy_port": 1080, // Port of proxy
|
"external_proxy_port": 1080, // Port of proxy
|
||||||
"flags": "0x00000001"
|
"flags": "0x00000001"
|
||||||
},
|
},
|
||||||
|
"proto": {
|
||||||
|
"port": 1650,
|
||||||
|
"connections": 3,
|
||||||
|
"use_external_proxy": true,
|
||||||
|
"replace_protocol": "http",
|
||||||
|
"external_proxy_is_socks": false,
|
||||||
|
"external_proxy_host": "wayback.protoweb.org",
|
||||||
|
"external_proxy_port": 7851,
|
||||||
|
"external_proxy_is_http1": true,
|
||||||
|
"flags": "0x00000001"
|
||||||
|
},
|
||||||
|
|
||||||
"pb_services": {
|
"pb_services": {
|
||||||
// PC Services for PageBuilder
|
// PC Services for PageBuilder
|
||||||
"port": 1697,
|
"port": 1697,
|
||||||
"pc_services": true, // defines service as a PC service
|
"pc_services": true, // defines service as a PC service
|
||||||
"hide_minisrv_version": true, // hide or show the minisrv version (eg like Apache version, can be hidden to hide known exploits for older version)
|
"hide_minisrv_version": true, // hide or show the minisrv version (eg like Apache version, can be hidden to hide known exploits for older version)
|
||||||
"servicevault_dir": "http_pb", // The service vault dir for the PC Services for PageBuilder
|
"servicevault_dir": "http_pb", // The service vault dir for the PC Services for PageBuilder
|
||||||
"service_vaults": ["PageBuilderVault"], // additional service vaults for this service
|
"service_vaults": [ "PageBuilderVault" ], // additional service vaults for this service
|
||||||
"drop_connection_on_wrong_port": true, // If true, resets connection if the PC browser connects to a port that is not PC Services enabled
|
"drop_connection_on_wrong_port": true, // If true, resets connection if the PC browser connects to a port that is not PC Services enabled
|
||||||
"show_verbose_errors": false, // extra debugging
|
"show_verbose_errors": false, // extra debugging
|
||||||
"allow_https": false, // for future use with LetsEncrypt
|
"allow_https": false, // for future use with LetsEncrypt
|
||||||
|
|||||||
4
zefie_wtvp_minisrv/package-lock.json
generated
4
zefie_wtvp_minisrv/package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "zefie_wtvp_minisrv",
|
"name": "zefie_wtvp_minisrv",
|
||||||
"version": "0.9.47",
|
"version": "0.9.49",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "zefie_wtvp_minisrv",
|
"name": "zefie_wtvp_minisrv",
|
||||||
"version": "0.9.47",
|
"version": "0.9.49",
|
||||||
"license": "GPL3",
|
"license": "GPL3",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mafintosh/vm2": "^3.9.2",
|
"@mafintosh/vm2": "^3.9.2",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "zefie_wtvp_minisrv",
|
"name": "zefie_wtvp_minisrv",
|
||||||
"version": "0.9.49",
|
"version": "0.9.50",
|
||||||
"description": "WebTV Service (WTVP) Emulation Server",
|
"description": "WebTV Service (WTVP) Emulation Server",
|
||||||
"main": "app.js",
|
"main": "app.js",
|
||||||
"homepage": "https://github.com/zefie/zefie_wtvp_minisrv",
|
"homepage": "https://github.com/zefie/zefie_wtvp_minisrv",
|
||||||
|
|||||||
Reference in New Issue
Block a user