v0.9.13

- wtv-cookie support
 - further development will be in dev branch (may rebase alot)
 - compression not yet ready, leave it disabled
 - update: do not delete WTVSec on last socket, instead recreate on prereg
 - update: clean up SSID session data only if client is not seen for 3 minutes
 - update: add shouldWeCompress() function
 - update: tweak lzpf (still corrupted)
 - update: rename wtv-setup:/get to wtv-setup:/get-settings
 - update: add additional headers to wtv-setup:/get-settings
 - update: add initial blank wtv-music:/get-playlist
 - update wtv-tricks system
   - Info now shows Guest Mode or Subscriber Info
   - Implemented wtv-tricks:/unregister
   - Implemented wtv-tricks:/register
   - Show correct link in wtv-tricks:/tricks based on Guest Mode status
 - config.json: enable compression by default
 - WTVP does not use \r, so swapping the internal header's usage for now. May remove internal header in future update
 - lzpf: this doesn't fix anything but doesn't break it more either :)
  - renamed some functions
  - fixed some param documentation
  - added ConvertToBuffer function
 - WTVSec Updates
  - optimize WordArray to Buffer functions
  - update documentation in WTVSec
  - update WTVSec barrowed function in WTVLzpf
  - removed NewRC4Session, was a pointless alias to SecureOn

zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js

@@ -12,39 +12,33 @@ if (socket.ssid != null && !ssid_sessions[socket.ssid].get("wtvsec_login")) {
 
 if (socket.ssid !== null) {
 	if (wtvsec_login.ticket_b64 == null) {
-		if (request_headers["wtv-ticket"]) {
-			if (request_headers["wtv-ticket"].length > 8) {
-				wtvsec_login.DecodeTicket(request_headers["wtv-ticket"]);
-				wtvsec_login.ticket_b64 = request_headers["wtv-ticket"];
+		challenge_response = wtvsec_login.challenge_response;
+		var client_challenge_response = request_headers["wtv-challenge-response"] || null;
+		if (challenge_response && client_challenge_response) {
+			if (challenge_response.toString(CryptoJS.enc.Base64) == client_challenge_response) {
+				console.log(" * wtv-challenge-response success for " + filterSSID(socket.ssid));
+				wtvsec_login.PrepareTicket();
+
+			} else {
+				console.log(" * wtv-challenge-response FAILED for " + filterSSID(socket.ssid));
+				if (zdebug) console.log("Response Expected:", challenge_response.toString(CryptoJS.enc.Base64));
+				if (zdebug) console.log("Response Received:", client_challenge_response)
+				gourl = "wtv-head-waiter:/login?reissue_challenge=true";
 			}
 		} else {
-			challenge_response = wtvsec_login.challenge_response;
-			var client_challenge_response = request_headers["wtv-challenge-response"] || null;
-			if (challenge_response && client_challenge_response) {		
-				if (challenge_response.toString(CryptoJS.enc.Base64) == client_challenge_response) {
-					console.log(" * wtv-challenge-response success for " + filterSSID(socket.ssid));
-					wtvsec_login.PrepareTicket();
-					if (!ssid_sessions[socket.ssid].getSessionData("registered")) gourl = "wtv-register:/splash";
-
-				} else {
-					console.log(" * wtv-challenge-response FAILED for " + filterSSID(socket.ssid));
-					if (zdebug) console.log("Response Expected:", challenge_response.toString(CryptoJS.enc.Base64));
-					if (zdebug) console.log("Response Received:", client_challenge_response)
-					gourl = "wtv-head-waiter:/login?reissue_challenge=true";
-				}
-			} else {
-				gourl = "wtv-head-waiter:/login?no_response=true";
-			}
+			gourl = "wtv-head-waiter:/login?no_response=true";
 		}
 	}
 }
 
+if (!ssid_sessions[socket.ssid].getSessionData("registered") && (!request_headers.query.guest_login || !minisrv_config.config.allow_guests)) gourl = "wtv-register:/splash";
+
 if (gourl) {
 	headers = `200 OK
 Connection: Close
 wtv-open-isp-disabled: false
 `;
-	if (!ssid_sessions[socket.ssid].session_data.registered && !request_headers.query.guest_mode) {
+	if (!ssid_sessions[socket.ssid].getSessionData("registered") && (!request_headers.query.guest_login || !minisrv_config.config.allow_guests)) {
 		headers += `wtv-encrypted: true
 wtv-ticket: ${wtvsec_login.ticket_b64}
 ${getServiceString('wtv-register')}
@@ -58,14 +52,15 @@ Content-type: text/html`;
 	data = '';
 }
 else {
-	if (request_headers.query.guest_mode) {
+	if (request_headers.query.guest_login && minisrv_config.config.allow_guests) {
 		var namerand = Math.floor(Math.random() * 100000);
 		var nickname = (minisrv_config.config.service_name + '_' + namerand)
 		var human_name = nickname;
 		var userid = '1' + Math.floor(Math.random() * 1000000000000000000);
 		var messenger_enabled = 0;
 		var messenger_authorized = 0;
-		var home_url = "wtv-home:/home?";
+		if (request_headers.query.skip_splash) var home_url = "wtv-home:/home?";
+		else var home_url = "wtv-home:/splash?";
 	} else if (!ssid_sessions[socket.ssid].getSessionData("registered")) {
 		var errpage = doErrorPage(400);
 		headers = errpage[0];
@@ -99,7 +94,7 @@ wtv-messenger-authorized: ${messenger_authorized}
 wtv-messenger-enable: ${messenger_enabled}
 wtv-noback-all: wtv-
 wtv-service: reset
-`+ getServiceString('all', { "exceptions": ["wtv-register"] } ) + `
+`+ getServiceString('all', { "exceptions": ["wtv-register"] }) + `
 user-id: ${userid}
 wtv-human-name: ${human_name}
 ${ssid_sessions[socket.ssid].setIRCNick(nickname)}
@@ -111,15 +106,36 @@ wtv-input-timeout: 14400
 wtv-connection-timeout: 90
 wtv-fader-timeout: 900
 wtv-smartcard-inserted-message: Contacting service
+user-id: ${userid}
+wtv-transition-override: off
+wtv-allow-dsc: true
+wtv-messenger-enable: 0
+wtv-noback-all: wtv-
+wtv-service: reset
+`+ getServiceString('all') + `
+wtv-boot-url: wtv-1800:/preregister?relogin=true
+wtv-human-name: ${nickname}
+${ssid_sessions[socket.ssid].setIRCNick(nickname)}
+wtv-home-url: wtv-home:/home?`
+	if (ssid_sessions[socket.ssid].get('wtv-need-upgrade') != 'true' && !request_headers.query.reconnect) {
+		headers += "\nwtv-settings-url: wtv-setup:/get-settings";
+	}
+headers += `
+wtv-domain: wtv.zefie.com
 wtv-inactive-timeout: 0
 wtv-connection-timeout: 90
 wtv-show-time-enabled: true
 wtv-fader-timeout: 900
-wtv-tourist-enabled: true
-wtv-boot-url: wtv-1800:/preregister?relogin=true
-wtv-allow-dsc: true
-wtv-home-url: wtv-home:/home?
-`
+wtv-tourist-enabled: true`
+	headers += "\nwtv-relogin-url: wtv-1800:/preregister?relogin=true";
+	if (request_headers.query.guest_login) headers += "&guest_login=true";
+	headers += "\nwtv-reconnect-url: wtv-1800:/preregister?reconnect=true";
+	if (request_headers.query.guest_login) headers += "&guest_login=true";
+	headers += "\nwtv-boot-url: wtv-1800:/preregister?relogin=true";
+	if (request_headers.query.guest_login) headers += "&guest_login=true";
+	headers += "\nwtv-allow-dsc: true";
+	headers += "\nwtv-home-url: wtv-home:/home?";
+
 	if (ssid_sessions[socket.ssid].get('wtv-need-upgrade') != 'true' && !request_headers.query.reconnect) {
 		headers += "\nwtv-settings-url: wtv-setup:/get";
 	}

zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js

@@ -2,7 +2,14 @@ var challenge_response, challenge_header = "";
 
 var gourl = "wtv-head-waiter:/login-stage-two?";
 if (request_headers.query.relogin) gourl += "relogin=true";
-if (request_headers.query.reconnect) gourl += "reconnect=true";
+else if (request_headers.query.reconnect) gourl += "reconnect=true";
+
+if (request_headers.query.guest_login) {
+	if (request_headers.query.relogin || request_headers.query.reconnect) gourl += "&";
+	gourl += "guest_login=true";
+	if (request_headers.query.skip_splash) gourl += "&skip_splash=true";
+}
+
 var send_to_relogin = true;
 
 if (socket.ssid) {