diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js index ad2b272a..c5f4a7a3 100644 --- a/zefie_wtvp_minisrv/app.js +++ b/zefie_wtvp_minisrv/app.js @@ -781,7 +781,7 @@ minisrv-no-mail-count: true`; else console.log(" * " + ((ssl) ? "SSL " : "") + "PC request on service " + original_service_name + " (Service Vault " + service_name + ") for " + request_headers.request_url, 'on', socket.id); } - if ((shortURL.indexOf(':/') >= 0) && (shortURL.indexOf('://') == -1 || (shortURL.indexOf('://') && (shortURL.startsWith("irc") || shortURL.startsWith("wtvchat"))))) { + if ((shortURL.indexOf(':/') >= 0) && (shortURL.indexOf('://') == -1 || (shortURL.indexOf('://') && minisrv_config.services[service_name].allow_double_slash) { var ssid = socket.ssid; if (ssid == null) { // prevent possible injection attacks via malformed SSID and filesystem SessionStore diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-passport/messengerlogin.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-passport/messengerlogin.js index 80c82df1..d549a308 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-passport/messengerlogin.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-passport/messengerlogin.js @@ -46,6 +46,7 @@ if (messenger_email && messenger_password) { }); }); request2.on('error', (error) => { + data = "200: OK"; console.error(' *** Error (Stage 1)', error); }); @@ -53,7 +54,10 @@ if (messenger_email && messenger_password) { }); request.on('error', (error) => { + data = "200: OK"; console.error(' *** Error (Stage 1)', error); }); } +} else { + data = "200: OK"; } \ No newline at end of file diff --git a/zefie_wtvp_minisrv/includes/config.json b/zefie_wtvp_minisrv/includes/config.json index c39bcf59..18c7e8cd 100644 --- a/zefie_wtvp_minisrv/includes/config.json +++ b/zefie_wtvp_minisrv/includes/config.json @@ -219,15 +219,19 @@ "connections": 3 }, "wtvchat": { - "port": 1630, - "nobind": true, - "flags": "0x00000004" - }, - "irc": { + // wtvchat://server:port/channel passthrough (wni official) "port": 1630, "nobind": true, "flags": "0x00000004", - "servicevault_dir": "wtvchat" + "allow_double_slash": true // allows service:// .. don't enable on http or https + }, + "irc": { + // irc://server:port/channel passthrough (something wni should have had...) + "port": 1630, + "nobind": true, + "flags": "0x00000004", + "servicevault_dir": "wtvchat", // share service_vault with wtvchat + "allow_double_slash": true // allows service:// .. don't enable on http or https }, "wtv-disk": { // wtv-disk (used for DiskMaps) @@ -305,10 +309,10 @@ "force_https": false, "https_cert": { /* self-signed, can be replaced with another cert */ - // "domain": "mycooldomain.com", - "cert": "%ServiceDeps%/https/selfsigned_cert.pem", - "key": "%ServiceDeps%/https/selfsigned_key.pem" - } + // "domain": "mycooldomain.com", + "cert": "%ServiceDeps%/https/selfsigned_cert.pem", + "key": "%ServiceDeps%/https/selfsigned_key.pem" + } } }, "favorites": {