jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #34: fix RFB 3.3/3.7 with no auth scheme. 

- Split out ClientInitialisation state.

- In version 3.3 and 3.7, when the server has no auth (scheme
  1), then we should skip from Authentication to ClientInitialisation.
This commit is contained in:
Joel Martin 2010-10-28 16:30:41 -05:00
parent 3dc3135b21
commit 1f758e87d3
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/rfb.js
View File

@ -378,6 +378,7 @@ print_stats = function() {
* Authentication * Authentication
* password - waiting for password, not part of RFB * password - waiting for password, not part of RFB
* SecurityResult * SecurityResult
* ClientInitialization - not triggered by server message
* ServerInitialization * ServerInitialization
*/ */
updateState = function(state, statusMsg) { updateState = function(state, statusMsg) {
@ -734,11 +735,12 @@ init_msg = function() {
cversion = "00" + parseInt(rfb_version,10) + cversion = "00" + parseInt(rfb_version,10) +
".00" + ((rfb_version * 10) % 10); ".00" + ((rfb_version * 10) % 10);
send_string("RFB " + cversion + "\n"); send_string("RFB " + cversion + "\n");
updateState('Security', "Sent ProtocolVersion: " + sversion); updateState('Security', "Sent ProtocolVersion: " + cversion);
break; break;
case 'Security' : case 'Security' :
if (rfb_version >= 3.7) { if (rfb_version >= 3.7) {
// Server sends supported list, client decides
num_types = rQ[rQi++]; num_types = rQ[rQi++];
if (rQwait("security type", num_types, 1)) { return false; } if (rQwait("security type", num_types, 1)) { return false; }
if (num_types === 0) { if (num_types === 0) {
@ -760,6 +762,7 @@ init_msg = function() {
send_array([rfb_auth_scheme]); send_array([rfb_auth_scheme]);
} else { } else {
// Server decides
if (rQwait("security scheme", 4)) { return false; } if (rQwait("security scheme", 4)) { return false; }
rfb_auth_scheme = rQshift32(); rfb_auth_scheme = rQshift32();
} }
@ -768,6 +771,7 @@ init_msg = function() {
init_msg(); // Recursive fallthrough (workaround JSLint complaint) init_msg(); // Recursive fallthrough (workaround JSLint complaint)
break; break;
// Triggered by fallthough, not by server message
case 'Authentication' : case 'Authentication' :
//Util.Debug("Security auth scheme: " + rfb_auth_scheme); //Util.Debug("Security auth scheme: " + rfb_auth_scheme);
switch (rfb_auth_scheme) { switch (rfb_auth_scheme) {
@ -777,7 +781,12 @@ init_msg = function() {
reason = rQshiftStr(strlen); reason = rQshiftStr(strlen);
return fail("Auth failure: " + reason); return fail("Auth failure: " + reason);
case 1: // no authentication case 1: // no authentication
updateState('SecurityResult'); if (rfb_version >= 3.8) {
updateState('SecurityResult');
return;
} else {
// Fall through to ClientInitialisation
}
break; break;
case 2: // VNC authentication case 2: // VNC authentication
if (rfb_password.length === 0) { if (rfb_password.length === 0) {
@ -796,11 +805,13 @@ init_msg = function() {
//Util.Debug("Sending DES encrypted auth response"); //Util.Debug("Sending DES encrypted auth response");
send_array(response); send_array(response);
updateState('SecurityResult'); updateState('SecurityResult');
break; return;
default: default:
fail("Unsupported auth scheme: " + rfb_auth_scheme); fail("Unsupported auth scheme: " + rfb_auth_scheme);
return; return;
} }
updateState('ClientInitialisation', "No auth required");
init_msg(); // Recursive fallthrough (workaround JSLint complaint)
break; break;
case 'SecurityResult' : case 'SecurityResult' :
@ -809,7 +820,7 @@ init_msg = function() {
} }
switch (rQshift32()) { switch (rQshift32()) {
case 0: // OK case 0: // OK
updateState('ServerInitialisation', "Authentication OK"); // Fall through to ClientInitialisation
break; break;
case 1: // failed case 1: // failed
if (rfb_version >= 3.8) { if (rfb_version >= 3.8) {
@ -826,7 +837,14 @@ init_msg = function() {
case 2: // too-many case 2: // too-many
return fail("Too many auth attempts"); return fail("Too many auth attempts");
} }
updateState('ClientInitialisation', "Authentication OK");
init_msg(); // Recursive fallthrough (workaround JSLint complaint)
break;
// Triggered by fallthough, not by server message
case 'ClientInitialisation' :
send_array([conf.shared ? 1 : 0]); // ClientInitialisation send_array([conf.shared ? 1 : 0]); // ClientInitialisation
updateState('ServerInitialisation', "Authentication OK");
break; break;
case 'ServerInitialisation' : case 'ServerInitialisation' :